diff --git a/.cargo/config b/.cargo/config
index 908f2d6dde..f6764a55b4 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,2 +1,3 @@
 [target.wasm32-unknown-unknown]
-runner = 'wasm-bindgen-test-runner'
\ No newline at end of file
+runner = 'wasm-bindgen-test-runner-0.2.78'
+rustflags = ["--cfg=web_sys_unstable_apis"]
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..2bd048103b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,140 @@
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: cargo
+    # Define the location of the package manifests
+    directory: "/mm2src/coins/"
+    schedule:
+      # By default, Dependabot checks for new versions on Monday at a random set time for the repository
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/common/shared_ref_counter/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/coins/lightning_persister/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/coins/lightning_background_processor/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/coins/utxo_signer/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/coins_activation/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/crypto/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/db_common/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/derives/ser_error/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/derives/ser_error_derive/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/floodsub/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/gossipsub/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+  - package-ecosystem: cargo
+    directory: "/mm2src/hw_common/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/crypto/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/chain/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/keys/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/rpc/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/primitives/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/script/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/serialization/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/serialization_derive/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_bitcoin/test_helpers/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_core/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_db/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_err_handle/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_test_helpers/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_libp2p/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_main/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_net/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_io/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/mm2_rpc/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/rpc_task/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: "/mm2src/trezor/"
+    schedule:
+      interval: weekly
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 02b05a90e7..7c885a57a3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,12 @@ iguana/exchanges/manychains
 
 # coins configuration file
 /coins
+# MM2 conf to avoid occasional adding to git by someone
+MM2.json
+
+# vim
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1429f1d6c3..cc6a24afa1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to AtomicDEX Marketmaker
+# Contributing to AtomicDEX-API
 
 We welcome contribution from everyone in the form of suggestions, bug reports, pull requests, and feedback.
 Please note we have a code of conduct, please follow it in all your interactions with the project.
@@ -14,16 +14,40 @@ cargo test --all
 We also use [Clippy](https://github.com/rust-lang/rust-clippy) to avoid common mistakes
 and we use [rustfmt](https://github.com/rust-lang/rustfmt) to make our code clear to everyone.
 
-1. Install these tools (only once):
-    ```
-    rustup component add rustfmt
-    rustup component add clippy
-    ```
 1. Format the code using rustfmt:
-    ```
+    ```shell
     cargo fmt
     ```
-1. Make sure there are no warnings and errors. Run the Clippy:
-    ```
+2. Make sure there are no warnings and errors. Run the Clippy:
+    ```shell
     cargo clippy -- -D warnings
     ```
+   Install cargo udeps
+   ```shell
+    cargo install cargo-udeps
+    ```
+3. Make sure there are no unused dependencies. Run the following check
+   ```shell
+   cargo udeps
+   ```
+   Install cargo deny
+   ```shell
+   cargo install cargo-deny
+   ```
+4. Make sure that no new dependencies duplicates appear. Run the following check
+   ```shell
+   cargo deny check bans
+   ```
+5. Make sure that dependencies do not have known vulnerabilities. If they do, update them.
+   ```shell
+   cargo deny check advisories
+   ```
+
+### Run WASM tests
+
+1. Install Firefox.
+1. Download Gecko driver for your OS: https://github.com/mozilla/geckodriver/releases
+1. Run the tests
+    ```
+    WASM_BINDGEN_TEST_TIMEOUT=120 GECKODRIVER=PATH_TO_GECKO_DRIVER_BIN wasm-pack test --firefox --headless mm2src/mm2_main
+    ```
diff --git a/Cargo.lock b/Cargo.lock
index a5ce80b61e..ec11587fa3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,7 +39,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "922b33332f54fc0ad13fa3e514601e8d30fb54e1f3eadc36643f6526db645621"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -55,13 +55,13 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "495ee669413bfbe9e8cace80f4d3d78e6d8c8d99579f97fb93bde351b185f2d4"
+checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
  "cfg-if 1.0.0",
  "cipher 0.3.0",
- "cpufeatures",
+ "cpufeatures 0.2.1",
  "opaque-debug 0.3.0",
 ]
 
@@ -72,7 +72,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f"
 dependencies = [
  "aead",
- "aes 0.7.4",
+ "aes 0.7.5",
  "cipher 0.3.0",
  "ctr",
  "ghash",
@@ -99,21 +99,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
-dependencies = [
- "const-random",
-]
-
-[[package]]
-name = "ahash"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
-
 [[package]]
 name = "ahash"
 version = "0.4.7"
@@ -122,24 +107,39 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
 
 [[package]]
 name = "ahash"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.6",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.12"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c259a748ac706ba73d609b73fc13469e128337f9a6b2fb3cc82d100f8dd8d511"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.42"
@@ -185,6 +185,12 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d6e24d2cce90c53b948c46271bfb053e4bdc2db9b5d3f65e20f8cf28a1b7fc3"
 
+[[package]]
+name = "assert_matches"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
+
 [[package]]
 name = "async-std"
 version = "1.6.2"
@@ -192,23 +198,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00d68a33ebc8b57800847d00787307f84a562224a14db069b0acefe4c2abbf5d"
 dependencies = [
  "async-task",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures-channel",
  "futures-core",
  "futures-io",
  "futures-timer",
  "kv-log-macro",
- "log 0.4.11",
+ "log 0.4.14",
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.1.7",
+ "pin-project-lite 0.1.12",
  "pin-utils",
  "slab 0.4.2",
  "smol",
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
 [[package]]
 name = "async-task"
 version = "3.0.0"
@@ -217,13 +244,13 @@ checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3"
 
 [[package]]
 name = "async-trait"
-version = "0.1.36"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92"
+checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -232,20 +259,11 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.6",
-]
-
-[[package]]
-name = "atomic"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281"
-dependencies = [
- "autocfg 1.0.0",
+ "pin-project-lite 0.2.9",
 ]
 
 [[package]]
@@ -266,7 +284,7 @@ dependencies = [
  "byteorder 1.4.3",
  "bytes 0.5.6",
  "common",
- "env_logger",
+ "env_logger 0.7.1",
  "fnv",
  "futures 0.3.15",
  "futures_codec",
@@ -274,13 +292,12 @@ dependencies = [
  "libp2p-plaintext",
  "libp2p-swarm",
  "libp2p-yamux",
- "log 0.4.11",
- "lru 0.4.3",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "quickcheck",
  "rand 0.7.3",
- "sha2 0.8.2",
+ "sha2 0.9.9",
  "smallvec 1.6.1",
  "unsigned-varint 0.4.0",
  "wasm-timer",
@@ -309,6 +326,49 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
+[[package]]
+name = "axum"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2504b827a8bef941ba3dd64bdffe9cf56ca182908a147edd6189c95fbcae7d"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags",
+ "bytes 1.1.0",
+ "futures-util",
+ "http 0.2.7",
+ "http-body 0.4.4",
+ "hyper",
+ "itoa 1.0.1",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding 2.1.0",
+ "pin-project-lite 0.2.9",
+ "serde",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-http",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da31c0ed7b4690e2c78fe4b880d21cd7db04a346ebc658b4270251b695437f17"
+dependencies = [
+ "async-trait",
+ "bytes 1.1.0",
+ "futures-util",
+ "http 0.2.7",
+ "http-body 0.4.4",
+ "mime",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.49"
@@ -329,11 +389,23 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
 
+[[package]]
+name = "base16ct"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+
+[[package]]
+name = "base32"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
+
 [[package]]
 name = "base58"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
+checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
 
 [[package]]
 name = "base64"
@@ -364,9 +436,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bech32"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c7f7096bc256f5e5cb960f60dfc4f4ef979ca65abe7fb9d5a4f77150d3783d4"
+checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
 
 [[package]]
 name = "bellman"
@@ -378,10 +450,10 @@ dependencies = [
  "blake2s_simd",
  "byteorder 1.4.3",
  "crossbeam",
- "ff",
+ "ff 0.8.0",
  "futures 0.1.29",
  "futures-cpupool",
- "group",
+ "group 0.8.0",
  "num_cpus",
  "pairing",
  "rand_core 0.5.1",
@@ -390,86 +462,67 @@ dependencies = [
 
 [[package]]
 name = "bigdecimal"
-version = "0.1.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1374191e2dd25f9ae02e3aa95041ed5d747fc77b3c102b49fe2dd9a8117a6244"
+checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744"
 dependencies = [
- "num-bigint 0.2.6",
+ "num-bigint 0.4.3",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits",
  "serde",
 ]
 
 [[package]]
-name = "bimap"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528c4b6f81eb2aadd3504da4ddc5bf5caec1b4aaf0d9dccfb8aaf2850f5b39c"
-
-[[package]]
-name = "bitcoin-cash"
-version = "0.2.3"
+name = "bincode"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35904d3f449fe9a01c5b8b872015415feea85cffc18b15170ddd665db9a78a82"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "base64 0.12.3",
- "bimap",
- "bitcoin-cash-base",
- "bitcoin-cash-script-macro",
- "bitflags",
- "byteorder 1.4.3",
- "error-chain",
- "hex 0.4.2",
- "hex-literal",
- "num",
- "num-derive",
- "num-traits 0.2.12",
- "ripemd160 0.9.1",
  "serde",
- "serde_derive",
- "serde_json",
- "sha-1 0.9.4",
- "sha2 0.9.5",
 ]
 
 [[package]]
-name = "bitcoin-cash-base"
-version = "0.2.0"
+name = "bip32"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d008cf4ceea63e1a9182c96ac320f263c53ddc70282b523f19500f454e490db"
+checksum = "c2d0f0fc59c7ba0333eed9dcc1b6980baa7b7a4dc7c6c5885994d0674f7adf34"
 dependencies = [
- "byteorder 1.4.3",
- "hex 0.4.2",
- "lazy_static",
- "num",
- "num-derive",
- "num-traits 0.2.12",
- "serde",
- "serde_derive",
+ "bs58",
+ "hkd32",
+ "hmac 0.11.0",
+ "ripemd160",
+ "secp256k1",
+ "sha2 0.9.9",
+ "subtle 2.4.0",
+ "zeroize",
 ]
 
 [[package]]
-name = "bitcoin-cash-script-macro"
-version = "0.2.0"
+name = "bitcoin"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3469ca4ed0b2d142528565dae7f9bba9313a3f833e771e400ef0bc2269ee8e95"
+checksum = "9a41df6ad9642c5c15ae312dd3d074de38fd3eb7cc87ad4ce10f90292a83fe4d"
 dependencies = [
- "bitcoin-cash-base",
- "proc-macro2",
- "quote 1.0.7",
- "regex",
- "syn 1.0.72",
- "tempfile",
- "toolchain_find",
+ "bech32",
+ "bitcoin_hashes",
+ "bitcoinconsensus",
+ "secp256k1",
 ]
 
 [[package]]
-name = "bitcoin-cash-slp"
-version = "0.3.1"
+name = "bitcoin_hashes"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0"
+
+[[package]]
+name = "bitcoinconsensus"
+version = "0.19.0-3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744837d4735aab854e4722a3a2ee942aaa96c6c02de7e06594e6511ef9fba309"
+checksum = "1a8aa43b5cd02f856cb126a9af819e77b8910fdd74dd1407be649f2f5fe3a1b5"
 dependencies = [
- "bitcoin-cash",
+ "cc",
+ "libc",
 ]
 
 [[package]]
@@ -478,18 +531,19 @@ version = "0.1.0"
 dependencies = [
  "groestl",
  "primitives",
- "ripemd160 0.8.0",
- "sha-1 0.8.2",
- "sha2 0.8.2",
+ "ripemd160",
+ "serialization",
+ "sha-1",
+ "sha2 0.9.9",
  "sha3",
  "siphasher",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitmaps"
@@ -506,9 +560,9 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98fcd36dda4e17b7d7abc64cb549bf0201f4ab71e00700c798ca7e62ed3761fa"
 dependencies = [
- "funty",
+ "funty 1.1.0",
  "radium 0.3.0",
- "wyz",
+ "wyz 0.2.0",
 ]
 
 [[package]]
@@ -517,33 +571,31 @@ version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
 dependencies = [
- "funty",
+ "funty 1.1.0",
  "radium 0.5.3",
  "tap",
- "wyz",
+ "wyz 0.2.0",
 ]
 
 [[package]]
 name = "bitvec"
-version = "0.20.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b"
 dependencies = [
- "funty",
- "radium 0.6.2",
+ "funty 2.0.0",
+ "radium 0.7.0",
  "tap",
- "wyz",
+ "wyz 0.5.0",
 ]
 
 [[package]]
 name = "blake2"
-version = "0.9.1"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4"
+checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388"
 dependencies = [
- "crypto-mac 0.8.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "digest 0.10.3",
 ]
 
 [[package]]
@@ -568,6 +620,20 @@ dependencies = [
  "constant_time_eq",
 ]
 
+[[package]]
+name = "blake3"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.1",
+ "cc",
+ "cfg-if 1.0.0",
+ "constant_time_eq",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -586,7 +652,17 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.4",
+ "block-padding 0.2.1",
+ "generic-array 0.14.5",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+dependencies = [
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -634,27 +710,66 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4caf0101205582491f772d60a6fcb6bcec19963e68209cb631851eeadb01421f"
 dependencies = [
  "bitvec 0.18.5",
- "ff",
- "group",
+ "ff 0.8.0",
+ "group 0.8.0",
  "pairing",
  "rand_core 0.5.1",
  "subtle 2.4.0",
 ]
 
 [[package]]
-name = "bs58"
-version = "0.4.0"
+name = "borsh"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa"
+dependencies = [
+ "borsh-derive",
+ "hashbrown 0.11.2",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775"
 dependencies = [
- "sha2 0.9.5",
+ "borsh-derive-internal",
+ "borsh-schema-derive-internal",
+ "proc-macro-crate 0.1.5",
+ "proc-macro2 1.0.39",
+ "syn 1.0.95",
 ]
 
 [[package]]
-name = "build_const"
-version = "0.2.1"
+name = "borsh-derive-internal"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "borsh-schema-derive-internal"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "bs58"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+dependencies = [
+ "sha2 0.9.9",
+]
 
 [[package]]
 name = "bumpalo"
@@ -662,6 +777,16 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
 
+[[package]]
+name = "bv"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8834bb1d8ee5dc048ee3124f2c7c1afcc6bc9aed03f11e9dfd8c69470a5db340"
+dependencies = [
+ "feature-probe",
+ "serde",
+]
+
 [[package]]
 name = "byte-slice-cast"
 version = "1.0.0"
@@ -674,6 +799,26 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
+[[package]]
+name = "bytemuck"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -704,9 +849,30 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
 [[package]]
 name = "bytes"
-version = "1.0.1"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+
+[[package]]
+name = "bzip2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
 
 [[package]]
 name = "cache-padded"
@@ -714,11 +880,25 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24508e28c677875c380c20f4d28124fab6f8ed4ef929a1397d7b1a31e92f1005"
 
+[[package]]
+name = "caps"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61bf7211aad104ce2769ec05efcdfabf85ee84ac92461d142f22cf8badd0e54c"
+dependencies = [
+ "errno",
+ "libc",
+ "thiserror",
+]
+
 [[package]]
 name = "cc"
-version = "1.0.54"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
+checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"
+dependencies = [
+ "jobserver",
+]
 
 [[package]]
 name = "cfg-if"
@@ -734,21 +914,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chacha20"
-version = "0.7.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412"
+checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91"
 dependencies = [
  "cfg-if 1.0.0",
  "cipher 0.3.0",
- "cpufeatures",
+ "cpufeatures 0.2.1",
  "zeroize",
 ]
 
 [[package]]
 name = "chacha20poly1305"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5"
+checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a"
 dependencies = [
  "aead",
  "chacha20",
@@ -761,6 +941,7 @@ dependencies = [
 name = "chain"
 version = "0.1.0"
 dependencies = [
+ "bitcoin",
  "bitcrypto",
  "primitives",
  "rustc-hex 2.1.0",
@@ -776,7 +957,8 @@ checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
 dependencies = [
  "js-sys",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits",
+ "serde",
  "time 0.1.43",
  "wasm-bindgen",
 ]
@@ -787,7 +969,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -796,7 +978,22 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
+]
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
 ]
 
 [[package]]
@@ -817,49 +1014,82 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "coins"
 version = "0.1.0"
 dependencies = [
  "async-std",
  "async-trait",
+ "base58",
  "base64 0.10.1",
- "bigdecimal",
- "bitcoin-cash-slp",
+ "bincode",
+ "bip32",
+ "bitcoin",
+ "bitcoin_hashes",
  "bitcrypto",
  "byteorder 1.4.3",
  "bytes 0.4.12",
  "cfg-if 1.0.0",
  "chain",
  "common",
+ "crossbeam",
+ "crypto",
+ "db_common",
  "derive_more",
  "dirs",
+ "ed25519-dalek",
+ "ed25519-dalek-bip32 0.2.0",
  "ethabi",
  "ethcore-transaction",
  "ethereum-types 0.4.2",
  "ethkey",
- "fomat-macros 0.2.1",
  "futures 0.1.29",
  "futures 0.3.15",
  "gstuff",
- "hex 0.3.2",
- "http 0.2.1",
- "itertools 0.9.0",
+ "hex 0.4.2",
+ "http 0.2.7",
+ "itertools",
  "js-sys",
- "jsonrpc-core",
+ "jsonrpc-core 8.0.1",
  "keys",
  "lazy_static",
  "libc",
+ "lightning",
+ "lightning-background-processor",
+ "lightning-invoice",
+ "lightning-net-tokio",
+ "lightning-persister",
  "metrics",
+ "mm2_core",
+ "mm2_db",
+ "mm2_err_handle",
+ "mm2_io",
+ "mm2_net",
+ "mm2_number",
+ "mm2_test_helpers",
  "mocktopus",
- "num-traits 0.2.12",
+ "num-traits",
+ "parking_lot 0.12.0",
  "primitives",
+ "prost",
+ "prost-build",
+ "protobuf",
  "rand 0.7.3",
  "rlp 0.3.0",
  "rmp-serde",
  "rpc",
+ "rpc_task",
  "rust-ini",
- "rustls",
+ "rustls 0.20.4",
  "script",
  "secp256k1",
  "ser_error",
@@ -869,86 +1099,107 @@ dependencies = [
  "serde_json",
  "serialization",
  "serialization_derive",
- "sha2 0.8.2",
+ "sha2 0.9.9",
  "sha3",
+ "solana-client",
+ "solana-sdk",
+ "solana-transaction-status",
+ "spl-associated-token-account",
+ "spl-token",
+ "spv_validation",
+ "tiny-bip39",
  "tokio",
  "tokio-rustls",
+ "tonic",
+ "tonic-build",
+ "utxo_signer",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
  "web-sys",
  "web3",
- "webpki-roots 0.19.0",
+ "webpki-roots",
  "winapi",
+ "zbase32",
  "zcash_client_backend",
+ "zcash_client_sqlite",
  "zcash_primitives",
  "zcash_proofs",
 ]
 
 [[package]]
-name = "common"
+name = "coins_activation"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "arrayref",
- "async-std",
  "async-trait",
- "backtrace",
- "base64 0.10.1",
- "bigdecimal",
- "bitcrypto",
- "bytes 0.4.12",
+ "coins",
+ "common",
+ "crypto",
+ "derive_more",
+ "futures 0.3.15",
+ "hex 0.4.2",
+ "mm2_core",
+ "mm2_err_handle",
+ "mm2_number",
+ "rpc",
+ "rpc_task",
+ "ser_error",
+ "ser_error_derive",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
+[[package]]
+name = "common"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "arrayref",
+ "async-trait",
+ "backtrace",
+ "base64 0.10.1",
+ "bytes 1.1.0",
  "cc",
  "cfg-if 1.0.0",
  "chrono",
  "crossbeam",
  "crossterm",
- "derive_more",
  "findshlibs",
  "fnv",
- "fomat-macros 0.2.1",
- "fomat-macros 0.3.1",
  "futures 0.1.29",
  "futures 0.3.15",
  "futures-cpupool",
- "getrandom 0.2.2",
+ "getrandom 0.2.6",
  "gstuff",
  "hdrhistogram 7.1.0",
- "hex 0.3.2",
- "http 0.2.1",
+ "hex 0.4.2",
+ "http 0.2.7",
  "http-body 0.1.0",
  "hyper",
  "hyper-rustls",
- "indexmap",
- "itertools 0.8.2",
+ "itertools",
  "js-sys",
- "keys",
  "lazy_static",
  "libc",
- "log 0.4.11",
+ "lightning",
+ "log 0.4.14",
  "log4rs",
  "metrics",
  "metrics-core",
  "metrics-runtime",
  "metrics-util",
- "num-bigint 0.2.6",
- "num-rational 0.2.4",
- "num-traits 0.2.12",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "parking_lot_core 0.6.2",
- "paste",
- "primitives",
  "rand 0.7.3",
- "regex",
- "rusqlite",
  "ser_error",
  "ser_error_derive",
  "serde",
- "serde_bencode",
- "serde_bytes 0.11.5",
+ "serde-wasm-bindgen",
  "serde_derive",
  "serde_json",
  "serde_repr",
+ "shared_ref_counter",
  "tokio",
  "uuid",
  "wasm-bindgen",
@@ -969,35 +1220,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "console_error_panic_hook"
-version = "0.1.6"
+name = "console"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
 dependencies = [
- "cfg-if 0.1.10",
- "wasm-bindgen",
+ "encode_unicode",
+ "libc",
+ "once_cell",
+ "regex",
+ "terminal_size",
+ "unicode-width",
+ "winapi",
 ]
 
 [[package]]
-name = "const-random"
-version = "0.1.8"
+name = "console_error_panic_hook"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
 dependencies = [
- "const-random-macro",
- "proc-macro-hack",
+ "cfg-if 1.0.0",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "const-random-macro"
-version = "0.1.8"
+name = "console_log"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a"
+checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
 dependencies = [
- "getrandom 0.1.14",
- "proc-macro-hack",
+ "log 0.4.14",
+ "web-sys",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
+
 [[package]]
 name = "const_fn"
 version = "0.4.7"
@@ -1010,6 +1272,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
+[[package]]
+name = "core2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.1.4"
@@ -1020,27 +1291,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "cpuid-bool"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
-
-[[package]]
-name = "crc"
-version = "1.8.1"
+name = "cpufeatures"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
 dependencies = [
- "build_const",
+ "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1050,34 +1315,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
 dependencies = [
  "cfg-if 0.1.10",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
+ "crossbeam-channel 0.4.4",
+ "crossbeam-deque 0.7.4",
+ "crossbeam-epoch 0.8.2",
  "crossbeam-queue",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
+checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
 dependencies = [
- "crossbeam-utils",
+ "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.8",
+]
+
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
 dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
+ "crossbeam-epoch 0.8.2",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch 0.9.5",
+ "crossbeam-utils 0.8.8",
+]
+
 [[package]]
 name = "crossbeam-epoch"
 version = "0.8.2"
@@ -1086,10 +1372,23 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg 1.0.0",
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
- "memoffset",
+ "memoffset 0.5.4",
+ "scopeguard 1.1.0",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.8",
+ "lazy_static",
+ "memoffset 0.6.4",
  "scopeguard 1.1.0",
 ]
 
@@ -1100,7 +1399,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
@@ -1115,6 +1414,16 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+dependencies = [
+ "cfg-if 1.0.0",
+ "lazy_static",
+]
+
 [[package]]
 name = "crossterm"
 version = "0.20.0"
@@ -1124,7 +1433,7 @@ dependencies = [
  "bitflags",
  "crossterm_winapi",
  "libc",
- "mio",
+ "mio 0.7.13",
  "parking_lot 0.11.1",
  "signal-hook",
  "signal-hook-mio",
@@ -1152,6 +1461,59 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto"
+version = "1.0.0"
+dependencies = [
+ "async-trait",
+ "bip32",
+ "bitcrypto",
+ "common",
+ "derive_more",
+ "enum-primitive-derive",
+ "futures 0.3.15",
+ "hex 0.4.2",
+ "http 0.2.7",
+ "hw_common",
+ "keys",
+ "mm2_core",
+ "mm2_err_handle",
+ "num-traits",
+ "parking_lot 0.12.0",
+ "primitives",
+ "rpc_task",
+ "rustc-hex 2.1.0",
+ "secp256k1",
+ "ser_error",
+ "ser_error_derive",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "trezor",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
+dependencies = [
+ "generic-array 0.14.5",
+ "rand_core 0.6.3",
+ "subtle 2.4.0",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+dependencies = [
+ "generic-array 0.14.5",
+ "typenum",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.7.0"
@@ -1168,7 +1530,27 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
+ "subtle 2.4.0",
+]
+
+[[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.5",
+ "subtle 2.4.0",
+]
+
+[[package]]
+name = "crypto-mac"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+dependencies = [
+ "generic-array 0.14.5",
  "subtle 2.4.0",
 ]
 
@@ -1188,12 +1570,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "ct-logs"
-version = "0.8.0"
+name = "ctor"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
+checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
 dependencies = [
- "sct",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -1228,9 +1611,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.0.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
 dependencies = [
  "byteorder 1.4.3",
  "digest 0.9.0",
@@ -1239,12 +1622,47 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "4.0.0-pre.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+dependencies = [
+ "byteorder 1.4.3",
+ "digest 0.9.0",
+ "rand_core 0.6.3",
+ "subtle 2.4.0",
+ "zeroize",
+]
+
+[[package]]
+name = "dashmap"
+version = "4.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "num_cpus",
+ "rayon",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69"
 
+[[package]]
+name = "db_common"
+version = "0.1.0"
+dependencies = [
+ "hex 0.4.2",
+ "log 0.4.14",
+ "rusqlite",
+ "sql-builder",
+ "uuid",
+]
+
 [[package]]
 name = "debug_stub_derive"
 version = "0.3.0"
@@ -1255,15 +1673,39 @@ dependencies = [
  "syn 0.11.11",
 ]
 
+[[package]]
+name = "der"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
+dependencies = [
+ "const-oid",
+]
+
+[[package]]
+name = "derivation-path"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "193388a8c8c75a490b604ff61775e236541b8975e98e5ca1f6ea97d122b7e2db"
+dependencies = [
+ "failure",
+]
+
+[[package]]
+name = "derivation-path"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0"
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -1272,9 +1714,21 @@ version = "0.99.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "dialoguer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb"
+dependencies = [
+ "console",
+ "lazy_static",
+ "tempfile",
+ "zeroize",
 ]
 
 [[package]]
@@ -1292,7 +1746,27 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+dependencies = [
+ "block-buffer 0.10.2",
+ "crypto-common",
+ "subtle 2.4.0",
+]
+
+[[package]]
+name = "dir-diff"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b"
+dependencies = [
+ "walkdir",
 ]
 
 [[package]]
@@ -1315,6 +1789,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.6"
@@ -1326,6 +1810,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users 0.4.0",
+ "winapi",
+]
+
 [[package]]
 name = "discard"
 version = "1.0.4"
@@ -1333,13 +1828,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
 [[package]]
-name = "dtoa"
-version = "0.4.6"
+name = "dlopen"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
-
-[[package]]
-name = "ed25519"
+checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937"
+dependencies = [
+ "dlopen_derive",
+ "lazy_static",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "dlopen_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581"
+dependencies = [
+ "libc",
+ "quote 0.6.13",
+ "syn 0.15.44",
+]
+
+[[package]]
+name = "dtoa"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6"
+
+[[package]]
+name = "ecdsa"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
+dependencies = [
+ "der",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+]
+
+[[package]]
+name = "ed25519"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf038a7b6fd7ef78ad3348b63f3a17550877b0e28f8d68bcc94894d1412158bc"
@@ -1353,14 +1883,39 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.5",
+ "sha2 0.9.9",
  "zeroize",
 ]
 
+[[package]]
+name = "ed25519-dalek-bip32"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057f328f31294b5ab432e6c39642f54afd1531677d6d4ba2905932844cc242f3"
+dependencies = [
+ "derivation-path 0.1.3",
+ "ed25519-dalek",
+ "failure",
+ "hmac 0.9.0",
+ "sha2 0.9.9",
+]
+
+[[package]]
+name = "ed25519-dalek-bip32"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908"
+dependencies = [
+ "derivation-path 0.2.0",
+ "ed25519-dalek",
+ "hmac 0.12.1",
+ "sha2 0.10.2",
+]
+
 [[package]]
 name = "edit-distance"
 version = "2.1.0"
@@ -1373,27 +1928,60 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
 
+[[package]]
+name = "elliptic-curve"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "der",
+ "ff 0.11.1",
+ "generic-array 0.14.5",
+ "group 0.11.0",
+ "rand_core 0.6.3",
+ "sec1",
+ "subtle 2.4.0",
+ "zeroize",
+]
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "enum-as-inner"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
+checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
  "heck",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "enum-primitive-derive"
-version = "0.1.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b90e520ec62c1864c8c78d637acbfe8baf5f63240f2fb8165b8325c07812dd"
+checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e"
 dependencies = [
- "num-traits 0.1.43",
- "quote 0.3.15",
- "syn 0.11.11",
+ "num-traits",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -1404,7 +1992,20 @@ checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 dependencies = [
  "atty",
  "humantime 1.3.0",
- "log 0.4.11",
+ "log 0.4.14",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "atty",
+ "humantime 2.1.0",
+ "log 0.4.14",
  "regex",
  "termcolor",
 ]
@@ -1412,12 +2013,33 @@ dependencies = [
 [[package]]
 name = "equihash"
 version = "0.1.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git#7da40e902463a78c93390686ee34e0379c121b40"
+source = "git+https://github.com/KomodoPlatform/librustzcash.git#95fa5110b4b3ec105ae5fed1aba3847f656ec9b7"
 dependencies = [
  "blake2b_simd",
  "byteorder 1.4.3",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "error-chain"
 version = "0.12.2"
@@ -1457,9 +2079,9 @@ dependencies = [
 
 [[package]]
 name = "ethbloom"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779864b9c7f7ead1f092972c3257496c6a84b46dba2ce131dd8a282cb2cc5972"
+checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef"
 dependencies = [
  "crunchy 0.2.2",
  "fixed-hash 0.7.0",
@@ -1471,7 +2093,7 @@ dependencies = [
 [[package]]
 name = "ethcore-transaction"
 version = "0.1.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#d4b2179e76b447f7def274e68e60e4c0a52c4070"
+source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
 dependencies = [
  "ethereum-types 0.4.2",
  "ethkey",
@@ -1497,11 +2119,11 @@ dependencies = [
 
 [[package]]
 name = "ethereum-types"
-version = "0.11.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd"
+checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6"
 dependencies = [
- "ethbloom 0.11.0",
+ "ethbloom 0.12.1",
  "fixed-hash 0.7.0",
  "impl-rlp",
  "impl-serde",
@@ -1521,7 +2143,7 @@ dependencies = [
 [[package]]
 name = "ethkey"
 version = "0.3.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#d4b2179e76b447f7def274e68e60e4c0a52c4070"
+source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
 dependencies = [
  "byteorder 1.4.3",
  "edit-distance",
@@ -1536,6 +2158,28 @@ dependencies = [
  "tiny-keccak 1.4.4",
 ]
 
+[[package]]
+name = "failure"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
+dependencies = [
+ "backtrace",
+ "failure_derive",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+ "synstructure",
+]
+
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -1556,9 +2200,18 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "fastrand"
-version = "1.2.4"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "feature-probe"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64b0126b293b050395b37b10489951590ed024c03d7df4f249d219c8ded7cbf"
+checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
 
 [[package]]
 name = "ff"
@@ -1571,6 +2224,28 @@ dependencies = [
  "subtle 2.4.0",
 ]
 
+[[package]]
+name = "ff"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
+dependencies = [
+ "rand_core 0.6.3",
+ "subtle 2.4.0",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall 0.2.10",
+ "winapi",
+]
+
 [[package]]
 name = "findshlibs"
 version = "0.5.0"
@@ -1605,17 +2280,17 @@ dependencies = [
 
 [[package]]
 name = "fixedbitset"
-version = "0.2.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
+checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
 
 [[package]]
 name = "flate2"
-version = "1.0.16"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "crc32fast",
  "libc",
  "libz-sys",
@@ -1629,16 +2304,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "fomat-macros"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b541b35d643a4dfbba66fc2a4d401314d6eb16e36155c92b439baeb232c5d0c7"
-
-[[package]]
-name = "fomat-macros"
-version = "0.3.1"
+name = "form_urlencoded"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe56556a8c9f9f556150eb6b390bc1a8b3715fd2ddbb4585f36b6a5672c6a833"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+dependencies = [
+ "matches",
+ "percent-encoding 2.1.0",
+]
 
 [[package]]
 name = "fpe"
@@ -1650,9 +2323,15 @@ dependencies = [
  "block-modes",
  "num-bigint 0.3.2",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
@@ -1665,6 +2344,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
 
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
 [[package]]
 name = "futures"
 version = "0.1.29"
@@ -1688,9 +2373,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1698,9 +2383,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-cpupool"
@@ -1726,21 +2411,19 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
- "autocfg 1.0.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -1750,21 +2433,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
 dependencies = [
  "futures-io",
- "rustls",
- "webpki",
+ "rustls 0.19.1",
+ "webpki 0.21.3",
+]
+
+[[package]]
+name = "futures-rustls"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe"
+dependencies = [
+ "futures-io",
+ "rustls 0.20.4",
+ "webpki 0.22.0",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
 
 [[package]]
 name = "futures-task"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-timer"
@@ -1778,11 +2472,10 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
- "autocfg 1.0.0",
  "futures 0.1.29",
  "futures-channel",
  "futures-core",
@@ -1791,10 +2484,8 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.9",
  "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
  "slab 0.4.2",
 ]
 
@@ -1807,7 +2498,7 @@ dependencies = [
  "bytes 0.5.6",
  "futures 0.3.15",
  "memchr",
- "pin-project 0.4.22",
+ "pin-project 0.4.29",
 ]
 
 [[package]]
@@ -1821,14 +2512,25 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
+ "serde",
  "typenum",
  "version_check",
 ]
 
+[[package]]
+name = "gethostname"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.14"
@@ -1843,9 +2545,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.2"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -1885,13 +2587,13 @@ dependencies = [
 
 [[package]]
 name = "groestl"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0261755b496855e90fb72689afbd2e8fa8a4d1e529073163149e9628eea20afc"
+checksum = "2432787a9b8f0d58dca43fe2240399479b7582dc8afa2126dc7652b864029e47"
 dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
@@ -1901,11 +2603,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc11f9f5fbf1943b48ae7c2bf6846e7d827a512d1be4f23af708f5ca5d01dde1"
 dependencies = [
  "byteorder 1.4.3",
- "ff",
+ "ff 0.8.0",
  "rand_core 0.5.1",
  "subtle 2.4.0",
 ]
 
+[[package]]
+name = "group"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
+dependencies = [
+ "ff 0.11.1",
+ "rand_core 0.6.3",
+ "subtle 2.4.0",
+]
+
 [[package]]
 name = "gstuff"
 version = "0.7.4"
@@ -1919,20 +2632,20 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.3"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
+checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.1",
+ "http 0.2.7",
  "indexmap",
  "slab 0.4.2",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.2",
  "tracing",
 ]
 
@@ -1953,40 +2666,29 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
-dependencies = [
- "ahash 0.2.18",
- "autocfg 0.1.7",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.8.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 dependencies = [
- "ahash 0.3.8",
- "autocfg 1.0.0",
+ "ahash 0.4.7",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash 0.4.7",
+ "ahash 0.7.6",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
 dependencies = [
- "ahash 0.7.4",
+ "ahash 0.7.6",
 ]
 
 [[package]]
@@ -2005,7 +2707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d331ebcdbca4acbefe5da8c3299b2e246f198a8294cc5163354e743398b89d"
 dependencies = [
  "byteorder 1.4.3",
- "num-traits 0.2.12",
+ "num-traits",
 ]
 
 [[package]]
@@ -2015,18 +2717,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3c22708574c44e924720c5b3a116326c688e6d532f438c77c007ec8768644f9"
 dependencies = [
  "byteorder 1.4.3",
- "crossbeam-channel",
- "num-traits 0.2.12",
+ "crossbeam-channel 0.4.4",
+ "num-traits",
 ]
 
 [[package]]
 name = "heck"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -2050,10 +2749,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
 
 [[package]]
-name = "hex-literal"
-version = "0.3.1"
+name = "hidapi"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b1717343691998deb81766bfcd1dce6df0d5d6c37070b5a3de2bb6d39f7822"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "hkd32"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8"
+checksum = "84f2a5541afe0725f0b95619d6af614f48c1b176385b8aa30918cfb8c4bfafc8"
+dependencies = [
+ "hmac 0.11.0",
+ "rand_core 0.6.3",
+ "sha2 0.9.9",
+ "zeroize",
+]
 
 [[package]]
 name = "hmac"
@@ -2076,21 +2792,50 @@ dependencies = [
 ]
 
 [[package]]
-name = "hmac-drbg"
-version = "0.3.0"
+name = "hmac"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
+checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff"
 dependencies = [
+ "crypto-mac 0.9.1",
  "digest 0.9.0",
- "generic-array 0.14.4",
- "hmac 0.8.1",
 ]
 
 [[package]]
-name = "hostname"
-version = "0.3.1"
+name = "hmac"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+dependencies = [
+ "crypto-mac 0.11.1",
+ "digest 0.9.0",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.3",
+]
+
+[[package]]
+name = "hmac-drbg"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
+dependencies = [
+ "digest 0.9.0",
+ "generic-array 0.14.5",
+ "hmac 0.8.1",
+]
+
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
 dependencies = [
  "libc",
  "match_cfg",
@@ -2105,18 +2850,18 @@ checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 dependencies = [
  "bytes 0.4.12",
  "fnv",
- "itoa",
+ "itoa 0.4.6",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
 dependencies = [
- "bytes 0.5.6",
+ "bytes 1.1.0",
  "fnv",
- "itoa",
+ "itoa 1.0.1",
 ]
 
 [[package]]
@@ -2133,20 +2878,26 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
- "bytes 1.0.1",
- "http 0.2.1",
- "pin-project-lite 0.2.6",
+ "bytes 1.1.0",
+ "http 0.2.7",
+ "pin-project-lite 0.2.9",
 ]
 
+[[package]]
+name = "http-range-header"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+
 [[package]]
 name = "httparse"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
 
 [[package]]
 name = "httpdate"
@@ -2169,24 +2920,45 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "hw_common"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "bip32",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "js-sys",
+ "mm2_err_handle",
+ "rusb",
+ "secp256k1",
+ "serde",
+ "serde_derive",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test",
+ "web-sys",
+]
+
 [[package]]
 name = "hyper"
-version = "0.14.11"
+version = "0.14.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
+checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures-channel",
  "futures-core",
  "futures-util",
  "h2",
- "http 0.2.1",
- "http-body 0.4.2",
+ "http 0.2.7",
+ "http-body 0.4.4",
  "httparse",
  "httpdate",
- "itoa",
- "pin-project-lite 0.2.6",
- "socket2 0.4.0",
+ "itoa 1.0.1",
+ "pin-project-lite 0.2.9",
+ "socket2 0.4.4",
  "tokio",
  "tower-service",
  "tracing",
@@ -2195,19 +2967,28 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.22.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
+checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
 dependencies = [
- "ct-logs",
- "futures-util",
+ "http 0.2.7",
  "hyper",
- "log 0.4.11",
- "rustls",
+ "rustls 0.20.4",
  "tokio",
  "tokio-rustls",
- "webpki",
- "webpki-roots 0.21.1",
+ "webpki-roots",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper",
+ "pin-project-lite 0.2.9",
+ "tokio",
+ "tokio-io-timeout",
 ]
 
 [[package]]
@@ -2223,9 +3004,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -2234,33 +3015,22 @@ dependencies = [
 
 [[package]]
 name = "if-addrs"
-version = "0.6.5"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48"
+checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9"
 dependencies = [
- "if-addrs-sys",
  "libc",
  "winapi",
 ]
 
-[[package]]
-name = "if-addrs-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "im"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111c1983f3c5bb72732df25cddacee9b546d08325fb584b5ebd38148be7b0246"
+checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9"
 dependencies = [
  "bitmaps",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
  "rand_xoshiro",
  "sized-chunks",
  "typenum",
@@ -2269,9 +3039,9 @@ dependencies = [
 
 [[package]]
 name = "impl-codec"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2287,9 +3057,9 @@ dependencies = [
 
 [[package]]
 name = "impl-serde"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f"
+checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
 dependencies = [
  "serde",
 ]
@@ -2300,26 +3070,50 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
+[[package]]
+name = "index_list"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce"
+
 [[package]]
 name = "indexmap"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg 1.0.0",
- "hashbrown 0.9.1",
+ "hashbrown 0.11.2",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
+dependencies = [
+ "console",
+ "lazy_static",
+ "number_prefix",
+ "regex",
 ]
 
 [[package]]
 name = "instant"
-version = "0.1.6"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
 name = "iovec"
@@ -2332,11 +3126,11 @@ dependencies = [
 
 [[package]]
 name = "ipconfig"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
+checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
 dependencies = [
- "socket2 0.3.19",
+ "socket2 0.4.4",
  "widestring",
  "winapi",
  "winreg",
@@ -2350,42 +3144,39 @@ checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
 
 [[package]]
 name = "itertools"
-version = "0.8.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
 dependencies = [
  "either",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.9.0"
+name = "itoa"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
 
 [[package]]
-name = "itertools"
-version = "0.10.1"
+name = "itoa"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
-dependencies = [
- "either",
-]
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
-name = "itoa"
-version = "0.4.6"
+name = "jobserver"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "js-sys"
-version = "0.3.51"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
+checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2403,6 +3194,21 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "jsonrpc-core"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+dependencies = [
+ "futures 0.3.15",
+ "futures-executor",
+ "futures-util",
+ "log 0.4.14",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "jubjub"
 version = "0.5.1"
@@ -2411,8 +3217,8 @@ checksum = "620638af3b80d23f4df0cae21e3cc9809ac8826767f345066f010bcea66a2c55"
 dependencies = [
  "bitvec 0.18.5",
  "bls12_381",
- "ff",
- "group",
+ "ff 0.8.0",
+ "group 0.8.0",
  "rand_core 0.5.1",
  "subtle 2.4.0",
 ]
@@ -2442,9 +3248,11 @@ dependencies = [
  "derive_more",
  "lazy_static",
  "primitives",
+ "rand 0.6.5",
  "rustc-hex 2.1.0",
  "secp256k1",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -2453,7 +3261,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ff57d6d215f7ca7eb35a9a64d656ba4d9d2bef114d741dc08048e75e2f5d418"
 dependencies = [
- "log 0.4.11",
+ "log 0.4.14",
 ]
 
 [[package]]
@@ -2477,22 +3285,35 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.97"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+
+[[package]]
+name = "libloading"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi",
+]
 
 [[package]]
 name = "libp2p"
-version = "0.39.1"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.45.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
- "atomic",
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures 0.3.15",
+ "futures-timer",
+ "getrandom 0.2.6",
+ "instant",
  "lazy_static",
  "libp2p-core",
  "libp2p-dns",
- "libp2p-floodsub 0.30.0",
+ "libp2p-floodsub 0.36.0",
+ "libp2p-metrics",
  "libp2p-mplex",
  "libp2p-noise",
  "libp2p-ping",
@@ -2503,16 +3324,16 @@ dependencies = [
  "libp2p-wasm-ext",
  "libp2p-websocket",
  "multiaddr",
- "parking_lot 0.11.1",
- "pin-project 1.0.7",
+ "parking_lot 0.12.0",
+ "pin-project 1.0.10",
+ "rand 0.7.3",
  "smallvec 1.6.1",
- "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-core"
-version = "0.29.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.33.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -2521,35 +3342,38 @@ dependencies = [
  "fnv",
  "futures 0.3.15",
  "futures-timer",
+ "instant",
  "lazy_static",
- "libsecp256k1",
- "log 0.4.11",
+ "libsecp256k1 0.7.0",
+ "log 0.4.14",
  "multiaddr",
  "multihash",
  "multistream-select",
- "parking_lot 0.11.1",
- "pin-project 1.0.7",
+ "p256",
+ "parking_lot 0.12.0",
+ "pin-project 1.0.10",
  "prost",
  "prost-build",
- "rand 0.7.3",
+ "rand 0.8.4",
  "ring",
  "rw-stream-sink",
- "sha2 0.9.5",
+ "sha2 0.10.2",
  "smallvec 1.6.1",
  "thiserror",
- "unsigned-varint 0.7.0",
+ "unsigned-varint 0.7.1",
  "void",
  "zeroize",
 ]
 
 [[package]]
 name = "libp2p-dns"
-version = "0.29.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.33.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "futures 0.3.15",
  "libp2p-core",
- "log 0.4.11",
+ "log 0.4.14",
+ "parking_lot 0.12.0",
  "smallvec 1.6.1",
  "trust-dns-resolver",
 ]
@@ -2570,53 +3394,64 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.30.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.36.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "cuckoofilter 0.5.0",
  "fnv",
  "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "rand 0.7.3",
  "smallvec 1.6.1",
 ]
 
+[[package]]
+name = "libp2p-metrics"
+version = "0.6.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+dependencies = [
+ "libp2p-core",
+ "libp2p-ping",
+ "libp2p-swarm",
+ "prometheus-client",
+]
+
 [[package]]
 name = "libp2p-mplex"
-version = "0.29.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.33.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "asynchronous-codec",
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures 0.3.15",
  "libp2p-core",
- "log 0.4.11",
+ "log 0.4.14",
  "nohash-hasher",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "rand 0.7.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
+ "unsigned-varint 0.7.1",
 ]
 
 [[package]]
 name = "libp2p-noise"
-version = "0.32.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.36.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
- "bytes 1.0.1",
- "curve25519-dalek",
+ "bytes 1.1.0",
+ "curve25519-dalek 3.2.0",
  "futures 0.3.15",
  "lazy_static",
  "libp2p-core",
- "log 0.4.11",
+ "log 0.4.14",
  "prost",
  "prost-build",
  "rand 0.8.4",
- "sha2 0.9.5",
+ "sha2 0.10.2",
  "snow",
  "static_assertions",
  "x25519-dalek",
@@ -2625,81 +3460,84 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.30.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.36.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "futures 0.3.15",
+ "futures-timer",
+ "instant",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
+ "log 0.4.14",
  "rand 0.7.3",
  "void",
- "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.29.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.33.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "asynchronous-codec",
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures 0.3.15",
  "libp2p-core",
- "log 0.4.11",
+ "log 0.4.14",
  "prost",
  "prost-build",
- "unsigned-varint 0.7.0",
+ "unsigned-varint 0.7.1",
  "void",
 ]
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.12.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.18.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "async-trait",
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures 0.3.15",
+ "instant",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
- "lru 0.6.0",
- "minicbor",
+ "log 0.4.14",
  "rand 0.7.3",
  "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
- "wasm-timer",
+ "unsigned-varint 0.7.1",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.30.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.36.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "either",
+ "fnv",
  "futures 0.3.15",
+ "futures-timer",
+ "instant",
  "libp2p-core",
- "log 0.4.11",
+ "log 0.4.14",
+ "pin-project 1.0.10",
  "rand 0.7.3",
  "smallvec 1.6.1",
+ "thiserror",
  "void",
- "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.24.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.27.2"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
- "quote 1.0.7",
- "syn 1.0.72",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.29.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.33.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "futures 0.3.15",
  "futures-timer",
@@ -2707,15 +3545,15 @@ dependencies = [
  "ipnet",
  "libc",
  "libp2p-core",
- "log 0.4.11",
- "socket2 0.4.0",
+ "log 0.4.14",
+ "socket2 0.4.4",
  "tokio",
 ]
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.29.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.33.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "futures 0.3.15",
  "js-sys",
@@ -2727,57 +3565,88 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.30.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.35.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "either",
  "futures 0.3.15",
- "futures-rustls",
+ "futures-rustls 0.22.1",
  "libp2p-core",
- "log 0.4.11",
+ "log 0.4.14",
+ "parking_lot 0.12.0",
  "quicksink",
  "rw-stream-sink",
  "soketto",
- "url 2.1.1",
- "webpki-roots 0.21.1",
+ "url 2.2.2",
+ "webpki-roots",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.33.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.37.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "futures 0.3.15",
  "libp2p-core",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "thiserror",
  "yamux",
 ]
 
 [[package]]
 name = "libsecp256k1"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7"
+checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73"
 dependencies = [
  "arrayref",
  "base64 0.12.3",
  "digest 0.9.0",
  "hmac-drbg",
- "libsecp256k1-core",
- "libsecp256k1-gen-ecmult",
- "libsecp256k1-gen-genmult",
+ "libsecp256k1-core 0.2.2",
+ "libsecp256k1-gen-ecmult 0.2.1",
+ "libsecp256k1-gen-genmult 0.2.1",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.5",
+ "sha2 0.9.9",
+ "typenum",
+]
+
+[[package]]
+name = "libsecp256k1"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37"
+dependencies = [
+ "arrayref",
+ "base64 0.13.0",
+ "digest 0.9.0",
+ "hmac-drbg",
+ "libsecp256k1-core 0.3.0",
+ "libsecp256k1-gen-ecmult 0.3.0",
+ "libsecp256k1-gen-genmult 0.3.0",
+ "rand 0.8.4",
+ "serde",
+ "sha2 0.9.9",
  "typenum",
 ]
 
 [[package]]
 name = "libsecp256k1-core"
-version = "0.2.1"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80"
+dependencies = [
+ "crunchy 0.2.2",
+ "digest 0.9.0",
+ "subtle 2.4.0",
+]
+
+[[package]]
+name = "libsecp256k1-core"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee11012b293ea30093c129173cac4335513064094619f4639a25b310fd33c11"
+checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy 0.2.2",
  "digest 0.9.0",
@@ -2786,20 +3655,38 @@ dependencies = [
 
 [[package]]
 name = "libsecp256k1-gen-ecmult"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32239626ffbb6a095b83b37a02ceb3672b2443a87a000a884fc3c4d16925c9c0"
+checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3"
 dependencies = [
- "libsecp256k1-core",
+ "libsecp256k1-core 0.2.2",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
+dependencies = [
+ "libsecp256k1-core 0.3.0",
 ]
 
 [[package]]
 name = "libsecp256k1-gen-genmult"
-version = "0.2.0"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d"
+dependencies = [
+ "libsecp256k1-core 0.2.2",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76acb433e21d10f5f9892b1962c2856c58c7f39a9e4bd68ac82b9436a0ffd5b9"
+checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
 dependencies = [
- "libsecp256k1-core",
+ "libsecp256k1-core 0.3.0",
 ]
 
 [[package]]
@@ -2814,10 +3701,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "libz-sys"
-version = "1.0.25"
+name = "libusb1-sys"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
+checksum = "e22e89d08bbe6816c6c5d446203b859eba35b8fa94bf1b7edb2f6d25d43f023f"
 dependencies = [
  "cc",
  "libc",
@@ -2826,18 +3713,94 @@ dependencies = [
 ]
 
 [[package]]
-name = "linked-hash-map"
-version = "0.5.3"
+name = "libz-sys"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
 
 [[package]]
-name = "lock_api"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+name = "lightning"
+version = "0.0.106"
+source = "git+https://github.com/shamardy/rust-lightning?branch=0.0.106#af4a89c08c22d0110d386df0e288b2f825aaebbc"
 dependencies = [
- "owning_ref",
+ "bitcoin",
+ "hex 0.4.2",
+ "regex",
+ "secp256k1",
+]
+
+[[package]]
+name = "lightning-background-processor"
+version = "0.0.106"
+dependencies = [
+ "bitcoin",
+ "db_common",
+ "lightning",
+ "lightning-invoice",
+ "lightning-persister",
+]
+
+[[package]]
+name = "lightning-invoice"
+version = "0.14.0"
+source = "git+https://github.com/shamardy/rust-lightning?branch=0.0.106#af4a89c08c22d0110d386df0e288b2f825aaebbc"
+dependencies = [
+ "bech32",
+ "bitcoin_hashes",
+ "lightning",
+ "num-traits",
+ "secp256k1",
+]
+
+[[package]]
+name = "lightning-net-tokio"
+version = "0.0.106"
+source = "git+https://github.com/shamardy/rust-lightning?branch=0.0.106#af4a89c08c22d0110d386df0e288b2f825aaebbc"
+dependencies = [
+ "bitcoin",
+ "lightning",
+ "tokio",
+]
+
+[[package]]
+name = "lightning-persister"
+version = "0.0.106"
+dependencies = [
+ "async-trait",
+ "bitcoin",
+ "common",
+ "db_common",
+ "derive_more",
+ "hex 0.4.2",
+ "libc",
+ "lightning",
+ "mm2_io",
+ "parking_lot 0.12.0",
+ "rand 0.7.3",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "winapi",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+
+[[package]]
+name = "lock_api"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+dependencies = [
+ "owning_ref",
  "scopeguard 0.3.3",
 ]
 
@@ -2852,9 +3815,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
  "scopeguard 1.1.0",
 ]
@@ -2865,17 +3828,17 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.11",
+ "log 0.4.14",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
- "serde",
+ "cfg-if 1.0.0",
+ "value-bag",
 ]
 
 [[package]]
@@ -2895,38 +3858,21 @@ dependencies = [
  "chrono",
  "derivative",
  "fnv",
- "humantime 2.1.0",
  "libc",
- "log 0.4.11",
+ "log 0.4.14",
  "log-mdc",
- "parking_lot 0.11.1",
- "regex",
- "serde",
- "serde-value",
- "serde_json",
- "serde_yaml",
  "thiserror",
  "thread-id",
- "typemap",
  "winapi",
 ]
 
 [[package]]
 name = "lru"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
-dependencies = [
- "hashbrown 0.6.3",
-]
-
-[[package]]
-name = "lru"
-version = "0.6.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111b945ac72ec09eb7bc62a0fbdc3cc6e80555a7245f52a69d3921a75b53b153"
+checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889"
 dependencies = [
- "hashbrown 0.8.2",
+ "hashbrown 0.11.2",
 ]
 
 [[package]]
@@ -2950,6 +3896,12 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
+[[package]]
+name = "matchit"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
+
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
@@ -2959,13 +3911,22 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 [[package]]
 name = "mem"
 version = "0.1.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#d4b2179e76b447f7def274e68e60e4c0a52c4070"
+source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+
+[[package]]
+name = "memmap2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "memoffset"
@@ -2976,14 +3937,23 @@ dependencies = [
  "autocfg 1.0.0",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+dependencies = [
+ "autocfg 1.0.0",
+]
+
 [[package]]
 name = "memory-db"
-version = "0.26.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "814bbecfc0451fc314eeea34f05bbcd5b98a7ad7af37faee088b86a1e633f1d4"
+checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a"
 dependencies = [
  "hash-db",
- "hashbrown 0.9.1",
+ "hashbrown 0.12.1",
  "parity-util-mem",
 ]
 
@@ -3021,7 +3991,7 @@ checksum = "ce0e4f69639ccc0c6b2f0612164f9817349eb25545ed1ffb5ef3e1e1c1d220b4"
 dependencies = [
  "arc-swap",
  "atomic-shim",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "im",
  "metrics",
  "metrics-core",
@@ -3037,29 +4007,15 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d11f8090a8886339f9468a04eeea0711e4cf27538b134014664308041307a1c5"
 dependencies = [
- "crossbeam-epoch",
+ "crossbeam-epoch 0.8.2",
  "serde",
 ]
 
 [[package]]
-name = "minicbor"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51aa5bb0ca22415daca596a227b507f880ad1b2318a87fa9325312a5d285ca0d"
-dependencies = [
- "minicbor-derive",
-]
-
-[[package]]
-name = "minicbor-derive"
-version = "0.6.3"
+name = "mime"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2b9e8883d58e34b18facd16c4564a77ea50fce028ad3d0ee6753440e37acc8"
-dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
-]
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "miniz_oxide"
@@ -3086,9 +4042,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
  "libc",
- "log 0.4.11",
+ "log 0.4.14",
+ "miow",
+ "ntapi",
+ "winapi",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
+dependencies = [
+ "libc",
+ "log 0.4.14",
  "miow",
  "ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "winapi",
 ]
 
@@ -3102,74 +4072,195 @@ dependencies = [
 ]
 
 [[package]]
-name = "mm2"
+name = "mm2-libp2p"
+version = "0.1.0"
+dependencies = [
+ "async-std",
+ "async-trait",
+ "atomicdex-gossipsub",
+ "derive_more",
+ "env_logger 0.7.1",
+ "futures 0.3.15",
+ "futures-rustls 0.21.1",
+ "getrandom 0.2.6",
+ "hex 0.4.2",
+ "lazy_static",
+ "libp2p",
+ "libp2p-floodsub 0.22.0",
+ "log 0.4.14",
+ "rand 0.7.3",
+ "regex",
+ "rmp-serde",
+ "secp256k1",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "sha2 0.9.9",
+ "tokio",
+ "void",
+ "wasm-bindgen-futures",
+ "wasm-timer",
+]
+
+[[package]]
+name = "mm2_core"
+version = "0.1.0"
+dependencies = [
+ "arrayref",
+ "async-trait",
+ "cfg-if 1.0.0",
+ "common",
+ "db_common",
+ "derive_more",
+ "futures 0.3.15",
+ "gstuff",
+ "hex 0.4.2",
+ "keys",
+ "lazy_static",
+ "mm2_rpc",
+ "primitives",
+ "rand 0.7.3",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "shared_ref_counter",
+ "uuid",
+]
+
+[[package]]
+name = "mm2_db"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "hex 0.4.2",
+ "itertools",
+ "js-sys",
+ "lazy_static",
+ "mm2_core",
+ "mm2_err_handle",
+ "mm2_number",
+ "num-traits",
+ "primitives",
+ "rand 0.7.3",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test",
+ "web-sys",
+]
+
+[[package]]
+name = "mm2_err_handle"
+version = "0.1.0"
+dependencies = [
+ "common",
+ "derive_more",
+ "futures 0.1.29",
+ "http 0.2.7",
+ "itertools",
+ "ser_error",
+ "ser_error_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "mm2_io"
+version = "0.1.0"
+dependencies = [
+ "async-std",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "gstuff",
+ "mm2_err_handle",
+ "rand 0.7.3",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "mm2_main"
 version = "0.1.0"
 dependencies = [
  "async-std",
  "async-trait",
- "bigdecimal",
- "bitcoin-cash-slp",
  "bitcrypto",
  "blake2",
  "bytes 0.4.12",
+ "cfg-if 1.0.0",
  "chain",
  "chrono",
  "coins",
+ "coins_activation",
  "common",
- "crc",
  "crc32fast",
  "crossbeam",
+ "crypto",
+ "db_common",
  "derive_more",
  "dirs",
  "either",
  "enum-primitive-derive",
  "ethereum-types 0.4.2",
- "fomat-macros 0.2.1",
  "futures 0.1.29",
  "futures 0.3.15",
  "futures-cpupool",
+ "futures-rustls 0.21.1",
  "gstuff",
  "hash-db",
  "hash256-std-hasher",
- "hex 0.3.2",
- "hex-literal",
- "http 0.2.1",
+ "hex 0.4.2",
+ "http 0.2.7",
+ "hw_common",
  "hyper",
- "itertools 0.9.0",
+ "instant",
+ "itertools",
  "js-sys",
  "keys",
  "lazy_static",
  "libc",
  "metrics",
  "mm2-libp2p",
+ "mm2_core",
+ "mm2_db",
+ "mm2_err_handle",
+ "mm2_io",
+ "mm2_net",
+ "mm2_number",
+ "mm2_rpc",
+ "mm2_test_helpers",
  "mocktopus",
- "num-rational 0.2.4",
- "num-traits 0.2.12",
+ "num-traits",
  "parity-util-mem",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "primitives",
  "rand 0.6.5",
  "rand 0.7.3",
  "regex",
  "rmp-serde",
  "rpc",
+ "rpc_task",
  "script",
  "secp256k1",
  "ser_error",
  "ser_error_derive",
  "serde",
- "serde_bencode",
  "serde_derive",
  "serde_json",
  "serialization",
  "serialization_derive",
  "sp-runtime-interface",
  "sp-trie",
- "sql-builder",
+ "spv_validation",
  "testcontainers",
  "tokio",
  "trie-db",
- "trie-root",
+ "trie-root 0.16.0",
  "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3180,59 +4271,111 @@ dependencies = [
 ]
 
 [[package]]
-name = "mm2-libp2p"
+name = "mm2_net"
 version = "0.1.0"
 dependencies = [
- "async-std",
  "async-trait",
- "atomicdex-gossipsub",
- "env_logger",
+ "bytes 1.1.0",
+ "cfg-if 1.0.0",
+ "common",
+ "derive_more",
  "futures 0.3.15",
- "getrandom 0.2.2",
- "hex 0.4.2",
+ "gstuff",
+ "http 0.2.7",
+ "hyper",
+ "js-sys",
  "lazy_static",
- "libp2p",
- "libp2p-floodsub 0.22.0",
- "log 0.4.11",
- "num-bigint 0.2.6",
- "num-rational 0.2.4",
+ "mm2_core",
+ "mm2_err_handle",
+ "prost",
  "rand 0.7.3",
- "rmp-serde",
- "secp256k1",
  "serde",
- "serde_bytes 0.11.5",
- "sha2 0.9.5",
- "tokio",
- "void",
+ "serde_json",
+ "wasm-bindgen",
  "wasm-bindgen-futures",
- "wasm-timer",
+ "wasm-bindgen-test",
+ "web-sys",
 ]
 
 [[package]]
-name = "mocktopus"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1e54a5bbecd61a064cb9c6ef396f8c896aee14e5baba8d1d555f35167dfd7c3"
+name = "mm2_number"
+version = "0.1.0"
 dependencies = [
- "mocktopus_macros",
+ "bigdecimal",
+ "num-bigint 0.4.3",
+ "num-rational",
+ "num-traits",
+ "paste",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
-name = "mocktopus_macros"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
+name = "mm2_rpc"
+version = "0.1.0"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "gstuff",
+ "http 0.2.7",
+ "mm2_err_handle",
+ "ser_error",
+ "ser_error_derive",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
-name = "multiaddr"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499"
+name = "mm2_test_helpers"
+version = "0.1.0"
+dependencies = [
+ "bytes 1.1.0",
+ "cfg-if 1.0.0",
+ "chrono",
+ "common",
+ "crossterm",
+ "db_common",
+ "futures 0.3.15",
+ "gstuff",
+ "http 0.2.7",
+ "lazy_static",
+ "mm2_core",
+ "mm2_io",
+ "mm2_net",
+ "mm2_number",
+ "rand 0.7.3",
+ "regex",
+ "serde",
+ "serde_json",
+ "uuid",
+]
+
+[[package]]
+name = "mocktopus"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1e54a5bbecd61a064cb9c6ef396f8c896aee14e5baba8d1d555f35167dfd7c3"
+dependencies = [
+ "mocktopus_macros",
+]
+
+[[package]]
+name = "mocktopus_macros"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "multiaddr"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261"
 dependencies = [
  "arrayref",
  "bs58",
@@ -3242,34 +4385,34 @@ dependencies = [
  "percent-encoding 2.1.0",
  "serde",
  "static_assertions",
- "unsigned-varint 0.7.0",
- "url 2.1.1",
+ "unsigned-varint 0.7.1",
+ "url 2.2.2",
 ]
 
 [[package]]
 name = "multihash"
-version = "0.14.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8"
+checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689"
 dependencies = [
- "digest 0.9.0",
- "generic-array 0.14.4",
+ "core2",
+ "digest 0.10.3",
  "multihash-derive",
- "sha2 0.9.5",
- "unsigned-varint 0.7.0",
+ "sha2 0.10.2",
+ "unsigned-varint 0.7.1",
 ]
 
 [[package]]
 name = "multihash-derive"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
+checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 1.1.3",
  "proc-macro-error",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
  "synstructure",
 ]
 
@@ -3281,15 +4424,28 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce"
 
 [[package]]
 name = "multistream-select"
-version = "0.10.3"
-source = "git+https://github.com/libp2p/rust-libp2p.git#20183c1ea152f5bfe183543e4934e082c1428011"
+version = "0.11.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures 0.3.15",
- "log 0.4.11",
- "pin-project 1.0.7",
+ "log 0.4.14",
+ "pin-project 1.0.10",
  "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
+ "unsigned-varint 0.7.1",
+]
+
+[[package]]
+name = "nix"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset 0.6.4",
 ]
 
 [[package]]
@@ -3311,7 +4467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
 dependencies = [
  "bitvec 0.19.5",
- "funty",
+ "funty 1.1.0",
  "lexical-core",
  "memchr",
  "version_check",
@@ -3326,50 +4482,27 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3e176191bc4faad357e3122c4747aa098ac880e88b168f106386128736cf4a"
-dependencies = [
- "num-bigint 0.3.2",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational 0.3.2",
- "num-traits 0.2.12",
-]
-
 [[package]]
 name = "num-bigint"
-version = "0.2.6"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
+checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
 dependencies = [
  "autocfg 1.0.0",
  "num-integer",
- "num-traits 0.2.12",
- "serde",
+ "num-traits",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.3.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
  "autocfg 1.0.0",
  "num-integer",
- "num-traits 0.2.12",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
-dependencies = [
- "num-traits 0.2.12",
+ "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -3378,9 +4511,9 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -3390,72 +4523,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
 dependencies = [
  "autocfg 1.0.0",
- "num-traits 0.2.12",
+ "num-traits",
 ]
 
 [[package]]
-name = "num-iter"
-version = "0.1.42"
+name = "num-rational"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
 dependencies = [
  "autocfg 1.0.0",
+ "num-bigint 0.4.3",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits",
+ "serde",
 ]
 
 [[package]]
-name = "num-rational"
-version = "0.2.4"
+name = "num-traits"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
 dependencies = [
  "autocfg 1.0.0",
- "num-bigint 0.2.6",
- "num-integer",
- "num-traits 0.2.12",
- "serde",
 ]
 
 [[package]]
-name = "num-rational"
-version = "0.3.2"
+name = "num_cpus"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
- "autocfg 1.0.0",
- "num-bigint 0.3.2",
- "num-integer",
- "num-traits 0.2.12",
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
-name = "num-traits"
-version = "0.1.43"
+name = "num_enum"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f"
 dependencies = [
- "num-traits 0.2.12",
+ "derivative",
+ "num_enum_derive",
 ]
 
 [[package]]
-name = "num-traits"
-version = "0.2.12"
+name = "num_enum_derive"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
 dependencies = [
- "autocfg 1.0.0",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.13.0"
+name = "number_prefix"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
@@ -3482,12 +4611,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
-name = "ordered-float"
-version = "2.7.0"
+name = "ouroboros"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039f02eb0f69271f26abe3202189275d7aa2258b903cb0281b5de710a2570ff3"
+checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257"
 dependencies = [
- "num-traits 0.2.12",
+ "Inflector",
+ "proc-macro-error",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -3499,24 +4643,36 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "p256"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "sec1",
+ "sha2 0.9.9",
+]
+
 [[package]]
 name = "pairing"
 version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f702cdbee9e0a6272452c20dec82465bc821116598b4eeb63e9a71a69dbf7fd"
 dependencies = [
- "ff",
- "group",
+ "ff 0.8.0",
+ "group 0.8.0",
 ]
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.2.0"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9"
+checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066"
 dependencies = [
  "arrayvec 0.7.1",
- "bitvec 0.20.4",
+ "bitvec 1.0.0",
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
@@ -3525,14 +4681,14 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "2.2.0"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09"
+checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8"
 dependencies = [
- "proc-macro-crate 1.0.0",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -3543,17 +4699,17 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
 
 [[package]]
 name = "parity-util-mem"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664a8c6b8e62d8f9f2f937e391982eb433ab285b4cd9545b342441e04a906e42"
+checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f"
 dependencies = [
  "cfg-if 1.0.0",
- "ethereum-types 0.11.0",
- "hashbrown 0.9.1",
+ "ethereum-types 0.13.1",
+ "hashbrown 0.12.1",
  "impl-trait-for-tuples",
- "lru 0.6.0",
+ "lru",
  "parity-util-mem-derive",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "primitive-types",
  "smallvec 1.6.1",
  "winapi",
@@ -3565,8 +4721,8 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
 dependencies = [
- "proc-macro2",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "syn 1.0.95",
  "synstructure",
 ]
 
@@ -3614,10 +4770,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
- "lock_api 0.4.4",
+ "lock_api 0.4.6",
  "parking_lot_core 0.8.0",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+dependencies = [
+ "lock_api 0.4.6",
+ "parking_lot_core 0.9.1",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.4.0"
@@ -3675,12 +4841,43 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall 0.2.10",
+ "smallvec 1.6.1",
+ "windows-sys",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
 
+[[package]]
+name = "pbkdf2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
+dependencies = [
+ "crypto-mac 0.8.0",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
+dependencies = [
+ "crypto-mac 0.11.1",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "1.0.1"
@@ -3693,20 +4890,11 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
 [[package]]
 name = "petgraph"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
+checksum = "51b305cc4569dd4e8765bab46261f67ef5d4d11a4b6e745100ee5dad8948b46c"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -3714,55 +4902,55 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "0.4.22"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909"
 dependencies = [
- "pin-project-internal 0.4.22",
+ "pin-project-internal 0.4.29",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.7"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
- "pin-project-internal 1.0.7",
+ "pin-project-internal 1.0.10",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.22"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.7"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.7"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "pin-utils"
@@ -3782,7 +4970,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fe800695325da85083cd23b56826fccb2e2dc29b218e7811a6f33bc93f414be"
 dependencies = [
- "cpufeatures",
+ "cpufeatures 0.1.4",
  "opaque-debug 0.3.0",
  "universal-hash",
 ]
@@ -3794,7 +4982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e597450cbf209787f0e6de80bf3795c6b2356a380ee87837b545aded8dbc1823"
 dependencies = [
  "cfg-if 1.0.0",
- "cpufeatures",
+ "cpufeatures 0.1.4",
  "opaque-debug 0.3.0",
  "universal-hash",
 ]
@@ -3805,16 +4993,27 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
 
+[[package]]
+name = "prettyplease"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28f53e8b192565862cf99343194579a022eb9c7dd3a8d03134734803c7b3125"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "syn 1.0.95",
+]
+
 [[package]]
 name = "primitive-types"
-version = "0.9.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e"
+checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
 dependencies = [
  "fixed-hash 0.7.0",
  "impl-codec",
  "impl-rlp",
  "impl-serde",
+ "scale-info",
  "uint 0.9.1",
 ]
 
@@ -3838,9 +5037,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.0.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
  "thiserror",
  "toml",
@@ -3853,9 +5052,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
  "version_check",
 ]
 
@@ -3865,8 +5064,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
  "version_check",
 ]
 
@@ -3877,68 +5076,98 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
-name = "proc-macro-nested"
-version = "0.1.6"
+name = "proc-macro2"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+dependencies = [
+ "unicode-xid 0.1.0",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
 dependencies = [
- "unicode-xid 0.2.0",
+ "unicode-ident",
+]
+
+[[package]]
+name = "prometheus-client"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825"
+dependencies = [
+ "dtoa",
+ "itoa 1.0.1",
+ "owning_ref",
+ "prometheus-client-derive-text-encode",
+]
+
+[[package]]
+name = "prometheus-client-derive-text-encode"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "prost"
-version = "0.8.0"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
+checksum = "bc03e116981ff7d8da8e5c220e374587b98d294af7ba7dd7fda761158f00086f"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "prost-derive",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.8.0"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"
+checksum = "65a1118354442de7feb8a2a76f3d80ef01426bd45542c8c1fdffca41a758f846"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
+ "cfg-if 1.0.0",
+ "cmake",
  "heck",
- "itertools 0.10.1",
- "log 0.4.11",
+ "itertools",
+ "lazy_static",
+ "log 0.4.14",
  "multimap",
  "petgraph",
  "prost",
  "prost-types",
+ "regex",
  "tempfile",
  "which",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.8.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
+checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
 dependencies = [
  "anyhow",
- "itertools 0.10.1",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "itertools",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.8.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
+checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "prost",
 ]
 
@@ -3967,6 +5196,15 @@ dependencies = [
  "protobuf-codegen",
 ]
 
+[[package]]
+name = "qstring"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e"
+dependencies = [
+ "percent-encoding 2.1.0",
+]
+
 [[package]]
 name = "quanta"
 version = "0.3.1"
@@ -3989,8 +5227,8 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
 dependencies = [
- "env_logger",
- "log 0.4.11",
+ "env_logger 0.7.1",
+ "log 0.4.14",
  "rand 0.7.3",
  "rand_core 0.5.1",
 ]
@@ -4003,7 +5241,7 @@ checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858"
 dependencies = [
  "futures-core",
  "futures-sink",
- "pin-project-lite 0.1.7",
+ "pin-project-lite 0.1.12",
 ]
 
 [[package]]
@@ -4014,11 +5252,20 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+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.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.39",
 ]
 
 [[package]]
@@ -4035,9 +5282,9 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
 
 [[package]]
 name = "radium"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rand"
@@ -4167,7 +5414,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.6",
 ]
 
 [[package]]
@@ -4261,11 +5508,36 @@ dependencies = [
 
 [[package]]
 name = "rand_xoshiro"
-version = "0.4.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004"
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
 dependencies = [
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
+]
+
+[[package]]
+name = "rayon"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+dependencies = [
+ "autocfg 1.0.0",
+ "crossbeam-deque 0.8.1",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+dependencies = [
+ "crossbeam-channel 0.5.1",
+ "crossbeam-deque 0.8.1",
+ "crossbeam-utils 0.8.8",
+ "lazy_static",
+ "num_cpus",
 ]
 
 [[package]]
@@ -4285,9 +5557,9 @@ checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
 dependencies = [
  "bitflags",
 ]
@@ -4309,8 +5581,8 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.2",
- "redox_syscall 0.2.8",
+ "getrandom 0.2.6",
+ "redox_syscall 0.2.10",
 ]
 
 [[package]]
@@ -4328,16 +5600,16 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "regex"
-version = "1.4.6"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4346,9 +5618,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
 
 [[package]]
 name = "remove_dir_all"
@@ -4360,39 +5632,77 @@ dependencies = [
 ]
 
 [[package]]
-name = "resolv-conf"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
-dependencies = [
- "hostname",
- "quick-error",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.15"
+name = "reqwest"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
+checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525"
 dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
+ "base64 0.13.0",
+ "bytes 1.1.0",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.7",
+ "http-body 0.4.4",
+ "hyper",
+ "hyper-rustls",
+ "ipnet",
+ "js-sys",
+ "lazy_static",
+ "log 0.4.14",
+ "mime",
+ "percent-encoding 2.1.0",
+ "pin-project-lite 0.2.9",
+ "rustls 0.20.4",
+ "rustls-pemfile 0.2.1",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-rustls",
+ "url 2.2.2",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
  "web-sys",
- "winapi",
+ "webpki-roots",
+ "winreg",
 ]
 
 [[package]]
-name = "ripemd160"
-version = "0.8.0"
+name = "resolv-conf"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
+ "hostname",
+ "quick-error",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
+dependencies = [
+ "crypto-bigint",
+ "hmac 0.11.0",
+ "zeroize",
+]
+
+[[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]]
@@ -4422,7 +5732,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "rustc-hex 2.1.0",
 ]
 
@@ -4433,7 +5743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f10b46df14cf1ee1ac7baa4d2fbc2c52c0622a4b82fa8740e37bc452ac0184f"
 dependencies = [
  "byteorder 1.4.3",
- "num-traits 0.2.12",
+ "num-traits",
 ]
 
 [[package]]
@@ -4447,13 +5757,23 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rpassword"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "rpc"
 version = "0.1.0"
 dependencies = [
  "chain",
  "keys",
- "log 0.4.11",
+ "log 0.4.14",
  "primitives",
  "rustc-hex 2.1.0",
  "script",
@@ -4463,6 +5783,32 @@ dependencies = [
  "serialization",
 ]
 
+[[package]]
+name = "rpc_task"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "mm2_err_handle",
+ "mm2_rpc",
+ "ser_error",
+ "ser_error_derive",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "rusb"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c470dc7dc6e4710b6f85e9c4aa4650bc742260b39a36328180578db76fa258c1"
+dependencies = [
+ "libc",
+ "libusb1-sys",
+]
+
 [[package]]
 name = "rusqlite"
 version = "0.24.2"
@@ -4476,6 +5822,7 @@ dependencies = [
  "libsqlite3-sys",
  "memchr",
  "smallvec 1.6.1",
+ "time 0.2.27",
 ]
 
 [[package]]
@@ -4487,7 +5834,7 @@ dependencies = [
  "base64 0.11.0",
  "blake2b_simd",
  "constant_time_eq",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
 ]
 
 [[package]]
@@ -4502,6 +5849,12 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc-hex"
 version = "1.0.0"
@@ -4525,11 +5878,11 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 0.11.0",
+ "semver 1.0.6",
 ]
 
 [[package]]
@@ -4539,20 +5892,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64 0.13.0",
- "log 0.4.11",
+ "log 0.4.14",
  "ring",
- "sct",
- "webpki",
+ "sct 0.6.0",
+ "webpki 0.21.3",
 ]
 
 [[package]]
-name = "rw-stream-sink"
+name = "rustls"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
+dependencies = [
+ "log 0.4.14",
+ "ring",
+ "sct 0.7.0",
+ "webpki 0.22.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
+dependencies = [
+ "base64 0.13.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
+dependencies = [
+ "base64 0.13.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+
+[[package]]
+name = "rw-stream-sink"
+version = "0.3.0"
+source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
 dependencies = [
  "futures 0.3.15",
- "pin-project 0.4.22",
+ "pin-project 1.0.10",
  "static_assertions",
 ]
 
@@ -4571,6 +5959,30 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "scale-info"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a"
+dependencies = [
+ "cfg-if 1.0.0",
+ "derive_more",
+ "parity-scale-codec",
+ "scale-info-derive",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
@@ -4597,7 +6009,7 @@ dependencies = [
  "blake2b_simd",
  "chain",
  "keys",
- "log 0.4.11",
+ "log 0.4.14",
  "primitives",
  "serde",
  "serialization",
@@ -4613,11 +6025,33 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "sec1"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
+dependencies = [
+ "der",
+ "generic-array 0.14.5",
+ "subtle 2.4.0",
+ "zeroize",
+]
+
 [[package]]
 name = "secp256k1"
-version = "0.20.2"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee5070fdc6f26ca5be6dcfc3d07c76fdb974a63a8b246b459854274145f5a258"
+checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
  "rand 0.6.5",
  "secp256k1-sys",
@@ -4634,9 +6068,9 @@ dependencies = [
 
 [[package]]
 name = "secrecy"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0"
+checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
 dependencies = [
  "zeroize",
 ]
@@ -4647,17 +6081,14 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser 0.7.0",
+ "semver-parser",
 ]
 
 [[package]]
 name = "semver"
-version = "0.11.0"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
-]
+checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"
 
 [[package]]
 name = "semver-parser"
@@ -4665,15 +6096,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
 [[package]]
 name = "send_wrapper"
 version = "0.2.0"
@@ -4697,48 +6119,30 @@ dependencies = [
 name = "ser_error_derive"
 version = "0.1.0"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
  "ser_error",
- "syn 1.0.72",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
-name = "serde-value"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-dependencies = [
- "ordered-float",
- "serde",
-]
-
-[[package]]
-name = "serde_bencode"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315c49c11b6b10acc209df75b757ee70957b911ecd0e29bcbf2b735ebd580d45"
-dependencies = [
- "serde",
- "serde_bytes 0.10.5",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.10.5"
+name = "serde-wasm-bindgen"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defbb8a83d7f34cc8380751eeb892b825944222888aff18996ea7901f24aec88"
+checksum = "1cfc62771e7b829b517cb213419236475f434fb480eddd76112ae182d274434a"
 dependencies = [
+ "js-sys",
  "serde",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -4752,23 +6156,23 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.57"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
 dependencies = [
  "indexmap",
- "itoa",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
@@ -4779,19 +6183,31 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+dependencies = [
+ "form_urlencoded",
+ "itoa 0.4.6",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.14"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7"
+checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
 dependencies = [
- "dtoa",
- "linked-hash-map",
+ "indexmap",
+ "ryu",
  "serde",
  "yaml-rust",
 ]
@@ -4801,7 +6217,9 @@ name = "serialization"
 version = "0.1.0"
 dependencies = [
  "byteorder 1.4.3",
+ "derive_more",
  "primitives",
+ "test_helpers",
 ]
 
 [[package]]
@@ -4815,25 +6233,13 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.4"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
+checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpuid-bool",
+ "cpufeatures 0.2.1",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -4858,28 +6264,45 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.5"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpufeatures",
+ "cpufeatures 0.2.1",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures 0.2.1",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "sha3"
-version = "0.8.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
 dependencies = [
- "block-buffer 0.7.3",
- "byte-tools",
- "digest 0.8.1",
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
  "keccak",
- "opaque-debug 0.2.3",
+ "opaque-debug 0.3.0",
+]
+
+[[package]]
+name = "shared_ref_counter"
+version = "0.1.0"
+dependencies = [
+ "log 0.4.14",
 ]
 
 [[package]]
@@ -4899,7 +6322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.7.13",
  "signal-hook",
 ]
 
@@ -4914,9 +6337,13 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.2.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210"
+checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
+dependencies = [
+ "digest 0.9.0",
+ "rand_core 0.6.3",
+]
 
 [[package]]
 name = "siphasher"
@@ -4967,114 +6394,729 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5"
 dependencies = [
- "async-task",
- "blocking",
- "concurrent-queue",
- "fastrand",
- "futures-io",
- "futures-util",
- "libc",
- "once_cell",
- "scoped-tls",
- "slab 0.4.2",
- "socket2 0.3.19",
- "wepoll-sys-stjepang",
- "winapi",
+ "async-task",
+ "blocking",
+ "concurrent-queue",
+ "fastrand",
+ "futures-io",
+ "futures-util",
+ "libc",
+ "once_cell",
+ "scoped-tls",
+ "slab 0.4.2",
+ "socket2 0.3.19",
+ "wepoll-sys-stjepang",
+ "winapi",
+]
+
+[[package]]
+name = "snow"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d"
+dependencies = [
+ "aes-gcm",
+ "blake2",
+ "chacha20poly1305",
+ "curve25519-dalek 4.0.0-pre.1",
+ "rand_core 0.6.3",
+ "ring",
+ "rustc_version 0.4.0",
+ "sha2 0.10.2",
+ "subtle 2.4.0",
+]
+
+[[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",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "soketto"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "083624472e8817d44d02c0e55df043737ff11f279af924abdf93845717c2b75c"
+dependencies = [
+ "base64 0.13.0",
+ "bytes 1.1.0",
+ "flate2",
+ "futures 0.3.15",
+ "httparse",
+ "log 0.4.14",
+ "rand 0.8.4",
+ "sha-1",
+]
+
+[[package]]
+name = "solana-account-decoder"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ea8c1862fc46c6ab40d83d15ced24a7afb1f3422da5824f1e9260f5ac10141f"
+dependencies = [
+ "Inflector",
+ "base64 0.12.3",
+ "bincode",
+ "bs58",
+ "bv",
+ "lazy_static",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-config-program",
+ "solana-sdk",
+ "solana-vote-program",
+ "spl-token",
+ "thiserror",
+ "zstd",
+]
+
+[[package]]
+name = "solana-address-lookup-table-program"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c60728aec35d772e6614319558cdccbe3f845102699b65ba5ac7497da0b626a"
+dependencies = [
+ "bincode",
+ "bytemuck",
+ "log 0.4.14",
+ "num-derive",
+ "num-traits",
+ "rustc_version 0.4.0",
+ "serde",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-program-runtime",
+ "solana-sdk",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-bloom"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ddcd7c6adb802bc812a5a80c8de06ba0f0e8df0cca296a8b4e67cd04c16218f"
+dependencies = [
+ "bv",
+ "fnv",
+ "log 0.4.14",
+ "rand 0.7.3",
+ "rayon",
+ "rustc_version 0.4.0",
+ "serde",
+ "serde_derive",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-bucket-map"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3435b145894971a58a08a7b6be997ec782239fdecd5edd9846cd1d6aa5986"
+dependencies = [
+ "fs_extra",
+ "log 0.4.14",
+ "memmap2",
+ "rand 0.7.3",
+ "rayon",
+ "solana-logger",
+ "solana-measure",
+ "solana-sdk",
+ "tempfile",
+]
+
+[[package]]
+name = "solana-clap-utils"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8417a89c377728dbfbf1966b6493544f6e5e168ebc5bb444f3526481fae94e31"
+dependencies = [
+ "chrono",
+ "clap",
+ "rpassword",
+ "solana-perf",
+ "solana-remote-wallet",
+ "solana-sdk",
+ "thiserror",
+ "tiny-bip39",
+ "uriparse",
+ "url 2.2.2",
+]
+
+[[package]]
+name = "solana-cli-config"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e8b011d36369ef2bc3dff63fee078bf2916a4fd21f3aa702ee731c7ddf83d28"
+dependencies = [
+ "dirs-next",
+ "lazy_static",
+ "serde",
+ "serde_derive",
+ "serde_yaml",
+ "url 2.2.2",
+]
+
+[[package]]
+name = "solana-client"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e20f4df8cee4a1819f1c5b0d3d85d50c30f27133b2ae68c2fd92655e4aede34a"
+dependencies = [
+ "base64 0.13.0",
+ "bincode",
+ "bs58",
+ "clap",
+ "indicatif",
+ "jsonrpc-core 18.0.0",
+ "log 0.4.14",
+ "rayon",
+ "reqwest",
+ "semver 1.0.6",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-account-decoder",
+ "solana-clap-utils",
+ "solana-faucet",
+ "solana-measure",
+ "solana-net-utils",
+ "solana-sdk",
+ "solana-transaction-status",
+ "solana-version",
+ "solana-vote-program",
+ "thiserror",
+ "tokio",
+ "tungstenite",
+ "url 2.2.2",
+]
+
+[[package]]
+name = "solana-compute-budget-program"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685567c221f6bb5b64387f7b45d03036ad112b2ecbcd0f94b11204efab9f891e"
+dependencies = [
+ "solana-program-runtime",
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-config-program"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f4b04403ff77f09eba5cf94078c1178161e26d346245b06180866ab5286fe6b"
+dependencies = [
+ "bincode",
+ "chrono",
+ "serde",
+ "serde_derive",
+ "solana-program-runtime",
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-faucet"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a11e1b6d5ce435bb3df95f2a970cd80500a8abf94ea87558c35fe0cce8456ab"
+dependencies = [
+ "bincode",
+ "byteorder 1.4.3",
+ "clap",
+ "log 0.4.14",
+ "serde",
+ "serde_derive",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-logger",
+ "solana-metrics",
+ "solana-sdk",
+ "solana-version",
+ "spl-memo",
+ "thiserror",
+ "tokio",
+]
+
+[[package]]
+name = "solana-frozen-abi"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5f69a79200f5ba439eb8b790c5e00beab4d1fae4da69ce023c69c6ac1b55bf1"
+dependencies = [
+ "bs58",
+ "bv",
+ "generic-array 0.14.5",
+ "log 0.4.14",
+ "memmap2",
+ "rustc_version 0.4.0",
+ "serde",
+ "serde_derive",
+ "sha2 0.9.9",
+ "solana-frozen-abi-macro",
+ "solana-logger",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-frozen-abi-macro"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402fffb54bf5d335e6df26fc1719feecfbd7a22fafdf6649fe78380de3c47384"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "rustc_version 0.4.0",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "solana-logger"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942dc59fc9da66d178362051b658646b65dc11cea0bc804e4ecd2528d3c1279f"
+dependencies = [
+ "env_logger 0.9.0",
+ "lazy_static",
+ "log 0.4.14",
+]
+
+[[package]]
+name = "solana-measure"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ccd5b1278b115249d6ca5a203fd852f7d856e048488c24442222ee86e682bd9"
+dependencies = [
+ "log 0.4.14",
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-metrics"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9774cd8309f599797b1612731fbc56df6c612879ab4923a3dc7234400eea419"
+dependencies = [
+ "env_logger 0.9.0",
+ "gethostname",
+ "lazy_static",
+ "log 0.4.14",
+ "reqwest",
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-net-utils"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cb530af085d8aab563530ed39703096aa526249d350082823882fdd59cdf839"
+dependencies = [
+ "bincode",
+ "clap",
+ "log 0.4.14",
+ "nix",
+ "rand 0.7.3",
+ "serde",
+ "serde_derive",
+ "socket2 0.4.4",
+ "solana-logger",
+ "solana-sdk",
+ "solana-version",
+ "tokio",
+ "url 2.2.2",
+]
+
+[[package]]
+name = "solana-perf"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4117c0cf7753bc18f3a09f4973175c3f2c7c5d8e3c9bc15cab09060b06f3434f"
+dependencies = [
+ "ahash 0.7.6",
+ "bincode",
+ "bv",
+ "caps",
+ "curve25519-dalek 3.2.0",
+ "dlopen",
+ "dlopen_derive",
+ "fnv",
+ "lazy_static",
+ "libc",
+ "log 0.4.14",
+ "nix",
+ "rand 0.7.3",
+ "rayon",
+ "serde",
+ "solana-bloom",
+ "solana-logger",
+ "solana-metrics",
+ "solana-rayon-threadlimit",
+ "solana-sdk",
+ "solana-vote-program",
+]
+
+[[package]]
+name = "solana-program"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a463f546a2f5842d35974bd4691ae5ceded6785ec24db440f773723f6ce4e11"
+dependencies = [
+ "base64 0.13.0",
+ "bincode",
+ "bitflags",
+ "blake3",
+ "borsh",
+ "borsh-derive",
+ "bs58",
+ "bv",
+ "bytemuck",
+ "console_error_panic_hook",
+ "console_log",
+ "curve25519-dalek 3.2.0",
+ "getrandom 0.1.14",
+ "itertools",
+ "js-sys",
+ "lazy_static",
+ "libsecp256k1 0.6.0",
+ "log 0.4.14",
+ "num-derive",
+ "num-traits",
+ "parking_lot 0.11.1",
+ "rand 0.7.3",
+ "rustc_version 0.4.0",
+ "rustversion",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "sha2 0.9.9",
+ "sha3",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
+ "solana-sdk-macro",
+ "thiserror",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "solana-program-runtime"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09841673334eab958d5bedab9c9d75ed2ff7a7ef70e7dfd6b239c6838a3d79ec"
+dependencies = [
+ "base64 0.13.0",
+ "bincode",
+ "itertools",
+ "libc",
+ "libloading",
+ "log 0.4.14",
+ "num-derive",
+ "num-traits",
+ "rustc_version 0.4.0",
+ "serde",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
+ "solana-measure",
+ "solana-sdk",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-rayon-threadlimit"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f92893e3129dfabb703cd045e1367f3ced91202a2d0b6179a3dcd62ad6bead3b"
+dependencies = [
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "solana-remote-wallet"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "315534baecaae3f804548ccc4738d73ae01bf6523219787ebe55ee66d8db9a85"
+dependencies = [
+ "base32",
+ "console",
+ "dialoguer",
+ "hidapi",
+ "log 0.4.14",
+ "num-derive",
+ "num-traits",
+ "parking_lot 0.11.1",
+ "qstring",
+ "semver 1.0.6",
+ "solana-sdk",
+ "thiserror",
+ "uriparse",
+]
+
+[[package]]
+name = "solana-runtime"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bd06e905260433f7e8d18bccb2e2eb2aa5cc53379d104d331ddeb12e13230a0"
+dependencies = [
+ "arrayref",
+ "bincode",
+ "blake3",
+ "bv",
+ "bytemuck",
+ "byteorder 1.4.3",
+ "bzip2",
+ "crossbeam-channel 0.5.1",
+ "dashmap",
+ "dir-diff",
+ "flate2",
+ "fnv",
+ "index_list",
+ "itertools",
+ "lazy_static",
+ "log 0.4.14",
+ "memmap2",
+ "num-derive",
+ "num-traits",
+ "num_cpus",
+ "ouroboros",
+ "rand 0.7.3",
+ "rayon",
+ "regex",
+ "rustc_version 0.4.0",
+ "serde",
+ "serde_derive",
+ "solana-address-lookup-table-program",
+ "solana-bloom",
+ "solana-bucket-map",
+ "solana-compute-budget-program",
+ "solana-config-program",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
+ "solana-measure",
+ "solana-metrics",
+ "solana-program-runtime",
+ "solana-rayon-threadlimit",
+ "solana-sdk",
+ "solana-stake-program",
+ "solana-vote-program",
+ "symlink",
+ "tar",
+ "tempfile",
+ "thiserror",
+ "zstd",
+]
+
+[[package]]
+name = "solana-sdk"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6560e605c68fa1e3e66a9d3c8529d097d402e1183f80dd06a2c870d0ecb795c2"
+dependencies = [
+ "assert_matches",
+ "base64 0.13.0",
+ "bincode",
+ "bitflags",
+ "borsh",
+ "bs58",
+ "bytemuck",
+ "byteorder 1.4.3",
+ "chrono",
+ "derivation-path 0.1.3",
+ "digest 0.9.0",
+ "ed25519-dalek",
+ "ed25519-dalek-bip32 0.1.1",
+ "generic-array 0.14.5",
+ "hmac 0.11.0",
+ "itertools",
+ "js-sys",
+ "lazy_static",
+ "libsecp256k1 0.6.0",
+ "log 0.4.14",
+ "memmap2",
+ "num-derive",
+ "num-traits",
+ "pbkdf2 0.9.0",
+ "qstring",
+ "rand 0.7.3",
+ "rand_chacha 0.2.2",
+ "rustc_version 0.4.0",
+ "rustversion",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "serde_json",
+ "sha2 0.9.9",
+ "sha3",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
+ "solana-program",
+ "solana-sdk-macro",
+ "thiserror",
+ "uriparse",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "solana-sdk-macro"
+version = "1.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c834b4e02ac911b13c13aed08b3f847e722f6be79d31b1c660c1dbd2dee83cdb"
+dependencies = [
+ "bs58",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "rustversion",
+ "syn 1.0.95",
 ]
 
 [[package]]
-name = "snow"
-version = "0.8.0"
+name = "solana-stake-program"
+version = "1.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7"
+checksum = "f92597c0ed16d167d5ee48e5b13e92dfaed9c55b23a13ec261440136cd418649"
 dependencies = [
- "aes-gcm",
- "blake2",
- "chacha20poly1305",
- "rand 0.8.4",
- "rand_core 0.6.3",
- "ring",
- "rustc_version 0.3.3",
- "sha2 0.9.5",
- "subtle 2.4.0",
- "x25519-dalek",
+ "bincode",
+ "log 0.4.14",
+ "num-derive",
+ "num-traits",
+ "rustc_version 0.4.0",
+ "serde",
+ "serde_derive",
+ "solana-config-program",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-metrics",
+ "solana-program-runtime",
+ "solana-sdk",
+ "solana-vote-program",
+ "thiserror",
 ]
 
 [[package]]
-name = "socket2"
-version = "0.3.19"
+name = "solana-transaction-status"
+version = "1.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+checksum = "612a51efa19380992e81fc64a2fb55d42aed32c67d795848d980cbe1f9693250"
 dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "winapi",
+ "Inflector",
+ "base64 0.12.3",
+ "bincode",
+ "bs58",
+ "lazy_static",
+ "log 0.4.14",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-account-decoder",
+ "solana-measure",
+ "solana-metrics",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-vote-program",
+ "spl-associated-token-account",
+ "spl-memo",
+ "spl-token",
+ "thiserror",
 ]
 
 [[package]]
-name = "socket2"
-version = "0.4.0"
+name = "solana-version"
+version = "1.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
+checksum = "222e2c91640d45cd9617dfc07121555a9bdac10e6e105f6931b758f46db6faaa"
 dependencies = [
- "libc",
- "winapi",
+ "log 0.4.14",
+ "rustc_version 0.4.0",
+ "serde",
+ "serde_derive",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-sdk",
 ]
 
 [[package]]
-name = "soketto"
-version = "0.4.1"
+name = "solana-vote-program"
+version = "1.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0"
+checksum = "b4cc64945010e9e76d368493ad091aa5cf43ee16f69296290ebb5c815e433232"
 dependencies = [
- "base64 0.12.3",
- "bytes 0.5.6",
- "flate2",
- "futures 0.3.15",
- "httparse",
- "log 0.4.11",
- "rand 0.7.3",
- "sha-1 0.8.2",
+ "bincode",
+ "log 0.4.14",
+ "num-derive",
+ "num-traits",
+ "rustc_version 0.4.0",
+ "serde",
+ "serde_derive",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
+ "solana-metrics",
+ "solana-program-runtime",
+ "solana-sdk",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-core"
-version = "3.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abbc8d4e9b8a7d5819ed26f1374017bb32833ef4890e4ff065e1da30669876bc"
+checksum = "77963e2aa8fadb589118c3aede2e78b6c4bcf1c01d588fbf33e915b390825fbd"
 dependencies = [
+ "bitflags",
  "byteorder 1.4.3",
  "hash-db",
  "hash256-std-hasher",
- "log 0.4.11",
- "num-traits 0.2.12",
+ "log 0.4.14",
+ "num-traits",
  "parity-scale-codec",
  "parity-util-mem",
  "primitive-types",
+ "scale-info",
  "secrecy",
  "sp-debug-derive",
  "sp-runtime-interface",
  "sp-std",
  "sp-storage",
+ "ss58-registry",
  "zeroize",
 ]
 
 [[package]]
 name = "sp-debug-derive"
-version = "3.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e80275f23b4e7ba8f54dec5f90f016530e7307d2ee9445f617ab986cbe97f31e"
+checksum = "d676664972e22a0796176e81e7bec41df461d1edf52090955cdab55f2c956ff2"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
-version = "3.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e5c88b4bc8d607e4e2ff767a85db58cf7101f3dd6064f06929342ea67fe8fb"
+checksum = "158bf0305c75a50fc0e334b889568f519a126e32b87900c3f4251202dece7b4b"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -5089,28 +7131,28 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "3.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a6c7c2251512c9e533d15db8a863b06ece1cbee778130dd9adbe44b6b39aa9"
+checksum = "22ecb916b9664ed9f90abef0ff5a3e61454c1efea5861b2997e03f39b59b955f"
 dependencies = [
  "Inflector",
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "sp-std"
-version = "3.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35391ea974fa5ee869cb094d5b437688fbf3d8127d64d1b9fed5822a1ed39b12"
+checksum = "14804d6069ee7a388240b665f17908d98386ffb0b5d39f89a4099fc7a2a4c03f"
 
 [[package]]
 name = "sp-storage"
-version = "3.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86af458d4a0251c490cdde9dcaaccb88d398f3b97ac6694cdd49ed9337e6b961"
+checksum = "5dab53af846068e3e0716d3ccc70ea0db44035c79b2ed5821aaa6635039efa37"
 dependencies = [
  "parity-scale-codec",
  "ref-cast",
@@ -5120,9 +7162,9 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "3.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567382d8d4e14fb572752863b5cd57a78f9e9a6583332b590b726f061f3ea957"
+checksum = "69a67e555d171c4238bd223393cda747dd20ec7d4f5fe5c042c056cb7fde9eda"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -5132,24 +7174,25 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "3.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85b7f745da41ef825c6f7b93f1fdc897b03df94a4884adfbb70fbcd0aed1298"
+checksum = "d6fc34f4f291886914733e083b62708d829f3e6b8d7a7ca7fa8a55a3d7640b0b"
 dependencies = [
  "hash-db",
  "memory-db",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-std",
  "trie-db",
- "trie-root",
+ "trie-root 0.17.0",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
-version = "3.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b214e125666a6416cf30a70cc6a5dacd34a4e5197f8a3d479f714af7e1dc7a47"
+checksum = "10d88debe690c2b24eaa9536a150334fcef2ae184c21a0e5b3e80135407a7d52"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -5162,6 +7205,54 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spl-associated-token-account"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "393e2240d521c3dd770806bff25c2c00d761ac962be106e14e22dd912007f428"
+dependencies = [
+ "solana-program",
+ "spl-token",
+]
+
+[[package]]
+name = "spl-memo"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
+dependencies = [
+ "solana-program",
+]
+
+[[package]]
+name = "spl-token"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93bfdd5bd7c869cb565c7d7635c4fafe189b988a0bdef81063cd9585c6b8dc01"
+dependencies = [
+ "arrayref",
+ "num-derive",
+ "num-traits",
+ "num_enum",
+ "solana-program",
+ "thiserror",
+]
+
+[[package]]
+name = "spv_validation"
+version = "0.1.0"
+dependencies = [
+ "chain",
+ "primitives",
+ "ripemd160",
+ "rustc-hex 2.1.0",
+ "serde",
+ "serde_json",
+ "serialization",
+ "sha2 0.9.9",
+ "test_helpers",
+]
+
 [[package]]
 name = "sql-builder"
 version = "3.1.1"
@@ -5172,11 +7263,25 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "ss58-registry"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9799e6d412271cb2414597581128b03f3285f260ea49f5363d07df6a332b3e"
+dependencies = [
+ "Inflector",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "serde",
+ "serde_json",
+ "unicode-xid 0.2.0",
+]
+
 [[package]]
 name = "stable_deref_trait"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "standback"
@@ -5213,11 +7318,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
  "serde",
  "serde_derive",
- "syn 1.0.72",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -5227,13 +7332,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
- "proc-macro2",
- "quote 1.0.7",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
  "serde",
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.72",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -5242,6 +7347,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
 [[package]]
 name = "subtle"
 version = "1.0.0"
@@ -5254,6 +7365,12 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
+[[package]]
+name = "symlink"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a"
+
 [[package]]
 name = "syn"
 version = "0.11.11"
@@ -5267,15 +7384,32 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.72"
+version = "0.15.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "unicode-xid 0.2.0",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "unicode-xid 0.1.0",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
+
 [[package]]
 name = "synom"
 version = "0.11.3"
@@ -5291,9 +7425,9 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
  "unicode-xid 0.2.0",
 ]
 
@@ -5303,12 +7437,23 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "tar"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
 [[package]]
 name = "tc_cli_client"
 version = "0.2.0"
 source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
- "log 0.4.11",
+ "log 0.4.14",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5322,7 +7467,7 @@ source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1
 dependencies = [
  "hex 0.3.2",
  "hmac 0.7.1",
- "log 0.4.11",
+ "log 0.4.14",
  "rand 0.7.3",
  "sha2 0.8.2",
  "tc_core",
@@ -5334,7 +7479,7 @@ version = "0.3.0"
 source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "debug_stub_derive",
- "log 0.4.11",
+ "log 0.4.14",
 ]
 
 [[package]]
@@ -5342,7 +7487,7 @@ name = "tc_dynamodb_local"
 version = "0.2.0"
 source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
- "log 0.4.11",
+ "log 0.4.14",
  "tc_core",
 ]
 
@@ -5367,7 +7512,7 @@ name = "tc_parity_parity"
 version = "0.5.0"
 source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
- "log 0.4.11",
+ "log 0.4.14",
  "tc_core",
 ]
 
@@ -5376,7 +7521,7 @@ name = "tc_postgres"
 version = "0.2.0"
 source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
- "log 0.4.11",
+ "log 0.4.14",
  "tc_core",
 ]
 
@@ -5398,14 +7543,14 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
+ "fastrand",
  "libc",
- "rand 0.7.3",
- "redox_syscall 0.1.56",
+ "redox_syscall 0.2.10",
  "remove_dir_all",
  "winapi",
 ]
@@ -5419,6 +7564,23 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "test_helpers"
+version = "0.1.0"
+dependencies = [
+ "hex 0.4.2",
+]
+
 [[package]]
 name = "testcontainers"
 version = "0.7.0"
@@ -5436,24 +7598,33 @@ dependencies = [
  "tc_trufflesuite_ganachecli",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
 [[package]]
 name = "thiserror"
-version = "1.0.25"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.25"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
@@ -5479,9 +7650,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.25"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7"
+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
 dependencies = [
  "const_fn",
  "libc",
@@ -5504,15 +7675,34 @@ dependencies = [
 
 [[package]]
 name = "time-macros-impl"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2",
- "quote 1.0.7",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
  "standback",
- "syn 1.0.72",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "tiny-bip39"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d"
+dependencies = [
+ "anyhow",
+ "hmac 0.8.1",
+ "once_cell",
+ "pbkdf2 0.4.0",
+ "rand 0.7.3",
+ "rustc-hash",
+ "sha2 0.9.9",
+ "thiserror",
+ "unicode-normalization",
+ "wasm-bindgen",
+ "zeroize",
 ]
 
 [[package]]
@@ -5533,12 +7723,6 @@ dependencies = [
  "crunchy 0.2.2",
 ]
 
-[[package]]
-name = "tinyvec"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
-
 [[package]]
 name = "tinyvec"
 version = "1.2.0"
@@ -5556,17 +7740,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.8.1"
+version = "1.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
+checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
 dependencies = [
- "autocfg 1.0.0",
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "libc",
  "memchr",
- "mio",
+ "mio 0.8.2",
  "num_cpus",
- "pin-project-lite 0.2.6",
+ "once_cell",
+ "parking_lot 0.12.0",
+ "pin-project-lite 0.2.9",
+ "signal-hook-registry",
+ "socket2 0.4.4",
  "tokio-macros",
  "winapi",
 ]
@@ -5582,25 +7769,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-macros"
+name = "tokio-io-timeout"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite 0.2.9",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.22.0"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b"
+dependencies = [
+ "rustls 0.20.4",
+ "tokio",
+ "webpki 0.22.0",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
+checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
 dependencies = [
- "rustls",
+ "futures-core",
+ "pin-project-lite 0.2.9",
  "tokio",
- "webpki",
 ]
 
 [[package]]
@@ -5619,12 +7827,26 @@ version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
- "bytes 1.0.1",
+ "bytes 1.1.0",
+ "futures-core",
+ "futures-sink",
+ "log 0.4.14",
+ "pin-project-lite 0.2.9",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
+dependencies = [
+ "bytes 1.1.0",
  "futures-core",
  "futures-sink",
- "log 0.4.11",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.9",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -5637,18 +7859,100 @@ dependencies = [
 ]
 
 [[package]]
-name = "toolchain_find"
-version = "0.1.4"
+name = "tonic"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.13.0",
+ "bytes 1.1.0",
+ "flate2",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.7",
+ "http-body 0.4.4",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding 2.1.0",
+ "pin-project 1.0.10",
+ "prost",
+ "prost-derive",
+ "rustls-pemfile 1.0.0",
+ "tokio",
+ "tokio-rustls",
+ "tokio-stream",
+ "tokio-util 0.7.2",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+ "tracing-futures",
+ "webpki-roots",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1"
+dependencies = [
+ "prettyplease",
+ "proc-macro2 1.0.39",
+ "prost-build",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap",
+ "pin-project 1.0.10",
+ "pin-project-lite 0.2.9",
+ "rand 0.8.4",
+ "slab 0.4.2",
+ "tokio",
+ "tokio-stream",
+ "tokio-util 0.6.7",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e458af37ead6107144c2e3bb892f605ddfad20251f12143cda8b9c9072b1ca45"
+checksum = "7d342c6d58709c0a6d48d48dabbb62d4ef955cf5f0f3bbfd845838e7ae88dbae"
 dependencies = [
- "dirs",
- "lazy_static",
- "regex",
- "semver 0.9.0",
- "walkdir",
+ "bitflags",
+ "bytes 1.1.0",
+ "futures-core",
+ "futures-util",
+ "http 0.2.7",
+ "http-body 0.4.4",
+ "http-range-header",
+ "pin-project-lite 0.2.9",
+ "tower",
+ "tower-layer",
+ "tower-service",
 ]
 
+[[package]]
+name = "tower-layer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
+
 [[package]]
 name = "tower-service"
 version = "0.3.0"
@@ -5657,39 +7961,80 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 
 [[package]]
 name = "tracing"
-version = "0.1.25"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
 dependencies = [
  "cfg-if 1.0.0",
- "pin-project-lite 0.2.6",
+ "log 0.4.14",
+ "pin-project-lite 0.2.9",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
-name = "traitobject"
-version = "0.1.0"
+name = "tracing-futures"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project 1.0.10",
+ "tracing",
+]
+
+[[package]]
+name = "trezor"
+version = "0.1.1"
+dependencies = [
+ "async-trait",
+ "bip32",
+ "byteorder 1.4.3",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "hw_common",
+ "js-sys",
+ "mm2_err_handle",
+ "prost",
+ "rand 0.7.3",
+ "rpc_task",
+ "serde",
+ "serde_derive",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test",
+ "web-sys",
+]
 
 [[package]]
 name = "trie-db"
-version = "0.22.6"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
+checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83"
 dependencies = [
  "hash-db",
- "hashbrown 0.11.2",
- "log 0.4.11",
+ "hashbrown 0.12.1",
+ "log 0.4.14",
  "smallvec 1.6.1",
 ]
 
@@ -5702,11 +8047,20 @@ dependencies = [
  "hash-db",
 ]
 
+[[package]]
+name = "trie-root"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891"
+dependencies = [
+ "hash-db",
+]
+
 [[package]]
 name = "trust-dns-proto"
-version = "0.20.3"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4"
+checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -5715,31 +8069,31 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 0.2.0",
+ "idna 0.2.3",
  "ipnet",
  "lazy_static",
- "log 0.4.11",
+ "log 0.4.14",
  "rand 0.8.4",
  "smallvec 1.6.1",
  "thiserror",
- "tinyvec 1.2.0",
+ "tinyvec",
  "tokio",
- "url 2.1.1",
+ "url 2.2.2",
 ]
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.20.3"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770"
+checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
 dependencies = [
  "cfg-if 1.0.0",
  "futures-util",
  "ipconfig",
  "lazy_static",
- "log 0.4.11",
+ "log 0.4.14",
  "lru-cache",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "resolv-conf",
  "smallvec 1.6.1",
  "thiserror",
@@ -5754,25 +8108,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
 [[package]]
-name = "typemap"
-version = "0.3.3"
+name = "tungstenite"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
+checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1"
 dependencies = [
- "unsafe-any",
+ "base64 0.13.0",
+ "byteorder 1.4.3",
+ "bytes 1.1.0",
+ "http 0.2.7",
+ "httparse",
+ "log 0.4.14",
+ "rand 0.8.4",
+ "rustls 0.20.4",
+ "sha-1",
+ "thiserror",
+ "url 2.2.2",
+ "utf-8",
+ "webpki 0.22.0",
+ "webpki-roots",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "uint"
@@ -5800,7 +8161,7 @@ dependencies = [
 [[package]]
 name = "unexpected"
 version = "0.1.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#d4b2179e76b447f7def274e68e60e4c0a52c4070"
+source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
 
 [[package]]
 name = "unicode-bidi"
@@ -5811,20 +8172,26 @@ dependencies = [
  "matches",
 ]
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+
 [[package]]
 name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
- "tinyvec 0.3.3",
+ "tinyvec",
 ]
 
 [[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
+name = "unicode-width"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
@@ -5832,6 +8199,12 @@ version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 
+[[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.0"
@@ -5844,19 +8217,10 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
  "subtle 2.4.0",
 ]
 
-[[package]]
-name = "unsafe-any"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
-dependencies = [
- "traitobject",
-]
-
 [[package]]
 name = "unsigned-varint"
 version = "0.4.0"
@@ -5869,12 +8233,12 @@ dependencies = [
 
 [[package]]
 name = "unsigned-varint"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f"
+checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836"
 dependencies = [
  "asynchronous-codec",
- "bytes 1.0.1",
+ "bytes 1.1.0",
  "futures-io",
  "futures-util",
 ]
@@ -5885,6 +8249,16 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "uriparse"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e515b1ada404168e145ac55afba3c42f04cf972201a8552d42e2abb17c1b7221"
+dependencies = [
+ "fnv",
+ "lazy_static",
+]
+
 [[package]]
 name = "url"
 version = "1.7.2"
@@ -5898,15 +8272,40 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.1.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
- "idna 0.2.0",
+ "form_urlencoded",
+ "idna 0.2.3",
  "matches",
  "percent-encoding 2.1.0",
 ]
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utxo_signer"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "chain",
+ "common",
+ "crypto",
+ "derive_more",
+ "hex 0.4.2",
+ "keys",
+ "mm2_err_handle",
+ "primitives",
+ "rpc",
+ "script",
+ "serialization",
+]
+
 [[package]]
 name = "uuid"
 version = "0.7.4"
@@ -5917,12 +8316,28 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f"
+dependencies = [
+ "ctor",
+ "version_check",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
 
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
 [[package]]
 name = "version_check"
 version = "0.9.2"
@@ -5935,56 +8350,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
-[[package]]
-name = "wagyu-zcash-parameters"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c904628658374e651288f000934c33ef738b2d8b3e65d4100b70b395dbe2bb"
-dependencies = [
- "wagyu-zcash-parameters-1",
- "wagyu-zcash-parameters-2",
- "wagyu-zcash-parameters-3",
- "wagyu-zcash-parameters-4",
- "wagyu-zcash-parameters-5",
- "wagyu-zcash-parameters-6",
-]
-
-[[package]]
-name = "wagyu-zcash-parameters-1"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bf2e21bb027d3f8428c60d6a720b54a08bf6ce4e6f834ef8e0d38bb5695da8"
-
-[[package]]
-name = "wagyu-zcash-parameters-2"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a616ab2e51e74cc48995d476e94de810fb16fc73815f390bf2941b046cc9ba2c"
-
-[[package]]
-name = "wagyu-zcash-parameters-3"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14da1e2e958ff93c0830ee68e91884069253bf3462a67831b02b367be75d6147"
-
-[[package]]
-name = "wagyu-zcash-parameters-4"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f058aeef03a2070e8666ffb5d1057d8bb10313b204a254a6e6103eb958e9a6d6"
-
-[[package]]
-name = "wagyu-zcash-parameters-5"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ffe916b30e608c032ae1b734f02574a3e12ec19ab5cc5562208d679efe4969d"
-
-[[package]]
-name = "wagyu-zcash-parameters-6"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7b6d5a78adc3e8f198e9cd730f219a695431467f7ec29dcfc63ade885feebe1"
-
 [[package]]
 name = "waker-fn"
 version = "1.0.0"
@@ -6008,7 +8373,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log 0.4.11",
+ "log 0.4.14",
  "try-lock",
 ]
 
@@ -6024,30 +8389,34 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.74"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
+checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
 dependencies = [
  "cfg-if 1.0.0",
- "serde",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.74"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
+checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
 dependencies = [
  "bumpalo",
  "lazy_static",
- "log 0.4.11",
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "log 0.4.14",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
  "wasm-bindgen-shared",
 ]
 
@@ -6065,32 +8434,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.74"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
+checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
 dependencies = [
- "quote 1.0.7",
+ "quote 1.0.18",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.74"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
+checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.74"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
+checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
 
 [[package]]
 name = "wasm-bindgen-test"
@@ -6112,8 +8481,8 @@ version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c2e18093f11c19ca4e188c177fecc7c372304c311189f12c2f9bea5b7324ac7"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
 ]
 
 [[package]]
@@ -6134,9 +8503,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.40"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b72fe77fd39e4bd3eaa4412fd299a0be6b3dfe9d2597e2f1c20beb968f41d17"
+checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6153,8 +8522,8 @@ dependencies = [
  "ethabi",
  "ethereum-types 0.4.2",
  "futures 0.1.29",
- "jsonrpc-core",
- "log 0.4.11",
+ "jsonrpc-core 8.0.1",
+ "log 0.4.14",
  "parking_lot 0.7.1",
  "rustc-hex 1.0.0",
  "serde",
@@ -6175,21 +8544,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "0.19.0"
+name = "webpki"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
 dependencies = [
- "webpki",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.21.1"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
+checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
 dependencies = [
- "webpki",
+ "webpki 0.22.0",
 ]
 
 [[package]]
@@ -6213,9 +8583,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
 
 [[package]]
 name = "winapi"
@@ -6248,11 +8618,54 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
+
 [[package]]
 name = "winreg"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
+checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
 dependencies = [
  "winapi",
 ]
@@ -6263,51 +8676,75 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
 
+[[package]]
+name = "wyz"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e"
+dependencies = [
+ "tap",
+]
+
 [[package]]
 name = "x25519-dalek"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "rand_core 0.5.1",
  "zeroize",
 ]
 
+[[package]]
+name = "xattr"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "yaml-rust"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
 
 [[package]]
 name = "yamux"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
+checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1"
 dependencies = [
  "futures 0.3.15",
- "log 0.4.11",
+ "log 0.4.14",
  "nohash-hasher",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "rand 0.8.4",
  "static_assertions",
 ]
 
+[[package]]
+name = "zbase32"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9079049688da5871a7558ddacb7f04958862c703e68258594cb7a862b5e33f"
+
 [[package]]
 name = "zcash_client_backend"
 version = "0.5.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git#7da40e902463a78c93390686ee34e0379c121b40"
+source = "git+https://github.com/KomodoPlatform/librustzcash.git#95fa5110b4b3ec105ae5fed1aba3847f656ec9b7"
 dependencies = [
  "base64 0.13.0",
  "bech32",
  "bls12_381",
  "bs58",
- "ff",
- "group",
+ "ff 0.8.0",
+ "group 0.8.0",
  "hex 0.4.2",
  "jubjub",
  "nom",
@@ -6316,21 +8753,39 @@ dependencies = [
  "protobuf-codegen-pure",
  "rand_core 0.5.1",
  "subtle 2.4.0",
- "time 0.2.25",
+ "time 0.2.27",
  "zcash_note_encryption",
  "zcash_primitives",
 ]
 
+[[package]]
+name = "zcash_client_sqlite"
+version = "0.3.0"
+source = "git+https://github.com/KomodoPlatform/librustzcash.git#95fa5110b4b3ec105ae5fed1aba3847f656ec9b7"
+dependencies = [
+ "bech32",
+ "bs58",
+ "ff 0.8.0",
+ "group 0.8.0",
+ "jubjub",
+ "protobuf",
+ "rand_core 0.5.1",
+ "rusqlite",
+ "time 0.2.27",
+ "zcash_client_backend",
+ "zcash_primitives",
+]
+
 [[package]]
 name = "zcash_note_encryption"
 version = "0.0.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git#7da40e902463a78c93390686ee34e0379c121b40"
+source = "git+https://github.com/KomodoPlatform/librustzcash.git#95fa5110b4b3ec105ae5fed1aba3847f656ec9b7"
 dependencies = [
  "blake2b_simd",
  "byteorder 1.4.3",
  "crypto_api_chachapoly",
- "ff",
- "group",
+ "ff 0.8.0",
+ "group 0.8.0",
  "rand_core 0.5.1",
  "subtle 2.4.0",
 ]
@@ -6338,7 +8793,7 @@ dependencies = [
 [[package]]
 name = "zcash_primitives"
 version = "0.5.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git#7da40e902463a78c93390686ee34e0379c121b40"
+source = "git+https://github.com/KomodoPlatform/librustzcash.git#95fa5110b4b3ec105ae5fed1aba3847f656ec9b7"
 dependencies = [
  "aes 0.6.0",
  "bitvec 0.18.5",
@@ -6348,19 +8803,19 @@ dependencies = [
  "byteorder 1.4.3",
  "crypto_api_chachapoly",
  "equihash",
- "ff",
+ "ff 0.8.0",
  "fpe",
- "funty",
- "group",
+ "funty 1.1.0",
+ "group 0.8.0",
  "hex 0.4.2",
  "jubjub",
  "lazy_static",
- "log 0.4.11",
+ "log 0.4.14",
  "rand 0.7.3",
  "rand_core 0.5.1",
- "ripemd160 0.9.1",
+ "ripemd160",
  "secp256k1",
- "sha2 0.9.5",
+ "sha2 0.9.9",
  "subtle 2.4.0",
  "zcash_note_encryption",
 ]
@@ -6368,43 +8823,71 @@ dependencies = [
 [[package]]
 name = "zcash_proofs"
 version = "0.5.0"
-source = "git+https://github.com/KomodoPlatform/librustzcash.git#7da40e902463a78c93390686ee34e0379c121b40"
+source = "git+https://github.com/KomodoPlatform/librustzcash.git#95fa5110b4b3ec105ae5fed1aba3847f656ec9b7"
 dependencies = [
  "bellman",
  "blake2b_simd",
  "bls12_381",
  "byteorder 1.4.3",
  "directories",
- "ff",
- "group",
+ "ff 0.8.0",
+ "group 0.8.0",
  "jubjub",
  "lazy_static",
  "rand_core 0.5.1",
- "wagyu-zcash-parameters",
  "zcash_primitives",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.4.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeafe61337cb2c879d328b74aa6cd9d794592c82da6be559fdf11493f02a2d18"
+checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.0.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
+checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
 dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.72",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
  "synstructure",
 ]
 
+[[package]]
+name = "zstd"
+version = "0.9.2+zstd.1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "4.1.3+zstd.1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "1.6.2+zstd.1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[patch.unused]]
 name = "backtrace"
 version = "0.3.32"
@@ -6414,8 +8897,3 @@ source = "git+https://github.com/artemii235/backtrace-rs.git#6f9ac910252ef783310
 name = "backtrace-sys"
 version = "0.1.30"
 source = "git+https://github.com/artemii235/backtrace-rs.git#6f9ac910252ef7833105080c9cb4d5948dcb74c2"
-
-[[patch.unused]]
-name = "num-rational"
-version = "0.2.2"
-source = "git+https://github.com/artemii235/num-rational.git#7e4aa03de722b6e965075cba3088a341a99901b0"
diff --git a/Cargo.toml b/Cargo.toml
index e34c5b0fce..4e27bed80d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,143 +1,18 @@
-# Support for split-debuginfo [should eventually](https://github.com/rust-lang/rust/issues/34651) land,
-# hopefully giving us an out-of-the-box way to separate the code from the debugging information.
-# We should use the "objcopy --only-keep-debug" and "add-symbol-file" meanwhile
-# and separating stack tracing into raw trace and symbolication parts.
-
-[package]
-name = "mm2"
-version = "0.1.0"
-edition = "2018"
-default-run = "mm2"
-
-[features]
-# Deprecated
-native = []
-zhtlc = ["coins/zhtlc"]
-
-[[bin]]
-name = "mm2"
-path = "mm2src/mm2_bin.rs"
-test = false
-doctest = false
-bench = false
-
-[[bin]]
-name = "docker_tests"
-path = "mm2src/docker_tests.rs"
-
-[lib]
-name = "mm2"
-path = "mm2src/mm2_lib.rs"
-crate-type = ["cdylib", "staticlib"]
-test = false
-doctest = false
-bench = false
-
-[profile.release]
-# Due to the "overrides" only affects our workspace crates, as intended.
-debug = true
-debug-assertions = false
-# For better or worse, might affect the stack traces in our portion of the code.
-#opt-level = 1
-
-[profile.release.overrides."*"]
-# Turns debugging symbols off for the out-of-workspace dependencies.
-debug = false
-
-[dependencies]
-async-std = { version = "1.5", features = ["unstable"] }
-async-trait = "0.1"
-bigdecimal = { version = "0.1", features = ["serde"] }
-bitcrypto = { path = "mm2src/mm2_bitcoin/crypto" }
-blake2 = "0.9.1"
-bytes = "0.4"
-chain = { path = "mm2src/mm2_bitcoin/chain" }
-coins = { path = "mm2src/coins" }
-common = { path = "mm2src/common" }
-crc = "1.8"
-crc32fast = { version = "1.2", features = ["std", "nightly"] }
-crossbeam = "0.7"
-derive_more = "0.99"
-either = "1.6"
-ethereum-types = { version = "0.4", default-features = false, features = ["std", "serialize"] }
-enum-primitive-derive = "0.1"
-fomat-macros = "0.2"
-futures01 = { version = "0.1", package = "futures" }
-futures-cpupool = "0.1"
-futures = { version = "0.3.1", package = "futures", features = ["compat", "async-await"] }
-gstuff = { version = "0.7", features = ["nightly"] }
-hash256-std-hasher = "0.15.2"
-hash-db = "0.15.2"
-hex = "0.3.2"
-hex-literal = "0.3.1"
-http = "0.2"
-itertools = "0.9"
-keys = { path = "mm2src/mm2_bitcoin/keys" }
-lazy_static = "1.4"
-libc = "0.2"
-metrics = "0.12"
-mm2-libp2p = { path = "mm2src/mm2_libp2p" }
-num-rational = { version = "0.2", features = ["serde", "bigint", "bigint-std"] }
-num-traits = "0.2"
-rpc = { path = "mm2src/mm2_bitcoin/rpc" }
-parking_lot = { version = "0.11", features = ["nightly"] }
-parity-util-mem = "0.9"
-# AP: portfolio RPCs are not documented and not used as of now
-# so the crate is disabled to speed up the entire removal of C code
-# portfolio = { path = "mm2src/portfolio" }
-primitives = { path = "mm2src/mm2_bitcoin/primitives" }
-rand = { version = "0.7", features = ["std", "small_rng"] }
-rmp-serde = "0.14.3"
-# TODO: Reduce the size of regex by disabling the features we don't use.
-# cf. https://github.com/rust-lang/regex/issues/583
-regex = "1"
-script = { path = "mm2src/mm2_bitcoin/script" }
-serde = "1.0"
-serde_bencode = "0.2"
-serde_json = { version = "1.0", features = ["preserve_order"] }
-serde_derive = "1.0"
-ser_error = { path = "mm2src/derives/ser_error" }
-ser_error_derive = { path = "mm2src/derives/ser_error_derive" }
-serialization = { path = "mm2src/mm2_bitcoin/serialization" }
-serialization_derive = { path = "mm2src/mm2_bitcoin/serialization_derive" }
-sp-runtime-interface = { version = "3.0.0", default-features = false, features = ["disable_target_static_assertions"] }
-sp-trie = { version = "3.0", default-features = false }
-sql-builder = "3.1.1"
-
-trie-db = { version = "0.22.6", default-features = false }
-trie-root = "0.16.0"
-uuid = { version = "0.7", features = ["serde", "v4"] }
-wasm-timer = "0.2.4"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = { version = "0.3.27" }
-wasm-bindgen = { version = "0.2.50", features = ["serde-serialize", "nightly"] }
-wasm-bindgen-futures = { version = "0.4.1" }
-wasm-bindgen-test = { version = "0.3.1" }
-web-sys = { version = "0.3.4", features = ["console"] }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-dirs = { version = "1" }
-hyper = { version = "0.14.11", features = ["client", "http2", "server", "tcp"] }
-tokio = { version = "1.7", features = ["io-util", "rt-multi-thread", "net"] }
-
-[dev-dependencies]
-bitcoin-cash-slp = "0.3.1"
-mocktopus = "0.7.0"
-rand6 = { version = "0.6", package = "rand" }
-secp256k1 = { version = "0.20", features = ["rand"] }
-testcontainers = { git = "https://github.com/artemii235/testcontainers-rs.git" }
-winapi = "0.3"
-
-[build-dependencies]
-chrono = "0.4"
-gstuff = { version = "0.7", features = ["nightly"] }
-regex = "1"
-
 [workspace]
 members = [
     "mm2src/coins",
+    "mm2src/coins/lightning_persister",
+    "mm2src/coins/lightning_background_processor",
+    "mm2src/coins/utxo_signer",
+    "mm2src/coins_activation",
+    "mm2src/common/shared_ref_counter",
+    "mm2src/crypto",
+    "mm2src/db_common",
+    "mm2src/derives/ser_error",
+    "mm2src/derives/ser_error_derive",
     "mm2src/floodsub",
+    "mm2src/gossipsub",
+    "mm2src/hw_common",
     "mm2src/mm2_bitcoin/crypto",
     "mm2src/mm2_bitcoin/chain",
     "mm2src/mm2_bitcoin/keys",
@@ -146,14 +21,39 @@ members = [
     "mm2src/mm2_bitcoin/script",
     "mm2src/mm2_bitcoin/serialization",
     "mm2src/mm2_bitcoin/serialization_derive",
+    "mm2src/mm2_bitcoin/test_helpers",
+    "mm2src/mm2_core",
+    "mm2src/mm2_db",
+    "mm2src/mm2_err_handle",
+    "mm2src/mm2_test_helpers",
     "mm2src/mm2_libp2p",
-    "mm2src/gossipsub",
-    "mm2src/derives/ser_error",
-    "mm2src/derives/ser_error_derive",
+    "mm2src/mm2_main",
+    "mm2src/mm2_net",
+    "mm2src/mm2_number",
+    "mm2src/mm2_io",
+    "mm2src/mm2_rpc",
+    "mm2src/rpc_task",
+    "mm2src/trezor",
 ]
+
 # https://doc.rust-lang.org/beta/cargo/reference/features.html#feature-resolver-version-2
 resolver = "2"
 
+[profile.release]
+# Due to the "overrides" only affects our workspace crates, as intended.
+debug = true
+debug-assertions = false
+# For better or worse, might affect the stack traces in our portion of the code.
+#opt-level = 1
+
+[profile.test]
+# required to avoid a long running process of librustcash additional chain validation that is enabled with debug assertions
+debug-assertions = false
+
+[profile.release.overrides."*"]
+# Turns debugging symbols off for the out-of-workspace dependencies.
+debug = false
+
 # The backtrace disables build.define("HAVE_DL_ITERATE_PHDR", "1"); for android which results in "unknown" function
 # names being printed, but dl_iterate_phdr is present since API version 21 https://github.com/rust-lang/rust/issues/17520#issuecomment-344885468
 # We're using 21 version for Android build so we're fine to use the patch.
@@ -162,4 +62,3 @@ resolver = "2"
 [patch.crates-io]
 backtrace = { git = "https://github.com/artemii235/backtrace-rs.git" }
 backtrace-sys = { git = "https://github.com/artemii235/backtrace-rs.git" }
-num-rational = { git = "https://github.com/artemii235/num-rational.git" }
diff --git a/Dockerfile.dev-release b/Dockerfile.dev-release
new file mode 100644
index 0000000000..036c3c6195
--- /dev/null
+++ b/Dockerfile.dev-release
@@ -0,0 +1,5 @@
+FROM debian:stable-slim
+WORKDIR /mm2
+COPY target/release/mm2 /usr/local/bin/mm2
+EXPOSE 7783
+CMD ["mm2"]
diff --git a/LEGAL/AUTHORS b/LEGAL/AUTHORS
deleted file mode 100755
index 8b5005c4da..0000000000
--- a/LEGAL/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-jl777 NXT-SQ9J-JCAN-8XVY-5XN7K
-
diff --git a/LEGAL/CONTRIBUTOR-LICENSE-AGREEMENT b/LEGAL/CONTRIBUTOR-LICENSE-AGREEMENT
new file mode 100644
index 0000000000..4c48d95b9b
--- /dev/null
+++ b/LEGAL/CONTRIBUTOR-LICENSE-AGREEMENT
@@ -0,0 +1,62 @@
+Software Grant and Contributor License Agreement (CLA)
+
+In order to clarify the intellectual property license granted with Contributions from any person or entity, we must have a Contributor License Agreement (CLA) on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of " Atomic Private Limited" (the "Company, Us and Our) users;
+
+This version of the Agreement allows Contributors to submit Contributions to us, to authorize Contributions and to grant copyright and patent licenses thereto.
+
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Us. Except for the license granted herein to Us and recipients of software distributed by Us, you reserve certain rights, title, and interest in and to your Contributions.
+
+"Contribution" shall mean the code, documentation or any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by you to us for inclusion in, or documentation of, any of the products owned or managed by us (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to us or our representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, us for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+
+"Code" means the computer software code, whether in human-readable or machine-executable form.
+
+"Submit" is the act of uploading, submitting, transmitting, or distributing code or other content to project, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the project for the purpose of discussing and improving that project.
+
+You must agree to the terms of this Agreement before making a Submission to the Project.
+
+Copyright License: Subject to the terms and conditions of this Agreement, you hereby grant to us and to recipients of software distributed by us a perpetual, worldwide, exclusive, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions and such derivative works.
+
+Patent License: Subject to the terms and conditions of this Agreement, You hereby grant to us and to recipients of software distributed by us a perpetual, worldwide, exclusive, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by you that are necessarily infringed by your contribution(s) alone or by combination of your contribution(s) with the Work to which such contribution(s) was submitted.
+
+If any entity institutes patent litigation against you or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that contribution or Work shall terminate as of the date such litigation is filed.
+
+If you choose to provide us with suggestions, ideas for improvement, recommendations or other feedback, on any Work we may use your feedback without any restriction or payment.
+
+Each party reserves all rights not expressly granted in this Agreement. No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are granted by implication, exhaustion, estoppel or otherwise. For permitted and/or restricted uses of software, please see the copyright notice attached to this project.
+
+You represent that You are legally entitled to grant the above licenses. You represent that each of Your Submissions is entirely Your original work (except as You may have disclosed under this Agreement).
+
+You represent that You have secured permission from Your employer to make the Submission in cases where Your Submission is made in the course of Your work for Your employer or Your employer has intellectual property rights in Your Submission by contract or applicable law.
+
+If You are signing this Agreement on behalf of Your employer, you represent and warrant that You have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
+
+You are not expected to provide support for your contributions, except to the extent you desire to provide support. You may provide support for free, for a fee, or not at all.
+
+Should You wish to submit work that is not your original creation, you may submit it to us separately from any contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party" followed by the names of the third party and any licenses or other restrictions of which you are aware, and follow any other instructions in the Project's written guidelines concerning Submissions.
+
+References to "employer" in this Agreement include Your employer or anyone else for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your Submission is made in the course of Your work for an employer or Your employer has intellectual property rights in Your Submission by contract or applicable law, you must secure permission from Your employer to make the Submission before signing this Agreement. In that case, the term "You" in this Agreement will refer to You and the employer collectively.
+
+If You change employers in the future and desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement and secure permission from the new employer before Submitting those Submissions.
+
+You agree to notify " Atomic Private Limited" in writing of any facts or circumstances of which You later become aware that would make Your representations in this Agreement inaccurate in any respect.
+
+You agree that contributions to Project and information about contributions may be maintained indefinitely and disclosed publicly, including Your name and other information that You submit with Your Submission.
+
+You agree to resolve disputes in a prompt, low-cost and mutually beneficial way. Before taking legal action or requesting legal proceedings, you will personally participate in an alternative dispute resolution procedure. Mediation and/or arbitral forum will be mutually selected and parties of the alternative dispute resolution will choose the procedure.
+
+The arbitration will be administered by JAMS, Inc. pursuant to its Streamlined Arbitration Rules and Procedures (the "Rules"). The Rules are available at https://www.jamsadr.com/rules-streamlined-arbitration/.
+
+Any arbitration must be commenced by filing a demand for arbitration within 6 months after the date the party asserting the claim first knows or reasonably should know of the act, omission or default giving rise to the claim, otherwise, such cause of action or claim is permanently barred. If applicable law provides a different limitation period for asserting claims, any claim must be asserted within the shortest time period permitted by applicable law.
+
+Any arbitration hearing ("Hearing") may be conducted through online means including but not limited to videoconference, upon request from either party. The Hearing will be conducted in English, and the Arbitrator may, at his or her discretion, also select a secondary language upon request by either party.
+
+You may be required, at Company's sole discretion, to give up any and all rights you may have to seek legal action to resolve any disputes arising from these terms through any other means, including but not limited to any court of law.
+
+The statute of limitations and any filing fee deadlines shall be tolled while the parties engage in the informal dispute resolution process required by this section.
+
+You give up your right to participate in a class action or other class proceeding.
+This Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by " Atomic Private Limited".
+
+By signing, you accept and agree to the terms of this Contribution License Agreement for Your present and future Submissions to " Atomic Private Limited".
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software with a limited restrictions as envisaged under the Copyright notice, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so.
\ No newline at end of file
diff --git a/LEGAL/COPYING b/LEGAL/COPYING
index d159169d10..012664a9a6 100755
--- a/LEGAL/COPYING
+++ b/LEGAL/COPYING
@@ -1,339 +1,601 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
-  When we speak of free software, we are referring to freedom, not
+When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
 modification follow.
 
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights from Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is affected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+
+7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+14. Revised Versions of this License.
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
+<one line to give the program's name and a brief idea of what it does.>
+Copyright (C) <year>  <name of author>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode: <program>  Copyright (C) <year>  <name of author>
+This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/LEGAL/DEVELOPER-AGREEMENT b/LEGAL/DEVELOPER-AGREEMENT
deleted file mode 100755
index a5d2aabfee..0000000000
--- a/LEGAL/DEVELOPER-AGREEMENT
+++ /dev/null
@@ -1,67 +0,0 @@
-This document describes the agreement between the SuperNET developers
-regarding copyright and licensing policies.
-
-
-0. License.
-
-The SuperNET software is distributed under the GPL version 2, with the exception of
-the code that allows SuperNET agents to be created. Agent reference code uses the MIT
-license to allow fully unencumbered development of SuperNET agents. Independently created
-SuperNET agents can even be closed source and be made available via the service provider
-functionality within SuperNET. Also, service providers are free to decide on what
-type of fees to charge for their services.
-
-
-1. Individual copyright.
-
-Each core developer retains full copyright over his contributions to
-the code. The aggregate "Copyright © The SuperNET Developers" notice
-can still be used in some places for brevity, but the metadata
-maintained by the version control software (currently Git) about the
-origin and subsequent modifications of each file shall be used as a
-definitive record of the specific copyright holders for that file or
-modification (if original enough to be copyrightable).
-
-
-2. Outside contributions.
-
-Contributions of non-committers (those without write access to the
-repository) shall only be accepted if submitted under the MIT license,
-or if placed in the public domain. Contributions of non-committers that
-do not specify a license shall be deemed to be public domain work.
-
-
-3. Closed source releases.
-
-Each copyright holder grants a non-transferable permission to the SuperNET
-development team to use his code in closed source experimental
-releases, provided that those are clearly labeled as experimental, for
-testing purposes only, and are in a reasonable timeframe (not to exceed
-six months) superseded by open source non-experimental releases with
-essentially the same functionality.
-
-
-4. Re-licensing.
-
-Re-licensing of the SuperNET software under a different license requires the
-agreement of all copyright holders whose work is being re-licensed. To
-ensure that an unreachable copyright holder cannot prevent the active
-development team from making licensing decisions, each copyright holder
-who leaves the development team shall provide an NXT account number in
-the AUTHORS file, at which he can be contacted to discuss such
-decisions. Lack of such contact info, or lack of any type of response to
-a re-licensing permission request after more than 28 days, as recorded
-in the NXT blockchain, shall be interpreted as an irrevocable permission
-to the then active development team to perform the specific re-licensing
-for which such a permission has been sought.
-
-
-5. Pseudonymous developers.
-
-Developers may choose to contribute under a fictitious name. Such
-developers shall provide verifiable crypto addresses in the AUTHORS file
-A verified signature with such addresses shall be considered
-sufficient, for making legally binding statements, or as a proof of
-copyright ownership, by such pseudonymous developers.
-
-
diff --git a/LEGAL/DEVELOPER-CERTIFICATE-OF-ORIGIN b/LEGAL/DEVELOPER-CERTIFICATE-OF-ORIGIN
new file mode 100755
index 0000000000..fa0ce4f4ca
--- /dev/null
+++ b/LEGAL/DEVELOPER-CERTIFICATE-OF-ORIGIN
@@ -0,0 +1,18 @@
+DCO
+(Developer Certificate of Origin)
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I have the right to submit it under the open-source license indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open-source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open-source license (unless I am permitted to submit under a different license), as indicated in the file; or
+
+(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
+
+(d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open-source license(s) involved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software with a limited restriction as envisaged under the Copyright notice, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so. 
+
+
+
+
diff --git a/LEGAL/LICENSE b/LEGAL/LICENSE
deleted file mode 100755
index 50c41bc792..0000000000
--- a/LEGAL/LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright © 2013-2018 The SuperNET Developers.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2,
-as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License version 2 for more details.
-
-You should have received a copy of the GNU General Public License version 2
-along with this program in the file COPYING. If not, see
-<https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>.
-
-The SuperNET development team will consider granting exceptions to allow use of
-this software under a different license on a case by case basis. Please see the
-DEVELOPER-AGREEMENT file describing the developer agreement on copyright
-and licensing policies, and the AUTHORS file for individual copyright holder
-information.
-
-This software uses third party libraries, distributed under licenses described
-in THIRDPARTY-LICENSES.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
diff --git a/LEGAL/LICENSE-COPYRIGHT-NOTICE b/LEGAL/LICENSE-COPYRIGHT-NOTICE
new file mode 100755
index 0000000000..6af58751a5
--- /dev/null
+++ b/LEGAL/LICENSE-COPYRIGHT-NOTICE
@@ -0,0 +1,58 @@
+Copyright © 2022 Atomic Private Limited and its contributors
+
+Permission to include in application software or to make digital or hard copies of part or all of this work is subject to the following Agreement.
+
+All software, both binary and source published by Atomic Private Limited (hereinafter, Software) is copyrighted by the Atomic Private Limited (hereinafter, "Atomic Private Limited", "Company","We" or "Us") and ownership of all right, title and interest in and to the Software remains with Atomic Private Limited. By using or copying the Software, User agrees to abide by the terms of this Agreement.
+
+The Company grants to you (hereinafter, "User" or "You") a royalty-free, non-exclusive right to execute, copy, modify and distribute both the binary and source code solely for the uses, subject to the following conditions:
+
+You acknowledge that the Software is being supplied "as is," without any support services from the Company. We don't make any representations or warranties, express or implied, including, without limitation, any representations or warranties of the merchantability or fitness for any particular purpose, or that the application of the software, will not infringe on any patents or other proprietary rights of others.
+
+Company shall not be held liable for direct, indirect, incidental or consequential damages arising from any claim by User or any third party with respect to uses allowed under this Agreement, or from any use of the Software.
+
+User agrees to fully indemnify and hold harmless Company from and against any and all claims, demands, suits, losses, damages, costs and expenses arising out of the User's use of the Software, including, without limitation, arising out of the User's modification of the Software.
+
+
+User may modify the Software and distribute that modified work to third parties under open-source license GPL Version 3.0 terms provided that:
+
+(a) if posted separately, it clearly acknowledges that it contains material copyrighted by "Atomic Private Limited"
+
+(b) no charge is associated with such copies,
+
+(c) User agrees to notify "Atomic Private Limited" of the distribution.
+
+(d) User clearly notifies secondary users that such modified work is not the original Software.
+
+(e) Code sections starting with a "license protected" comment and/or "Dex_Fee" code prefix and code-sections / software-logic related to these aforementioned sections shall not be modified by the Users/third parties and are subject of the copyright limitation covered under the foregoing Agreement.
+
+(f) User Agrees that he/she will not modify the following code sections and/or cryptographic keys: 
+https://github.com/KomodoPlatform/atomicDEX-API/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/common/common.rs#L164 
+https://github.com/KomodoPlatform/atomicDEX-API/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/common/common.rs#L166 
+https://github.com/KomodoPlatform/atomicDEX-API/blob/6a634c09198ff18a3825164d2ca1e597cd8ebb51/mm2src/coins/z_coin.rs#L97 
+https://github.com/KomodoPlatform/atomicDEX-API/blob/2fe5be95e166744667bc1fdd75fa5bb1eb5c5903/mm2src/lp_swap.rs#L504 
+
+User agrees that "Atomic Private Limited", the authors of the original work and others may enjoy a royalty-free, non-exclusive license to use, copy, modify and redistribute these modifications to the Software made by the User and distributed to third parties as a derivative work under this agreement.
+
+This agreement will terminate immediately upon User's breach of, or non-compliance with, any of its terms. User may be held liable for any copyright infringement or the infringement of any other proprietary rights in the Software that is caused or facilitated by the User's failure to abide by the terms of this agreement.
+
+This agreement will be construed and enforced in accordance with the international private laws applicable to contracts performed entirely within the designated country of the Company. 
+
+Parties agree to resolve disputes in a prompt, low-cost and mutually beneficial way. Before taking legal action or requesting legal proceedings, User will personally participate in an alternative dispute resolution procedure. Mediation and/or arbitral forum will be mutually selected and parties of the alternative dispute resolution will choose the procedure.
+
+The arbitration will be administered by JAMS, Inc. pursuant to its Streamlined Arbitration Rules and Procedures (the "Rules"). The Rules are available at https://www.jamsadr.com/rules-streamlined-arbitration/.
+
+Any arbitration must be commenced by filing a demand for arbitration within 6 months after the date the party asserting the claim first knows or reasonably should know of the act, omission or default giving rise to the claim, otherwise, such cause of action or claim is permanently barred. If applicable law provides a different limitation period for asserting claims, any claim must be asserted within the shortest time period permitted by applicable law.
+
+Any arbitration hearing ("Hearing") may be conducted through online means including but not limited to videoconference, upon request from either party. The Hearing will be conducted in English, and the Arbitrator may, at his or her discretion, also select a secondary language upon request by either party.
+
+You may be required, at Company's sole discretion, to give up any and all rights you may have to seek legal action to resolve any disputes arising from these terms through any other means, including but not limited to any court of law.
+
+The statute of limitations and any filing fee deadlines shall be tolled while the parties engage in the informal dispute resolution process required by this section. 
+
+You give up your right to participate in a class action or other class proceeding.
+
+This Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by "Atomic Private Limited" and hence you accept and agree to the terms of this Agreement. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software with a limited restrictions as envisaged under the Copyright notice, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so. 
+
+The above copyright notice/Agreement and this permission notice shall be included in all copies or substantial portions of the Software.
\ No newline at end of file
diff --git a/LEGAL/THIRDPARTY-LICENSES b/LEGAL/THIRDPARTY-LICENSES
index db260ab548..96ae454e1f 100755
--- a/LEGAL/THIRDPARTY-LICENSES
+++ b/LEGAL/THIRDPARTY-LICENSES
@@ -1,21 +1,25 @@
-The following third party projects are incorporated into SuperNET and their respective licenses are adopted for each of these projects. Please see the files for each project for the exact details of their licensing. Most of them are in the public domain, MIT license or GPL.
+List of 3rd party licenses - Warning: this list may be incomplete. 
+
+0BSD OR Apache-2.0 OR MIT (1): adler
+Apache-2.0 (26): edit-distance, hash-db, hash256-std-hasher, hmac-drbg, libsecp256k1, libsecp256k1-core, libsecp256k1-gen-ecmult, libsecp256k1-gen-genmult, memory-db, parity-scale-codec, parity-scale-codec-derive, prost, prost-build, prost-derive, prost-types, sp-core, sp-debug-derive, sp-runtime-interface, sp-runtime-interface-proc-macro, sp-std, sp-storage, sp-tracing, sp-trie, sp-wasm-interface, trie-db, trie-root
+Apache-2.0 AND BSD-2-Clause OR MIT (2): crossbeam-channel, crossbeam-queue
+Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT (2): wasi, wasi
+Apache-2.0 OR BSL-1.0 (1): ryu
+Apache-2.0 OR ISC OR MIT (4): ct-logs, hyper-rustls, rustls, sct
+Apache-2.0 OR MIT (343): addr2line, aead, aes, aes-gcm, ahash, ahash, ahash, ahash, anyhow, arc-swap, arrayvec, arrayvec, arrayvec, async-std, async-task, async-trait, atomic, atomic-shim, autocfg, autocfg, backtrace, base64, base64, base64, base64, bigdecimal, bimap, bitflags, blake2, block-buffer, block-buffer, block-padding, blocking, bs58, bumpalo, byte-tools, cache-padded, cc, cfg-if, cfg-if, chacha20, chacha20poly1305, chrono, cipher, concurrent-queue, console_error_panic_hook, const-random, const-random-macro, cpufeatures, cpuid-bool, crc, crc32fast, crossbeam, crossbeam-deque, crossbeam-epoch, crossbeam-utils, crypto-mac, crypto-mac, ctr, debug_stub_derive, derivative, digest, digest, dirs, dtoa, ed25519, either, enum-as-inner, env_logger, error-chain, ethabi, ethbloom, ethereum-types, fake-simd, fallible-iterator, fallible-streaming-iterator, fastrand, findshlibs, fixed-hash, fixedbitset, flate2, fnv, futures, futures, futures-channel, futures-core, futures-cpupool, futures-executor, futures-io, futures-macro, futures-rustls, futures-sink, futures-task, futures-timer, futures-util, getrandom, getrandom, ghash, gimli, gloo-timers, groestl, hashbrown, hashbrown, hashbrown, hashbrown, hashlink, hdrhistogram, hdrhistogram, heck, hermit-abi, hex, hex, hex-literal, hmac, hmac, http, http, httparse, httpdate, humantime, humantime, idna, idna, impl-codec, impl-rlp, impl-serde, impl-trait-for-tuples, indexmap, iovec, ipconfig, ipnet, itertools, itertools, itertools, itoa, js-sys, kv-log-macro, lazy_static, libc, libz-sys, linked-hash-map, lock_api, lock_api, lock_api, log, log, log-mdc, log4rs, lru-cache, match_cfg, maybe-uninit, miow, multimap, nodrop, nohash-hasher, ntapi, num, num-bigint, num-bigint, num-complex, num-derive, num-integer, num-iter, num-rational, num-rational, num-traits, num-traits, num_cpus, object, once_cell, opaque-debug, opaque-debug, parity-send-wrapper, parity-util-mem, parking, parking_lot, parking_lot, parking_lot, parking_lot, parking_lot_core, parking_lot_core, parking_lot_core, parking_lot_core, paste, percent-encoding, percent-encoding, pest, petgraph, pin-project, pin-project, pin-project-internal, pin-project-internal, pin-project-lite, pin-project-lite, pin-utils, pkg-config, poly1305, polyval, ppv-lite86, primitive-types, proc-macro-crate, proc-macro-crate, proc-macro-error, proc-macro-error-attr, proc-macro-hack, proc-macro-nested, proc-macro2, quick-error, quicksink, quote, quote, rand, rand, rand, rand, rand, rand_chacha, rand_chacha, rand_chacha, rand_core, rand_core, rand_core, rand_core, rand_hc, rand_hc, rand_hc, rand_isaac, rand_jitter, rand_os, rand_pcg, rand_pcg, rand_xorshift, rand_xoshiro, ref-cast, ref-cast-impl, regex, regex-syntax, remove_dir_all, resolv-conf, ripemd160, ripemd160, rlp, rlp, rust-argon2, rustc-demangle, rustc-hex, rustc-hex, rustc_version, rustc_version, scoped-tls, scopeguard, scopeguard, secrecy, semver, semver, semver-parser, semver-parser, send_wrapper, send_wrapper, serde, serde_bytes, serde_bytes, serde_derive, serde_json, serde_repr, serde_yaml, sha-1, sha-1, sha2, sha2, sha3, signal-hook, signal-hook-mio, signal-hook-registry, signature, siphasher, smallvec, smallvec, smol, snow, socket2, socket2, soketto, stable_deref_trait, static_assertions, syn, syn, synom, tc_cli_client, tc_coblox_bitcoincore, tc_core, tc_dynamodb_local, tc_elasticmq, tc_generic, tc_parity_parity, tc_postgres, tc_redis, tc_trufflesuite_ganachecli, tempfile, testcontainers, thiserror, thiserror-impl, thread-id, time, tokio-rustls, tokio-timer, toml, traitobject, trust-dns-proto, trust-dns-resolver, typenum, ucd-trie, uint, uint, unicode-bidi, unicode-normalization, unicode-segmentation, unicode-xid, unicode-xid, universal-hash, url, url, uuid, vcpkg, version_check, waker-fn, wasm-bindgen, wasm-bindgen-backend, wasm-bindgen-futures, wasm-bindgen-macro, wasm-bindgen-macro-support, wasm-bindgen-shared, wasm-bindgen-test, wasm-bindgen-test-macro, web-sys, widestring, winapi, winapi-i686-pc-windows-gnu, winapi-x86_64-pc-windows-gnu, yaml-rust, yamux, zeroize, zeroize_derive
+Apache-2.0 OR MIT OR Zlib (2): tinyvec, tinyvec_macros
+BSD-2-Clause (4): Inflector, arrayref, cloudabi, cloudabi
+BSD-2-Clause OR MIT (1): asn1_der
+BSD-3-Clause (6): curve25519-dalek, ed25519-dalek, instant, subtle, subtle, x25519-dalek
+BSD-3-Clause OR MIT (2): if-addrs, if-addrs-sys
+BlueOak-1.0.0 (2): minicbor, minicbor-derive
+CC0-1.0 (6): constant_time_eq, keccak, secp256k1, secp256k1-sys, tiny-keccak, tiny-keccak
+GPL-3.0 (10): keccak-hash, bitcrypto, chain, keys, primitives, rpc, script, serialization, serialization_derive, unexpected
+ISC (2): rdrand, untrusted
+MIT (117): asynchronous-codec, atomicdex-gossipsub, atty, base58, bech32, bitcoin-cash, bitcoin-cash-base, bitcoin-cash-script-macro, bitcoin-cash-slp, bitvec, blake2b_simd, build_const, byte-slice-cast, bytes, bytes, bytes, crossterm, crossterm_winapi, crunchy, crunchy, cuckoofilter, cuckoofilter, data-encoding, derive_more, enum-primitive-derive, ethbloom, ethereum-types, ethereum-types-serialize, fixed-hash, fomat-macros, fomat-macros, funty, futures_codec, generic-array, generic-array, gstuff, h2, hostname, http-body, http-body, hyper, jsonrpc-core, libp2p, libp2p-core, libp2p-dns, libp2p-floodsub, libp2p-floodsub, libp2p-mplex, libp2p-noise, libp2p-ping, libp2p-plaintext, libp2p-request-response, libp2p-swarm, libp2p-swarm-derive, libp2p-tcp, libp2p-wasm-ext, libp2p-websocket, libp2p-yamux, libsqlite3-sys, lru, lru, matches, memoffset, metrics, metrics-core, metrics-observer-prometheus, metrics-runtime, metrics-util, miniz_oxide, miniz_oxide, mio, mocktopus, mocktopus_macros, multiaddr, multihash, multihash-derive, multistream-select, ordered-float, owning_ref, parity-util-mem-derive, quanta, radium, redox_syscall, redox_users, rmp, rmp-serde, rusqlite, rust-ini, rw-stream-sink, serde-value, serde_bencode, slab, slab, spin, sql-builder, synstructure, tap, tokio, tokio-buf, tokio-macros, tokio-util, toolchain_find, tower-service, tracing, tracing-core, try-lock, typemap, unsafe-any, unsigned-varint, unsigned-varint, void, want, wasm-timer, web3, which, winreg, wyz
+MIT OR Unlicense (9): aho-corasick, byteorder, byteorder, memchr, quickcheck, same-file, termcolor, walkdir, winapi-util
+MPL-2.0 (3): webpki-roots, webpki-roots, wepoll-sys-stjepang
+MPL-2.0+ (3): bitmaps, im, sized-chunks
+specific (12): coins, common, ethcore-transaction, ethkey, fuchsia-cprng, mem, mm2, mm2-libp2p, ring (https://github.com/briansmith/ring/blob/main/LICENSE), ser_error, ser_error_derive, , webpki (https://github.com/briansmith/webpki/blob/main/LICENSE (ISC-style))
+Zlib (2): adler32, tinyvec
 
-libtom: Tom St Denis, tomstdenis@gmail.com, http://libtom.org
-
-tweetnacl: http://tweetnacl.cr.yp.to/
-
-curve25519: http://code.google.com/p/curve25519-donna/ and http://cr.yp.to/ecdh.html
-
-libtai: also from DJB http://tweetnacl.cr.yp.to/
-
-SaM and vps: from Come-from-Beyond
-
-cJSON: Copyright (c) 2009 Dave Gamble http://sourceforge.net/projects/cjson/
-
-uthash/utlist: Copyright (c) 2003-2014, Troy D. Hanson     http://troydhanson.github.com/uthash/
-
-inet.c: Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") Copyright (c) 1996-1999 by Internet Software Consortium.
-
-libgfshare: Copyright Daniel Silverstone <dsilvers@digital-scurf.org>
-
-misc: there might be some other third party files not listed above, in such cases the relevant copyright header in the top of these files govern
diff --git a/README.md b/README.md
index 217499c5bd..b9627935c5 100755
--- a/README.md
+++ b/README.md
@@ -79,12 +79,12 @@ If you want to build from source, the following prerequisites are required:
 - [Rustup](https://rustup.rs/)
 - [Cmake](https://cmake.org/download/) version 3.12 or higher
 - OS specific build tools (e.g. [build-essential](https://linuxhint.com/install-build-essential-ubuntu/) on Linux, [XCode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) on OSX or [MSVC](https://docs.microsoft.com/en-us/cpp/build/vscpp-step-0-installation?view=vs-2017) on Win)
-- (Optional) OSX: install [openssl](https://www.openssl.org/), e.g. `brew install openssl`.  
+- (Optional) OSX: install [openssl](https://www.openssl.org/), e.g. `brew install openssl`.
 - (Optional) OSX: run `LIBRARY_PATH=/usr/local/opt/openssl/lib`
 - Additional Rust Components
     ```
-    rustup install nightly-2021-05-17
-    rustup default nightly-2021-05-17
+    rustup install nightly-2022-02-01
+    rustup default nightly-2022-02-01
     rustup component add rustfmt-preview
     ```
         
@@ -92,6 +92,9 @@ To build, run `cargo build` (or `cargo build -vv` to get verbose build output).
 
 For more detailed instructions, please refer to the [Installation Guide](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-setup/get-started-atomicdex.html). 
 
+## Building WASM binary
+
+Please refer to the [WASM Build Guide](./docs/WASM_BUILD.md).
 
 ## Configuration
 
@@ -165,9 +168,9 @@ Refer to the [Komodo Developer Docs](https://developers.komodoplatform.com/basic
 
 ## Additional docs for developers
 
-- [Contribution guide](./CONTRIBUTING.md)  
-- [Setting up the environment to run the full tests suite](./docs/DEV_ENVIRONMENT.md)  
-- [Git flow and general workflow](./docs/GIT_FLOW_AND_WORKING_PROCESS.md)  
+- [Contribution guide](./CONTRIBUTING.md)
+- [Setting up the environment to run the full tests suite](./docs/DEV_ENVIRONMENT.md)
+- [Git flow and general workflow](./docs/GIT_FLOW_AND_WORKING_PROCESS.md)
 - [Komodo Developer Docs](https://developers.komodoplatform.com/basic-docs/atomicdex/introduction-to-atomicdex.html)
 
 
diff --git a/azure-pipelines-build-stage-job.yml b/azure-pipelines-build-stage-job.yml
index f2540c75f1..2efa0c5b58 100644
--- a/azure-pipelines-build-stage-job.yml
+++ b/azure-pipelines-build-stage-job.yml
@@ -7,6 +7,7 @@ parameters:
   bob_userpass: ''
   alice_passphrase: ''
   alice_userpass: ''
+  telegram_api_key: ''
 
 jobs:
   - job: ${{ parameters.name }}
@@ -30,25 +31,58 @@ jobs:
           export TAG="$(git rev-parse --short=9 HEAD)"
           echo "##vso[task.setvariable variable=COMMIT_HASH]${TAG}"
         displayName: Setup ENV
+      # On MacOS, cross-compile for x86_64-apple-darwin
       - bash: |
           rm -rf upload
           mkdir upload
-          echo 2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release > MM_VERSION
+          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release
+          if ! grep -q $VERSION MM_VERSION; then
+            echo $VERSION > MM_VERSION
+          fi
           cat MM_VERSION
-          cargo build --release --bin mm2
+          if [ $AGENT_OS = "Darwin" ]
+          then
+            cargo build --bin mm2 --release --target x86_64-apple-darwin
+          else
+            cargo build --bin mm2 --release
+          fi
         displayName: 'Build MM2 Release'
-      - bash: |
-          cargo test --target wasm32-unknown-unknown --release --bin mm2
-        displayName: 'Test MM2 WASM'
-        condition: eq( variables['Agent.OS'], 'Linux' )
+        condition: ne ( variables['Build.Reason'], 'PullRequest' )
         env:
-          WASM_BINDGEN_TEST_TIMEOUT: 120
-          GECKODRIVER: '/home/azureagent/wasm/geckodriver'
+          MANUAL_MM_VERSION: true
+      - task: Docker@2
+        displayName: Build & Push container of dev branch
+        condition: and( eq( variables['Agent.OS'], 'Linux' ), eq( variables['Build.SourceBranchName'], 'dev' ) )
+        inputs:
+          containerRegistry: dockerhub
+          repository: komodoofficial/atomicdexapi
+          command: buildAndPush
+          tags: |
+            dev-$(COMMIT_HASH)
+            dev-latest
+          Dockerfile: Dockerfile.dev-release
+      - bash: |
+          rm -rf atomicdex-deployments
+          git clone git@github.com:KomodoPlatform/atomicdex-deployments.git
+          if [ -d "atomicdex-deployments/atomicDEX-API" ]; then
+            cd atomicdex-deployments/atomicDEX-API
+            sed -i "1s/^.*$/$(COMMIT_HASH)/" .commit
+            git add .commit
+            git commit -m "[atomicDEX-API] $(COMMIT_HASH) is committed for git & container registry"
+            git push
+          fi
+        condition: and( eq( variables['Agent.OS'], 'Linux' ), eq( variables['Build.SourceBranchName'], 'dev' ) )
+        displayName: 'Update playground deployment'
       # Explicit --test-threads=16 makes testing process slightly faster on agents that have <16 CPU cores.
       # Always run tests on mm2.1 branch and PRs
+      # On MacOS, run for x86_64-apple-darwin
       - bash: |
-          cargo clean -p mm2-libp2p -p mm2
-          cargo test --all -- --test-threads=16
+          if [ $AGENT_OS = "Darwin" ]
+          then
+            cargo test --all --target x86_64-apple-darwin -- --test-threads=16
+          else
+            cargo test --all -- --test-threads=32
+          fi
         displayName: 'Test MM2'
         timeoutInMinutes: 22
         env:
@@ -56,34 +90,32 @@ jobs:
           BOB_USERPASS: $(${{ parameters.bob_userpass }})
           ALICE_PASSPHRASE: $(${{ parameters.alice_passphrase }})
           ALICE_USERPASS: $(${{ parameters.alice_userpass }})
+          TELEGRAM_API_KEY: $(${{ parameters.telegram_api_key }})
           RUST_LOG: debug
+          MANUAL_MM_VERSION: true
         condition: or( eq( variables['Build.Reason'], 'PullRequest' ), eq( variables['Build.SourceBranchName'], 'mm2.1' ), eq( variables['Build.SourceBranchName'], 'dev' ) )
       - bash: |
-          cargo clippy -- -D warnings
-        displayName: 'Check Clippy warnings'
-        condition: eq( variables['Agent.OS'], 'Linux' )
-      - bash: |
-          cargo deny check advisories
-        displayName: 'Check Cargo deny advisories'
-        condition: eq( variables['Agent.OS'], 'Linux' )
-        enabled: false
-      - bash: |
-          cargo fmt -- --check
-        displayName: 'Check rustfmt warnings'
-        condition: eq( variables['Agent.OS'], 'Linux' )
+          containers=$(docker ps -q | wc -l)
+          echo $containers
+          if [ $containers -gt 0 ]; then
+            docker rm -f $(docker ps -q)
+          fi
+        displayName: 'Clean up Docker containers'
+        # Run unconditionally even if previous steps failed
+        condition: true
       - bash: |
           zip upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-Release target/release/mm2 -j
         displayName: 'Prepare release build upload Linux'
-        condition: eq( variables['Agent.OS'], 'Linux' )
+        condition: and ( eq( variables['Agent.OS'], 'Linux' ), ne ( variables['Build.Reason'], 'PullRequest' ) )
       - bash: |
-          cd target/release
-          zip ../../upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-Release mm2.dSYM mm2 -r
+          cd target/x86_64-apple-darwin/release
+          zip ../../../upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-Release mm2.dSYM mm2 -r
         displayName: 'Prepare release build upload MacOS'
-        condition: eq( variables['Agent.OS'], 'Darwin' )
+        condition: and ( eq( variables['Agent.OS'], 'Darwin' ), ne ( variables['Build.Reason'], 'PullRequest' ) )
       - powershell: |
           7z a .\upload\mm2-$(COMMIT_HASH)-$(Agent.OS)-Release.zip .\target\release\mm2.exe .\target\release\*.dll "$Env:windir\system32\msvcr100.dll" "$Env:windir\system32\msvcp140.dll" "$Env:windir\system32\vcruntime140.dll"
         displayName: 'Prepare release build upload Windows'
-        condition: eq( variables['Agent.OS'], 'Windows_NT' )
+        condition: and ( eq( variables['Agent.OS'], 'Windows_NT' ), ne ( variables['Build.Reason'], 'PullRequest' ) )
       # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/deploy/copy-files-over-ssh?view=vsts
       - task: CopyFilesOverSSH@0
         inputs:
@@ -93,4 +125,4 @@ jobs:
           targetFolder: "uploads/$(Build.SourceBranchName)" # Optional
           overwrite: true
         displayName: 'Upload nightly'
-        condition: ne(variables['build.sourceBranch'], 'refs/heads/mm2')
\ No newline at end of file
+        condition: ne ( variables['Build.Reason'], 'PullRequest' )
diff --git a/azure-pipelines-lint-stage-job.yml b/azure-pipelines-lint-stage-job.yml
new file mode 100644
index 0000000000..3f2ab6f495
--- /dev/null
+++ b/azure-pipelines-lint-stage-job.yml
@@ -0,0 +1,50 @@
+# Job template for MM2 Build
+
+parameters:
+  name: ''  # defaults for any parameters that aren't specified
+  os: ''
+  bob_passphrase: ''
+  bob_userpass: ''
+  alice_passphrase: ''
+  alice_userpass: ''
+  telegram_api_key: ''
+
+jobs:
+  - job: ${{ parameters.name }}
+    timeoutInMinutes: 0 # 0 means infinite for self-hosted agent
+    pool:
+      name: Default
+      demands: agent.os -equals ${{ parameters.os }}
+    steps:
+      - checkout: self  # self represents the repo where the initial Pipelines YAML file was found
+        clean: ${{ eq( variables['Build.Reason'], 'Schedule' ) }} # clean up only on Scheduled build
+      - bash: |
+          if [ $CLEANUP = "true" ]
+          then
+            git clean -ffdx
+          fi
+        displayName: Clean Up
+        failOnStderr: false
+        continueOnError: true
+      - bash: |
+          cargo fmt -- --check
+        displayName: 'Check rustfmt warnings'
+        env:
+          MANUAL_MM_VERSION: true
+      - bash: |
+          cargo clippy -- -D warnings
+        displayName: 'Check Clippy warnings'
+        env:
+          MANUAL_MM_VERSION: true
+      - bash: |
+          cargo check --tests
+        displayName: 'Check Tests'
+        env:
+          MANUAL_MM_VERSION: true
+      - bash: |
+          cargo udeps
+        displayName: 'Check unused dependencies'
+      - bash: |
+          cargo deny check bans --hide-inclusion-graph
+          cargo deny check advisories --hide-inclusion-graph
+        displayName: 'Cargo deny checks'
diff --git a/azure-pipelines-release-stage-job.yml b/azure-pipelines-release-stage-job.yml
index 5d2f92b55f..3ea90d3059 100644
--- a/azure-pipelines-release-stage-job.yml
+++ b/azure-pipelines-release-stage-job.yml
@@ -41,7 +41,10 @@ jobs:
           mkdir upload
         displayName: 'Recreate upload dir'
       - bash: |
-          echo 2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Debug > MM_VERSION
+          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Debug
+          if ! grep -q $VERSION MM_VERSION; then
+            echo $VERSION > MM_VERSION
+          fi
           cat MM_VERSION
           if [ $AGENT_OS = "Linux" ]
           then
@@ -62,6 +65,8 @@ jobs:
           fi
         displayName: 'Build MM2 Debug'
         condition: eq( variables['DEBUG_UPLOADED'], '' )
+        env:
+          MANUAL_MM_VERSION: true
       - bash: |
           zip upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-Debug target-xenial/debug/mm2 target-xenial/debug/libmm2.a -j
         displayName: 'Prepare debug build upload Linux'
@@ -77,7 +82,10 @@ jobs:
         condition: and( eq( variables['Agent.OS'], 'Windows_NT' ), eq( variables['DEBUG_UPLOADED'], '' ) )
       - bash: |
           rm -f MM_VERSION
-          echo 2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release > MM_VERSION
+          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release
+          if ! grep -q $VERSION MM_VERSION; then
+            echo $VERSION > MM_VERSION
+          fi
           cat MM_VERSION
           touch mm2src/common/build.rs
           if [ $AGENT_OS = "Linux" ]
@@ -99,6 +107,8 @@ jobs:
           fi
         displayName: 'Build MM2 Release'
         condition: eq( variables['RELEASE_UPLOADED'], '' )
+        env:
+          MANUAL_MM_VERSION: true
       - bash: |
           objcopy --only-keep-debug target-xenial/release/mm2 target-xenial/release/mm2.debug
           objcopy --only-keep-debug target-xenial/release/libmm2.a target-xenial/release/libmm2.debug.a
diff --git a/azure-pipelines-wasm-stage-job.yml b/azure-pipelines-wasm-stage-job.yml
new file mode 100644
index 0000000000..65519832df
--- /dev/null
+++ b/azure-pipelines-wasm-stage-job.yml
@@ -0,0 +1,72 @@
+# Job template for MM2 Build
+
+parameters:
+  name: ''  # defaults for any parameters that aren't specified
+  os: ''
+  bob_passphrase: ''
+  bob_userpass: ''
+  alice_passphrase: ''
+  alice_userpass: ''
+  telegram_api_key: ''
+
+jobs:
+  - job: ${{ parameters.name }}
+    timeoutInMinutes: 0 # 0 means infinite for self-hosted agent
+    pool:
+      name: Default
+      demands: agent.os -equals ${{ parameters.os }}
+    steps:
+      - checkout: self  # self represents the repo where the initial Pipelines YAML file was found
+        clean: ${{ eq( variables['Build.Reason'], 'Schedule' ) }} # clean up only on Scheduled build
+      - bash: |
+          if [ $CLEANUP = "true" ]
+          then
+            git clean -ffdx
+          fi
+        displayName: Clean Up
+        failOnStderr: false
+        continueOnError: true
+      # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch#set-a-job-scoped-variable-from-a-script
+      - bash: |
+          export TAG="$(git rev-parse --short=9 HEAD)"
+          echo "##vso[task.setvariable variable=COMMIT_HASH]${TAG}"
+        displayName: Setup ENV
+      # Build WASM.
+      - bash: |
+          rm -rf upload
+          mkdir upload
+          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release
+          if ! grep -q $VERSION MM_VERSION; then
+            echo $VERSION > MM_VERSION
+          fi
+          cat MM_VERSION
+          CC=clang-8 wasm-pack build mm2src/mm2_main --release --target web --out-dir ../../target/target-wasm-release
+        displayName: 'Build MM2 WASM Release'
+        condition: ne ( variables['Build.Reason'], 'PullRequest' )
+        env:
+          MANUAL_MM_VERSION: true
+      - bash: |
+          CC=clang-8 cargo test --package mm2_main --target wasm32-unknown-unknown --release --bin mm2
+        displayName: 'Test MM2 WASM'
+        env:
+          WASM_BINDGEN_TEST_TIMEOUT: 120
+          GECKODRIVER: '/home/azureagent/wasm/geckodriver'
+          BOB_PASSPHRASE: $(${{ parameters.bob_passphrase }})
+          ALICE_PASSPHRASE: $(${{ parameters.alice_passphrase }})
+          MANUAL_MM_VERSION: true
+        condition: or( eq( variables['Build.Reason'], 'PullRequest' ), eq( variables['Build.SourceBranchName'], 'mm2.1' ), eq( variables['Build.SourceBranchName'], 'dev' ) )
+      - bash: |
+          cd target/target-wasm-release/
+          zip ../../upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-Wasm-Release mm2_bg.wasm mm2.js snippets -r
+        displayName: 'Prepare release WASM build upload Linux'
+        condition: ne ( variables['Build.Reason'], 'PullRequest' )
+      # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/deploy/copy-files-over-ssh?view=vsts
+      - task: CopyFilesOverSSH@0
+        inputs:
+          sshEndpoint: nightly_build_server
+          sourceFolder: 'upload' # Optional
+          contents: "**"
+          targetFolder: "uploads/$(Build.SourceBranchName)" # Optional
+          overwrite: true
+        displayName: 'Upload nightly'
+        condition: ne ( variables['Build.Reason'], 'PullRequest' )
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4348f292da..2159a81bdd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,9 +19,45 @@ trigger:
       - iguana/Readme.md
       - .gitignore
 
+pr: # https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema%2Cparameter-schema#pr-trigger
+  drafts: false
+
 stages:
+  - stage: Lint
+    displayName: Formatting, Clippy, and other checks
+    jobs:
+      - template: azure-pipelines-lint-stage-job.yml  # Template reference
+        parameters:
+          name: 'MM2_Lint_Linux'
+          os: 'Linux'
+
+      - template: azure-pipelines-lint-stage-job.yml  # Template reference
+        parameters:
+          name: 'MM2_Lint_MacOS'
+          os: 'Darwin'
+
+      - template: azure-pipelines-lint-stage-job.yml  # Template reference
+        parameters:
+          name: 'MM2_Lint_Win'
+          os: 'Windows_NT'
+
+  - stage: WASM
+    displayName: WASM build and test
+    condition: succeeded('Lint')
+    jobs:
+      - template: azure-pipelines-wasm-stage-job.yml  # Template reference
+        parameters:
+          name: 'MM2_WASM_Linux'
+          os: 'Linux'
+          bob_passphrase: 'BOB_PASSPHRASE_LINUX'
+          bob_userpass: 'BOB_USERPASS_LINUX'
+          alice_passphrase: 'ALICE_PASSPHRASE_LINUX'
+          alice_userpass: 'ALICE_USERPASS_LINUX'
+          telegram_api_key: 'TELEGRAM_API_KEY'
+
   - stage: Build
     displayName: Build and test Debug
+    condition: succeeded('WASM')
     jobs:
       - template: azure-pipelines-build-stage-job.yml  # Template reference
         parameters:
@@ -31,6 +67,7 @@ stages:
           bob_userpass: 'BOB_USERPASS_LINUX'
           alice_passphrase: 'ALICE_PASSPHRASE_LINUX'
           alice_userpass: 'ALICE_USERPASS_LINUX'
+          telegram_api_key: 'TELEGRAM_API_KEY'
 
       - template: azure-pipelines-build-stage-job.yml  # Template reference
         parameters:
@@ -40,6 +77,7 @@ stages:
           bob_userpass: 'BOB_USERPASS_MAC'
           alice_passphrase: 'ALICE_PASSPHRASE_MAC'
           alice_userpass: 'ALICE_USERPASS_MAC'
+          telegram_api_key: 'TELEGRAM_API_KEY'
 
       - template: azure-pipelines-build-stage-job.yml  # Template reference
         parameters:
@@ -49,22 +87,4 @@ stages:
           bob_userpass: 'BOB_USERPASS_WIN'
           alice_passphrase: 'ALICE_PASSPHRASE_WIN'
           alice_userpass: 'ALICE_USERPASS_WIN'
-
-  - stage: Release
-    displayName: Release
-    condition: and(eq(variables['build.sourceBranch'], 'refs/heads/mm2.1'), succeeded('Build'))
-    jobs:
-      - template: azure-pipelines-release-stage-job.yml  # Template reference
-        parameters:
-          name: 'MM2_Release_Linux'
-          os: 'Linux'
-
-      - template: azure-pipelines-release-stage-job.yml  # Template reference
-        parameters:
-          name: 'MM2_Release_MacOS'
-          os: 'Darwin'
-
-      - template: azure-pipelines-release-stage-job.yml  # Template reference
-        parameters:
-          name: 'MM2_Release_Windows'
-          os: 'Windows_NT'
+          telegram_api_key: 'TELEGRAM_API_KEY'
diff --git a/deny.toml b/deny.toml
index 5306ee72eb..c27fd4a6de 100644
--- a/deny.toml
+++ b/deny.toml
@@ -47,7 +47,12 @@ yanked = "warn"
 notice = "warn"
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
+
+# RUSTSEC-2021-0113 is related to metrics-util crate that is not actively used for now despite being still present in deps tree
+# RUSTSEC-2020-0071 is related to time crate, which is used only by chrono in our deps tree, remove when https://github.com/chronotope/chrono/issues/700 is resolved
 ignore = [
+    "RUSTSEC-2021-0113",
+    "RUSTSEC-2020-0071",
     #"RUSTSEC-0000-0000",
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
@@ -143,7 +148,7 @@ registries = [
 # https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
 [bans]
 # Lint level for when multiple versions of the same crate are detected
-multiple-versions = "warn"
+multiple-versions = "deny"
 # Lint level for when a crate version requirement is `*`
 wildcards = "allow"
 # The graph highlighting used when creating dotgraphs for crates
@@ -167,8 +172,112 @@ deny = [
     #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
 ]
 # Certain crates/versions that will be skipped when doing duplicate detection.
+# The goal is to reduce this list as much as possible
 skip = [
-    #{ name = "ansi_term", version = "=0.11.0" },
+    { name = "aes", version = "*" },
+    { name = "ahash", version = "*" },
+    { name = "arrayvec", version = "*" },
+    { name = "autocfg", version = "*" },
+    { name = "base64", version = "*" },
+    { name = "bitvec", version = "*" },
+    { name = "block-buffer", version = "*" },
+    { name = "block-padding", version = "*" },
+    { name = "byteorder", version = "*" },
+    { name = "bytes", version = "*" },
+    { name = "cfg-if", version = "*" },
+    { name = "cipher", version = "*" },
+    { name = "cloudabi", version = "*" },
+    { name = "cpufeatures", version = "*" },
+    { name = "crossbeam-channel", version = "*" },
+    { name = "crossbeam-deque", version = "*" },
+    { name = "crossbeam-epoch", version = "*" },
+    { name = "crossbeam-utils", version = "*" },
+    { name = "crunchy", version = "*" },
+    { name = "crypto-mac", version = "*" },
+    { name = "cuckoofilter", version = "*" },
+    { name = "curve25519-dalek", version = "*" },
+    { name = "derivation-path", version = "*" },
+    { name = "digest", version = "*" },
+    { name = "ed25519-dalek-bip32", version = "*" },
+    { name = "env_logger", version = "*" },
+    { name = "ethbloom", version = "*" },
+    { name = "ethereum-types", version = "*" },
+    { name = "ff", version = "*" },
+    { name = "fixed-hash", version = "*" },
+    { name = "funty", version = "*" },
+    { name = "futures", version = "*" },
+    { name = "futures-rustls", version = "*" },
+    { name = "generic-array", version = "*" },
+    { name = "getrandom", version = "*" },
+    { name = "group", version = "*" },
+    { name = "hashbrown", version = "*" },
+    { name = "hdrhistogram", version = "*" },
+    { name = "hex", version = "*" },
+    { name = "hmac", version = "*" },
+    { name = "http", version = "*" },
+    { name = "http-body", version = "*" },
+    { name = "humantime", version = "*" },
+    { name = "idna", version = "*" },
+    { name = "impl-codec", version = "*" },
+    { name = "itoa", version = "*" },
+    { name = "jsonrpc-core", version = "*" },
+    { name = "libp2p-floodsub", version = "*" },
+    { name = "libsecp256k1", version = "*" },
+    { name = "libsecp256k1-core", version = "*" },
+    { name = "libsecp256k1-gen-ecmult", version = "*" },
+    { name = "libsecp256k1-gen-genmult", version = "*" },
+    { name = "lock_api", version = "*" },
+    { name = "log", version = "*" },
+    { name = "memoffset", version = "*" },
+    { name = "miniz_oxide", version = "*" },
+    { name = "mio", version = "*" },
+    { name = "num-bigint", version = "*" },
+    { name = "opaque-debug", version = "*" },
+    { name = "parking_lot", version = "*" },
+    { name = "parking_lot_core", version = "*" },
+    { name = "pbkdf2", version = "*" },
+    { name = "percent-encoding", version = "*" },
+    { name = "petgraph", version = "*" },
+    { name = "pin-project", version = "*" },
+    { name = "pin-project-internal", version = "*" },
+    { name = "pin-project-lite", version = "*" },
+    { name = "proc-macro-crate", version = "*" },
+    { name = "proc-macro2", version = "*" },
+    { name = "quote", version = "*" },
+    { name = "radium", version = "*" },
+    { name = "rand", version = "*" },
+    { name = "rand_chacha", version = "*" },
+    { name = "rand_core", version = "*" },
+    { name = "rand_hc", version = "*" },
+    { name = "rand_pcg", version = "*" },
+    { name = "redox_syscall", version = "*" },
+    { name = "redox_users", version = "*" },
+    { name = "rlp", version = "*" },
+    { name = "rustc-hex", version = "*" },
+    { name = "rustc_version", version = "*" },
+    { name = "rustls", version = "*" },
+    { name = "rustls-pemfile", version = "*" },
+    { name = "scopeguard", version = "*" },
+    { name = "sct", version = "*" },
+    { name = "semver", version = "*" },
+    { name = "send_wrapper", version = "*" },
+    { name = "sha2", version = "*" },
+    { name = "slab", version = "*" },
+    { name = "smallvec", version = "*" },
+    { name = "socket2", version = "*" },
+    { name = "subtle", version = "*" },
+    { name = "syn", version = "*" },
+    { name = "time", version = "*" },
+    { name = "tiny-keccak", version = "*" },
+    { name = "tokio-util", version = "*" },
+    { name = "trie-root", version = "*" },
+    { name = "uint", version = "*" },
+    { name = "unicode-xid", version = "*" },
+    { name = "unsigned-varint", version = "*" },
+    { name = "url", version = "*" },
+    { name = "wasi", version = "*" },
+    { name = "webpki", version = "*" },
+    { name = "wyz", version = "*" },
 ]
 # Similarly to `skip` allows you to skip certain crates during duplicate 
 # detection. Unlike skip, it also includes the entire tree of transitive 
diff --git a/docs/DEV_ENVIRONMENT.md b/docs/DEV_ENVIRONMENT.md
index 4fe516eeac..990a502ea7 100644
--- a/docs/DEV_ENVIRONMENT.md
+++ b/docs/DEV_ENVIRONMENT.md
@@ -1,29 +1,70 @@
 # Setting up the dev environment for AtomicDEX-API to run full tests suite
 
-1. Install docker.
-2. Download ZCash params files: [Windows](https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.bat), [Unix/Linux](https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.sh)
-3. Create `.env.client` file with the following content
-```
-PASSPHRASE=spice describe gravity federal blast come thank unfair canal monkey style afraid
-```
-4. Create `.env.seed` file with the following content
-```
-PASSPHRASE=also shoot benefit prefer juice shell elder veteran woman mimic image kidney
-```
-5. MacOS specific: run script (required after each reboot)
-```shell
-#!/bin/bash
-for ((i=2;i<256;i++))
-do
-    sudo ifconfig lo0 alias 127.0.0.$i up
-done
-```
-Please note that you have to run it again after each reboot  
-6. Linux specific:
-```
-sudo groupadd docker
-sudo usermod -aG docker $USER
-```
-7. Try `cargo test --features native --all -- --test-threads=16`.
+## Running native tests
+
+1. Install Docker or Podman.
+2. Install `libudev-dev` (dpkg) or `libudev-devel` (rpm) package.
+3. Install protobuf compiler, so `protoc` is available in your PATH.
+4. Download ZCash params files: [Windows](https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.bat),
+   [Unix/Linux](https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.sh)
+5. Create `.env.client` file with the following content
+   ```
+   PASSPHRASE=spice describe gravity federal blast come thank unfair canal monkey style afraid
+   ```
+6. Create `.env.seed` file with the following content
+   ```
+   PASSPHRASE=also shoot benefit prefer juice shell elder veteran woman mimic image kidney
+   ```
+7. MacOS specific: run script (required after each reboot)
+   ```shell
+   #!/bin/bash
+   for ((i=2;i<256;i++))
+   do
+       sudo ifconfig lo0 alias 127.0.0.$i up
+   done
+   sudo ifconfig lo0 inet6 -alias ::1
+   sudo ifconfig lo0 inet6 -alias fe80::1%lo0
+   ```
+   Please note that you have to run it again after each reboot
+8. Linux specific:
+    - for Docker users:
+       ```
+       sudo groupadd docker
+       sudo usermod -aG docker $USER
+       ```
+    - for Podman users:
+       ```
+       sudo ln -s $(which podman) /usr/bin/docker
+       ```
+9. Try `cargo test --features native --all -- --test-threads=16`.
+
+## Running WASM tests
+
+1. Set up [WASM Build Environment](../docs/WASM_BUILD.md#Setting-up-the-environment)
+2. Install Firefox.
+3. Download [Gecko driver](https://github.com/mozilla/geckodriver/releases) for your OS
+4. Set environment variables required to run WASM tests
+   ```shell
+   # wasm-bindgen specific variables
+   export WASM_BINDGEN_TEST_TIMEOUT=120
+   export GECKODRIVER=PATH_TO_GECKO_DRIVER_BIN
+   # MarketMaker specific variables
+   export BOB_PASSPHRASE="also shoot benefit prefer juice shell elder veteran woman mimic image kidney"
+   export ALICE_PASSPHRASE="spice describe gravity federal blast come thank unfair canal monkey style afraid"
+   ```
+6. Run WASM tests
+   - for Linux users:
+   ```
+   wasm-pack test --firefox --headless mm2src/mm2_main
+   ```
+    - for OSX users (Intel):
+   ```
+   CC=/usr/local/opt/llvm/bin/clang AR=/usr/local/opt/llvm/bin/llvm-ar wasm-pack test --firefox --headless mm2src/mm2_main
+   ```
+    - for OSX users (M1):
+   ```
+   CC=/opt/homebrew/opt/llvm/bin/clang AR=/opt/homebrew/opt/llvm/bin/llvm-ar wasm-pack test --firefox --headless mm2src/mm2_main
+   ```
+   Please note `CC` and `AR` must be specified in the same line as `wasm-pack test mm2src/mm2_main`.
 
 PS If you notice that this guide is outdated, please submit a PR.
diff --git a/docs/GIT_FLOW_AND_WORKING_PROCESS.md b/docs/GIT_FLOW_AND_WORKING_PROCESS.md
index 84cc75b0ca..7f010a669d 100644
--- a/docs/GIT_FLOW_AND_WORKING_PROCESS.md
+++ b/docs/GIT_FLOW_AND_WORKING_PROCESS.md
@@ -5,7 +5,7 @@
 3. The dev is merged to mm2.1 when a new release is planned.
 4. The feature branch lifetime should be <= 1-2 weeks.
 5. Big task should be decomposed to the several feature branches. Each of which is merged periodically with a code review process. The new feature branch should be started from dev afterward.
-6. In certain cases, the dev might be not in a "releasable" state. The feature branch might be merged directly to mm2.1 in this case if required (hotfix, very useful feature, blocker). Dev is synced with mm2.1 afterward.
+6. In certain cases, the dev might not be in a "releasable" state. In this case, if the feature branch has no dependencies updates, it might be merged directly to mm2.1 if required (hotfix, very useful feature, blocker). Dev is synced with mm2.1 afterward.
 7. For convenience, we can consider making several minor features/fixes in the single feature branch.
 
 Pros:
@@ -20,7 +20,8 @@ Cons:
 
 1. It's desired to have a separate issue for any bug report or feature request.
 2. Once the issue is created, add it to the MM2.0 Github project. Select an appropriate column.
-3. Decide whether you should base your feature branch from mm2.1 or dev. For hotfixes or minor useful features choose mm2.1. In other cases choose dev.
+3. Decide whether you should base your feature branch on mm2.1 or dev. For hotfixes or minor useful features that don't include any dependencies updates choose mm2.1. In other cases choose dev.
+5. PR titles must have a prefix that displays the current status of PR. Such as `[wip] X feat integration`, `[r2r] X feat integration`, where `[wip]` prefix stands for "Work in Progress", and `[r2r]` for Ready to Review.
 4. PRs to dev can be merged right after approval. Request the tests in the dev branch from Tony by assigning the issue to him and moving it to the `Testing` column. Provide a detailed explanation of what changed and what should be tested. Indicate the critical points.
 5. PRs to mm2.1 must be tested by QA *before* merging.
 6. If documentation update is required, prepare examples and notify smk762. Assign issue to him. Move the issue to the documentation column. Smk will then prepare PR in [developer-docs](https://github.com/KomodoPlatform/developer-docs) repo.
@@ -30,5 +31,5 @@ Cons:
 [@artemii235](https://github.com/artemii235)
 [@sergeyboyko0791](https://github.com/sergeyboyko0791)
 [@shamardy](https://github.com/shamardy)
-[@Milerius](https://github.com/Milerius)
+[@ozkanonur](https://github.com/ozkanonur)
 
diff --git a/docs/WASM_BUILD.md b/docs/WASM_BUILD.md
new file mode 100644
index 0000000000..c2e5bd7bee
--- /dev/null
+++ b/docs/WASM_BUILD.md
@@ -0,0 +1,42 @@
+# Building WASM binary
+
+## Setting up the environment
+
+To build WASM binary from source, the following prerequisites are required:
+
+1. Install `wasm-pack`
+   ```
+   cargo install wasm-pack
+   ```
+2. OSX specific: install `llvm`
+   ```
+   brew install llvm
+   ```
+
+## Compiling WASM release binary
+
+To build WASM release binary run one of the following commands according to your environment:
+
+- for Linux users:
+   ```
+   wasm-pack build mm2src/mm2_main --target web --out-dir wasm_build/deps/pkg/
+   ```
+- for OSX users (Intel):
+   ```
+   CC=/usr/local/opt/llvm/bin/clang AR=/usr/local/opt/llvm/bin/llvm-ar wasm-pack build mm2src/mm2_main --target web --out-dir wasm_build/deps/pkg/
+   ```
+- for OSX users (M1):
+   ```
+   CC=/opt/homebrew/opt/llvm/bin/clang AR=/opt/homebrew/opt/llvm/bin/llvm-ar wasm-pack build mm2src/mm2_main --target web --out-dir wasm_build/deps/pkg/
+   ```
+
+Please note `CC` and `AR` must be specified in the same line as `wasm-pack test mm2src/mm2_main`.
+
+## Compiling WASM binary with debug symbols
+
+If you want to disable optimizations to reduce the compilation time, run `wasm-pack build mm2src/mm2_main` with an additional `--dev` flag:
+```
+wasm-pack build mm2src/mm2_main --target web --out-dir wasm_build/deps/pkg/ --dev
+```
+
+Please don't forget to specify `CC` and `AR` if you run the command on OSX.
\ No newline at end of file
diff --git a/etomic_build/client/buy_ONE_ANOTHER b/etomic_build/client/buy_ONE_ANOTHER
index 84545b5aec..62bea8f117 100755
--- a/etomic_build/client/buy_ONE_ANOTHER
+++ b/etomic_build/client/buy_ONE_ANOTHER
@@ -6,7 +6,7 @@ curl --url "http://127.0.0.1:7783" --data '
   "method":"buy",
   "base":"'$1'",
   "rel":"'$2'",
-  "volume":"0.1",
-  "price":"2"
+  "volume":"0.777",
+  "price":"1"
 }
 '
diff --git a/etomic_build/client/enable_USDF b/etomic_build/client/enable_USDF
new file mode 100755
index 0000000000..965a1d2345
--- /dev/null
+++ b/etomic_build/client/enable_USDF
@@ -0,0 +1,13 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data '{
+  "userpass":"'$userpass'",
+  "method":"enable_slp",
+  "mmrpc":"2.0",
+  "params":{
+    "ticker":"USDF",
+    "activation_params": {
+      "required_confirmations": 1
+    }
+  }
+}'
diff --git a/etomic_build/client/enable_tBCH b/etomic_build/client/enable_tBCH
index 0fb6f2f2fa..18f7c033a2 100755
--- a/etomic_build/client/enable_tBCH
+++ b/etomic_build/client/enable_tBCH
@@ -1,3 +1,14 @@
 #!/bin/bash
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"electrum\",\"coin\":\"tBCH\",\"servers\":[{\"url\":\"bch0.kister.net:51002\",\"protocol\":\"SSL\"},{\"url\":\"electroncash.de:50004\",\"protocol\":\"SSL\"},{\"url\":\"electrs.electroncash.de:60002\",\"protocol\":\"SSL\"},{\"url\":\"testnet.bitcoincash.network:60002\",\"protocol\":\"SSL\"},{\"url\":\"electroncash.de:50004\",\"protocol\":\"SSL\"}]}"
+curl --url "http://127.0.0.1:7783" --data '{
+  "userpass":"'$userpass'",
+  "method":"electrum",
+  "coin":"tBCH",
+  "servers":[
+    {"url":"tbch.loping.net:60002","protocol":"SSL"},
+    {"url":"electroncash.de:50004","protocol":"SSL"},
+    {"url":"testnet.bitcoincash.network:60002","protocol":"SSL"},
+    {"url":"electrs.electroncash.de:60002","protocol":"SSL"}
+  ],
+  "bchd_urls": ["https://bchd-testnet.electroncash.de:18335"]
+}'
diff --git a/etomic_build/client/enable_tBCH_USDF b/etomic_build/client/enable_tBCH_USDF
new file mode 100755
index 0000000000..4d3531ac12
--- /dev/null
+++ b/etomic_build/client/enable_tBCH_USDF
@@ -0,0 +1,54 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data '{
+  "userpass":"'$userpass'",
+  "method":"enable_bch_with_tokens",
+  "mmrpc":"2.0",
+  "params":{
+    "ticker":"tBCH",
+    "allow_slp_unsafe_conf":false,
+    "bchd_urls":[
+      "https://bchd-testnet.electroncash.de:18335"
+    ],
+    "mode":{
+      "rpc":"Electrum",
+      "rpc_data":{
+        "servers":[
+          {
+            "url":"electroncash.de:50003"
+          },
+          {
+            "url":"tbch.loping.net:60001"
+          },
+          {
+            "url":"blackie.c3-soft.com:60001"
+          },
+          {
+            "url":"bch0.kister.net:51001"
+          },
+          {
+            "url":"testnet.imaginary.cash:50001"
+          }
+        ]
+      }
+    },
+    "tx_history":true,
+    "slp_tokens_requests":[
+      {
+        "ticker":"USDF",
+        "required_confirmations": 1
+      }
+    ],
+    "required_confirmations": 1,
+    "requires_notarization":false,
+    "address_format":{
+      "format":"cashaddress",
+      "network":"bchtest"
+    },
+    "utxo_merge_params":{
+      "merge_at":50,
+      "check_every":10,
+      "max_merge_at_once":25
+    }
+  }
+}'
\ No newline at end of file
diff --git a/etomic_build/client/my_tx_history_from_id b/etomic_build/client/my_tx_history_from_id
new file mode 100755
index 0000000000..a72e5deebb
--- /dev/null
+++ b/etomic_build/client/my_tx_history_from_id
@@ -0,0 +1,14 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data '{
+  "userpass":"'$userpass'",
+  "method":"my_tx_history",
+  "mmrpc":"2.0",
+  "params": {
+    "coin": "USDF",
+    "limit": 2,
+    "paging_options": {
+      "FromId": "433b641bc89e1b59c22717918583c60ec98421805c8e85b064691705d9aeb970"
+    }
+  }
+}'
diff --git a/etomic_build/client/my_tx_history_page_number b/etomic_build/client/my_tx_history_page_number
new file mode 100755
index 0000000000..14eb61deb3
--- /dev/null
+++ b/etomic_build/client/my_tx_history_page_number
@@ -0,0 +1,14 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data '{
+  "userpass":"'$userpass'",
+  "method":"my_tx_history",
+  "mmrpc":"2.0",
+  "params": {
+    "coin": "tBCH",
+    "limit": 2,
+    "paging_options": {
+      "PageNumber": 2
+    }
+  }
+}'
diff --git a/etomic_build/client/validate_address b/etomic_build/client/validate_address
new file mode 100644
index 0000000000..b6a7285310
--- /dev/null
+++ b/etomic_build/client/validate_address
@@ -0,0 +1,10 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data '
+{
+  "userpass":"'$userpass'",
+  "method":"validateaddress",
+  "coin":"'$1'",
+  "address":"'$2'"
+}
+'
diff --git a/js/defined-in-js.js b/js/defined-in-js.js
deleted file mode 100644
index 214a83ca2a..0000000000
--- a/js/defined-in-js.js
+++ /dev/null
@@ -1,53 +0,0 @@
-//! The wasm plug functions.
-
-// pub fn host_ensure_dir_is_writable(ptr: *const c_char, len: i32) -> i32;
-export function host_ensure_dir_is_writable(ptr, len) {
-}
-
-// pub fn host_env(name: *const c_char, nameˡ: i32, rbuf: *mut c_char, rcap: i32) -> i32;
-export function host_env(name, name2, rbuf, rcap) {
-    return 0;
-}
-
-// pub fn host_slurp(path_p: *const c_char, path_l: i32, rbuf: *mut c_char, rcap: i32) -> i32;
-export function host_slurp(path_p, path_l, rbuf, rcap) {
-    return 0;
-}
-
-// pub fn temp_dir(rbuf: *mut c_char, rcap: i32) -> i32;
-export function temp_dir(rbuf, rcap) {
-    return 0;
-}
-
-// pub fn host_rm(ptr: *const c_char, len: i32) -> i32;
-export function host_rm(ptr, len) {
-    return 0;
-}
-
-// pub fn host_write(path_p: *const c_char, path_l: i32, ptr: *const c_char, len: i32) -> i32;
-export function host_write(path_p, path_l, ptr, len) {
-    return 0;
-}
-
-// pub fn host_read_dir(path_p: *const c_char, path_l: i32, rbuf: *mut c_char, rcap: i32) -> i32;
-export function host_read_dir(path_p, path_l, rbuf, rcap) {
-    return 0;
-}
-
-// fn http_helper_if(helper: *const u8, helper_len: i32, payload: *const u8, payload_len: i32, timeout_ms: i32) -> i32;
-export function http_helper_if(helper, helper_len, payload, payload_len, timeout_ms) {
-}
-
-// pub fn http_helper_check(helper_request_id: i32, rbuf: *mut u8, rcap: i32) -> i32;
-export function http_helper_check(helper_request_id, rbuf, rcap) {
-    return 0;
-}
-
-// pub fn call_back(cb_id: i32, ptr: *const c_char, len: i32);
-export function call_back(cb_id, ptr, len) {
-}
-
-// fn sleep(ms: u32) -> Promise;
-export function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
diff --git a/mm2src/coins/Cargo.toml b/mm2src/coins/Cargo.toml
index f2947ae57a..d541a1153b 100644
--- a/mm2src/coins/Cargo.toml
+++ b/mm2src/coins/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 
 [features]
-zhtlc = ["zcash_client_backend", "zcash_primitives", "zcash_proofs"]
+zhtlc-native-tests = []
 
 [lib]
 name = "coins"
@@ -13,43 +13,62 @@ doctest = false
 
 [dependencies]
 async-std = { version = "1.5", features = ["unstable"] }
-async-trait = "0.1"
+async-trait = "0.1.52"
 base64 = "0.10.0"
-bigdecimal = { version = "0.1.0", features = ["serde"] }
-bitcoin-cash-slp = "0.3.1"
+base58 = "0.2.0"
+bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
+bitcoin = "0.27.1"
+bitcoin_hashes = "0.10.0"
 bitcrypto = { path = "../mm2_bitcoin/crypto" }
+bincode = "1.3.3"
 byteorder = "1.3"
 bytes = "0.4"
 cfg-if = "1.0"
 chain = { path = "../mm2_bitcoin/chain" }
 common = { path = "../common" }
+crossbeam = "0.7"
+crypto = { path = "../crypto" }
+db_common = { path = "../db_common" }
 derive_more = "0.99"
+ed25519-dalek = "1.0.1"
+ed25519-dalek-bip32 = "0.2.0"
 ethabi = { git = "https://github.com/artemii235/ethabi" }
 ethcore-transaction = { git = "https://github.com/artemii235/parity-ethereum.git" }
 ethereum-types = { version = "0.4", default-features = false, features = ["std", "serialize"] }
 ethkey = { git = "https://github.com/artemii235/parity-ethereum.git" }
 # Waiting for https://github.com/rust-lang/rust/issues/54725 to use on Stable.
 #enum_dispatch = "0.1"
-fomat-macros = "0.2"
 futures01 = { version = "0.1", package = "futures" }
 # using select macro requires the crate to be named futures, compilation failed with futures03 name
 futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
 gstuff = { version = "0.7", features = ["nightly"] }
-hex = "0.3.2"
+hex = "0.4.2"
 http = "0.2"
-itertools = "0.9"
+itertools = { version = "0.10", features = ["use_std"] }
 jsonrpc-core = "8.0.1"
 keys = { path = "../mm2_bitcoin/keys" }
 lazy_static = "1.4"
 libc = "0.2"
+lightning = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106" }
+lightning-background-processor = { path = "lightning_background_processor" }
+lightning-invoice = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106" }
 metrics = "0.12"
+mm2_core = { path = "../mm2_core" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_io = { path = "../mm2_io" }
+mm2_net = { path = "../mm2_net" }
+mm2_number = { path = "../mm2_number" }
 mocktopus = "0.7.0"
 num-traits = "0.2"
+parking_lot = { version = "0.12.0", features = ["nightly"] }
 primitives = { path = "../mm2_bitcoin/primitives" }
+prost = "0.10"
+protobuf = "2.20"
 rand = { version = "0.7", features = ["std", "small_rng"] }
 rlp = { git = "https://github.com/artemii235/parity-common" }
 rmp-serde = "0.14.3"
 rpc = { path = "../mm2_bitcoin/rpc" }
+rpc_task = { path = "../rpc_task" }
 script = { path = "../mm2_bitcoin/script" }
 secp256k1 = { version = "0.20" }
 ser_error = { path = "../derives/ser_error" }
@@ -59,27 +78,51 @@ serde_derive = "1.0"
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
 serialization = { path = "../mm2_bitcoin/serialization" }
 serialization_derive = { path = "../mm2_bitcoin/serialization_derive" }
-sha2 = "0.8"
-sha3 = "0.8"
+spv_validation = { path = "../mm2_bitcoin/spv_validation" }
+sha2 = "0.9"
+sha3 = "0.9"
+utxo_signer = { path = "utxo_signer" }
+tiny-bip39 = "0.8.0"
 # One of web3 dependencies is the old `tokio-uds 0.1.7` which fails cross-compiling to ARM.
 # We don't need the default web3 features at all since we added our own web3 transport using shared HYPER instance.
 web3 = { git = "https://github.com/artemii235/rust-web3", default-features = false }
-winapi = "0.3"
+zbase32 = "0.1.2"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = { version = "0.3.27" }
-wasm-bindgen = { version = "0.2.50", features = ["serde-serialize", "nightly"] }
+mm2_db = { path = "../mm2_db" }
+mm2_test_helpers = { path = "../mm2_test_helpers" }
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
 wasm-bindgen-futures = { version = "0.4.1" }
 wasm-bindgen-test = { version = "0.3.2" }
-web-sys = { version = "0.3.4", features = ["console", "Headers", "Request", "RequestInit", "RequestMode", "Response", "Window"] }
+web-sys = { version = "0.3.55", features = ["console", "Headers", "Request", "RequestInit", "RequestMode", "Response", "Window"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 dirs = { version = "1" }
+lightning-persister = { path = "lightning_persister" }
+lightning-net-tokio = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106" }
 rust-ini = { version = "0.13" }
-rustls = { version = "0.19", features = ["dangerous_configuration"] }
+rustls = { version = "0.20", features = ["dangerous_configuration"] }
 tokio = { version = "1.7" }
-tokio-rustls = { version = "0.22.0" }
-webpki-roots = { version = "0.19.0" }
-zcash_client_backend = { git = "https://github.com/KomodoPlatform/librustzcash.git", optional = true }
-zcash_primitives = { features = ["transparent-inputs"], git = "https://github.com/KomodoPlatform/librustzcash.git", optional = true }
-zcash_proofs = { features = ["bundled-prover"], git = "https://github.com/KomodoPlatform/librustzcash.git", optional = true }
+tokio-rustls = { version = "0.23" }
+tonic = { version = "0.7", features = ["tls", "tls-webpki-roots", "compression"] }
+webpki-roots = { version = "0.22" }
+solana-client = { version = "1", default-features = false }
+solana-sdk = { version = "1", default-features = false }
+solana-transaction-status = "1"
+spl-token = { version = "3" }
+spl-associated-token-account = "1"
+zcash_client_backend = { git = "https://github.com/KomodoPlatform/librustzcash.git" }
+zcash_client_sqlite = { git = "https://github.com/KomodoPlatform/librustzcash.git" }
+zcash_primitives = { features = ["transparent-inputs"], git = "https://github.com/KomodoPlatform/librustzcash.git" }
+zcash_proofs = { git = "https://github.com/KomodoPlatform/librustzcash.git" }
+
+[target.'cfg(windows)'.dependencies]
+winapi = "0.3"
+
+[dev-dependencies]
+mm2_test_helpers = { path = "../mm2_test_helpers" }
+
+[build-dependencies]
+prost-build = { version = "0.10.3", default-features = false }
+tonic-build = { version = "0.7", features = ["prost", "compression"] }
diff --git a/mm2src/coins/build.rs b/mm2src/coins/build.rs
new file mode 100644
index 0000000000..2625bb9ded
--- /dev/null
+++ b/mm2src/coins/build.rs
@@ -0,0 +1,10 @@
+fn main() {
+    let mut prost = prost_build::Config::new();
+    prost.out_dir("utxo");
+    prost.compile_protos(&["utxo/bchrpc.proto"], &["utxo"]).unwrap();
+
+    tonic_build::configure()
+        .build_server(false)
+        .compile(&["z_coin/service.proto"], &["z_coin"])
+        .unwrap();
+}
diff --git a/mm2src/coins/coin_balance.rs b/mm2src/coins/coin_balance.rs
new file mode 100644
index 0000000000..da1b49eef2
--- /dev/null
+++ b/mm2src/coins/coin_balance.rs
@@ -0,0 +1,330 @@
+use crate::hd_pubkey::HDXPubExtractor;
+use crate::hd_wallet::{HDWalletCoinOps, NewAccountCreatingError};
+use crate::{BalanceError, BalanceResult, CoinBalance, CoinWithDerivationMethod, DerivationMethod, HDAddress,
+            MarketCoinOps};
+use async_trait::async_trait;
+use common::custom_iter::TryUnzip;
+use common::log::{debug, info};
+use crypto::{Bip44Chain, RpcDerivationPath};
+use derive_more::Display;
+use futures::compat::Future01CompatExt;
+use mm2_err_handle::prelude::*;
+use std::fmt;
+use std::ops::Range;
+
+pub type AddressIdRange = Range<u32>;
+
+#[derive(Display)]
+pub enum EnableCoinBalanceError {
+    NewAccountCreatingError(NewAccountCreatingError),
+    BalanceError(BalanceError),
+}
+
+impl From<NewAccountCreatingError> for EnableCoinBalanceError {
+    fn from(e: NewAccountCreatingError) -> Self { EnableCoinBalanceError::NewAccountCreatingError(e) }
+}
+
+impl From<BalanceError> for EnableCoinBalanceError {
+    fn from(e: BalanceError) -> Self { EnableCoinBalanceError::BalanceError(e) }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+#[serde(tag = "wallet_type")]
+pub enum EnableCoinBalance {
+    Iguana(IguanaWalletBalance),
+    HD(HDWalletBalance),
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct IguanaWalletBalance {
+    pub address: String,
+    pub balance: CoinBalance,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct HDWalletBalance {
+    pub accounts: Vec<HDAccountBalance>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct HDAccountBalance {
+    pub account_index: u32,
+    pub derivation_path: RpcDerivationPath,
+    pub total_balance: CoinBalance,
+    pub addresses: Vec<HDAddressBalance>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct HDAddressBalance {
+    pub address: String,
+    pub derivation_path: RpcDerivationPath,
+    pub chain: Bip44Chain,
+    pub balance: CoinBalance,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub enum EnableCoinScanPolicy {
+    /// Don't scan for new addresses.
+    DoNotScan,
+    /// Scan for new addresses if the coin HD wallet hasn't been enabled *only*.
+    /// In other words, scan for new addresses if there were no HD accounts in the HD wallet storage.
+    ScanIfNewWallet,
+    /// Scan for new addresses even if the coin HD wallet has been enabled before.
+    Scan,
+}
+
+impl Default for EnableCoinScanPolicy {
+    fn default() -> Self { EnableCoinScanPolicy::ScanIfNewWallet }
+}
+
+#[async_trait]
+pub trait EnableCoinBalanceOps {
+    async fn enable_coin_balance<XPubExtractor>(
+        &self,
+        xpub_extractor: &XPubExtractor,
+        scan_policy: EnableCoinScanPolicy,
+    ) -> MmResult<EnableCoinBalance, EnableCoinBalanceError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync;
+}
+
+#[async_trait]
+impl<Coin> EnableCoinBalanceOps for Coin
+where
+    Coin: CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet>
+        + HDWalletBalanceOps
+        + MarketCoinOps
+        + Sync,
+    <Coin as CoinWithDerivationMethod>::Address: fmt::Display + Sync,
+{
+    async fn enable_coin_balance<XPubExtractor>(
+        &self,
+        xpub_extractor: &XPubExtractor,
+        scan_policy: EnableCoinScanPolicy,
+    ) -> MmResult<EnableCoinBalance, EnableCoinBalanceError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        match self.derivation_method() {
+            DerivationMethod::Iguana(my_address) => self
+                .my_balance()
+                .compat()
+                .await
+                .map(|balance| {
+                    EnableCoinBalance::Iguana(IguanaWalletBalance {
+                        address: my_address.to_string(),
+                        balance,
+                    })
+                })
+                .mm_err(EnableCoinBalanceError::from),
+            DerivationMethod::HDWallet(hd_wallet) => self
+                .enable_hd_wallet(hd_wallet, xpub_extractor, scan_policy)
+                .await
+                .map(EnableCoinBalance::HD),
+        }
+    }
+}
+
+#[async_trait]
+pub trait HDWalletBalanceOps: HDWalletCoinOps {
+    type HDAddressScanner: HDAddressBalanceScanner<Address = Self::Address>;
+
+    async fn produce_hd_address_scanner(&self) -> BalanceResult<Self::HDAddressScanner>;
+
+    /// Requests balances of already known addresses, and if it's prescribed by [`EnableCoinParams::scan_policy`],
+    /// scans for new addresses of every HD account by using [`HDWalletBalanceOps::scan_for_new_addresses`].
+    /// This method is used on coin initialization to index working addresses and to return the wallet balance to the user.
+    async fn enable_hd_wallet<XPubExtractor>(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        xpub_extractor: &XPubExtractor,
+        scan_policy: EnableCoinScanPolicy,
+    ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync;
+
+    /// Scans for the new addresses of the specified `hd_account` using the given `address_scanner`.
+    /// Returns balances of the new addresses.
+    async fn scan_for_new_addresses(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        address_scanner: &Self::HDAddressScanner,
+        gap_limit: u32,
+    ) -> BalanceResult<Vec<HDAddressBalance>>;
+
+    /// Requests balances of every known addresses of the given `hd_account`.
+    async fn all_known_addresses_balances(&self, hd_account: &Self::HDAccount) -> BalanceResult<Vec<HDAddressBalance>>;
+
+    /// Requests balances of known addresses of the given `address_ids` addresses at the specified `chain`.
+    async fn known_addresses_balances_with_ids<Ids>(
+        &self,
+        hd_account: &Self::HDAccount,
+        chain: Bip44Chain,
+        address_ids: Ids,
+    ) -> BalanceResult<Vec<HDAddressBalance>>
+    where
+        Self::Address: fmt::Display + Clone,
+        Ids: Iterator<Item = u32> + Send,
+    {
+        let (addresses, der_paths) = address_ids
+            .into_iter()
+            .map(|address_id| -> BalanceResult<_> {
+                let HDAddress {
+                    address,
+                    derivation_path,
+                    ..
+                } = self.derive_address(hd_account, chain, address_id)?;
+                Ok((address, derivation_path))
+            })
+            // Try to unzip `Result<(Address, DerivationPath)>` elements into `Result<(Vec<Address>, Vec<DerivationPath>)>`.
+            .try_unzip::<Vec<_>, Vec<_>>()?;
+
+        let balances = self
+            .known_addresses_balances(addresses)
+            .await?
+            .into_iter()
+            // [`HDWalletBalanceOps::known_addresses_balances`] returns pairs `(Address, CoinBalance)`
+            // that are guaranteed to be in the same order in which they were requested.
+            // So we can zip the derivation paths with the pairs `(Address, CoinBalance)`.
+            .zip(der_paths)
+            .map(|((address, balance), derivation_path)| HDAddressBalance {
+                address: address.to_string(),
+                derivation_path: RpcDerivationPath(derivation_path),
+                chain,
+                balance,
+            })
+            .collect();
+        Ok(balances)
+    }
+
+    /// Requests balance of the given `address`.
+    /// This function is expected to be more efficient than ['HDWalletBalanceOps::is_address_used'] in most cases
+    /// since many of RPC clients allow us to request the address balance without the history.
+    async fn known_address_balance(&self, address: &Self::Address) -> BalanceResult<CoinBalance>;
+
+    /// Requests balances of the given `addresses`.
+    /// The pairs `(Address, CoinBalance)` are guaranteed to be in the same order in which they were requested.
+    async fn known_addresses_balances(
+        &self,
+        addresses: Vec<Self::Address>,
+    ) -> BalanceResult<Vec<(Self::Address, CoinBalance)>>;
+
+    /// Checks if the address has been used by the user by checking if the transaction history of the given `address` is not empty.
+    /// Please note the function can return zero balance even if the address has been used before.
+    async fn is_address_used(
+        &self,
+        address: &Self::Address,
+        address_scanner: &Self::HDAddressScanner,
+    ) -> BalanceResult<AddressBalanceStatus<CoinBalance>> {
+        if !address_scanner.is_address_used(address).await? {
+            return Ok(AddressBalanceStatus::NotUsed);
+        }
+        // Now we know that the address has been used.
+        let balance = self.known_address_balance(address).await?;
+        Ok(AddressBalanceStatus::Used(balance))
+    }
+}
+
+#[async_trait]
+pub trait HDAddressBalanceScanner: Sync {
+    type Address;
+
+    async fn is_address_used(&self, address: &Self::Address) -> BalanceResult<bool>;
+}
+
+pub enum AddressBalanceStatus<Balance> {
+    Used(Balance),
+    NotUsed,
+}
+
+pub mod common_impl {
+    use super::*;
+    use crate::hd_wallet::{HDAccountOps, HDWalletOps};
+
+    pub(crate) async fn enable_hd_account<Coin>(
+        coin: &Coin,
+        hd_wallet: &Coin::HDWallet,
+        hd_account: &mut Coin::HDAccount,
+        address_scanner: &Coin::HDAddressScanner,
+        scan_new_addresses: bool,
+    ) -> MmResult<HDAccountBalance, EnableCoinBalanceError>
+    where
+        Coin: HDWalletBalanceOps + Sync,
+    {
+        let gap_limit = hd_wallet.gap_limit();
+        let mut addresses = coin.all_known_addresses_balances(hd_account).await?;
+        if scan_new_addresses {
+            addresses.extend(
+                coin.scan_for_new_addresses(hd_wallet, hd_account, address_scanner, gap_limit)
+                    .await?,
+            );
+        }
+
+        let total_balance = addresses.iter().fold(CoinBalance::default(), |total, addr_balance| {
+            total + addr_balance.balance.clone()
+        });
+        let account_balance = HDAccountBalance {
+            account_index: hd_account.account_id(),
+            derivation_path: RpcDerivationPath(hd_account.account_derivation_path()),
+            total_balance,
+            addresses,
+        };
+
+        Ok(account_balance)
+    }
+
+    pub(crate) async fn enable_hd_wallet<Coin, XPubExtractor>(
+        coin: &Coin,
+        hd_wallet: &Coin::HDWallet,
+        xpub_extractor: &XPubExtractor,
+        scan_policy: EnableCoinScanPolicy,
+    ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
+    where
+        Coin: HDWalletBalanceOps + MarketCoinOps + Sync,
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        let mut accounts = hd_wallet.get_accounts_mut().await;
+        let address_scanner = coin.produce_hd_address_scanner().await?;
+
+        let mut result = HDWalletBalance {
+            accounts: Vec::with_capacity(accounts.len() + 1),
+        };
+
+        if accounts.is_empty() {
+            // Is seems that we couldn't find any HD account from the HD wallet storage.
+            drop(accounts);
+            info!(
+                "{} HD wallet hasn't been enabled before. Create default HD account",
+                coin.ticker()
+            );
+
+            // Create new HD account.
+            let mut new_account = coin.create_new_account(hd_wallet, xpub_extractor).await?;
+            let scan_new_addresses = matches!(
+                scan_policy,
+                EnableCoinScanPolicy::ScanIfNewWallet | EnableCoinScanPolicy::Scan
+            );
+
+            let account_balance =
+                enable_hd_account(coin, hd_wallet, &mut new_account, &address_scanner, scan_new_addresses).await?;
+            result.accounts.push(account_balance);
+            return Ok(result);
+        }
+
+        debug!(
+            "{} HD accounts were found on {} coin activation",
+            accounts.len(),
+            coin.ticker()
+        );
+        let scan_new_addresses = matches!(scan_policy, EnableCoinScanPolicy::Scan);
+        for (_account_id, hd_account) in accounts.iter_mut() {
+            let account_balance =
+                enable_hd_account(coin, hd_wallet, hd_account, &address_scanner, scan_new_addresses).await?;
+            result.accounts.push(account_balance);
+        }
+
+        Ok(result)
+    }
+}
diff --git a/mm2src/coins/eth.rs b/mm2src/coins/eth.rs
index 80b7765f44..1a2f6dc78e 100644
--- a/mm2src/coins/eth.rs
+++ b/mm2src/coins/eth.rs
@@ -1,13 +1,15 @@
 /******************************************************************************
- * Copyright © 2014-2019 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -16,57 +18,62 @@
 //  eth.rs
 //  marketmaker
 //
-//  Copyright © 2017-2019 SuperNET. All rights reserved.
+//  Copyright © 2022 AtomicDEX. All rights reserved.
 //
-use bigdecimal::BigDecimal;
-use bitcrypto::sha256;
-use common::custom_futures::TimedAsyncMutex;
+use async_trait::async_trait;
+use bitcrypto::{keccak256, sha256};
 use common::executor::Timer;
-use common::log::error;
-use common::mm_ctx::{MmArc, MmWeak};
-use common::mm_error::prelude::*;
-use common::{now_ms, slurp_url, small_rng, DEX_FEE_ADDR_RAW_PUBKEY};
+use common::log::{error, info, warn};
+use common::{now_ms, small_rng, DEX_FEE_ADDR_RAW_PUBKEY};
+use crypto::privkey::key_pair_from_secret;
 use derive_more::Display;
 use ethabi::{Contract, Token};
+pub use ethcore_transaction::SignedTransaction as SignedEthTx;
 use ethcore_transaction::{Action, Transaction as UnSignedEthTx, UnverifiedTransaction};
-use ethereum_types::{Address, H160, U256};
-use ethkey::{public_to_address, KeyPair, Public};
+use ethereum_types::{Address, H160, H256, U256};
+use ethkey::{public_to_address, KeyPair, Public, Signature};
+use ethkey::{sign, verify_address};
 use futures::compat::Future01CompatExt;
 use futures::future::{join_all, select, Either, FutureExt, TryFutureExt};
 use futures01::Future;
 use http::StatusCode;
+use mm2_core::mm_ctx::{MmArc, MmWeak};
+use mm2_err_handle::prelude::*;
+use mm2_net::transport::{slurp_url, SlurpError};
+use mm2_number::{BigDecimal, MmNumber};
 #[cfg(test)] use mocktopus::macros::*;
 use rand::seq::SliceRandom;
 use rpc::v1::types::Bytes as BytesJson;
 use secp256k1::PublicKey;
 use serde_json::{self as json, Value as Json};
+use serialization::{CompactInteger, Serializable, Stream};
 use sha3::{Digest, Keccak256};
-use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::ops::Deref;
 use std::path::PathBuf;
 use std::str::FromStr;
-use std::sync::atomic::{AtomicU64, Ordering as AtomicOrderding};
+use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering};
 use std::sync::{Arc, Mutex};
 use web3::types::{Action as TraceAction, BlockId, BlockNumber, Bytes, CallRequest, FilterBuilder, Log, Trace,
                   TraceFilterBuilder, Transaction as Web3Transaction, TransactionId};
 use web3::{self, Web3};
+use web3_transport::{EthFeeHistoryNamespace, Web3Transport};
 
-use super::{BalanceError, BalanceFut, CoinBalance, CoinProtocol, CoinTransportMetrics, CoinsContext, FeeApproxStage,
-            FoundSwapTxSpend, HistorySyncState, MarketCoinOps, MmCoin, NegotiateSwapContractAddrErr, NumConversError,
-            NumConversResult, RpcClientType, RpcTransportEventHandler, RpcTransportEventHandlerShared, SwapOps,
-            TradeFee, TradePreimageError, TradePreimageFut, TradePreimageValue, Transaction, TransactionDetails,
-            TransactionEnum, TransactionFut, ValidateAddressResult, WithdrawError, WithdrawFee, WithdrawFut,
-            WithdrawRequest, WithdrawResult};
-pub use ethcore_transaction::SignedTransaction as SignedEthTx;
-pub use rlp;
+use super::{AsyncMutex, BalanceError, BalanceFut, CoinBalance, CoinProtocol, CoinTransportMetrics, CoinsContext,
+            FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps, MmCoin, NegotiateSwapContractAddrErr,
+            NumConversError, NumConversResult, RawTransactionError, RawTransactionFut, RawTransactionRequest,
+            RawTransactionRes, RawTransactionResult, RpcClientType, RpcTransportEventHandler,
+            RpcTransportEventHandlerShared, SearchForSwapTxSpendInput, SignatureError, SignatureResult, SwapOps,
+            TradeFee, TradePreimageError, TradePreimageFut, TradePreimageResult, TradePreimageValue, Transaction,
+            TransactionDetails, TransactionEnum, TransactionErr, TransactionFut, UnexpectedDerivationMethod,
+            ValidateAddressResult, ValidatePaymentInput, VerificationError, VerificationResult, WithdrawError,
+            WithdrawFee, WithdrawFut, WithdrawRequest, WithdrawResult};
 
-mod web3_transport;
-use common::mm_number::MmNumber;
-use web3_transport::{EthFeeHistoryNamespace, Web3Transport};
+pub use rlp;
 
 #[cfg(test)] mod eth_tests;
 #[cfg(target_arch = "wasm32")] mod eth_wasm_tests;
+mod web3_transport;
 
 /// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol
 /// Dev chain (195.201.0.6:8565) contract address: 0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd
@@ -111,16 +118,33 @@ pub type GasStationResult = Result<GasStationData, MmError<GasStationReqErr>>;
 
 #[derive(Debug, Display)]
 pub enum GasStationReqErr {
-    #[display(fmt = "Transport: {}", _0)]
-    Transport(String),
+    #[display(fmt = "Transport '{}' error: {}", uri, error)]
+    Transport {
+        uri: String,
+        error: String,
+    },
     #[display(fmt = "Invalid response: {}", _0)]
     InvalidResponse(String),
+    Internal(String),
 }
 
 impl From<serde_json::Error> for GasStationReqErr {
     fn from(e: serde_json::Error) -> Self { GasStationReqErr::InvalidResponse(e.to_string()) }
 }
 
+impl From<SlurpError> for GasStationReqErr {
+    fn from(e: SlurpError) -> Self {
+        let error = e.to_string();
+        match e {
+            SlurpError::ErrorDeserializing { .. } => GasStationReqErr::InvalidResponse(error),
+            SlurpError::Transport { uri, .. } | SlurpError::Timeout { uri, .. } => {
+                GasStationReqErr::Transport { uri, error }
+            },
+            SlurpError::Internal(_) | SlurpError::InvalidRequest(_) => GasStationReqErr::Internal(error),
+        }
+    }
+}
+
 #[derive(Debug, Display)]
 pub enum Web3RpcError {
     #[display(fmt = "Transport: {}", _0)]
@@ -134,8 +158,9 @@ pub enum Web3RpcError {
 impl From<GasStationReqErr> for Web3RpcError {
     fn from(err: GasStationReqErr) -> Self {
         match err {
-            GasStationReqErr::Transport(err) => Web3RpcError::Transport(err),
+            GasStationReqErr::Transport { .. } => Web3RpcError::Transport(err.to_string()),
             GasStationReqErr::InvalidResponse(err) => Web3RpcError::InvalidResponse(err),
+            GasStationReqErr::Internal(err) => Web3RpcError::Internal(err),
         }
     }
 }
@@ -158,6 +183,10 @@ impl From<web3::Error> for Web3RpcError {
     }
 }
 
+impl From<web3::Error> for RawTransactionError {
+    fn from(e: web3::Error) -> Self { RawTransactionError::Transport(e.to_string()) }
+}
+
 impl From<ethabi::Error> for Web3RpcError {
     fn from(e: ethabi::Error) -> Web3RpcError {
         // Currently, we use the `ethabi` crate to work with a smart contract ABI known at compile time.
@@ -256,6 +285,7 @@ pub struct EthCoinImpl {
     coin_type: EthCoinType,
     key_pair: KeyPair,
     my_address: Address,
+    sign_message_prefix: Option<String>,
     swap_contract_address: Address,
     fallback_swap_contract: Option<Address>,
     web3: Web3<Web3Transport>,
@@ -273,6 +303,7 @@ pub struct EthCoinImpl {
     chain_id: Option<u64>,
     /// the block range used for eth_getLogs
     logs_block_range: u64,
+    nonce_lock: Arc<AsyncMutex<()>>,
 }
 
 #[derive(Clone, Debug)]
@@ -295,10 +326,13 @@ pub enum EthAddressFormat {
 
 #[cfg_attr(test, mockable)]
 async fn make_gas_station_request(url: &str) -> GasStationResult {
-    let resp = slurp_url(url).await.map_to_mm(GasStationReqErr::Transport)?;
+    let resp = slurp_url(url).await?;
     if resp.0 != StatusCode::OK {
         let error = format!("Gas price request failed with status code {}", resp.0);
-        return MmError::err(GasStationReqErr::Transport(error));
+        return MmError::err(GasStationReqErr::Transport {
+            uri: url.to_owned(),
+            error,
+        });
     }
     let result: GasStationData = json::from_slice(&resp.2)?;
     Ok(result)
@@ -480,7 +514,7 @@ impl EthCoinImpl {
         swap_contract_address: Address,
         from_block: u64,
         to_block: u64,
-    ) -> Box<dyn Future<Item = Vec<Log>, Error = String>> {
+    ) -> Box<dyn Future<Item = Vec<Log>, Error = String> + Send> {
         let contract_event = try_fus!(SWAP_CONTRACT.event("SenderRefunded"));
         let filter = FilterBuilder::default()
             .topics(Some(vec![contract_event.signature()]), None, None, None)
@@ -498,7 +532,21 @@ impl EthCoinImpl {
     }
 }
 
-async fn withdraw_impl(ctx: MmArc, coin: EthCoin, req: WithdrawRequest) -> WithdrawResult {
+async fn get_raw_transaction_impl(coin: EthCoin, req: RawTransactionRequest) -> RawTransactionResult {
+    let tx = match req.tx_hash.strip_prefix("0x") {
+        Some(tx) => tx,
+        None => &req.tx_hash,
+    };
+    let hash = H256::from_str(tx).map_to_mm(|e| RawTransactionError::InvalidHashError(e.to_string()))?;
+    let web3_tx = coin.web3.eth().transaction(TransactionId::Hash(hash)).compat().await?;
+    let web3_tx = web3_tx.or_mm_err(|| RawTransactionError::HashNotExist(req.tx_hash))?;
+    let raw = signed_tx_from_web3_tx(web3_tx).map_to_mm(RawTransactionError::InternalError)?;
+    Ok(RawTransactionRes {
+        tx_hex: BytesJson(rlp::encode(&raw)),
+    })
+}
+
+async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult {
     let to_addr = coin
         .address_from_str(&req.to)
         .map_to_mm(WithdrawError::InvalidAddress)?;
@@ -574,15 +622,7 @@ async fn withdraw_impl(ctx: MmArc, coin: EthCoin, req: WithdrawRequest) -> Withd
         eth_value -= total_fee;
         wei_amount -= total_fee;
     };
-    let _nonce_lock = NONCE_LOCK
-        .lock(|_start, _now| {
-            if ctx.is_stopping() {
-                let error = "MM is stopping, aborting withdraw_impl in NONCE_LOCK".to_owned();
-                return MmError::err(WithdrawError::InternalError(error));
-            }
-            Ok(0.5)
-        })
-        .await?;
+    let _nonce_lock = coin.nonce_lock.lock().await;
     let nonce_fut = get_addr_nonce(coin.my_address, coin.web3_instances.clone()).compat();
     let nonce = match select(nonce_fut, Timer::sleep(30.)).await {
         Either::Left((nonce_res, _)) => nonce_res.map_to_mm(WithdrawError::Transport)?,
@@ -619,13 +659,14 @@ async fn withdraw_impl(ctx: MmArc, coin: EthCoin, req: WithdrawRequest) -> Withd
         spent_by_me,
         received_by_me,
         tx_hex: bytes.into(),
-        tx_hash: signed.tx_hash(),
+        tx_hash: format!("{:02x}", signed.tx_hash()),
         block_height: 0,
         fee_details: Some(fee_details.into()),
         coin: coin.ticker.clone(),
         internal_id: vec![].into(),
         timestamp: now_ms() / 1000,
         kmd_rewards: None,
+        transaction_type: Default::default(),
     })
 }
 
@@ -636,12 +677,13 @@ impl Deref for EthCoin {
     fn deref(&self) -> &EthCoinImpl { &*self.0 }
 }
 
+#[async_trait]
 impl SwapOps for EthCoin {
-    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal) -> TransactionFut {
-        let address = try_fus!(addr_from_raw_pubkey(fee_addr));
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
+        let address = try_tx_fus!(addr_from_raw_pubkey(fee_addr));
 
         Box::new(
-            self.send_to_address(address, try_fus!(wei_from_big_decimal(&amount, self.decimals)))
+            self.send_to_address(address, try_tx_fus!(wei_from_big_decimal(&amount, self.decimals)))
                 .map(TransactionEnum::from),
         )
     }
@@ -653,14 +695,15 @@ impl SwapOps for EthCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let taker_addr = try_fus!(addr_from_raw_pubkey(taker_pub));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let taker_addr = try_tx_fus!(addr_from_raw_pubkey(taker_pub));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         Box::new(
             self.send_hash_time_locked_payment(
                 self.etomic_swap_id(time_lock, secret_hash),
-                try_fus!(wei_from_big_decimal(&amount, self.decimals)),
+                try_tx_fus!(wei_from_big_decimal(&amount, self.decimals)),
                 time_lock,
                 secret_hash,
                 taker_addr,
@@ -677,14 +720,15 @@ impl SwapOps for EthCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let maker_addr = try_fus!(addr_from_raw_pubkey(maker_pub));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let maker_addr = try_tx_fus!(addr_from_raw_pubkey(maker_pub));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         Box::new(
             self.send_hash_time_locked_payment(
                 self.etomic_swap_id(time_lock, secret_hash),
-                try_fus!(wei_from_big_decimal(&amount, self.decimals)),
+                try_tx_fus!(wei_from_big_decimal(&amount, self.decimals)),
                 time_lock,
                 secret_hash,
                 maker_addr,
@@ -701,10 +745,11 @@ impl SwapOps for EthCoin {
         _taker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UnverifiedTransaction = try_fus!(rlp::decode(taker_payment_tx));
-        let signed = try_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_payment_tx));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address(), signed);
 
         Box::new(
             self.spend_hash_time_locked_payment(signed, swap_contract_address, secret)
@@ -719,10 +764,11 @@ impl SwapOps for EthCoin {
         _maker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UnverifiedTransaction = try_fus!(rlp::decode(maker_payment_tx));
-        let signed = try_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_payment_tx));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
         Box::new(
             self.spend_hash_time_locked_payment(signed, swap_contract_address, secret)
                 .map(TransactionEnum::from),
@@ -736,10 +782,11 @@ impl SwapOps for EthCoin {
         _maker_pub: &[u8],
         _secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UnverifiedTransaction = try_fus!(rlp::decode(taker_payment_tx));
-        let signed = try_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_payment_tx));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         Box::new(
             self.refund_hash_time_locked_payment(swap_contract_address, signed)
@@ -754,10 +801,11 @@ impl SwapOps for EthCoin {
         _taker_pub: &[u8],
         _secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UnverifiedTransaction = try_fus!(rlp::decode(maker_payment_tx));
-        let signed = try_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_payment_tx));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         Box::new(
             self.refund_hash_time_locked_payment(swap_contract_address, signed)
@@ -772,6 +820,7 @@ impl SwapOps for EthCoin {
         fee_addr: &[u8],
         amount: &BigDecimal,
         min_block_number: u64,
+        _uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let selfi = self.clone();
         let tx = match fee_tx {
@@ -871,42 +920,26 @@ impl SwapOps for EthCoin {
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_maker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        secret_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let swap_contract_address = try_fus!(input.swap_contract_address.try_to_address());
         self.validate_payment(
-            payment_tx,
-            time_lock,
-            maker_pub,
-            secret_hash,
-            amount,
+            &input.payment_tx,
+            input.time_lock,
+            &input.other_pub,
+            &input.secret_hash,
+            input.amount,
             swap_contract_address,
         )
     }
 
-    fn validate_taker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        secret_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let swap_contract_address = try_fus!(input.swap_contract_address.try_to_address());
         self.validate_payment(
-            payment_tx,
-            time_lock,
-            taker_pub,
-            secret_hash,
-            amount,
+            &input.payment_tx,
+            input.time_lock,
+            &input.other_pub,
+            &input.secret_hash,
+            input.amount,
             swap_contract_address,
         )
     }
@@ -918,6 +951,7 @@ impl SwapOps for EthCoin {
         secret_hash: &[u8],
         from_block: u64,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
         let id = self.etomic_swap_id(time_lock, secret_hash);
         let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
@@ -980,30 +1014,22 @@ impl SwapOps for EthCoin {
         Box::new(fut.boxed().compat())
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        _time_lock: u32,
-        _other_pub: &[u8],
-        _secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        let swap_contract_address = try_s!(swap_contract_address.try_to_address());
-        self.search_for_swap_tx_spend(tx, swap_contract_address, search_from_block)
+        let swap_contract_address = try_s!(input.swap_contract_address.try_to_address());
+        self.search_for_swap_tx_spend(input.tx, swap_contract_address, input.search_from_block)
+            .await
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
-        _time_lock: u32,
-        _other_pub: &[u8],
-        _secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        let swap_contract_address = try_s!(swap_contract_address.try_to_address());
-        self.search_for_swap_tx_spend(tx, swap_contract_address, search_from_block)
+        let swap_contract_address = try_s!(input.swap_contract_address.try_to_address());
+        self.search_for_swap_tx_spend(input.tx, swap_contract_address, input.search_from_block)
+            .await
     }
 
     fn extract_secret(&self, _secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
@@ -1047,6 +1073,10 @@ impl SwapOps for EthCoin {
                 .ok_or_else(|| MmError::new(NegotiateSwapContractAddrErr::NoOtherAddrAndNoFallback)),
         }
     }
+
+    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> keys::KeyPair {
+        key_pair_from_secret(self.key_pair.secret()).expect("valid key")
+    }
 }
 
 #[cfg_attr(test, mockable)]
@@ -1055,6 +1085,40 @@ impl MarketCoinOps for EthCoin {
 
     fn my_address(&self) -> Result<String, String> { Ok(checksum_address(&format!("{:#02x}", self.my_address))) }
 
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
+
+    /// Hash message for signature using Ethereum's message signing format.
+    /// keccak256(PREFIX_LENGTH + PREFIX + MESSAGE_LENGTH + MESSAGE)
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
+        let message_prefix = self.sign_message_prefix.as_ref()?;
+        let mut stream = Stream::new();
+        let prefix_len = CompactInteger::from(message_prefix.len());
+        prefix_len.serialize(&mut stream);
+        stream.append_slice(message_prefix.as_bytes());
+        stream.append_slice(message.len().to_string().as_bytes());
+        stream.append_slice(message.as_bytes());
+        Some(keccak256(&stream.out()).take())
+    }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        let message_hash = self.sign_message_hash(message).ok_or(SignatureError::PrefixNotFound)?;
+        let privkey = &self.key_pair.secret();
+        let signature = sign(privkey, &H256::from(message_hash))?;
+        Ok(format!("0x{}", signature))
+    }
+
+    fn verify_message(&self, signature: &str, message: &str, address: &str) -> VerificationResult<bool> {
+        let message_hash = self
+            .sign_message_hash(message)
+            .ok_or(VerificationError::PrefixNotFound)?;
+        let address = self
+            .address_from_str(address)
+            .map_err(VerificationError::AddressDecodingError)?;
+        let signature = Signature::from_str(signature.strip_prefix("0x").unwrap_or(signature))?;
+        let is_verified = verify_address(&address, &signature, &H256::from(message_hash))?;
+        Ok(is_verified)
+    }
+
     fn my_balance(&self) -> BalanceFut<CoinBalance> {
         let decimals = self.decimals;
         let fut = self
@@ -1074,6 +1138,13 @@ impl MarketCoinOps for EthCoin {
         )
     }
 
+    fn platform_ticker(&self) -> &str {
+        match &self.coin_type {
+            EthCoinType::Eth => self.ticker(),
+            EthCoinType::Erc20 { platform, .. } => platform,
+        }
+    }
+
     fn send_raw_tx(&self, mut tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
         if tx.starts_with("0x") {
             tx = &tx[2..];
@@ -1088,6 +1159,16 @@ impl MarketCoinOps for EthCoin {
         )
     }
 
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        Box::new(
+            self.web3
+                .eth()
+                .send_raw_transaction(tx.into())
+                .map(|res| format!("{:02x}", res))
+                .map_err(|e| ERRL!("{}", e)),
+        )
+    }
+
     fn wait_for_confirmations(
         &self,
         tx: &[u8],
@@ -1120,7 +1201,12 @@ impl MarketCoinOps for EthCoin {
                 let web3_receipt = match selfi.web3.eth().transaction_receipt(tx.hash()).compat().await {
                     Ok(r) => r,
                     Err(e) => {
-                        log!("Error " [e] " getting the " (selfi.ticker()) " transaction " [tx.tx_hash()] ", retrying in 15 seconds");
+                        error!(
+                            "Error {:?} getting the {} transaction {:?}, retrying in 15 seconds",
+                            e,
+                            selfi.ticker(),
+                            tx.tx_hash()
+                        );
                         Timer::sleep(check_every as f64).await;
                         continue;
                     },
@@ -1140,7 +1226,11 @@ impl MarketCoinOps for EthCoin {
                         let current_block = match selfi.web3.eth().block_number().compat().await {
                             Ok(b) => b,
                             Err(e) => {
-                                log!("Error " [e] " getting the " (selfi.ticker()) " block number retrying in 15 seconds");
+                                error!(
+                                    "Error {:?} getting the {} block number retrying in 15 seconds",
+                                    e,
+                                    selfi.ticker()
+                                );
                                 Timer::sleep(check_every as f64).await;
                                 continue;
                             },
@@ -1165,17 +1255,17 @@ impl MarketCoinOps for EthCoin {
         from_block: u64,
         swap_contract_address: &Option<BytesJson>,
     ) -> TransactionFut {
-        let unverified: UnverifiedTransaction = try_fus!(rlp::decode(tx_bytes));
-        let tx = try_fus!(SignedEthTx::new(unverified));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let unverified: UnverifiedTransaction = try_tx_fus!(rlp::decode(tx_bytes));
+        let tx = try_tx_fus!(SignedEthTx::new(unverified));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         let func_name = match self.coin_type {
             EthCoinType::Eth => "ethPayment",
             EthCoinType::Erc20 { .. } => "erc20Payment",
         };
 
-        let payment_func = try_fus!(SWAP_CONTRACT.function(func_name));
-        let decoded = try_fus!(payment_func.decode_input(&tx.data));
+        let payment_func = try_tx_fus!(SWAP_CONTRACT.function(func_name));
+        let decoded = try_tx_fus!(payment_func.decode_input(&tx.data));
         let id = match &decoded[0] {
             Token::FixedBytes(bytes) => bytes.clone(),
             _ => panic!(),
@@ -1187,7 +1277,7 @@ impl MarketCoinOps for EthCoin {
                 let current_block = match selfi.current_block().compat().await {
                     Ok(b) => b,
                     Err(e) => {
-                        log!("Error " (e) " getting block number");
+                        error!("Error getting block number: {}", e);
                         Timer::sleep(5.).await;
                         continue;
                     },
@@ -1200,7 +1290,7 @@ impl MarketCoinOps for EthCoin {
                 {
                     Ok(ev) => ev,
                     Err(e) => {
-                        log!("Error " (e) " getting spend events");
+                        error!("Error getting spend events: {}", e);
                         Timer::sleep(5.).await;
                         continue;
                     },
@@ -1219,26 +1309,26 @@ impl MarketCoinOps for EthCoin {
                         {
                             Ok(Some(t)) => t,
                             Ok(None) => {
-                                log!("Tx " (tx_hash) " not found yet");
+                                info!("Tx {} not found yet", tx_hash);
                                 Timer::sleep(5.).await;
                                 continue;
                             },
                             Err(e) => {
-                                log!("Get tx " (tx_hash) " error " (e));
+                                error!("Get tx {} error: {}", tx_hash, e);
                                 Timer::sleep(5.).await;
                                 continue;
                             },
                         };
 
-                        return Ok(TransactionEnum::from(try_s!(signed_tx_from_web3_tx(transaction))));
+                        return Ok(TransactionEnum::from(try_tx_s!(signed_tx_from_web3_tx(transaction))));
                     }
                 }
 
                 if now_ms() / 1000 > wait_until {
-                    return ERR!(
+                    return TX_PLAIN_ERR!(
                         "Waited too long until {} for transaction {:?} to be spent ",
                         wait_until,
-                        tx
+                        tx,
                     );
                 }
                 Timer::sleep(5.).await;
@@ -1262,7 +1352,7 @@ impl MarketCoinOps for EthCoin {
         )
     }
 
-    fn display_priv_key(&self) -> String { format!("{:#02x}", self.key_pair.secret()) }
+    fn display_priv_key(&self) -> Result<String, String> { Ok(format!("{:#02x}", self.key_pair.secret())) }
 
     fn min_tx_amount(&self) -> BigDecimal { BigDecimal::from(0) }
 
@@ -1278,15 +1368,13 @@ pub fn signed_eth_tx_from_bytes(bytes: &[u8]) -> Result<SignedEthTx, String> {
     Ok(signed)
 }
 
-// We can use a shared nonce lock for all ETH coins.
-// It's highly likely that we won't experience any issues with it as we won't need to send "a lot" of transactions concurrently.
-// For ETH it makes even more sense because different ERC20 tokens can be running on same ETH blockchain.
-// So we would need to handle shared locks anyway.
+// We can use a nonce lock shared between tokens using the same platform coin and the platform itself.
+// For example, ETH/USDT-ERC20 should use the same lock, but it will be different for BNB/USDT-BEP20.
 lazy_static! {
-    static ref NONCE_LOCK: TimedAsyncMutex<()> = TimedAsyncMutex::new(());
+    static ref NONCE_LOCK: Mutex<HashMap<String, Arc<AsyncMutex<()>>>> = Mutex::new(HashMap::new());
 }
 
-type EthTxFut = Box<dyn Future<Item = SignedEthTx, Error = String> + Send + 'static>;
+type EthTxFut = Box<dyn Future<Item = SignedEthTx, Error = TransactionErr> + Send + 'static>;
 
 async fn sign_and_send_transaction_impl(
     ctx: MmArc,
@@ -1295,32 +1383,22 @@ async fn sign_and_send_transaction_impl(
     action: Action,
     data: Vec<u8>,
     gas: U256,
-) -> Result<SignedEthTx, String> {
+) -> Result<SignedEthTx, TransactionErr> {
     let mut status = ctx.log.status_handle();
     macro_rules! tags {
         () => {
             &[&"sign-and-send"]
         };
     }
-    let _nonce_lock = NONCE_LOCK
-        .lock(|start, now| {
-            if ctx.is_stopping() {
-                return ERR!("MM is stopping, aborting sign_and_send_transaction_impl in NONCE_LOCK");
-            }
-            if start < now {
-                status.status(tags!(), "Waiting for NONCE_LOCK…")
-            }
-            Ok(0.5)
-        })
-        .await;
+    let _nonce_lock = coin.nonce_lock.lock().await;
     status.status(tags!(), "get_addr_nonce…");
-    let nonce = try_s!(
+    let nonce = try_tx_s!(
         get_addr_nonce(coin.my_address, coin.web3_instances.clone())
             .compat()
             .await
     );
     status.status(tags!(), "get_gas_price…");
-    let gas_price = try_s!(coin.get_gas_price().compat().await);
+    let gas_price = try_tx_s!(coin.get_gas_price().compat().await);
     let tx = UnSignedEthTx {
         nonce,
         gas_price,
@@ -1332,14 +1410,17 @@ async fn sign_and_send_transaction_impl(
     let signed = tx.sign(coin.key_pair.secret(), coin.chain_id);
     let bytes = web3::types::Bytes(rlp::encode(&signed).to_vec());
     status.status(tags!(), "send_raw_transaction…");
-    try_s!(
+
+    try_tx_s!(
         coin.web3
             .eth()
             .send_raw_transaction(bytes)
             .map_err(|e| ERRL!("{}", e))
             .compat()
-            .await
+            .await,
+        signed
     );
+
     status.status(tags!(), "get_addr_nonce…");
     loop {
         // Check every second till ETH nodes recognize that nonce is increased
@@ -1352,7 +1433,7 @@ async fn sign_and_send_transaction_impl(
         {
             Ok(n) => n,
             Err(e) => {
-                log!("Error " [e] " getting " [coin.ticker()] " " [coin.my_address] " nonce");
+                error!("Error getting {} {} nonce: {}", coin.ticker(), coin.my_address, e);
                 // we can just keep looping in case of error hoping it will go away
                 continue;
             },
@@ -1691,23 +1772,15 @@ impl EthCoin {
                     coin: self.ticker.clone(),
                     fee_details: fee_details.map(|d| d.into()),
                     block_height: trace.block_number,
-                    tx_hash: BytesJson(raw.hash.to_vec()),
+                    tx_hash: format!("{:02x}", BytesJson(raw.hash.to_vec())),
                     tx_hex: BytesJson(rlp::encode(&raw)),
                     internal_id,
                     timestamp: block.timestamp.into(),
                     kmd_rewards: None,
+                    transaction_type: Default::default(),
                 };
 
                 existing_history.push(details);
-                existing_history.sort_unstable_by(|a, b| {
-                    if a.block_height == 0 {
-                        Ordering::Less
-                    } else if b.block_height == 0 {
-                        Ordering::Greater
-                    } else {
-                        b.block_height.cmp(&a.block_height)
-                    }
-                });
 
                 if let Err(e) = self.save_history_to_file(ctx, existing_history.clone()).compat().await {
                     ctx.log.log(
@@ -2065,23 +2138,16 @@ impl EthCoin {
                     coin: self.ticker.clone(),
                     fee_details: fee_details.map(|d| d.into()),
                     block_height: block_number.into(),
-                    tx_hash: BytesJson(raw.hash.to_vec()),
+                    tx_hash: format!("{:02x}", BytesJson(raw.hash.to_vec())),
                     tx_hex: BytesJson(rlp::encode(&raw)),
                     internal_id: BytesJson(internal_id.to_vec()),
                     timestamp: block.timestamp.into(),
                     kmd_rewards: None,
+                    transaction_type: Default::default(),
                 };
 
                 existing_history.push(details);
-                existing_history.sort_unstable_by(|a, b| {
-                    if a.block_height == 0 {
-                        Ordering::Less
-                    } else if b.block_height == 0 {
-                        Ordering::Greater
-                    } else {
-                        b.block_height.cmp(&a.block_height)
-                    }
-                });
+
                 if let Err(e) = self.save_history_to_file(ctx, existing_history).compat().await {
                     ctx.log.log(
                         "",
@@ -2113,7 +2179,7 @@ impl EthCoin {
 #[cfg_attr(test, mockable)]
 impl EthCoin {
     fn sign_and_send_transaction(&self, value: U256, action: Action, data: Vec<u8>, gas: U256) -> EthTxFut {
-        let ctx = try_fus!(MmArc::from_weak(&self.ctx).ok_or("!ctx"));
+        let ctx = try_tx_fus!(MmArc::from_weak(&self.ctx).ok_or("!ctx"));
         let fut = Box::pin(sign_and_send_transaction_impl(
             ctx,
             self.clone(),
@@ -2132,9 +2198,9 @@ impl EthCoin {
                 platform: _,
                 token_addr,
             } => {
-                let abi = try_fus!(Contract::load(ERC20_ABI.as_bytes()));
-                let function = try_fus!(abi.function("transfer"));
-                let data = try_fus!(function.encode_input(&[Token::Address(address), Token::Uint(value)]));
+                let abi = try_tx_fus!(Contract::load(ERC20_ABI.as_bytes()));
+                let function = try_tx_fus!(abi.function("transfer"));
+                let data = try_tx_fus!(function.encode_input(&[Token::Address(address), Token::Uint(value)]));
                 self.sign_and_send_transaction(0.into(), Action::Call(*token_addr), data, U256::from(210_000))
             },
         }
@@ -2151,8 +2217,8 @@ impl EthCoin {
     ) -> EthTxFut {
         match &self.coin_type {
             EthCoinType::Eth => {
-                let function = try_fus!(SWAP_CONTRACT.function("ethPayment"));
-                let data = try_fus!(function.encode_input(&[
+                let function = try_tx_fus!(SWAP_CONTRACT.function("ethPayment"));
+                let data = try_tx_fus!(function.encode_input(&[
                     Token::FixedBytes(id),
                     Token::Address(receiver_addr),
                     Token::FixedBytes(secret_hash.to_vec()),
@@ -2164,10 +2230,12 @@ impl EthCoin {
                 platform: _,
                 token_addr,
             } => {
-                let allowance_fut = self.allowance(swap_contract_address).map_err(|e| ERRL!("{}", e));
+                let allowance_fut = self
+                    .allowance(swap_contract_address)
+                    .map_err(|e| TransactionErr::Plain(ERRL!("{}", e)));
 
-                let function = try_fus!(SWAP_CONTRACT.function("erc20Payment"));
-                let data = try_fus!(function.encode_input(&[
+                let function = try_tx_fus!(SWAP_CONTRACT.function("erc20Payment"));
+                let data = try_tx_fus!(function.encode_input(&[
                     Token::FixedBytes(id),
                     Token::Uint(value),
                     Token::Address(*token_addr),
@@ -2209,144 +2277,160 @@ impl EthCoin {
         swap_contract_address: Address,
         secret: &[u8],
     ) -> EthTxFut {
-        let spend_func = try_fus!(SWAP_CONTRACT.function("receiverSpend"));
+        let spend_func = try_tx_fus!(SWAP_CONTRACT.function("receiverSpend"));
         let clone = self.clone();
         let secret_vec = secret.to_vec();
 
         match self.coin_type {
             EthCoinType::Eth => {
-                let payment_func = try_fus!(SWAP_CONTRACT.function("ethPayment"));
-                let decoded = try_fus!(payment_func.decode_input(&payment.data));
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("ethPayment"));
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
 
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
-                Box::new(state_f.and_then(move |state| -> EthTxFut {
-                    if state != PAYMENT_STATE_SENT.into() {
-                        return Box::new(futures01::future::err(ERRL!(
-                            "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
-                            payment,
-                            state
-                        )));
-                    }
+                Box::new(
+                    state_f
+                        .map_err(TransactionErr::Plain)
+                        .and_then(move |state| -> EthTxFut {
+                            if state != PAYMENT_STATE_SENT.into() {
+                                return Box::new(futures01::future::err(TransactionErr::Plain(ERRL!(
+                                    "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
+                                    payment,
+                                    state
+                                ))));
+                            }
 
-                    let value = payment.value;
-                    let data = try_fus!(spend_func.encode_input(&[
-                        decoded[0].clone(),
-                        Token::Uint(value),
-                        Token::FixedBytes(secret_vec),
-                        Token::Address(Address::default()),
-                        Token::Address(payment.sender()),
-                    ]));
-
-                    clone.sign_and_send_transaction(
-                        0.into(),
-                        Action::Call(swap_contract_address),
-                        data,
-                        U256::from(150_000),
-                    )
-                }))
+                            let value = payment.value;
+                            let data = try_tx_fus!(spend_func.encode_input(&[
+                                decoded[0].clone(),
+                                Token::Uint(value),
+                                Token::FixedBytes(secret_vec),
+                                Token::Address(Address::default()),
+                                Token::Address(payment.sender()),
+                            ]));
+
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(150_000),
+                            )
+                        }),
+                )
             },
             EthCoinType::Erc20 {
                 platform: _,
                 token_addr,
             } => {
-                let payment_func = try_fus!(SWAP_CONTRACT.function("erc20Payment"));
-                let decoded = try_fus!(payment_func.decode_input(&payment.data));
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("erc20Payment"));
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
 
-                Box::new(state_f.and_then(move |state| -> EthTxFut {
-                    if state != PAYMENT_STATE_SENT.into() {
-                        return Box::new(futures01::future::err(ERRL!(
-                            "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
-                            payment,
-                            state
-                        )));
-                    }
-                    let data = try_fus!(spend_func.encode_input(&[
-                        decoded[0].clone(),
-                        decoded[1].clone(),
-                        Token::FixedBytes(secret_vec),
-                        Token::Address(token_addr),
-                        Token::Address(payment.sender()),
-                    ]));
-
-                    clone.sign_and_send_transaction(
-                        0.into(),
-                        Action::Call(swap_contract_address),
-                        data,
-                        U256::from(150_000),
-                    )
-                }))
+                Box::new(
+                    state_f
+                        .map_err(TransactionErr::Plain)
+                        .and_then(move |state| -> EthTxFut {
+                            if state != PAYMENT_STATE_SENT.into() {
+                                return Box::new(futures01::future::err(TransactionErr::Plain(ERRL!(
+                                    "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
+                                    payment,
+                                    state
+                                ))));
+                            }
+                            let data = try_tx_fus!(spend_func.encode_input(&[
+                                decoded[0].clone(),
+                                decoded[1].clone(),
+                                Token::FixedBytes(secret_vec),
+                                Token::Address(token_addr),
+                                Token::Address(payment.sender()),
+                            ]));
+
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(150_000),
+                            )
+                        }),
+                )
             },
         }
     }
 
     fn refund_hash_time_locked_payment(&self, swap_contract_address: Address, payment: SignedEthTx) -> EthTxFut {
-        let refund_func = try_fus!(SWAP_CONTRACT.function("senderRefund"));
+        let refund_func = try_tx_fus!(SWAP_CONTRACT.function("senderRefund"));
         let clone = self.clone();
 
         match self.coin_type {
             EthCoinType::Eth => {
-                let payment_func = try_fus!(SWAP_CONTRACT.function("ethPayment"));
-                let decoded = try_fus!(payment_func.decode_input(&payment.data));
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("ethPayment"));
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
 
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
-                Box::new(state_f.and_then(move |state| -> EthTxFut {
-                    if state != PAYMENT_STATE_SENT.into() {
-                        return Box::new(futures01::future::err(ERRL!(
-                            "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
-                            payment,
-                            state
-                        )));
-                    }
+                Box::new(
+                    state_f
+                        .map_err(TransactionErr::Plain)
+                        .and_then(move |state| -> EthTxFut {
+                            if state != PAYMENT_STATE_SENT.into() {
+                                return Box::new(futures01::future::err(TransactionErr::Plain(ERRL!(
+                                    "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
+                                    payment,
+                                    state
+                                ))));
+                            }
 
-                    let value = payment.value;
-                    let data = try_fus!(refund_func.encode_input(&[
-                        decoded[0].clone(),
-                        Token::Uint(value),
-                        decoded[2].clone(),
-                        Token::Address(Address::default()),
-                        decoded[1].clone(),
-                    ]));
-
-                    clone.sign_and_send_transaction(
-                        0.into(),
-                        Action::Call(swap_contract_address),
-                        data,
-                        U256::from(150_000),
-                    )
-                }))
+                            let value = payment.value;
+                            let data = try_tx_fus!(refund_func.encode_input(&[
+                                decoded[0].clone(),
+                                Token::Uint(value),
+                                decoded[2].clone(),
+                                Token::Address(Address::default()),
+                                decoded[1].clone(),
+                            ]));
+
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(150_000),
+                            )
+                        }),
+                )
             },
             EthCoinType::Erc20 {
                 platform: _,
                 token_addr,
             } => {
-                let payment_func = try_fus!(SWAP_CONTRACT.function("erc20Payment"));
-                let decoded = try_fus!(payment_func.decode_input(&payment.data));
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("erc20Payment"));
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
-                Box::new(state_f.and_then(move |state| -> EthTxFut {
-                    if state != PAYMENT_STATE_SENT.into() {
-                        return Box::new(futures01::future::err(ERRL!(
-                            "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
-                            payment,
-                            state
-                        )));
-                    }
+                Box::new(
+                    state_f
+                        .map_err(TransactionErr::Plain)
+                        .and_then(move |state| -> EthTxFut {
+                            if state != PAYMENT_STATE_SENT.into() {
+                                return Box::new(futures01::future::err(TransactionErr::Plain(ERRL!(
+                                    "Payment {:?} state is not PAYMENT_STATE_SENT, got {}",
+                                    payment,
+                                    state
+                                ))));
+                            }
 
-                    let data = try_fus!(refund_func.encode_input(&[
-                        decoded[0].clone(),
-                        decoded[1].clone(),
-                        decoded[4].clone(),
-                        Token::Address(token_addr),
-                        decoded[3].clone(),
-                    ]));
-
-                    clone.sign_and_send_transaction(
-                        0.into(),
-                        Action::Call(swap_contract_address),
-                        data,
-                        U256::from(150_000),
-                    )
-                }))
+                            let data = try_tx_fus!(refund_func.encode_input(&[
+                                decoded[0].clone(),
+                                decoded[1].clone(),
+                                decoded[4].clone(),
+                                Token::Address(token_addr),
+                                decoded[3].clone(),
+                            ]));
+
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(150_000),
+                            )
+                        }),
+                )
             },
         }
     }
@@ -2466,13 +2550,13 @@ impl EthCoin {
         let coin = self.clone();
         let fut = async move {
             let token_addr = match coin.coin_type {
-                EthCoinType::Eth => return ERR!("'approve' is expected to be call for ERC20 coins only"),
+                EthCoinType::Eth => return TX_PLAIN_ERR!("'approve' is expected to be call for ERC20 coins only"),
                 EthCoinType::Erc20 { token_addr, .. } => token_addr,
             };
-            let function = try_s!(ERC20_CONTRACT.function("approve"));
-            let data = try_s!(function.encode_input(&[Token::Address(spender), Token::Uint(amount)]));
+            let function = try_tx_s!(ERC20_CONTRACT.function("approve"));
+            let data = try_tx_s!(function.encode_input(&[Token::Address(spender), Token::Uint(amount)]));
 
-            let gas_limit = try_s!(
+            let gas_limit = try_tx_s!(
                 coin.estimate_gas_for_contract_call(token_addr, Bytes::from(data.clone()))
                     .compat()
                     .await
@@ -2481,7 +2565,6 @@ impl EthCoin {
             coin.sign_and_send_transaction(0.into(), Action::Call(token_addr), data, gas_limit)
                 .compat()
                 .await
-                .map_err(|e| ERRL!("{}", e))
         };
         Box::new(fut.boxed().compat())
     }
@@ -2687,7 +2770,7 @@ impl EthCoin {
         )
     }
 
-    fn search_for_swap_tx_spend(
+    async fn search_for_swap_tx_spend(
         &self,
         tx: &[u8],
         swap_contract_address: Address,
@@ -2708,7 +2791,7 @@ impl EthCoin {
             _ => panic!(),
         };
 
-        let mut current_block = try_s!(self.current_block().wait());
+        let mut current_block = try_s!(self.current_block().compat().await);
         if current_block < search_from_block {
             current_block = search_from_block;
         }
@@ -2718,19 +2801,26 @@ impl EthCoin {
         loop {
             let to_block = current_block.min(from_block + self.logs_block_range);
 
-            let spend_events = try_s!(self.spend_events(swap_contract_address, from_block, to_block).wait());
+            let spend_events = try_s!(
+                self.spend_events(swap_contract_address, from_block, to_block)
+                    .compat()
+                    .await
+            );
             let found = spend_events.iter().find(|event| &event.data.0[..32] == id.as_slice());
 
             if let Some(event) = found {
                 match event.transaction_hash {
                     Some(tx_hash) => {
-                        let transaction = match try_s!(self.web3.eth().transaction(TransactionId::Hash(tx_hash)).wait())
-                        {
-                            Some(t) => t,
-                            None => {
-                                return ERR!("Found ReceiverSpent event, but transaction {:02x} is missing", tx_hash)
-                            },
-                        };
+                        let transaction =
+                            match try_s!(self.web3.eth().transaction(TransactionId::Hash(tx_hash)).compat().await) {
+                                Some(t) => t,
+                                None => {
+                                    return ERR!(
+                                        "Found ReceiverSpent event, but transaction {:02x} is missing",
+                                        tx_hash
+                                    )
+                                },
+                            };
 
                         return Ok(Some(FoundSwapTxSpend::Spent(TransactionEnum::from(try_s!(
                             signed_tx_from_web3_tx(transaction)
@@ -2740,19 +2830,26 @@ impl EthCoin {
                 }
             }
 
-            let refund_events = try_s!(self.refund_events(swap_contract_address, from_block, to_block).wait());
+            let refund_events = try_s!(
+                self.refund_events(swap_contract_address, from_block, to_block)
+                    .compat()
+                    .await
+            );
             let found = refund_events.iter().find(|event| &event.data.0[..32] == id.as_slice());
 
             if let Some(event) = found {
                 match event.transaction_hash {
                     Some(tx_hash) => {
-                        let transaction = match try_s!(self.web3.eth().transaction(TransactionId::Hash(tx_hash)).wait())
-                        {
-                            Some(t) => t,
-                            None => {
-                                return ERR!("Found SenderRefunded event, but transaction {:02x} is missing", tx_hash)
-                            },
-                        };
+                        let transaction =
+                            match try_s!(self.web3.eth().transaction(TransactionId::Hash(tx_hash)).compat().await) {
+                                Some(t) => t,
+                                None => {
+                                    return ERR!(
+                                        "Found SenderRefunded event, but transaction {:02x} is missing",
+                                        tx_hash
+                                    )
+                                },
+                            };
 
                         return Ok(Some(FoundSwapTxSpend::Refunded(TransactionEnum::from(try_s!(
                             signed_tx_from_web3_tx(transaction)
@@ -2852,12 +2949,16 @@ impl EthTxFeeDetails {
     }
 }
 
+#[async_trait]
 impl MmCoin for EthCoin {
     fn is_asset_chain(&self) -> bool { false }
 
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(get_raw_transaction_impl(self.clone(), req).boxed().compat())
+    }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
-        let ctx = try_f!(MmArc::from_weak(&self.ctx).or_mm_err(|| WithdrawError::InternalError("!ctx".to_owned())));
-        Box::new(Box::pin(withdraw_impl(ctx, self.clone(), req)).compat())
+        Box::new(Box::pin(withdraw_impl(self.clone(), req)).compat())
     }
 
     fn decimals(&self) -> u8 { self.decimals }
@@ -2926,58 +3027,57 @@ impl MmCoin for EthCoin {
         )
     }
 
-    fn get_sender_trade_fee(&self, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
-        let coin = self.clone();
-        let fut = async move {
-            let gas_price = coin.get_gas_price().compat().await?;
-            let gas_price = increase_gas_price_by_stage(gas_price, &stage);
-            let gas_limit = match coin.coin_type {
-                EthCoinType::Eth => {
-                    // this gas_limit includes gas for `ethPayment` and `senderRefund` contract calls
-                    U256::from(300_000)
-                },
-                EthCoinType::Erc20 { token_addr, .. } => {
-                    let value = match value {
-                        TradePreimageValue::Exact(value) | TradePreimageValue::UpperBound(value) => {
-                            wei_from_big_decimal(&value, coin.decimals)?
-                        },
-                    };
-                    let allowed = coin.allowance(coin.swap_contract_address).compat().await?;
-                    if allowed < value {
-                        // estimate gas for the `approve` contract call
-
-                        // Pass a dummy spender. Let's use `my_address`.
-                        let spender = coin.my_address;
-                        let approve_function = ERC20_CONTRACT.function("approve")?;
-                        let approve_data =
-                            approve_function.encode_input(&[Token::Address(spender), Token::Uint(value)])?;
-                        let approve_gas_limit = coin
-                            .estimate_gas_for_contract_call(token_addr, Bytes::from(approve_data))
-                            .compat()
-                            .await?;
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        let gas_price = self.get_gas_price().compat().await?;
+        let gas_price = increase_gas_price_by_stage(gas_price, &stage);
+        let gas_limit = match self.coin_type {
+            EthCoinType::Eth => {
+                // this gas_limit includes gas for `ethPayment` and `senderRefund` contract calls
+                U256::from(300_000)
+            },
+            EthCoinType::Erc20 { token_addr, .. } => {
+                let value = match value {
+                    TradePreimageValue::Exact(value) | TradePreimageValue::UpperBound(value) => {
+                        wei_from_big_decimal(&value, self.decimals)?
+                    },
+                };
+                let allowed = self.allowance(self.swap_contract_address).compat().await?;
+                if allowed < value {
+                    // estimate gas for the `approve` contract call
+
+                    // Pass a dummy spender. Let's use `my_address`.
+                    let spender = self.my_address;
+                    let approve_function = ERC20_CONTRACT.function("approve")?;
+                    let approve_data = approve_function.encode_input(&[Token::Address(spender), Token::Uint(value)])?;
+                    let approve_gas_limit = self
+                        .estimate_gas_for_contract_call(token_addr, Bytes::from(approve_data))
+                        .compat()
+                        .await?;
 
-                        // this gas_limit includes gas for `approve`, `erc20Payment` and `senderRefund` contract calls
-                        U256::from(300_000) + approve_gas_limit
-                    } else {
-                        // this gas_limit includes gas for `erc20Payment` and `senderRefund` contract calls
-                        U256::from(300_000)
-                    }
-                },
-            };
+                    // this gas_limit includes gas for `approve`, `erc20Payment` and `senderRefund` contract calls
+                    U256::from(300_000) + approve_gas_limit
+                } else {
+                    // this gas_limit includes gas for `erc20Payment` and `senderRefund` contract calls
+                    U256::from(300_000)
+                }
+            },
+        };
 
-            let total_fee = gas_limit * gas_price;
-            let amount = u256_to_big_decimal(total_fee, 18)?;
-            let fee_coin = match &coin.coin_type {
-                EthCoinType::Eth => &coin.ticker,
-                EthCoinType::Erc20 { platform, .. } => platform,
-            };
-            Ok(TradeFee {
-                coin: fee_coin.into(),
-                amount: amount.into(),
-                paid_from_trading_vol: false,
-            })
+        let total_fee = gas_limit * gas_price;
+        let amount = u256_to_big_decimal(total_fee, 18)?;
+        let fee_coin = match &self.coin_type {
+            EthCoinType::Eth => &self.ticker,
+            EthCoinType::Erc20 { platform, .. } => platform,
         };
-        Box::new(fut.boxed().compat())
+        Ok(TradeFee {
+            coin: fee_coin.into(),
+            amount: amount.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
     fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
@@ -3000,65 +3100,61 @@ impl MmCoin for EthCoin {
         Box::new(fut.boxed().compat())
     }
 
-    fn get_fee_to_send_taker_fee(
+    async fn get_fee_to_send_taker_fee(
         &self,
         dex_fee_amount: BigDecimal,
         stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee> {
-        let coin = self.clone();
-        let fut = async move {
-            let dex_fee_amount = wei_from_big_decimal(&dex_fee_amount, coin.decimals)?;
-
-            // pass the dummy params
-            let to_addr = addr_from_raw_pubkey(&DEX_FEE_ADDR_RAW_PUBKEY)
-                .expect("addr_from_raw_pubkey should never fail with DEX_FEE_ADDR_RAW_PUBKEY");
-            let (eth_value, data, call_addr, fee_coin) = match &coin.coin_type {
-                EthCoinType::Eth => (dex_fee_amount, Vec::new(), &to_addr, &coin.ticker),
-                EthCoinType::Erc20 { platform, token_addr } => {
-                    let function = ERC20_CONTRACT.function("transfer")?;
-                    let data = function.encode_input(&[Token::Address(to_addr), Token::Uint(dex_fee_amount)])?;
-                    (0.into(), data, token_addr, platform)
-                },
-            };
-
-            let gas_price = coin.get_gas_price().compat().await?;
-            let gas_price = increase_gas_price_by_stage(gas_price, &stage);
-            let estimate_gas_req = CallRequest {
-                value: Some(eth_value),
-                data: Some(data.clone().into()),
-                from: Some(coin.my_address),
-                to: *call_addr,
-                gas: None,
-                // gas price must be supplied because some smart contracts base their
-                // logic on gas price, e.g. TUSD: https://github.com/KomodoPlatform/atomicDEX-API/issues/643
-                gas_price: Some(gas_price),
-            };
+    ) -> TradePreimageResult<TradeFee> {
+        let dex_fee_amount = wei_from_big_decimal(&dex_fee_amount, self.decimals)?;
+
+        // pass the dummy params
+        let to_addr = addr_from_raw_pubkey(&DEX_FEE_ADDR_RAW_PUBKEY)
+            .expect("addr_from_raw_pubkey should never fail with DEX_FEE_ADDR_RAW_PUBKEY");
+        let (eth_value, data, call_addr, fee_coin) = match &self.coin_type {
+            EthCoinType::Eth => (dex_fee_amount, Vec::new(), &to_addr, &self.ticker),
+            EthCoinType::Erc20 { platform, token_addr } => {
+                let function = ERC20_CONTRACT.function("transfer")?;
+                let data = function.encode_input(&[Token::Address(to_addr), Token::Uint(dex_fee_amount)])?;
+                (0.into(), data, token_addr, platform)
+            },
+        };
 
-            // Please note if the wallet's balance is insufficient to withdraw, then `estimate_gas` may fail with the `Exception` error.
-            // Ideally we should determine the case when we have the insufficient balance and return `TradePreimageError::NotSufficientBalance` error.
-            let gas_limit = coin.estimate_gas(estimate_gas_req).compat().await?;
-            let total_fee = gas_limit * gas_price;
-            let amount = u256_to_big_decimal(total_fee, 18)?;
-            Ok(TradeFee {
-                coin: fee_coin.into(),
-                amount: amount.into(),
-                paid_from_trading_vol: false,
-            })
+        let gas_price = self.get_gas_price().compat().await?;
+        let gas_price = increase_gas_price_by_stage(gas_price, &stage);
+        let estimate_gas_req = CallRequest {
+            value: Some(eth_value),
+            data: Some(data.clone().into()),
+            from: Some(self.my_address),
+            to: *call_addr,
+            gas: None,
+            // gas price must be supplied because some smart contracts base their
+            // logic on gas price, e.g. TUSD: https://github.com/KomodoPlatform/atomicDEX-API/issues/643
+            gas_price: Some(gas_price),
         };
-        Box::new(fut.boxed().compat())
+
+        // Please note if the wallet's balance is insufficient to withdraw, then `estimate_gas` may fail with the `Exception` error.
+        // Ideally we should determine the case when we have the insufficient balance and return `TradePreimageError::NotSufficientBalance` error.
+        let gas_limit = self.estimate_gas(estimate_gas_req).compat().await?;
+        let total_fee = gas_limit * gas_price;
+        let amount = u256_to_big_decimal(total_fee, 18)?;
+        Ok(TradeFee {
+            coin: fee_coin.into(),
+            amount: amount.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
-    fn required_confirmations(&self) -> u64 { self.required_confirmations.load(AtomicOrderding::Relaxed) }
+    fn required_confirmations(&self) -> u64 { self.required_confirmations.load(AtomicOrdering::Relaxed) }
 
     fn requires_notarization(&self) -> bool { false }
 
     fn set_required_confirmations(&self, confirmations: u64) {
         self.required_confirmations
-            .store(confirmations, AtomicOrderding::Relaxed);
+            .store(confirmations, AtomicOrdering::Relaxed);
     }
 
     fn set_requires_notarization(&self, _requires_nota: bool) {
-        log!("Warning: set_requires_notarization doesn't take any effect on ETH/ERC20 coins");
+        warn!("set_requires_notarization doesn't take any effect on ETH/ERC20 coins");
     }
 
     fn swap_contract_address(&self) -> Option<BytesJson> {
@@ -3256,6 +3352,9 @@ fn rpc_event_handlers_for_eth_transport(ctx: &MmArc, ticker: String) -> Vec<RpcT
     vec![CoinTransportMetrics::new(metrics, ticker, RpcClientType::Ethereum).into_shared()]
 }
 
+#[inline]
+fn new_nonce_lock() -> Arc<AsyncMutex<()>> { Arc::new(AsyncMutex::new(())) }
+
 pub async fn eth_coin_from_conf_and_request(
     ctx: &MmArc,
     ticker: &str,
@@ -3297,7 +3396,7 @@ pub async fn eth_coin_from_conf_and_request(
         let version = match web3.web3().client_version().compat().await {
             Ok(v) => v,
             Err(e) => {
-                log!("Couldn't get client version for url " (url) ", " (e));
+                error!("Couldn't get client version for url {}: {}", url, e);
                 continue;
             },
         };
@@ -3337,9 +3436,11 @@ pub async fn eth_coin_from_conf_and_request(
         .into();
 
     if req["requires_notarization"].as_bool().is_some() {
-        log!("Warning: requires_notarization doesn't take any effect on ETH/ERC20 coins");
+        warn!("requires_notarization doesn't take any effect on ETH/ERC20 coins");
     }
 
+    let sign_message_prefix: Option<String> = json::from_value(conf["sign_message_prefix"].clone()).unwrap_or(None);
+
     let initial_history_state = if req["tx_history"].as_bool().unwrap_or(false) {
         HistorySyncState::NotStarted
     } else {
@@ -3350,10 +3451,20 @@ pub async fn eth_coin_from_conf_and_request(
     let gas_station_policy: GasStationPricePolicy =
         json::from_value(req["gas_station_policy"].clone()).unwrap_or_default();
 
+    let key_lock = match &coin_type {
+        EthCoinType::Eth => String::from(ticker),
+        EthCoinType::Erc20 { ref platform, .. } => String::from(platform),
+    };
+
+    let mut map = NONCE_LOCK.lock().unwrap();
+
+    let nonce_lock = map.entry(key_lock).or_insert_with(new_nonce_lock).clone();
+
     let coin = EthCoinImpl {
         key_pair,
         my_address,
         coin_type,
+        sign_message_prefix,
         swap_contract_address,
         fallback_swap_contract,
         decimals,
@@ -3368,6 +3479,7 @@ pub async fn eth_coin_from_conf_and_request(
         required_confirmations,
         chain_id: conf["chain_id"].as_u64(),
         logs_block_range: conf["logs_block_range"].as_u64().unwrap_or(DEFAULT_LOGS_BLOCK_RANGE),
+        nonce_lock,
     };
     Ok(EthCoin(Arc::new(coin)))
 }
@@ -3381,8 +3493,8 @@ fn checksum_address(addr: &str) -> String {
     }
 
     let mut hasher = Keccak256::default();
-    hasher.input(&addr);
-    let hash = hasher.result();
+    hasher.update(&addr);
+    let hash = hasher.finalize();
     let mut result: String = "0x".into();
     for (i, c) in addr.chars().enumerate() {
         if c.is_digit(10) {
@@ -3435,7 +3547,7 @@ fn get_addr_nonce(addr: Address, web3s: Vec<Web3Instance>) -> Box<dyn Future<Ite
                 .filter_map(|nonce_res| match nonce_res {
                     Ok(n) => Some(n),
                     Err(e) => {
-                        log!("Error " (e) " when getting nonce for addr " [addr]);
+                        error!("Error getting nonce for addr {:?}: {}", addr, e);
                         None
                     },
                 })
@@ -3452,7 +3564,7 @@ fn get_addr_nonce(addr: Address, web3s: Vec<Web3Instance>) -> Box<dyn Future<Ite
                 if max == min {
                     return Ok(*max);
                 } else {
-                    log!("Max nonce " (max) " != " (min) " min nonce");
+                    warn!("Max nonce {} != {} min nonce", max, min);
                 }
             }
             Timer::sleep(1.).await
diff --git a/mm2src/coins/eth/eth_tests.rs b/mm2src/coins/eth/eth_tests.rs
index b05d765cb9..46070326c8 100644
--- a/mm2src/coins/eth/eth_tests.rs
+++ b/mm2src/coins/eth/eth_tests.rs
@@ -1,6 +1,6 @@
 use super::*;
 use common::block_on;
-use common::mm_ctx::{MmArc, MmCtxBuilder};
+use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
 use mocktopus::mocking::*;
 
 /// The gas price for the tests
@@ -48,6 +48,7 @@ fn eth_coin_for_test(
         history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
         gas_station_policy: GasStationPricePolicy::MeanAverageFast,
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
         fallback_swap_contract,
@@ -61,6 +62,7 @@ fn eth_coin_for_test(
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     }));
     (ctx, eth_coin)
 }
@@ -210,6 +212,7 @@ fn send_and_refund_erc20_payment() {
             token_addr: Address::from("0xc0eb7AeD740E1796992A08962c15661bDEB58003"),
         },
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
         fallback_swap_contract: None,
@@ -227,6 +230,7 @@ fn send_and_refund_erc20_payment() {
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     }));
 
     let payment = coin
@@ -236,11 +240,12 @@ fn send_and_refund_erc20_payment() {
             &[1; 20],
             "0.001".parse().unwrap(),
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
 
-    log!([payment]);
+    log!("{:?}", payment);
 
     block_on(Timer::sleep(60.));
 
@@ -251,11 +256,12 @@ fn send_and_refund_erc20_payment() {
             &DEX_FEE_ADDR_RAW_PUBKEY,
             &[1; 20],
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
 
-    log!([refund]);
+    log!("{:?}", refund);
 }
 
 #[test]
@@ -273,6 +279,7 @@ fn send_and_refund_eth_payment() {
         ticker: "ETH".into(),
         coin_type: EthCoinType::Eth,
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
         fallback_swap_contract: None,
@@ -290,6 +297,7 @@ fn send_and_refund_eth_payment() {
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     }));
 
     let payment = coin
@@ -299,11 +307,12 @@ fn send_and_refund_eth_payment() {
             &[1; 20],
             "0.001".parse().unwrap(),
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
 
-    log!([payment]);
+    log!("{:?}", payment);
 
     block_on(Timer::sleep(60.));
 
@@ -314,11 +323,12 @@ fn send_and_refund_eth_payment() {
             &DEX_FEE_ADDR_RAW_PUBKEY,
             &[1; 20],
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
 
-    log!([refund]);
+    log!("{:?}", refund);
 }
 
 #[test]
@@ -345,6 +355,7 @@ fn test_nonce_several_urls() {
         ticker: "ETH".into(),
         coin_type: EthCoinType::Eth,
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
         fallback_swap_contract: None,
@@ -372,17 +383,18 @@ fn test_nonce_several_urls() {
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     }));
 
-    log!("My address "[coin.my_address]);
+    log!("My address {:?}", coin.my_address);
     log!("before payment");
     let payment = coin.send_to_address(coin.my_address, 200000000.into()).wait().unwrap();
 
-    log!([payment]);
+    log!("{:?}", payment);
     let new_nonce = get_addr_nonce(coin.my_address, coin.web3_instances.clone())
         .wait()
         .unwrap();
-    log!([new_nonce]);
+    log!("{:?}", new_nonce);
 }
 
 #[test]
@@ -406,6 +418,7 @@ fn test_wait_for_payment_spend_timeout() {
         gas_station_policy: GasStationPricePolicy::MeanAverageFast,
         history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
         fallback_swap_contract: None,
@@ -419,6 +432,7 @@ fn test_wait_for_payment_spend_timeout() {
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     };
 
     let coin = EthCoin(Arc::new(coin));
@@ -466,6 +480,7 @@ fn test_search_for_swap_tx_spend_was_spent() {
         gas_station_policy: GasStationPricePolicy::MeanAverageFast,
         history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address,
         fallback_swap_contract: None,
@@ -479,6 +494,7 @@ fn test_search_for_swap_tx_spend_was_spent() {
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     }));
 
     // raw transaction bytes of https://ropsten.etherscan.io/tx/0xb1c987e2ac79581bb8718267b5cb49a18274890494299239d1d0dfdb58d6d76a
@@ -509,8 +525,7 @@ fn test_search_for_swap_tx_spend_was_spent() {
     ];
     let spend_tx = FoundSwapTxSpend::Spent(signed_eth_tx_from_bytes(&spend_tx).unwrap().into());
 
-    let found_tx = coin
-        .search_for_swap_tx_spend(&payment_tx, swap_contract_address, 6051857)
+    let found_tx = block_on(coin.search_for_swap_tx_spend(&payment_tx, swap_contract_address, 6051857))
         .unwrap()
         .unwrap();
     assert_eq!(spend_tx, found_tx);
@@ -574,6 +589,7 @@ fn test_search_for_swap_tx_spend_was_refunded() {
         gas_station_policy: GasStationPricePolicy::MeanAverageFast,
         history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address,
         fallback_swap_contract: None,
@@ -587,6 +603,7 @@ fn test_search_for_swap_tx_spend_was_refunded() {
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     }));
 
     // raw transaction bytes of https://ropsten.etherscan.io/tx/0xe18bbca69dea9a4624e1f5b0b2021d5fe4c8daa03f36084a8ba011b08e5cd938
@@ -618,8 +635,7 @@ fn test_search_for_swap_tx_spend_was_refunded() {
     ];
     let refund_tx = FoundSwapTxSpend::Refunded(signed_eth_tx_from_bytes(&refund_tx).unwrap().into());
 
-    let found_tx = coin
-        .search_for_swap_tx_spend(&payment_tx, swap_contract_address, 5886908)
+    let found_tx = block_on(coin.search_for_swap_tx_spend(&payment_tx, swap_contract_address, 5886908))
         .unwrap()
         .unwrap();
     assert_eq!(refund_tx, found_tx);
@@ -627,7 +643,7 @@ fn test_search_for_swap_tx_spend_was_refunded() {
 
 #[test]
 fn test_withdraw_impl_manual_fee() {
-    let (ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://dummy.dummy".into()], None);
+    let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://dummy.dummy".into()], None);
 
     EthCoin::my_balance.mock_safe(|_| {
         let balance = wei_from_big_decimal(&1000000000.into(), 18).unwrap();
@@ -637,6 +653,7 @@ fn test_withdraw_impl_manual_fee() {
 
     let withdraw_req = WithdrawRequest {
         amount: 1.into(),
+        from: None,
         to: "0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94".to_string(),
         coin: "ETH".to_string(),
         max: false,
@@ -647,7 +664,7 @@ fn test_withdraw_impl_manual_fee() {
     };
     coin.my_balance().wait().unwrap();
 
-    let tx_details = block_on(withdraw_impl(ctx, coin.clone(), withdraw_req)).unwrap();
+    let tx_details = block_on(withdraw_impl(coin.clone(), withdraw_req)).unwrap();
     let expected = Some(
         EthTxFeeDetails {
             coin: "ETH".into(),
@@ -662,7 +679,7 @@ fn test_withdraw_impl_manual_fee() {
 
 #[test]
 fn test_withdraw_impl_fee_details() {
-    let (ctx, coin) = eth_coin_for_test(
+    let (_ctx, coin) = eth_coin_for_test(
         EthCoinType::Erc20 {
             platform: "ETH".to_string(),
             token_addr: Address::from("0x2b294F029Fde858b2c62184e8390591755521d8E"),
@@ -679,6 +696,7 @@ fn test_withdraw_impl_fee_details() {
 
     let withdraw_req = WithdrawRequest {
         amount: 1.into(),
+        from: None,
         to: "0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94".to_string(),
         coin: "JST".to_string(),
         max: false,
@@ -689,7 +707,7 @@ fn test_withdraw_impl_fee_details() {
     };
     coin.my_balance().wait().unwrap();
 
-    let tx_details = block_on(withdraw_impl(ctx, coin.clone(), withdraw_req)).unwrap();
+    let tx_details = block_on(withdraw_impl(coin.clone(), withdraw_req)).unwrap();
     let expected = Some(
         EthTxFeeDetails {
             coin: "ETH".into(),
@@ -705,8 +723,8 @@ fn test_withdraw_impl_fee_details() {
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_nonce_lock() {
-    use common::for_tests::wait_for_log;
     use futures::future::join_all;
+    use mm2_test_helpers::for_tests::wait_for_log;
 
     // send several transactions concurrently to check that they are not using same nonce
     // using real ETH dev node
@@ -729,7 +747,7 @@ fn test_nonce_lock() {
     // Waiting for NONCE_LOCK… might not appear at all if waiting takes less than 0.5 seconds
     // but all transactions are sent successfully still
     // wait_for_log(&ctx.log, 1.1, &|line| line.contains("Waiting for NONCE_LOCK…")));
-    wait_for_log(&ctx.log, 1.1, &|line| line.contains("get_addr_nonce…")).unwrap();
+    block_on(wait_for_log(&ctx, 1.1, |line| line.contains("get_addr_nonce…"))).unwrap();
 }
 
 #[test]
@@ -766,36 +784,28 @@ fn get_sender_trade_preimage() {
 
     let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://dummy.dummy".into()], None);
 
-    let actual = coin
-        .get_sender_trade_fee(
-            TradePreimageValue::UpperBound(150.into()),
-            FeeApproxStage::WithoutApprox,
-        )
-        .wait()
-        .expect("!get_sender_trade_fee");
+    let actual = block_on(coin.get_sender_trade_fee(
+        TradePreimageValue::UpperBound(150.into()),
+        FeeApproxStage::WithoutApprox,
+    ))
+    .expect("!get_sender_trade_fee");
     let expected = expected_fee(GAS_PRICE);
     assert_eq!(actual, expected);
 
     let value = u256_to_big_decimal(100.into(), 18).expect("!u256_to_big_decimal");
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::OrderIssue)
-        .wait()
+    let actual = block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::OrderIssue))
         .expect("!get_sender_trade_fee");
     let expected = expected_fee(GAS_PRICE_APPROXIMATION_ON_ORDER_ISSUE);
     assert_eq!(actual, expected);
 
     let value = u256_to_big_decimal(1.into(), 18).expect("!u256_to_big_decimal");
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::StartSwap)
-        .wait()
+    let actual = block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::StartSwap))
         .expect("!get_sender_trade_fee");
     let expected = expected_fee(GAS_PRICE_APPROXIMATION_ON_START_SWAP);
     assert_eq!(actual, expected);
 
     let value = u256_to_big_decimal(10000000000u64.into(), 18).expect("!u256_to_big_decimal");
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::TradePreimage)
-        .wait()
+    let actual = block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::TradePreimage))
         .expect("!get_sender_trade_fee");
     let expected = expected_fee(GAS_PRICE_APPROXIMATION_ON_TRADE_PREIMAGE);
     assert_eq!(actual, expected);
@@ -837,20 +847,17 @@ fn get_erc20_sender_trade_preimage() {
     // value is allowed
     unsafe { ALLOWANCE = 1000 };
     let value = u256_to_big_decimal(1000.into(), 18).expect("u256_to_big_decimal");
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::UpperBound(value), FeeApproxStage::WithoutApprox)
-        .wait()
-        .expect("!get_sender_trade_fee");
-    log!([actual.amount.to_decimal()]);
+    let actual =
+        block_on(coin.get_sender_trade_fee(TradePreimageValue::UpperBound(value), FeeApproxStage::WithoutApprox))
+            .expect("!get_sender_trade_fee");
+    log!("{:?}", actual.amount.to_decimal());
     unsafe { assert!(!ESTIMATE_GAS_CALLED) }
     assert_eq!(actual, expected_trade_fee(300_000, GAS_PRICE));
 
     // value is greater than allowance
     unsafe { ALLOWANCE = 999 };
     let value = u256_to_big_decimal(1000.into(), 18).expect("u256_to_big_decimal");
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::UpperBound(value), FeeApproxStage::StartSwap)
-        .wait()
+    let actual = block_on(coin.get_sender_trade_fee(TradePreimageValue::UpperBound(value), FeeApproxStage::StartSwap))
         .expect("!get_sender_trade_fee");
     unsafe {
         assert!(ESTIMATE_GAS_CALLED);
@@ -864,9 +871,7 @@ fn get_erc20_sender_trade_preimage() {
     // value is allowed
     unsafe { ALLOWANCE = 1000 };
     let value = u256_to_big_decimal(999.into(), 18).expect("u256_to_big_decimal");
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::OrderIssue)
-        .wait()
+    let actual = block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::OrderIssue))
         .expect("!get_sender_trade_fee");
     unsafe { assert!(!ESTIMATE_GAS_CALLED) }
     assert_eq!(
@@ -877,9 +882,7 @@ fn get_erc20_sender_trade_preimage() {
     // value is greater than allowance
     unsafe { ALLOWANCE = 1000 };
     let value = u256_to_big_decimal(1500.into(), 18).expect("u256_to_big_decimal");
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::TradePreimage)
-        .wait()
+    let actual = block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(value), FeeApproxStage::TradePreimage))
         .expect("!get_sender_trade_fee");
     unsafe {
         assert!(ESTIMATE_GAS_CALLED);
@@ -930,9 +933,7 @@ fn test_get_fee_to_send_taker_fee() {
     let dex_fee_amount = u256_to_big_decimal(DEX_FEE_AMOUNT.into(), 18).expect("!u256_to_big_decimal");
 
     let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://dummy.dummy".into()], None);
-    let actual = coin
-        .get_fee_to_send_taker_fee(dex_fee_amount.clone(), FeeApproxStage::WithoutApprox)
-        .wait()
+    let actual = block_on(coin.get_fee_to_send_taker_fee(dex_fee_amount.clone(), FeeApproxStage::WithoutApprox))
         .expect("!get_fee_to_send_taker_fee");
     assert_eq!(actual, expected_fee);
 
@@ -944,9 +945,7 @@ fn test_get_fee_to_send_taker_fee() {
         vec!["http://dummy.dummy".into()],
         None,
     );
-    let actual = coin
-        .get_fee_to_send_taker_fee(dex_fee_amount.clone(), FeeApproxStage::WithoutApprox)
-        .wait()
+    let actual = block_on(coin.get_fee_to_send_taker_fee(dex_fee_amount.clone(), FeeApproxStage::WithoutApprox))
         .expect("!get_fee_to_send_taker_fee");
     assert_eq!(actual, expected_fee);
 }
@@ -973,11 +972,9 @@ fn test_get_fee_to_send_taker_fee_insufficient_balance() {
     );
     let dex_fee_amount = u256_to_big_decimal(DEX_FEE_AMOUNT.into(), 18).expect("!u256_to_big_decimal");
 
-    let error = coin
-        .get_fee_to_send_taker_fee(dex_fee_amount.clone(), FeeApproxStage::WithoutApprox)
-        .wait()
-        .unwrap_err();
-    log!((error));
+    let error =
+        block_on(coin.get_fee_to_send_taker_fee(dex_fee_amount.clone(), FeeApproxStage::WithoutApprox)).unwrap_err();
+    log!("{}", error);
     assert!(
         matches!(error.get_inner(), TradePreimageError::NotSufficientBalance { .. }),
         "Expected TradePreimageError::NotSufficientBalance"
@@ -986,7 +983,11 @@ fn test_get_fee_to_send_taker_fee_insufficient_balance() {
 
 #[test]
 fn validate_dex_fee_invalid_sender_eth() {
-    let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://eth1.cipig.net:8555".into()], None);
+    let (_ctx, coin) = eth_coin_for_test(
+        EthCoinType::Eth,
+        vec!["https://mainnet.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b".into()],
+        None,
+    );
     // the real dex fee sent on mainnet
     // https://etherscan.io/tx/0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f
     let tx = coin
@@ -1001,7 +1002,14 @@ fn validate_dex_fee_invalid_sender_eth() {
     let tx = signed_tx_from_web3_tx(tx).unwrap().into();
     let amount: BigDecimal = "0.000526435076465".parse().unwrap();
     let validate_err = coin
-        .validate_fee(&tx, &*DEX_FEE_ADDR_RAW_PUBKEY, &*DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0)
+        .validate_fee(
+            &tx,
+            &*DEX_FEE_ADDR_RAW_PUBKEY,
+            &*DEX_FEE_ADDR_RAW_PUBKEY,
+            &amount,
+            0,
+            &[],
+        )
         .wait()
         .unwrap_err();
     assert!(validate_err.contains("was sent from wrong address"));
@@ -1031,7 +1039,14 @@ fn validate_dex_fee_invalid_sender_erc() {
     let tx = signed_tx_from_web3_tx(tx).unwrap().into();
     let amount: BigDecimal = "5.548262548262548262".parse().unwrap();
     let validate_err = coin
-        .validate_fee(&tx, &*DEX_FEE_ADDR_RAW_PUBKEY, &*DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0)
+        .validate_fee(
+            &tx,
+            &*DEX_FEE_ADDR_RAW_PUBKEY,
+            &*DEX_FEE_ADDR_RAW_PUBKEY,
+            &amount,
+            0,
+            &[],
+        )
         .wait()
         .unwrap_err();
     assert!(validate_err.contains("was sent from wrong address"));
@@ -1048,7 +1063,11 @@ fn sender_compressed_pub(tx: &SignedEthTx) -> [u8; 33] {
 
 #[test]
 fn validate_dex_fee_eth_confirmed_before_min_block() {
-    let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://eth1.cipig.net:8555".into()], None);
+    let (_ctx, coin) = eth_coin_for_test(
+        EthCoinType::Eth,
+        vec!["https://mainnet.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b".into()],
+        None,
+    );
     // the real dex fee sent on mainnet
     // https://etherscan.io/tx/0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f
     let tx = coin
@@ -1065,7 +1084,14 @@ fn validate_dex_fee_eth_confirmed_before_min_block() {
     let tx = tx.into();
     let amount: BigDecimal = "0.000526435076465".parse().unwrap();
     let validate_err = coin
-        .validate_fee(&tx, &compressed_public, &*DEX_FEE_ADDR_RAW_PUBKEY, &amount, 11784793)
+        .validate_fee(
+            &tx,
+            &compressed_public,
+            &*DEX_FEE_ADDR_RAW_PUBKEY,
+            &amount,
+            11784793,
+            &[],
+        )
         .wait()
         .unwrap_err();
     assert!(validate_err.contains("confirmed before min_block"));
@@ -1098,7 +1124,14 @@ fn validate_dex_fee_erc_confirmed_before_min_block() {
     let tx = tx.into();
     let amount: BigDecimal = "5.548262548262548262".parse().unwrap();
     let validate_err = coin
-        .validate_fee(&tx, &compressed_public, &*DEX_FEE_ADDR_RAW_PUBKEY, &amount, 11823975)
+        .validate_fee(
+            &tx,
+            &compressed_public,
+            &*DEX_FEE_ADDR_RAW_PUBKEY,
+            &amount,
+            11823975,
+            &[],
+        )
         .wait()
         .unwrap_err();
     assert!(validate_err.contains("confirmed before min_block"));
@@ -1169,6 +1202,7 @@ fn test_negotiate_swap_contract_addr_has_fallback() {
 }
 
 #[test]
+#[ignore]
 fn polygon_check_if_my_payment_sent() {
     let ctx = MmCtxBuilder::new().into_mm_arc();
     let conf = json!({
@@ -1188,7 +1222,7 @@ fn polygon_check_if_my_payment_sent() {
     let request = json!({
         "method": "enable",
         "coin": "MATIC",
-        "urls": ["https://polygon-rpc.com"],
+        "urls": ["https://polygon-mainnet.g.alchemy.com/v2/9YYl6iMLmXXLoflMPHnMTC4Dcm2L2tFH"],
         "swap_contract_address": "0x9130b257d37a52e52f21054c4da3450c72f595ce",
     });
 
@@ -1208,10 +1242,102 @@ fn polygon_check_if_my_payment_sent() {
     let secret_hash = hex::decode("fc33114b389f0ee1212abf2867e99e89126f4860").unwrap();
     let swap_contract_address = "9130b257d37a52e52f21054c4da3450c72f595ce".into();
     let my_payment = coin
-        .check_if_my_payment_sent(1638764369, &[], &secret_hash, 22185109, &Some(swap_contract_address))
+        .check_if_my_payment_sent(
+            1638764369,
+            &[],
+            &secret_hash,
+            22185109,
+            &Some(swap_contract_address),
+            &[],
+        )
         .wait()
         .unwrap()
         .unwrap();
     let expected_hash = BytesJson::from("69a20008cea0c15ee483b5bbdff942752634aa072dfd2ff715fe87eec302de11");
     assert_eq!(expected_hash, my_payment.tx_hash());
 }
+
+#[test]
+fn test_message_hash() {
+    let key_pair = KeyPair::from_secret_slice(
+        &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
+    )
+    .unwrap();
+    let transport = Web3Transport::new(vec!["http://195.201.0.6:8545".into()]).unwrap();
+    let web3 = Web3::new(transport);
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let coin = EthCoin(Arc::new(EthCoinImpl {
+        ticker: "ETH".into(),
+        coin_type: EthCoinType::Eth,
+        my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
+        key_pair,
+        swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
+        fallback_swap_contract: None,
+        web3_instances: vec![Web3Instance {
+            web3: web3.clone(),
+            is_parity: true,
+        }],
+        web3,
+        decimals: 18,
+        gas_station_url: None,
+        gas_station_decimals: ETH_GAS_STATION_DECIMALS,
+        gas_station_policy: GasStationPricePolicy::MeanAverageFast,
+        history_sync_state: Mutex::new(HistorySyncState::NotStarted),
+        ctx: ctx.weak(),
+        required_confirmations: 1.into(),
+        chain_id: None,
+        logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
+    }));
+
+    let message_hash = coin.sign_message_hash("test").unwrap();
+    assert_eq!(
+        hex::encode(message_hash),
+        "4a5c5d454721bbbb25540c3317521e71c373ae36458f960d2ad46ef088110e95"
+    );
+}
+
+#[test]
+fn test_sign_verify_message() {
+    let key_pair = KeyPair::from_secret_slice(
+        &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
+    )
+    .unwrap();
+    let transport = Web3Transport::new(vec!["http://195.201.0.6:8545".into()]).unwrap();
+    let web3 = Web3::new(transport);
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let coin = EthCoin(Arc::new(EthCoinImpl {
+        ticker: "ETH".into(),
+        coin_type: EthCoinType::Eth,
+        my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
+        key_pair,
+        swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
+        fallback_swap_contract: None,
+        web3_instances: vec![Web3Instance {
+            web3: web3.clone(),
+            is_parity: true,
+        }],
+        web3,
+        decimals: 18,
+        gas_station_url: None,
+        gas_station_decimals: ETH_GAS_STATION_DECIMALS,
+        gas_station_policy: GasStationPricePolicy::MeanAverageFast,
+        history_sync_state: Mutex::new(HistorySyncState::NotStarted),
+        ctx: ctx.weak(),
+        required_confirmations: 1.into(),
+        chain_id: None,
+        logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
+    }));
+
+    let message = "test";
+    let signature = coin.sign_message(message).unwrap();
+    assert_eq!(signature, "0xcdf11a9c4591fb7334daa4b21494a2590d3f7de41c7d2b333a5b61ca59da9b311b492374cc0ba4fbae53933260fa4b1c18f15d95b694629a7b0620eec77a938600");
+
+    let is_valid = coin
+        .verify_message(&signature, message, "0xbAB36286672fbdc7B250804bf6D14Be0dF69fa29")
+        .unwrap();
+    assert!(is_valid);
+}
diff --git a/mm2src/coins/eth/eth_wasm_tests.rs b/mm2src/coins/eth/eth_wasm_tests.rs
index 1574b780f1..ca1f3f8362 100644
--- a/mm2src/coins/eth/eth_wasm_tests.rs
+++ b/mm2src/coins/eth/eth_wasm_tests.rs
@@ -1,6 +1,7 @@
 use super::*;
 use crate::lp_coininit;
-use common::mm_ctx::MmCtxBuilder;
+use crypto::CryptoCtx;
+use mm2_core::mm_ctx::MmCtxBuilder;
 use wasm_bindgen_test::*;
 use web_sys::console;
 
@@ -26,6 +27,7 @@ async fn test_send() {
         ticker: "ETH".into(),
         coin_type: EthCoinType::Eth,
         my_address: key_pair.address(),
+        sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
         key_pair,
         swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
         fallback_swap_contract: None,
@@ -43,6 +45,7 @@ async fn test_send() {
         required_confirmations: 1.into(),
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
     }));
     let tx = coin
         .send_maker_payment(
@@ -51,6 +54,7 @@ async fn test_send() {
             &[1; 20],
             "0.001".parse().unwrap(),
             &None,
+            &[],
         )
         .compat()
         .await;
@@ -62,10 +66,6 @@ async fn test_send() {
 
 #[wasm_bindgen_test]
 async fn test_init_eth_coin() {
-    use common::privkey::key_pair_from_seed;
-
-    let key_pair =
-        key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid").unwrap();
     let conf = json!({
         "coins": [{
             "coin": "ETH",
@@ -78,10 +78,13 @@ async fn test_init_eth_coin() {
             "mm2": 1
         }]
     });
-    let ctx = MmCtxBuilder::new()
-        .with_conf(conf)
-        .with_secp256k1_key_pair(key_pair)
-        .into_mm_arc();
+
+    let ctx = MmCtxBuilder::new().with_conf(conf).into_mm_arc();
+    CryptoCtx::init_with_iguana_passphrase(
+        ctx.clone(),
+        "spice describe gravity federal blast come thank unfair canal monkey style afraid",
+    )
+    .unwrap();
 
     let req = json!({
         "urls":["http://195.201.0.6:8565"],
diff --git a/mm2src/coins/eth/web3_transport.rs b/mm2src/coins/eth/web3_transport.rs
index 5635e48a60..5b0b229a57 100644
--- a/mm2src/coins/eth/web3_transport.rs
+++ b/mm2src/coins/eth/web3_transport.rs
@@ -57,9 +57,9 @@ impl<T: Transport> EthFeeHistoryNamespace<T> {
 /// Parse bytes RPC response into `Result`.
 /// Implementation copied from Web3 HTTP transport
 #[cfg(not(target_arch = "wasm32"))]
-fn single_response<T: Deref<Target = [u8]>>(response: T) -> Result<Json, Error> {
-    let response =
-        serde_json::from_slice(&*response).map_err(|e| Error::from(ErrorKind::InvalidResponse(format!("{}", e))))?;
+fn single_response<T: Deref<Target = [u8]>>(response: T, rpc_url: &str) -> Result<Json, Error> {
+    let response = serde_json::from_slice(&*response)
+        .map_err(|e| Error::from(ErrorKind::InvalidResponse(format!("{}: {}", rpc_url, e))))?;
 
     match response {
         Response::Single(output) => to_result_from_output(output),
@@ -114,7 +114,7 @@ impl<T: Future> Future for SendFuture<T> {
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> { self.0.poll() }
 }
 
-unsafe impl<T> Send for SendFuture<T> {}
+unsafe impl<T> Send for SendFuture<T> where T: Send {}
 unsafe impl<T> Sync for SendFuture<T> {}
 
 impl Transport for Web3Transport {
@@ -150,10 +150,13 @@ async fn send_request(
     event_handlers: Vec<RpcTransportEventHandlerShared>,
 ) -> Result<Json, Error> {
     use common::executor::Timer;
-    use common::wio::slurp_reqʹ;
+    use common::log::warn;
     use futures::future::{select, Either};
     use gstuff::binprint;
     use http::header::HeaderValue;
+    use mm2_net::transport::slurp_req;
+
+    const REQUEST_TIMEOUT_S: f64 = 60.;
 
     let mut errors = Vec::new();
     for uri in uris.iter() {
@@ -165,13 +168,15 @@ async fn send_request(
         *req.uri_mut() = uri.clone();
         req.headers_mut()
             .insert(http::header::CONTENT_TYPE, HeaderValue::from_static("application/json"));
-        let timeout = Timer::sleep(60.);
-        let req = Box::pin(slurp_reqʹ(req));
+        let timeout = Timer::sleep(REQUEST_TIMEOUT_S);
+        let req = Box::pin(slurp_req(req));
         let rc = select(req, timeout).await;
         let res = match rc {
             Either::Left((r, _t)) => r,
             Either::Right((_t, _r)) => {
-                errors.push(ERRL!("timeout"));
+                let error = ERRL!("Error requesting '{}': {}s timeout expired", uri, REQUEST_TIMEOUT_S);
+                warn!("{}", error);
+                errors.push(error);
                 continue;
             },
         };
@@ -179,7 +184,7 @@ async fn send_request(
         let (status, _headers, body) = match res {
             Ok(r) => r,
             Err(err) => {
-                errors.push(err);
+                errors.push(err.to_string());
                 continue;
             },
         };
@@ -187,17 +192,18 @@ async fn send_request(
         event_handlers.on_incoming_response(&body);
 
         if !status.is_success() {
-            errors.push(ERRL!("!200: {}, {}", status, binprint(&body, b'.')));
+            errors.push(ERRL!(
+                "Server '{}' response !200: {}, {}",
+                uri,
+                status,
+                binprint(&body, b'.')
+            ));
             continue;
         }
 
-        return single_response(body);
+        return single_response(body, &uri.to_string());
     }
-    Err(ErrorKind::Transport(fomat!(
-        "request " [request] " failed: "
-        for err in errors {(err)} sep {"; "}
-    ))
-    .into())
+    Err(request_failed_error(&request, &errors))
 }
 
 #[cfg(target_arch = "wasm32")]
@@ -210,7 +216,7 @@ async fn send_request(
 
     let mut transport_errors = Vec::new();
     for uri in uris {
-        match send_request_once(&request_payload, &uri, &event_handlers).await {
+        match send_request_once(request_payload.clone(), &uri, &event_handlers).await {
             Ok(response_json) => return Ok(response_json),
             Err(Error(ErrorKind::Transport(e), _)) => {
                 transport_errors.push(e.to_string());
@@ -219,23 +225,16 @@ async fn send_request(
         }
     }
 
-    Err(ErrorKind::Transport(fomat!(
-        "request " [request] " failed: "
-        for err in transport_errors {(err)} sep {"; "}
-    ))
-    .into())
+    Err(request_failed_error(&request, &transport_errors))
 }
 
 #[cfg(target_arch = "wasm32")]
 async fn send_request_once(
-    request_payload: &String,
+    request_payload: String,
     uri: &http::Uri,
     event_handlers: &Vec<RpcTransportEventHandlerShared>,
 ) -> Result<Json, Error> {
-    use wasm_bindgen::prelude::*;
-    use wasm_bindgen::JsCast;
-    use wasm_bindgen_futures::JsFuture;
-    use web_sys::{Request, RequestInit, RequestMode, Response as JsResponse};
+    use mm2_net::wasm_http::FetchRequest;
 
     macro_rules! try_or {
         ($exp:expr, $errkind:ident) => {
@@ -246,39 +245,29 @@ async fn send_request_once(
         };
     }
 
-    let window = web_sys::window().expect("!window");
-
     // account for outgoing traffic
     event_handlers.on_outgoing_request(request_payload.as_bytes());
 
-    let mut opts = RequestInit::new();
-    opts.method("POST");
-    opts.mode(RequestMode::Cors);
-    opts.body(Some(&JsValue::from_str(&request_payload)));
-
-    let request = try_or!(Request::new_with_str_and_init(&uri.to_string(), &opts), Transport);
-
-    request.headers().set("Accept", "application/json").unwrap();
-    request.headers().set("Content-Type", "application/json").unwrap();
-
-    let request_promise = window.fetch_with_request(&request);
-
-    let future = JsFuture::from(request_promise);
-    let resp_value = try_or!(future.await, Transport);
-    let js_response: JsResponse = try_or!(resp_value.dyn_into(), Transport);
-
-    let resp_txt_fut = try_or!(js_response.text(), Transport);
-    let resp_txt = try_or!(JsFuture::from(resp_txt_fut).await, Transport);
+    let result = FetchRequest::post(&uri.to_string())
+        .cors()
+        .body_utf8(request_payload)
+        .header("Accept", "application/json")
+        .header("Content-Type", "application/json")
+        .request_str()
+        .await;
+    let (status_code, response_str) = try_or!(result, Transport);
+    if !status_code.is_success() {
+        return Err(Error::from(ErrorKind::Transport(ERRL!(
+            "!200: {}, {}",
+            status_code,
+            response_str
+        ))));
+    }
 
-    let resp_str = resp_txt.as_string().ok_or_else(|| {
-        Error::from(ErrorKind::Transport(ERRL!(
-            "Expected a UTF-8 string JSON, found {:?}",
-            resp_txt
-        )))
-    })?;
-    event_handlers.on_incoming_response(resp_str.as_bytes());
+    // account for incoming traffic
+    event_handlers.on_incoming_response(response_str.as_bytes());
 
-    let response: Response = try_or!(serde_json::from_str(&resp_str), InvalidResponse);
+    let response: Response = try_or!(serde_json::from_str(&response_str), InvalidResponse);
     match response {
         Response::Single(output) => to_result_from_output(output),
         Response::Batch(_) => Err(Error::from(ErrorKind::InvalidResponse(
@@ -286,3 +275,9 @@ async fn send_request_once(
         ))),
     }
 }
+
+fn request_failed_error(request: &Call, errors: &[String]) -> Error {
+    let errors = errors.join("; ");
+    let error = format!("request {:?} failed: {}", request, errors);
+    Error::from(ErrorKind::Transport(error))
+}
diff --git a/mm2src/coins/for_tests/ZOMBIE_CACHE.db b/mm2src/coins/for_tests/ZOMBIE_CACHE.db
new file mode 100644
index 0000000000..36f086ff5f
Binary files /dev/null and b/mm2src/coins/for_tests/ZOMBIE_CACHE.db differ
diff --git a/mm2src/coins/for_tests/tBCH_tx_history_fixtures.json b/mm2src/coins/for_tests/tBCH_tx_history_fixtures.json
new file mode 100644
index 0000000000..6949461b3e
--- /dev/null
+++ b/mm2src/coins/for_tests/tBCH_tx_history_fixtures.json
@@ -0,0 +1,246 @@
+[
+{"tx_hex":"0100000001ce59a734f33811afcc00c19dcb12202ed00067a50efed80424fabd2b723678c0020000006b483045022100ec1fecff9c60fb7e821b9a412bd8c4ce4a757c68287f9cf9e0f461165492d6530220222f020dd05d65ba35cddd0116c99255612ec90d63019bb1cea45e2cf09a62a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914953b3909ff6aa269f85da34c132a92424440e18e879decad00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd1215c61","tx_hash":"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pz2nkwgfla42y60ctk35cye2jfpygs8p3csm2zkhzd","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.11400301","spent_by_me":"0.11400301","received_by_me":"0.11398301","my_balance_change":"-0.00002000","block_height":0,"timestamp":0,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000001ce59a734f33811afcc00c19dcb12202ed00067a50efed80424fabd2b723678c0020000006b483045022100ec1fecff9c60fb7e821b9a412bd8c4ce4a757c68287f9cf9e0f461165492d6530220222f020dd05d65ba35cddd0116c99255612ec90d63019bb1cea45e2cf09a62a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914953b3909ff6aa269f85da34c132a92424440e18e879decad00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd1215c61","tx_hash":"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69","from":[],"to":["slptest:pz2nkwgfla42y60ctk35cye2jfpygs8p3ct0devqss"],"total_amount":"0","spent_by_me":"0","received_by_me":"0","my_balance_change":"0","block_height":0,"timestamp":0,"fee_details":null,"coin":"tBCH","internal_id":"421b9d5aed93ab2a20fb41d6a30d85ee6e315a506a6ac521eafaec4cb09739df","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000001c0b02bc3ded9a8684fcd729e19e6c53a5cf1467106554273b1b2684229771809000000006a4730440220607616e5ed18ac83461c8b3c1c258e5245efe936d3b37d2e60b667ec6accd47602204e2c55ba355f58206be3e30bb5aebabc72ce7878306c41a319156a67094eea494121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a914953b3909ff6aa269f85da34c132a92424440e18e88ac6df4ad00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accc1d5c61","tx_hash":"c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qz2nkwgfla42y60ctk35cye2jfpygs8p3c87hd35es","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.11402301","spent_by_me":"0.11402301","received_by_me":"0.11400301","my_balance_change":"-0.00002000","block_height":1468165,"timestamp":1633426943,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000001c0b02bc3ded9a8684fcd729e19e6c53a5cf1467106554273b1b2684229771809000000006a4730440220607616e5ed18ac83461c8b3c1c258e5245efe936d3b37d2e60b667ec6accd47602204e2c55ba355f58206be3e30bb5aebabc72ce7878306c41a319156a67094eea494121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a914953b3909ff6aa269f85da34c132a92424440e18e88ac6df4ad00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accc1d5c61","tx_hash":"c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce","from":[],"to":["slptest:qz2nkwgfla42y60ctk35cye2jfpygs8p3cu2sktrtd"],"total_amount":"0","spent_by_me":"0","received_by_me":"0","my_balance_change":"0","block_height":1468165,"timestamp":1633426943,"fee_details":null,"coin":"tBCH","internal_id":"8c18978529a68bb9eb0cd4b3488775ef2dcfa473baab23158174c4a8b68a03e8","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000001a789174935fb6af2d669b52d03e4dc37dbf0d6afced2d598c54bb692c02367d7010000006b483045022100c3fee0b751f098debd3cfd6befdcd7210f192840143655dee95157c20c9731920220548dab4ddaabd4da92c838d036853a97d6ab98af6d4d8894f82f261c9ed14aa34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff013dfcad00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acda865161","tx_hash":"091877294268b2b1734255067146f15c3ac5e6199e72cd4f68a8d9dec32bb0c0","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.11403301","spent_by_me":"0.11403301","received_by_me":"0.11402301","my_balance_change":"-0.00001000","block_height":1467009,"timestamp":1632733367,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"091877294268b2b1734255067146f15c3ac5e6199e72cd4f68a8d9dec32bb0c0","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000190e35c09c83b5818b441c18a2d5ec54734851e5581fb21bde7936e77c6c3dca8030000006b483045022100e6b1415cbd81f2d04360597fba65965bc77ab5a972f5b8f8d5c0f1b1912923c402206a63f305f03e9c49ffba6c71c7a76ef60631f67dce7631f673a0e8485b86898d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff020000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e82500ae00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac62715161","tx_hash":"d76723c092b64bc598d5d2ceafd6f0db37dce4032db569d6f26afb35491789a7","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.11404301","spent_by_me":"0.11404301","received_by_me":"0.11403301","my_balance_change":"-0.00001000","block_height":1467000,"timestamp":1632728165,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"d76723c092b64bc598d5d2ceafd6f0db37dce4032db569d6f26afb35491789a7","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000190e35c09c83b5818b441c18a2d5ec54734851e5581fb21bde7936e77c6c3dca8030000006b483045022100e6b1415cbd81f2d04360597fba65965bc77ab5a972f5b8f8d5c0f1b1912923c402206a63f305f03e9c49ffba6c71c7a76ef60631f67dce7631f673a0e8485b86898d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff020000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e82500ae00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac62715161","tx_hash":"d76723c092b64bc598d5d2ceafd6f0db37dce4032db569d6f26afb35491789a7","from":[],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1467000,"timestamp":1632728165,"fee_details":null,"coin":"tBCH","internal_id":"045fa17faacd5e2b420266cca1265b37549aa45e140a30f0b92da7fb54ac3cdf","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000027f6af57604a18438921d5a1ce0c62af7e6f372fdf8c31a654796903f613145e6020000006a47304402200657110d9cad55a3cddb6515006a0263e93d4017f9eded90196d7ef51783cd3d022046b40ceccd9e5edd14a9651db8ea1a2a8a7bd5a8d49a2e5c37cc725763b95ae04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5a181e6feadb8db84c6aebea0cd2006a09f1981a0d88df2fa6a3fc1350ecc9e5010000006b483045022100d3600f5b4db791d4385a205bc1b27723bf950fdca15471e23577ab4244e1b51802203584b8d66324a29117699a72cb0ae40989fd22fdd3aecb1a1228445ccce359914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000271008000000000000ceeee8030000000000001976a914eed5d3ad264ffc68fc0a6454e1696a30d8f405be88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0d04ae00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f3e1261","tx_hash":"a8dcc3c6776e93e7bd21fb81551e853447c55e2d8ac141b418583bc8095ce390","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qrhdt5adye8lc68upfj9fctfdgcd3aq9hctf8ft6md","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.11407782","spent_by_me":"0.11407782","received_by_me":"0.11405301","my_balance_change":"-0.00002481","block_height":1460099,"timestamp":1628586152,"fee_details":{"type":"Utxo","amount":"0.00001481"},"coin":"tBCH","internal_id":"a8dcc3c6776e93e7bd21fb81551e853447c55e2d8ac141b418583bc8095ce390","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000027f6af57604a18438921d5a1ce0c62af7e6f372fdf8c31a654796903f613145e6020000006a47304402200657110d9cad55a3cddb6515006a0263e93d4017f9eded90196d7ef51783cd3d022046b40ceccd9e5edd14a9651db8ea1a2a8a7bd5a8d49a2e5c37cc725763b95ae04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5a181e6feadb8db84c6aebea0cd2006a09f1981a0d88df2fa6a3fc1350ecc9e5010000006b483045022100d3600f5b4db791d4385a205bc1b27723bf950fdca15471e23577ab4244e1b51802203584b8d66324a29117699a72cb0ae40989fd22fdd3aecb1a1228445ccce359914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000271008000000000000ceeee8030000000000001976a914eed5d3ad264ffc68fc0a6454e1696a30d8f405be88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0d04ae00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f3e1261","tx_hash":"a8dcc3c6776e93e7bd21fb81551e853447c55e2d8ac141b418583bc8095ce390","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qrhdt5adye8lc68upfj9fctfdgcd3aq9hcsaqj3dfs","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.2974","spent_by_me":"6.2974","received_by_me":"5.2974","my_balance_change":"-1.0000","block_height":1460099,"timestamp":1628586152,"fee_details":null,"coin":"tBCH","internal_id":"20976b31d1e0a5257bf983bdcbbb4230cc465197cc6dd886a9cf2e17b1b9acb0","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000017f6af57604a18438921d5a1ce0c62af7e6f372fdf8c31a654796903f613145e6030000006b483045022100c335dd0f22e047b806a9d84e02b70aab609093e960888f6f1878e605a173e3da02201c274ce4983d8e519a47c4bd17aeca897b084954ce7a9d77033100e06aa999304121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0280969800000000001976a914eed5d3ad264ffc68fc0a6454e1696a30d8f405be88acbe0dae00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7a361261","tx_hash":"e5c9ec5013fca3a62fdf880d1a98f1096a00d20ceaeb6a4cb88ddbea6f1e185a","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qrhdt5adye8lc68upfj9fctfdgcd3aq9hctf8ft6md","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21407847","spent_by_me":"0.21407847","received_by_me":"0.11406782","my_balance_change":"-0.10001065","block_height":1460096,"timestamp":1628584118,"fee_details":{"type":"Utxo","amount":"0.00001065"},"coin":"tBCH","internal_id":"e5c9ec5013fca3a62fdf880d1a98f1096a00d20ceaeb6a4cb88ddbea6f1e185a","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002ebc10f58f220ec1bad5d634684ae649aa7bdd2f9c9081d36e5384e579caa95c2020000006a4730440220639ac218f572520c7d8addae74be6bfdefa9c86bc91474b6dedd7e117d232085022015a92f45f9ae5cee08c188e01fc614b77c461a41733649a55abfcc3e7ca207444121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffebc10f58f220ec1bad5d634684ae649aa7bdd2f9c9081d36e5384e579caa95c2030000006a47304402204c27a2c04df44f34bd71ec69cc0a24291a96f265217473affb3c3fce2dbd937202202c2ad2e6cfaac3901c807d9b048ccb2b5e7b0dbd922f2066e637f6bbf459313a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000f5fee80300000000000017a9146569d9a853a1934c642223a9432f18c3b3f2a64b87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac67a84601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac87caee60","tx_hash":"e64531613f909647651ac3f8fd72f3e6f72ac6e01c5a1d923884a10476f56a7f","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppjknkdg2wsexnryyg36jse0rrpm8u4xfv9hwa0rgl","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21411847","spent_by_me":"0.21411847","received_by_me":"0.21408847","my_balance_change":"-0.00003000","block_height":1456230,"timestamp":1626262632,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"e64531613f909647651ac3f8fd72f3e6f72ac6e01c5a1d923884a10476f56a7f","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002ebc10f58f220ec1bad5d634684ae649aa7bdd2f9c9081d36e5384e579caa95c2020000006a4730440220639ac218f572520c7d8addae74be6bfdefa9c86bc91474b6dedd7e117d232085022015a92f45f9ae5cee08c188e01fc614b77c461a41733649a55abfcc3e7ca207444121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffebc10f58f220ec1bad5d634684ae649aa7bdd2f9c9081d36e5384e579caa95c2030000006a47304402204c27a2c04df44f34bd71ec69cc0a24291a96f265217473affb3c3fce2dbd937202202c2ad2e6cfaac3901c807d9b048ccb2b5e7b0dbd922f2066e637f6bbf459313a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000f5fee80300000000000017a9146569d9a853a1934c642223a9432f18c3b3f2a64b87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac67a84601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac87caee60","tx_hash":"e64531613f909647651ac3f8fd72f3e6f72ac6e01c5a1d923884a10476f56a7f","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppjknkdg2wsexnryyg36jse0rrpm8u4xfv7rfx456z","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.3974","spent_by_me":"6.3974","received_by_me":"6.2974","my_balance_change":"-0.1000","block_height":1456230,"timestamp":1626262632,"fee_details":null,"coin":"tBCH","internal_id":"babe9bd0dc1495dff0920da14a76311b744daadc9d01314f8bd4e2438c6b183b","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002f418c909e5baba0708643146d6f1b0b77af9d3fa7f199c56a0e61b230d3dbcee020000006a47304402201367fc23d4acf145c1aa9b7b4111db42a01bf9e8d1555f09b99bfc0e3a26cac7022053dd8f2d617e0acf132f3930b5e91515fd997e07e04e945a2066f09c63739ce24121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cfffffffff418c909e5baba0708643146d6f1b0b77af9d3fa7f199c56a0e61b230d3dbcee030000006a4730440220010f1d0f1d6246575cbb3d666b453bdd1515f3d9f6cabfb4a7907df50b8aee4f022066c56d4bb7126882c2044d2c777f5c78a23a7a36a9709b735e69d2bd3946c92f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000000f9e6e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1fb44601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac85caee60","tx_hash":"c295aa9c574e38e5361d08c9f9d2bda79a64ae8446635dad1bec20f2580fc1eb","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21414847","spent_by_me":"0.21414847","received_by_me":"0.21411847","my_balance_change":"-0.00003000","block_height":1456230,"timestamp":1626262632,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"c295aa9c574e38e5361d08c9f9d2bda79a64ae8446635dad1bec20f2580fc1eb","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002f418c909e5baba0708643146d6f1b0b77af9d3fa7f199c56a0e61b230d3dbcee020000006a47304402201367fc23d4acf145c1aa9b7b4111db42a01bf9e8d1555f09b99bfc0e3a26cac7022053dd8f2d617e0acf132f3930b5e91515fd997e07e04e945a2066f09c63739ce24121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cfffffffff418c909e5baba0708643146d6f1b0b77af9d3fa7f199c56a0e61b230d3dbcee030000006a4730440220010f1d0f1d6246575cbb3d666b453bdd1515f3d9f6cabfb4a7907df50b8aee4f022066c56d4bb7126882c2044d2c777f5c78a23a7a36a9709b735e69d2bd3946c92f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000000f9e6e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1fb44601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac85caee60","tx_hash":"c295aa9c574e38e5361d08c9f9d2bda79a64ae8446635dad1bec20f2580fc1eb","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.3975","spent_by_me":"6.3975","received_by_me":"6.3974","my_balance_change":"-0.0001","block_height":1456230,"timestamp":1626262632,"fee_details":null,"coin":"tBCH","internal_id":"433b641bc89e1b59c22717918583c60ec98421805c8e85b064691705d9aeb970","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000270fba4f0921a57c550bfe911fa436757cc65f56825f2ff0581aed9775a72fb9c020000006b483045022100c0b9faeb97307ed33db1ac5c5b1b189d7b18267676a3e01d65a48d310651779302205e5be1e1d5ebfeed6994f52c1cc1af2908ff2d9d9b7eb846c7e715e9673e228a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff70fba4f0921a57c550bfe911fa436757cc65f56825f2ff0581aed9775a72fb9c030000006b483045022100965eed3d4152262adbacc52f928b59385480cd4ef44e899d2064a6f38503794902205cebbf1abaab0c116f4b63417cdf6a13dd681cf75e520e26caa7257f9064c6454121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000f9e7e80300000000000017a914fe9318c279369c68cb240c88ef2c2df18cea63e087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd7bf4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc3c7ee60","tx_hash":"eebc3d0d231be6a0569c197ffad3f97ab7b0f1d64631640807babae509c918f4","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prlfxxxz0ymfc6xtysxg3mev9hcce6nruq9p6sq73k","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21417847","spent_by_me":"0.21417847","received_by_me":"0.21414847","my_balance_change":"-0.00003000","block_height":1456229,"timestamp":1626261653,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"eebc3d0d231be6a0569c197ffad3f97ab7b0f1d64631640807babae509c918f4","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000270fba4f0921a57c550bfe911fa436757cc65f56825f2ff0581aed9775a72fb9c020000006b483045022100c0b9faeb97307ed33db1ac5c5b1b189d7b18267676a3e01d65a48d310651779302205e5be1e1d5ebfeed6994f52c1cc1af2908ff2d9d9b7eb846c7e715e9673e228a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff70fba4f0921a57c550bfe911fa436757cc65f56825f2ff0581aed9775a72fb9c030000006b483045022100965eed3d4152262adbacc52f928b59385480cd4ef44e899d2064a6f38503794902205cebbf1abaab0c116f4b63417cdf6a13dd681cf75e520e26caa7257f9064c6454121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000f9e7e80300000000000017a914fe9318c279369c68cb240c88ef2c2df18cea63e087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd7bf4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc3c7ee60","tx_hash":"eebc3d0d231be6a0569c197ffad3f97ab7b0f1d64631640807babae509c918f4","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prlfxxxz0ymfc6xtysxg3mev9hcce6nruq74at6frt","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.4975","spent_by_me":"6.4975","received_by_me":"6.3975","my_balance_change":"-0.1000","block_height":1456229,"timestamp":1626261653,"fee_details":null,"coin":"tBCH","internal_id":"cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000026fd35b26526cebfc7df0b229bde298b04aa853c0499c4c54c12df0118ed84052020000006a47304402203bd00a6a61434abb4fe4359aad6991e28eeb224fc1f4524309bebca89fbe5807022062a38c4e1da944942c6722141df6bae9c44c07ed52fd736e1f8c75e15aaf99f44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6fd35b26526cebfc7df0b229bde298b04aa853c0499c4c54c12df0118ed84052030000006b483045022100909a8d0be19172c68c2889f240b1531d4a921bf9df8d081fce172d95c7a971cd02206ab0de0ed044b002341e72678106c558cd5e8565352fd78dcdf88a574c409a754121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000000fdcfe8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8fcb4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc0c7ee60","tx_hash":"9cfb725a77d9ae8105fff22568f565cc576743fa11e9bf50c5571a92f0a4fb70","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21420847","spent_by_me":"0.21420847","received_by_me":"0.21417847","my_balance_change":"-0.00003000","block_height":1456229,"timestamp":1626261653,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"9cfb725a77d9ae8105fff22568f565cc576743fa11e9bf50c5571a92f0a4fb70","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000026fd35b26526cebfc7df0b229bde298b04aa853c0499c4c54c12df0118ed84052020000006a47304402203bd00a6a61434abb4fe4359aad6991e28eeb224fc1f4524309bebca89fbe5807022062a38c4e1da944942c6722141df6bae9c44c07ed52fd736e1f8c75e15aaf99f44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6fd35b26526cebfc7df0b229bde298b04aa853c0499c4c54c12df0118ed84052030000006b483045022100909a8d0be19172c68c2889f240b1531d4a921bf9df8d081fce172d95c7a971cd02206ab0de0ed044b002341e72678106c558cd5e8565352fd78dcdf88a574c409a754121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000000fdcfe8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8fcb4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc0c7ee60","tx_hash":"9cfb725a77d9ae8105fff22568f565cc576743fa11e9bf50c5571a92f0a4fb70","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.4976","spent_by_me":"6.4976","received_by_me":"6.4975","my_balance_change":"-0.0001","block_height":1456229,"timestamp":1626261653,"fee_details":null,"coin":"tBCH","internal_id":"1c1e68357cf5a6dacb53881f13aa5d2048fe0d0fab24b76c9ec48f53884bed97","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000024aaac282f81cc302e86957d19acd73bdf2757a2ad84b9377ef8dcab593a34545020000006a4730440220772cb5f66b9eb22a48d9aa65711f121a7d074cc645c7bd32e6068f28a7f67e16022070b627a64c0b81c8f3a25d398da12707488cdc8b1782629d2b1cb4c6e17f2b0a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff4aaac282f81cc302e86957d19acd73bdf2757a2ad84b9377ef8dcab593a34545030000006a473044022074bac9d2396dc7b9e44fd83a722620b2f553404d94356267debb421027bed67e02200513bc889699dab01a7abc0248a8ecdcabbceaac119b453fe6b553848d5178534121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000fdd0e80300000000000017a914fbda7aee561fd22fd76c6c29b712aee35b8dc44187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac47d74601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7a5aed60","tx_hash":"5240d88e11f02dc1544c9c49c053a84ab098e2bd29b2f07dfceb6c52265bd36f","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:praa57hw2c0ayt7hd3kzndcj4m34hrwygy4jffn8sy","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21423847","spent_by_me":"0.21423847","received_by_me":"0.21420847","my_balance_change":"-0.00003000","block_height":1456064,"timestamp":1626168435,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"5240d88e11f02dc1544c9c49c053a84ab098e2bd29b2f07dfceb6c52265bd36f","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000024aaac282f81cc302e86957d19acd73bdf2757a2ad84b9377ef8dcab593a34545020000006a4730440220772cb5f66b9eb22a48d9aa65711f121a7d074cc645c7bd32e6068f28a7f67e16022070b627a64c0b81c8f3a25d398da12707488cdc8b1782629d2b1cb4c6e17f2b0a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff4aaac282f81cc302e86957d19acd73bdf2757a2ad84b9377ef8dcab593a34545030000006a473044022074bac9d2396dc7b9e44fd83a722620b2f553404d94356267debb421027bed67e02200513bc889699dab01a7abc0248a8ecdcabbceaac119b453fe6b553848d5178534121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000fdd0e80300000000000017a914fbda7aee561fd22fd76c6c29b712aee35b8dc44187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac47d74601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7a5aed60","tx_hash":"5240d88e11f02dc1544c9c49c053a84ab098e2bd29b2f07dfceb6c52265bd36f","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:praa57hw2c0ayt7hd3kzndcj4m34hrwygywxwjfsze","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.5976","spent_by_me":"6.5976","received_by_me":"6.4976","my_balance_change":"-0.1000","block_height":1456064,"timestamp":1626168435,"fee_details":null,"coin":"tBCH","internal_id":"c4304b5ef4f1b88ed4939534a8ca9eca79f592939233174ae08002e8454e3f06","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002de1e81fdbb6766cfbd5feed3f71845fb9980df3d3029d07012a48b6eef48552a020000006a473044022064459a789f9dc6efbf1464922bb4e778b434afdc9a4034f587776169d2e2a966022031f38a543b67354263d865371a931f6fd9c9a70fa336e563d1aa71579376f6004121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffde1e81fdbb6766cfbd5feed3f71845fb9980df3d3029d07012a48b6eef48552a030000006b483045022100f1f35326636053589c9dcbe5d60e9ab95d04076ba5563862cd00b39e6af9326f02201f31c95858d534298aa5a5044d744cb9f6ee5a057d0177735e3b8b3ebd36c26d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000101b8e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acffe24601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac765aed60","tx_hash":"4545a393b5ca8def77934bd82a7a75f2bd73cd9ad15769e802c31cf882c2aa4a","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21426847","spent_by_me":"0.21426847","received_by_me":"0.21423847","my_balance_change":"-0.00003000","block_height":1456064,"timestamp":1626168435,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"4545a393b5ca8def77934bd82a7a75f2bd73cd9ad15769e802c31cf882c2aa4a","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002de1e81fdbb6766cfbd5feed3f71845fb9980df3d3029d07012a48b6eef48552a020000006a473044022064459a789f9dc6efbf1464922bb4e778b434afdc9a4034f587776169d2e2a966022031f38a543b67354263d865371a931f6fd9c9a70fa336e563d1aa71579376f6004121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffde1e81fdbb6766cfbd5feed3f71845fb9980df3d3029d07012a48b6eef48552a030000006b483045022100f1f35326636053589c9dcbe5d60e9ab95d04076ba5563862cd00b39e6af9326f02201f31c95858d534298aa5a5044d744cb9f6ee5a057d0177735e3b8b3ebd36c26d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000101b8e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acffe24601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac765aed60","tx_hash":"4545a393b5ca8def77934bd82a7a75f2bd73cd9ad15769e802c31cf882c2aa4a","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.5977","spent_by_me":"6.5977","received_by_me":"6.5976","my_balance_change":"-0.0001","block_height":1456064,"timestamp":1626168435,"fee_details":null,"coin":"tBCH","internal_id":"b0035434a1e7be5af2ed991ee2a21a90b271c5852a684a0b7d315c5a770d1b1c","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000029ee15b0b97c5fd25baafbf7375caab4110a74653566c902f15c62383a445f013020000006b483045022100b738bb36ad5dd6d35f2c21d1817a77df2830e27c40d5bd950460542ed1382d580220740f189c29ff9a8acb488db22be5c04ce06c33f44911f742236389cd62acf06c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff9ee15b0b97c5fd25baafbf7375caab4110a74653566c902f15c62383a445f013030000006b4830450221008278cab9ea89412af4366b7cf13223a66c75f1b99b8d2426ab45874bb76fda020220153585a9c531f53eff0a1de2285159aa60d882d9b0f8c4b81abafa06608d15c54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000101b9e80300000000000017a914fd3dee29c96afa812f7fad76a04a2499d1555fac87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb7ee4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca745ed60","tx_hash":"2a5548ef6e8ba41270d029303ddf8099fb4518f7d3ee5fbdcf6667bbfd811ede","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pr7nmm3fe9404qf007khdgz2yjvaz42l4sqdkmt79k","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21429847","spent_by_me":"0.21429847","received_by_me":"0.21426847","my_balance_change":"-0.00003000","block_height":1456060,"timestamp":1626163734,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"2a5548ef6e8ba41270d029303ddf8099fb4518f7d3ee5fbdcf6667bbfd811ede","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000029ee15b0b97c5fd25baafbf7375caab4110a74653566c902f15c62383a445f013020000006b483045022100b738bb36ad5dd6d35f2c21d1817a77df2830e27c40d5bd950460542ed1382d580220740f189c29ff9a8acb488db22be5c04ce06c33f44911f742236389cd62acf06c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff9ee15b0b97c5fd25baafbf7375caab4110a74653566c902f15c62383a445f013030000006b4830450221008278cab9ea89412af4366b7cf13223a66c75f1b99b8d2426ab45874bb76fda020220153585a9c531f53eff0a1de2285159aa60d882d9b0f8c4b81abafa06608d15c54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000101b9e80300000000000017a914fd3dee29c96afa812f7fad76a04a2499d1555fac87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb7ee4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca745ed60","tx_hash":"2a5548ef6e8ba41270d029303ddf8099fb4518f7d3ee5fbdcf6667bbfd811ede","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pr7nmm3fe9404qf007khdgz2yjvaz42l4sme3q3fht","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.6977","spent_by_me":"6.6977","received_by_me":"6.5977","my_balance_change":"-0.1000","block_height":1456060,"timestamp":1626163734,"fee_details":null,"coin":"tBCH","internal_id":"bd9e35d35e4296a53693074c51e92458a5982bf60e966c919be6d05958f4c406","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000203d79bcfeb47659aeabf17f71043fb9ce7f985edf4a20d3244673f737943fce6020000006a4730440220340bed348f70c0fb7362d7b37451ae6a604116140172e866edead7200eb92693022027880c0aa2bbc2eaa3834238d4e04f4675200d4424e9bec21e1d0c6bb3832c594121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff03d79bcfeb47659aeabf17f71043fb9ce7f985edf4a20d3244673f737943fce6030000006a473044022042452a36d3d44bc85f77881a1bb6a55120a269c95544ca0a0951492e439bc0f1022020a375bf7f34f95148b8b9c55129a995805cc35e84c5c3c89603a0d5f181be694121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000105a1e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6ffa4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca645ed60","tx_hash":"13f045a48323c6152f906c565346a71041abca7573bfafba25fdc5970b5be19e","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21432847","spent_by_me":"0.21432847","received_by_me":"0.21429847","my_balance_change":"-0.00003000","block_height":1456060,"timestamp":1626163734,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"13f045a48323c6152f906c565346a71041abca7573bfafba25fdc5970b5be19e","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000203d79bcfeb47659aeabf17f71043fb9ce7f985edf4a20d3244673f737943fce6020000006a4730440220340bed348f70c0fb7362d7b37451ae6a604116140172e866edead7200eb92693022027880c0aa2bbc2eaa3834238d4e04f4675200d4424e9bec21e1d0c6bb3832c594121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff03d79bcfeb47659aeabf17f71043fb9ce7f985edf4a20d3244673f737943fce6030000006a473044022042452a36d3d44bc85f77881a1bb6a55120a269c95544ca0a0951492e439bc0f1022020a375bf7f34f95148b8b9c55129a995805cc35e84c5c3c89603a0d5f181be694121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000105a1e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6ffa4601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca645ed60","tx_hash":"13f045a48323c6152f906c565346a71041abca7573bfafba25fdc5970b5be19e","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.6978","spent_by_me":"6.6978","received_by_me":"6.6977","my_balance_change":"-0.0001","block_height":1456060,"timestamp":1626163734,"fee_details":null,"coin":"tBCH","internal_id":"3c76ca7ab4290a09683d13794e8636e2071344beb7364ab043ce8c2dd14514a8","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002dc7d15bb62351eabe269d01499d2a1c00bee0705eaa1cef29cf8d04a8bcd184d020000006b483045022100d113d6de671c750ef79bc60f14da46a9e255e33e3f0b85fb37533706a63826390220777565b655e7e28d6f6e12a89a4d5c6e6a56f47d6b4c5f2aef418b4d7a8710a74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffdc7d15bb62351eabe269d01499d2a1c00bee0705eaa1cef29cf8d04a8bcd184d030000006a47304402204f63572b779323619eb16c40db07360346bd5f60ee90075c97e4db40ea59aed602206c7753de0f58417caf6fc92a6bec8fefcad4ae410bb73d9206719244ff53834f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000105a2e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac27064701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc336ec60","tx_hash":"e6fc4379733f6744320da2f4ed85f9e79cfb4310f717bfea9a6547ebcf9bd703","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21435847","spent_by_me":"0.21435847","received_by_me":"0.21432847","my_balance_change":"-0.00003000","block_height":1455944,"timestamp":1626094075,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"e6fc4379733f6744320da2f4ed85f9e79cfb4310f717bfea9a6547ebcf9bd703","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002dc7d15bb62351eabe269d01499d2a1c00bee0705eaa1cef29cf8d04a8bcd184d020000006b483045022100d113d6de671c750ef79bc60f14da46a9e255e33e3f0b85fb37533706a63826390220777565b655e7e28d6f6e12a89a4d5c6e6a56f47d6b4c5f2aef418b4d7a8710a74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffdc7d15bb62351eabe269d01499d2a1c00bee0705eaa1cef29cf8d04a8bcd184d030000006a47304402204f63572b779323619eb16c40db07360346bd5f60ee90075c97e4db40ea59aed602206c7753de0f58417caf6fc92a6bec8fefcad4ae410bb73d9206719244ff53834f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000105a2e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac27064701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc336ec60","tx_hash":"e6fc4379733f6744320da2f4ed85f9e79cfb4310f717bfea9a6547ebcf9bd703","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.6979","spent_by_me":"6.6979","received_by_me":"6.6978","my_balance_change":"-0.0001","block_height":1455944,"timestamp":1626094075,"fee_details":null,"coin":"tBCH","internal_id":"d7b73b1e45e78f5738760355cf643bb0ce7f84a87e51dfed3ddcd999f5a1892a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000026d51c211fbbb091312efc8f4051666807e13402102f90aaccac7be62fb5958de020000006b483045022100e660ebcb57c4a2d7aa67d02be84e7347a50e277544f734ca7edd58a76b8ded1c022069153d86b2df7663c79c79d6411c1edb287595b0e96557af353fce8ca9b4291d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6d51c211fbbb091312efc8f4051666807e13402102f90aaccac7be62fb5958de030000006a47304402204b0ce7a6baf38d93b70ffd069a96e714d07668ee8c79a0df5ff37ecf5e3f6490022039b32d03755772032b513311bdcc5fcd5aadc1ec863fe31bfecddad204eb1a324121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000001098be8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac971d4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc52fec60","tx_hash":"bc2fc4aa6996da2267fd0f8cc18d3752d290dad15d2291c887351b18ffd10cb0","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21441847","spent_by_me":"0.21441847","received_by_me":"0.21438847","my_balance_change":"-0.00003000","block_height":1455942,"timestamp":1626092520,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"bc2fc4aa6996da2267fd0f8cc18d3752d290dad15d2291c887351b18ffd10cb0","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000026d51c211fbbb091312efc8f4051666807e13402102f90aaccac7be62fb5958de020000006b483045022100e660ebcb57c4a2d7aa67d02be84e7347a50e277544f734ca7edd58a76b8ded1c022069153d86b2df7663c79c79d6411c1edb287595b0e96557af353fce8ca9b4291d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6d51c211fbbb091312efc8f4051666807e13402102f90aaccac7be62fb5958de030000006a47304402204b0ce7a6baf38d93b70ffd069a96e714d07668ee8c79a0df5ff37ecf5e3f6490022039b32d03755772032b513311bdcc5fcd5aadc1ec863fe31bfecddad204eb1a324121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000001098be8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac971d4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc52fec60","tx_hash":"bc2fc4aa6996da2267fd0f8cc18d3752d290dad15d2291c887351b18ffd10cb0","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.798","spent_by_me":"6.798","received_by_me":"6.7979","my_balance_change":"-0.0001","block_height":1455942,"timestamp":1626092520,"fee_details":null,"coin":"tBCH","internal_id":"2a5f6789a28e62ebfcac80e1e371c87ac1c8a363ee844b65e52fe603633a12fe","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b00cd1ff181b3587c891225dd1da90d252378dc18c0ffd6722da9669aac42fbc020000006a47304402206a76876825e83613dea316a03db8df83cdf198d11da60e601fb2e436cbb813ea02206f5450aff9dfa35c9f3bffef649474d4b974746f822ba2f674907601872a7dc94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb00cd1ff181b3587c891225dd1da90d252378dc18c0ffd6722da9669aac42fbc030000006b483045022100ce05de693f51b977545a59aff4eb9f8293c4590ae5a69ac823a2a92d5d7dc33502206271a537f50713f6d79800977a9695023ddcae6a9758642c2397b57991de19224121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000105a3e80300000000000017a914bf0e3e4395363c21f2ae5f8514d6e0636d64753b87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf114701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc82fec60","tx_hash":"4d18cd8b4ad0f89cf2cea1ea0507ee0bc0a1d29914d069e2ab1e3562bb157ddc","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzlsu0jrj5mrcg0j4e0c29xkup3k6er48vw7yxjdtl","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21438847","spent_by_me":"0.21438847","received_by_me":"0.21435847","my_balance_change":"-0.00003000","block_height":1455942,"timestamp":1626092520,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"4d18cd8b4ad0f89cf2cea1ea0507ee0bc0a1d29914d069e2ab1e3562bb157ddc","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b00cd1ff181b3587c891225dd1da90d252378dc18c0ffd6722da9669aac42fbc020000006a47304402206a76876825e83613dea316a03db8df83cdf198d11da60e601fb2e436cbb813ea02206f5450aff9dfa35c9f3bffef649474d4b974746f822ba2f674907601872a7dc94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb00cd1ff181b3587c891225dd1da90d252378dc18c0ffd6722da9669aac42fbc030000006b483045022100ce05de693f51b977545a59aff4eb9f8293c4590ae5a69ac823a2a92d5d7dc33502206271a537f50713f6d79800977a9695023ddcae6a9758642c2397b57991de19224121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000105a3e80300000000000017a914bf0e3e4395363c21f2ae5f8514d6e0636d64753b87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf114701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc82fec60","tx_hash":"4d18cd8b4ad0f89cf2cea1ea0507ee0bc0a1d29914d069e2ab1e3562bb157ddc","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzlsu0jrj5mrcg0j4e0c29xkup3k6er48v42rag6ez","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.7979","spent_by_me":"6.7979","received_by_me":"6.6979","my_balance_change":"-0.1000","block_height":1455942,"timestamp":1626092520,"fee_details":null,"coin":"tBCH","internal_id":"eb51cc74f9ed8b567ed7e2d5e93f94e34846407fccc8b4c82e02ff92bfc69bd6","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002174c10d97ce1db602e2ec12a79566029a58290b7f679d349bd535a0b66f23903020000006b483045022100fec07d643397cf597d7850158605d57123c9436167ac7ec4ba9a87f618bf26a2022057f5999ef200e63995cf76f238cf1efdfdbc579009685e394d43821a0498e1d74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff174c10d97ce1db602e2ec12a79566029a58290b7f679d349bd535a0b66f23903030000006a47304402202d292987b9de77aaa624c51518dfc4715b3f86329bb10c61f20bffe07d8c76a9022005c93c381c8d9af5569e300a8b3fea1a00d6d5256b5c2fb11835f4d81747f88d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000001098ce80300000000000017a9144a016e56ef1c3846f3636da1938cdcff489d267f87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f294701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acfa1bec60","tx_hash":"de5859fb62bec7caac0af9022140137e80661605f4c8ef121309bbfb11c2516d","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pp9qzmjkauwrs3hnvdk6ryuvmnl538fx0ujw2qtywk","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21444847","spent_by_me":"0.21444847","received_by_me":"0.21441847","my_balance_change":"-0.00003000","block_height":1455932,"timestamp":1626086540,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"de5859fb62bec7caac0af9022140137e80661605f4c8ef121309bbfb11c2516d","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002174c10d97ce1db602e2ec12a79566029a58290b7f679d349bd535a0b66f23903020000006b483045022100fec07d643397cf597d7850158605d57123c9436167ac7ec4ba9a87f618bf26a2022057f5999ef200e63995cf76f238cf1efdfdbc579009685e394d43821a0498e1d74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff174c10d97ce1db602e2ec12a79566029a58290b7f679d349bd535a0b66f23903030000006a47304402202d292987b9de77aaa624c51518dfc4715b3f86329bb10c61f20bffe07d8c76a9022005c93c381c8d9af5569e300a8b3fea1a00d6d5256b5c2fb11835f4d81747f88d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000001098ce80300000000000017a9144a016e56ef1c3846f3636da1938cdcff489d267f87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f294701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acfa1bec60","tx_hash":"de5859fb62bec7caac0af9022140137e80661605f4c8ef121309bbfb11c2516d","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pp9qzmjkauwrs3hnvdk6ryuvmnl538fx0uf6dm3nut","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.898","spent_by_me":"6.898","received_by_me":"6.798","my_balance_change":"-0.100","block_height":1455932,"timestamp":1626086540,"fee_details":null,"coin":"tBCH","internal_id":"0f14bb119589b11dae2554544265ba60d3558ae5e73d4ca73bfae3abafaf1188","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000025e3205d6a4a8c7b823572c2cb7c5f3172d7986f1bfed2b04321d3dcf44b22f7f020000006a47304402207b4ebcbbb8dc10a288397b9c0a25d54f59e85df648bd32f56e5f367579819142022051bfdacb030374cc04fb7436c877114b3d824e7e55b7a34ddfab05fe68092e8c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5e3205d6a4a8c7b823572c2cb7c5f3172d7986f1bfed2b04321d3dcf44b22f7f030000006a473044022052a24a37a1bc67772c12c8426c91f4fd6a69d7066f83908b14b2ea10dac2e65102206f7858e0681f736303d23b6fe3f178e6b9785f30957028f5ffe5b29d702ae0734121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000010d74e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac07354701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aced1bec60","tx_hash":"0339f2660b5a53bd49d379f6b79082a5296056792ac12e2e60dbe17cd9104c17","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21447847","spent_by_me":"0.21447847","received_by_me":"0.21444847","my_balance_change":"-0.00003000","block_height":1455932,"timestamp":1626086540,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"0339f2660b5a53bd49d379f6b79082a5296056792ac12e2e60dbe17cd9104c17","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000025e3205d6a4a8c7b823572c2cb7c5f3172d7986f1bfed2b04321d3dcf44b22f7f020000006a47304402207b4ebcbbb8dc10a288397b9c0a25d54f59e85df648bd32f56e5f367579819142022051bfdacb030374cc04fb7436c877114b3d824e7e55b7a34ddfab05fe68092e8c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5e3205d6a4a8c7b823572c2cb7c5f3172d7986f1bfed2b04321d3dcf44b22f7f030000006a473044022052a24a37a1bc67772c12c8426c91f4fd6a69d7066f83908b14b2ea10dac2e65102206f7858e0681f736303d23b6fe3f178e6b9785f30957028f5ffe5b29d702ae0734121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000010d74e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac07354701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aced1bec60","tx_hash":"0339f2660b5a53bd49d379f6b79082a5296056792ac12e2e60dbe17cd9104c17","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.8981","spent_by_me":"6.8981","received_by_me":"6.898","my_balance_change":"-0.0001","block_height":1455932,"timestamp":1626086540,"fee_details":null,"coin":"tBCH","internal_id":"2b2c364bcbda16dc1c91f5939fc57fda12a350954cbf6cedbc7c233713f4740a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002bf7ec5e2f89089897ba9a327e5b1d45c8446193cbc9eedb90d2f4c5e83329f45020000006a473044022073e4c2b8c72d5597feaa4aac2d3122e30f6dd2e68d627fb7dc7e220acd70ea6c02206de3aec2dc49aff8b06c9575938379f5077db441a5c843a4d8bb7e326ec509f84121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbf7ec5e2f89089897ba9a327e5b1d45c8446193cbc9eedb90d2f4c5e83329f45030000006b483045022100b1df08b3be7aad4a5b1e3abf3643f8bfb54b1c7c625a1710e9860439a1d7df1f022034d24cdbe29b1148eeaa0555823385e29f8acb305ec671907bd4ac9ef950d3304121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000010d75e80300000000000017a914eb39dbf19aedc8fb22467ce18fafcd97cb8cc2b187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbf404701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0c03ec60","tx_hash":"7f2fb244cf3d1d32042bedbff186792d17f3c5b72c2c5723b8c7a8a4d605325e","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pr4nnkl3ntku37ezge7wrra0ektuhrxzkyk9gpw5ce","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21450847","spent_by_me":"0.21450847","received_by_me":"0.21447847","my_balance_change":"-0.00003000","block_height":1455920,"timestamp":1626080445,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"7f2fb244cf3d1d32042bedbff186792d17f3c5b72c2c5723b8c7a8a4d605325e","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002bf7ec5e2f89089897ba9a327e5b1d45c8446193cbc9eedb90d2f4c5e83329f45020000006a473044022073e4c2b8c72d5597feaa4aac2d3122e30f6dd2e68d627fb7dc7e220acd70ea6c02206de3aec2dc49aff8b06c9575938379f5077db441a5c843a4d8bb7e326ec509f84121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbf7ec5e2f89089897ba9a327e5b1d45c8446193cbc9eedb90d2f4c5e83329f45030000006b483045022100b1df08b3be7aad4a5b1e3abf3643f8bfb54b1c7c625a1710e9860439a1d7df1f022034d24cdbe29b1148eeaa0555823385e29f8acb305ec671907bd4ac9ef950d3304121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000010d75e80300000000000017a914eb39dbf19aedc8fb22467ce18fafcd97cb8cc2b187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbf404701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0c03ec60","tx_hash":"7f2fb244cf3d1d32042bedbff186792d17f3c5b72c2c5723b8c7a8a4d605325e","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pr4nnkl3ntku37ezge7wrra0ektuhrxzkyd3065r2y","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.9981","spent_by_me":"6.9981","received_by_me":"6.8981","my_balance_change":"-0.1000","block_height":1455920,"timestamp":1626080445,"fee_details":null,"coin":"tBCH","internal_id":"c97ea51d4c9fef38bcef7f5f8889187233c99907f087ae4fd27e9a3305e493f4","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002528acbbae8d79a7dcef6ddf53eddbab835880c88522d79fdf4f1512ab6685382020000006b483045022100c6a0be60fcb959f94980bc6ca0913793cbf17e9c84f79ef692daf4e603a4124402204c4ff28b0476a0e9363d0251468314499ffccebce9ddd8f2286d4220a5e3b0a34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff528acbbae8d79a7dcef6ddf53eddbab835880c88522d79fdf4f1512ab6685382030000006b483045022100f1189b76a0f58d5ea2e75420dd6277d2030ef2aa7e1bdc301715870c7860e2a60220239d1d7b6678427c50d6e6e7f2a69d87c54c75be1578a4b3c8b9b246ef164eb04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000001115de8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac774c4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acff02ec60","tx_hash":"459f32835e4c2f0db9ed9ebc3c1946845cd4b1e527a3a97b898990f8e2c57ebf","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21453847","spent_by_me":"0.21453847","received_by_me":"0.21450847","my_balance_change":"-0.00003000","block_height":1455920,"timestamp":1626080445,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"459f32835e4c2f0db9ed9ebc3c1946845cd4b1e527a3a97b898990f8e2c57ebf","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002528acbbae8d79a7dcef6ddf53eddbab835880c88522d79fdf4f1512ab6685382020000006b483045022100c6a0be60fcb959f94980bc6ca0913793cbf17e9c84f79ef692daf4e603a4124402204c4ff28b0476a0e9363d0251468314499ffccebce9ddd8f2286d4220a5e3b0a34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff528acbbae8d79a7dcef6ddf53eddbab835880c88522d79fdf4f1512ab6685382030000006b483045022100f1189b76a0f58d5ea2e75420dd6277d2030ef2aa7e1bdc301715870c7860e2a60220239d1d7b6678427c50d6e6e7f2a69d87c54c75be1578a4b3c8b9b246ef164eb04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000001115de8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac774c4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acff02ec60","tx_hash":"459f32835e4c2f0db9ed9ebc3c1946845cd4b1e527a3a97b898990f8e2c57ebf","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"6.9982","spent_by_me":"6.9982","received_by_me":"6.9981","my_balance_change":"-0.0001","block_height":1455920,"timestamp":1626080445,"fee_details":null,"coin":"tBCH","internal_id":"622eded551f4ab8052e462d9b13a5826b46d0850117b5309f7cf35d4b2dd7d20","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b8c5dc25ebdbf124674e408d85367c8454a68ea3dbae0a8bf4e3039c4ebef0e6020000006b483045022100b6ca21e41daa73b6b6a0a053b5b6a72156c5af5258122e56a1c7fe0cd49695cb02202d2e09e50c874bc711f4fabf0d469846a5fdb599731720dffc9e9ec4521023904121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb8c5dc25ebdbf124674e408d85367c8454a68ea3dbae0a8bf4e3039c4ebef0e6030000006a47304402205f486aad621801ada4206fdef983224ed4a10e1d85785929870bfbf0ab7c939202201a37f499351f69a7ffe119b5f73d8e03cc746bfafbfb90d950bb1d4ffcfde4364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000011546e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace7634701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3cf7e760","tx_hash":"c156cb702b0dbe463f64a354386169dd1a0b3808c904c27db8ed0256ced2c37e","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21459847","spent_by_me":"0.21459847","received_by_me":"0.21456847","my_balance_change":"-0.00003000","block_height":1455481,"timestamp":1625814954,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"c156cb702b0dbe463f64a354386169dd1a0b3808c904c27db8ed0256ced2c37e","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b8c5dc25ebdbf124674e408d85367c8454a68ea3dbae0a8bf4e3039c4ebef0e6020000006b483045022100b6ca21e41daa73b6b6a0a053b5b6a72156c5af5258122e56a1c7fe0cd49695cb02202d2e09e50c874bc711f4fabf0d469846a5fdb599731720dffc9e9ec4521023904121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb8c5dc25ebdbf124674e408d85367c8454a68ea3dbae0a8bf4e3039c4ebef0e6030000006a47304402205f486aad621801ada4206fdef983224ed4a10e1d85785929870bfbf0ab7c939202201a37f499351f69a7ffe119b5f73d8e03cc746bfafbfb90d950bb1d4ffcfde4364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000011546e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace7634701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3cf7e760","tx_hash":"c156cb702b0dbe463f64a354386169dd1a0b3808c904c27db8ed0256ced2c37e","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.0983","spent_by_me":"7.0983","received_by_me":"7.0982","my_balance_change":"-0.0001","block_height":1455481,"timestamp":1625814954,"fee_details":null,"coin":"tBCH","internal_id":"01108977dad384b3495ed3ee6d07401785431326784102c7f8b4e33c7fceedda","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000027ec3d2ce5602edb87dc204c908380b1add69613854a3643f46be0d2b70cb56c1020000006b4830450221008e47c2c07a9c4856fdec40a13abbbb87dab56706917e5314278549686febc43b022042e07e4b477ac5f29fa6c7ee2a97c73901d8861ad1c299a718c4c92ed5a2d1804121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff7ec3d2ce5602edb87dc204c908380b1add69613854a3643f46be0d2b70cb56c1030000006a473044022017821ab2ae4d31e6eebcf3e4575e06e8180ad03c17207f339d7b5441d85e50aa02200f78eb7687e600348742129ade40099e33902b30f638ac5574570be09b8c81c14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000001115ee80300000000000017a914b7e0007cf03669a5b4ae5268617432b030dc9d5187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f584701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3ef7e760","tx_hash":"825368b62a51f1f4fd792d52880c8835b8badd3ef5ddf6ce7d9ad7e8bacb8a52","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzm7qqru7qmxnfd54efxsct5x2crphya2yx0cn77dm","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21456847","spent_by_me":"0.21456847","received_by_me":"0.21453847","my_balance_change":"-0.00003000","block_height":1455481,"timestamp":1625814954,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"825368b62a51f1f4fd792d52880c8835b8badd3ef5ddf6ce7d9ad7e8bacb8a52","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000027ec3d2ce5602edb87dc204c908380b1add69613854a3643f46be0d2b70cb56c1020000006b4830450221008e47c2c07a9c4856fdec40a13abbbb87dab56706917e5314278549686febc43b022042e07e4b477ac5f29fa6c7ee2a97c73901d8861ad1c299a718c4c92ed5a2d1804121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff7ec3d2ce5602edb87dc204c908380b1add69613854a3643f46be0d2b70cb56c1030000006a473044022017821ab2ae4d31e6eebcf3e4575e06e8180ad03c17207f339d7b5441d85e50aa02200f78eb7687e600348742129ade40099e33902b30f638ac5574570be09b8c81c14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000001115ee80300000000000017a914b7e0007cf03669a5b4ae5268617432b030dc9d5187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f584701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3ef7e760","tx_hash":"825368b62a51f1f4fd792d52880c8835b8badd3ef5ddf6ce7d9ad7e8bacb8a52","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzm7qqru7qmxnfd54efxsct5x2crphya2yamlgyflx","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.0982","spent_by_me":"7.0982","received_by_me":"6.9982","my_balance_change":"-0.1000","block_height":1455481,"timestamp":1625814954,"fee_details":null,"coin":"tBCH","internal_id":"70dd3998d70330772870f23db91beeee9d52f7dc9de80c4e4a5369fa1c244a7b","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000020a54c63de908f7db54cbda8595ba47b616205d919e27b0534f784ac564ba313a020000006b483045022100daa11f5ece3150332a4283ee221450948ed35d261441dcedcf41823edc9357d80220474574926bd3002cadbc98ee2d08d9f4fb031376cf47d920fa70fee717c87eff4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0a54c63de908f7db54cbda8595ba47b616205d919e27b0534f784ac564ba313a030000006b483045022100afd96dfe543efe8d84b5e1c05216db0bf4269d4f3986c8c04f3ec344079d2b330220498b5d147b9901b60aee2d7afb25f9acf5fe8b81616b70bb07dc4f6a6125a96b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000011547e80300000000000017a91472a1f30385c63ee266b6955d6edfdb10596de93087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f6f4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb80de760","tx_hash":"e6f0be4e9c03e3f48b0aaedba38ea654847c36858d404e6724f1dbeb25dcc5b8","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppe2rucrshrracnxk6246mklmvg9jm0fxqvlx3y9ty","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21462847","spent_by_me":"0.21462847","received_by_me":"0.21459847","my_balance_change":"-0.00003000","block_height":1455413,"timestamp":1625755850,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"e6f0be4e9c03e3f48b0aaedba38ea654847c36858d404e6724f1dbeb25dcc5b8","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000020a54c63de908f7db54cbda8595ba47b616205d919e27b0534f784ac564ba313a020000006b483045022100daa11f5ece3150332a4283ee221450948ed35d261441dcedcf41823edc9357d80220474574926bd3002cadbc98ee2d08d9f4fb031376cf47d920fa70fee717c87eff4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0a54c63de908f7db54cbda8595ba47b616205d919e27b0534f784ac564ba313a030000006b483045022100afd96dfe543efe8d84b5e1c05216db0bf4269d4f3986c8c04f3ec344079d2b330220498b5d147b9901b60aee2d7afb25f9acf5fe8b81616b70bb07dc4f6a6125a96b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000011547e80300000000000017a91472a1f30385c63ee266b6955d6edfdb10596de93087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f6f4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb80de760","tx_hash":"e6f0be4e9c03e3f48b0aaedba38ea654847c36858d404e6724f1dbeb25dcc5b8","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppe2rucrshrracnxk6246mklmvg9jm0fxqhtp27jee","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.1983","spent_by_me":"7.1983","received_by_me":"7.0983","my_balance_change":"-0.1000","block_height":1455413,"timestamp":1625755850,"fee_details":null,"coin":"tBCH","internal_id":"ce6c7660410cc159b0d57509238189383d47ca5e1a154eea457b5615b3655833","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000263a5fab0683011ee4d18541e2aed8fb190f26fe08d216e88e247f602acc6eba7020000006b483045022100e78ce23da10343611783990aecdc833e68d6a41389af52c44be92c4a78ddc9db022058833c1c05deff16327cf48be706a5da3ed4227bf946463516409deb3cb8d86b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff63a5fab0683011ee4d18541e2aed8fb190f26fe08d216e88e247f602acc6eba7030000006b483045022100a232e5521febc0fb36bb01f50657662cc7297e27ea278067ade677fe98796cfd022015962e70f0c5a079655ecf485f42f3a28330eaf5fcad045bdd853da45394cda54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000001192fe8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac577b4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb50de760","tx_hash":"3a31ba64c54a784f53b0279e915d2016b647ba9585dacb54dbf708e93dc6540a","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21465847","spent_by_me":"0.21465847","received_by_me":"0.21462847","my_balance_change":"-0.00003000","block_height":1455413,"timestamp":1625755850,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"3a31ba64c54a784f53b0279e915d2016b647ba9585dacb54dbf708e93dc6540a","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000263a5fab0683011ee4d18541e2aed8fb190f26fe08d216e88e247f602acc6eba7020000006b483045022100e78ce23da10343611783990aecdc833e68d6a41389af52c44be92c4a78ddc9db022058833c1c05deff16327cf48be706a5da3ed4227bf946463516409deb3cb8d86b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff63a5fab0683011ee4d18541e2aed8fb190f26fe08d216e88e247f602acc6eba7030000006b483045022100a232e5521febc0fb36bb01f50657662cc7297e27ea278067ade677fe98796cfd022015962e70f0c5a079655ecf485f42f3a28330eaf5fcad045bdd853da45394cda54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000001192fe8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac577b4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb50de760","tx_hash":"3a31ba64c54a784f53b0279e915d2016b647ba9585dacb54dbf708e93dc6540a","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.1984","spent_by_me":"7.1984","received_by_me":"7.1983","my_balance_change":"-0.0001","block_height":1455413,"timestamp":1625755850,"fee_details":null,"coin":"tBCH","internal_id":"2c2a602e6fbbb97045ba95afb534479a59d1cf179a36959070c67d4ef9e92d56","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002bb93d534bfa95c5a746c22671ef5e9f7dae48b414c46d7885862e50887fcdc2b020000006a4730440220474ee418db2760c703016d01f8cd1440d36a45ae3eb5bea1d8ec257f22e34a0802201516a8b32af513c3914839d1bb6871ffe4b77928070444bd0e7ca1033ef53b1d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbb93d534bfa95c5a746c22671ef5e9f7dae48b414c46d7885862e50887fcdc2b030000006a47304402203627759d399bb8ca178926fc93412bce1f78e2c6c43803e33db4eb79a4f6c7fa022016a1c2a54df3503a9749ac97f482b819a236cadc1273fc8dd70a9e2ef69193ce4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000011930e80300000000000017a914cdad3b10b52f6e13c606cdca160bc8f510c48e5187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0f874701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5eb0e660","tx_hash":"a7ebc6ac02f647e2886e218de06ff290b18fed2a1e54184dee113068b0faa563","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prx66wcsk5hkuy7xqmxu59ster63p3yw2ywmgzqrqz","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21468847","spent_by_me":"0.21468847","received_by_me":"0.21465847","my_balance_change":"-0.00003000","block_height":1455393,"timestamp":1625732178,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"a7ebc6ac02f647e2886e218de06ff290b18fed2a1e54184dee113068b0faa563","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002bb93d534bfa95c5a746c22671ef5e9f7dae48b414c46d7885862e50887fcdc2b020000006a4730440220474ee418db2760c703016d01f8cd1440d36a45ae3eb5bea1d8ec257f22e34a0802201516a8b32af513c3914839d1bb6871ffe4b77928070444bd0e7ca1033ef53b1d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbb93d534bfa95c5a746c22671ef5e9f7dae48b414c46d7885862e50887fcdc2b030000006a47304402203627759d399bb8ca178926fc93412bce1f78e2c6c43803e33db4eb79a4f6c7fa022016a1c2a54df3503a9749ac97f482b819a236cadc1273fc8dd70a9e2ef69193ce4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000011930e80300000000000017a914cdad3b10b52f6e13c606cdca160bc8f510c48e5187e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0f874701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5eb0e660","tx_hash":"a7ebc6ac02f647e2886e218de06ff290b18fed2a1e54184dee113068b0faa563","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prx66wcsk5hkuy7xqmxu59ster63p3yw2y400e65jl","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.2984","spent_by_me":"7.2984","received_by_me":"7.1984","my_balance_change":"-0.1000","block_height":1455393,"timestamp":1625732178,"fee_details":null,"coin":"tBCH","internal_id":"f4e1812cc0095cece6d05ec831d13c8ed9e58f546ad05bf41e28c37f2e4cf085","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002d01df8b7a9a203a5d1b1b797d339f69ff0f3c929e638758948f1497599f3ef7d020000006a47304402200e2dfab7c1cea057f825c65b5158c33e4bcefcce0d492cddc220fb63dc4d9bda022016048782f9b321406f8991c6b38562bf240626cbc35825a2a34f7e1bd49848024121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffd01df8b7a9a203a5d1b1b797d339f69ff0f3c929e638758948f1497599f3ef7d030000006b483045022100de0917450e56164d8cca69bc0e29f070eafd0b0b4239407ffbed73b673a2843d022062406ce0bb6c13b916a24cbb781aa44d6ac4f3db28a6d8b22ed06028f060f69d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000011d18e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc7924701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5bb0e660","tx_hash":"2bdcfc8708e5625888d7464c418be4daf7e9f51e67226c745a5ca9bf34d593bb","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21471847","spent_by_me":"0.21471847","received_by_me":"0.21468847","my_balance_change":"-0.00003000","block_height":1455393,"timestamp":1625732178,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"2bdcfc8708e5625888d7464c418be4daf7e9f51e67226c745a5ca9bf34d593bb","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002d01df8b7a9a203a5d1b1b797d339f69ff0f3c929e638758948f1497599f3ef7d020000006a47304402200e2dfab7c1cea057f825c65b5158c33e4bcefcce0d492cddc220fb63dc4d9bda022016048782f9b321406f8991c6b38562bf240626cbc35825a2a34f7e1bd49848024121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffd01df8b7a9a203a5d1b1b797d339f69ff0f3c929e638758948f1497599f3ef7d030000006b483045022100de0917450e56164d8cca69bc0e29f070eafd0b0b4239407ffbed73b673a2843d022062406ce0bb6c13b916a24cbb781aa44d6ac4f3db28a6d8b22ed06028f060f69d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000011d18e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc7924701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5bb0e660","tx_hash":"2bdcfc8708e5625888d7464c418be4daf7e9f51e67226c745a5ca9bf34d593bb","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.2985","spent_by_me":"7.2985","received_by_me":"7.2984","my_balance_change":"-0.0001","block_height":1455393,"timestamp":1625732178,"fee_details":null,"coin":"tBCH","internal_id":"536ba3818af4beb7eff054adc313c01a21cbca40dc480a2040e9f165af5d3ffd","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002846a1b801449b070e701db8d41c905fcad7db3fd7645987903c2a8b348ffe47f020000006b483045022100ecdcb4e81e0976693c7974029f74ebe0e2697f8547f4ef06130fa6d89519720f02203e794f2d66b6549a088f49d3d18ffbf8d46166d01af35fa2d03b3fedb6721ed64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff846a1b801449b070e701db8d41c905fcad7db3fd7645987903c2a8b348ffe47f030000006b483045022100f7db307d111357b6926564728a52a83b714c5a850e1a8fcb081cb6499929e2f702200fd5a171f9a06ec03ad844ee5513b72e1f6f6def1ddd0360f20f6161cae46be44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000011d19e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7f9e4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace828df60","tx_hash":"7deff3997549f148897538e629c9f3f09ff639d397b7b1d1a503a2a9b7f81dd0","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21474847","spent_by_me":"0.21474847","received_by_me":"0.21471847","my_balance_change":"-0.00003000","block_height":1454520,"timestamp":1625238393,"fee_details":{"type":"Utxo","amount":"0.00002"},"coin":"tBCH","internal_id":"7deff3997549f148897538e629c9f3f09ff639d397b7b1d1a503a2a9b7f81dd0","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002846a1b801449b070e701db8d41c905fcad7db3fd7645987903c2a8b348ffe47f020000006b483045022100ecdcb4e81e0976693c7974029f74ebe0e2697f8547f4ef06130fa6d89519720f02203e794f2d66b6549a088f49d3d18ffbf8d46166d01af35fa2d03b3fedb6721ed64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff846a1b801449b070e701db8d41c905fcad7db3fd7645987903c2a8b348ffe47f030000006b483045022100f7db307d111357b6926564728a52a83b714c5a850e1a8fcb081cb6499929e2f702200fd5a171f9a06ec03ad844ee5513b72e1f6f6def1ddd0360f20f6161cae46be44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000011d19e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7f9e4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace828df60","tx_hash":"7deff3997549f148897538e629c9f3f09ff639d397b7b1d1a503a2a9b7f81dd0","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.2986","spent_by_me":"7.2986","received_by_me":"7.2985","my_balance_change":"-0.0001","block_height":1454520,"timestamp":1625238393,"fee_details":null,"coin":"tBCH","internal_id":"d0d0d27da94208523d7aa15e69c01e26aaf2e57d3babb59cb33c2a12312139c9","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002bc2f060f95f49adebada3a716b8b41f8ae910116a0a785025424083bd9f4a227020000006a47304402200801537c34845451ee32d55d92d067692d5a7e90b42e40b494b110aa600a7512022045812131c23b0372cc1f08e86fe09511aa84ded6c5bc7785f7af1dff1d01bf5a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbc2f060f95f49adebada3a716b8b41f8ae910116a0a785025424083bd9f4a227030000006a473044022057c3ca0a94ffd218809c362244777aceff638dd673d492dc305e6bf4d0c8eeab02205f3863339664b1cbe6aa15d70b959b30646e581f9d7b009afc7b0cd2df839ea54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000124ebe8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca7c14701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac63ccde60","tx_hash":"ec8eed8490565c17685f8ad2a0399b67af0433c2b16d1ce53c5e1c3a0f416f60","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21482847","spent_by_me":"0.21482847","received_by_me":"0.21480847","my_balance_change":"-0.00002000","block_height":1454479,"timestamp":1625215221,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"ec8eed8490565c17685f8ad2a0399b67af0433c2b16d1ce53c5e1c3a0f416f60","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002bc2f060f95f49adebada3a716b8b41f8ae910116a0a785025424083bd9f4a227020000006a47304402200801537c34845451ee32d55d92d067692d5a7e90b42e40b494b110aa600a7512022045812131c23b0372cc1f08e86fe09511aa84ded6c5bc7785f7af1dff1d01bf5a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbc2f060f95f49adebada3a716b8b41f8ae910116a0a785025424083bd9f4a227030000006a473044022057c3ca0a94ffd218809c362244777aceff638dd673d492dc305e6bf4d0c8eeab02205f3863339664b1cbe6aa15d70b959b30646e581f9d7b009afc7b0cd2df839ea54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000124ebe8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca7c14701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac63ccde60","tx_hash":"ec8eed8490565c17685f8ad2a0399b67af0433c2b16d1ce53c5e1c3a0f416f60","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.4988","spent_by_me":"7.4988","received_by_me":"7.4987","my_balance_change":"-0.0001","block_height":1454479,"timestamp":1625215221,"fee_details":null,"coin":"tBCH","internal_id":"74a914ba7cdd9164cbb36cc26d3af17bf4c54619e1d3118b542cef44352a61a2","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002624c73d2d461f17c8c65240185ebc5f8c5e7864cbebc7e9cb837c58712d51558020000006b483045022100c95e3beb4f2b4ba1880de7631cbd0570e5b5cc4b53cc6d72f505db4db119ca8f02205389a8eb3fef0a3986accdb86a9fabf83968ddc91f5aed76e18abb58a05ae92f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff624c73d2d461f17c8c65240185ebc5f8c5e7864cbebc7e9cb837c58712d51558030000006b483045022100e30e6e76b0e201d607ec23c12d52d0e68cb7c524b4ce30dbdebb3e25256feb4802207fa3ca01ed8a8e304ba4bdf9229ca3159210949dca22bf45d8b17c27e1f5014c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000011d1ae80300000000000017a914a532cabaee0701e1e1db193683e3cda43161612b87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac37aa4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac32cede60","tx_hash":"7fe4ff48b3a8c20379984576fdb37dadfc05c9418ddb01e770b04914801b6a84","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzjn9j46acrsrc0pmvvndqlrekjrzctp9vpmhqt026","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21476847","spent_by_me":"0.21476847","received_by_me":"0.21474847","my_balance_change":"-0.00002000","block_height":1454479,"timestamp":1625215221,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"7fe4ff48b3a8c20379984576fdb37dadfc05c9418ddb01e770b04914801b6a84","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002624c73d2d461f17c8c65240185ebc5f8c5e7864cbebc7e9cb837c58712d51558020000006b483045022100c95e3beb4f2b4ba1880de7631cbd0570e5b5cc4b53cc6d72f505db4db119ca8f02205389a8eb3fef0a3986accdb86a9fabf83968ddc91f5aed76e18abb58a05ae92f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff624c73d2d461f17c8c65240185ebc5f8c5e7864cbebc7e9cb837c58712d51558030000006b483045022100e30e6e76b0e201d607ec23c12d52d0e68cb7c524b4ce30dbdebb3e25256feb4802207fa3ca01ed8a8e304ba4bdf9229ca3159210949dca22bf45d8b17c27e1f5014c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000011d1ae80300000000000017a914a532cabaee0701e1e1db193683e3cda43161612b87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac37aa4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac32cede60","tx_hash":"7fe4ff48b3a8c20379984576fdb37dadfc05c9418ddb01e770b04914801b6a84","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzjn9j46acrsrc0pmvvndqlrekjrzctp9v60sm3cc8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.3986","spent_by_me":"7.3986","received_by_me":"7.2986","my_balance_change":"-0.1000","block_height":1454479,"timestamp":1625215221,"fee_details":null,"coin":"tBCH","internal_id":"0a0a509bc58762751e9c55d683d829c25a02d8a2e2882bc9477ebb52444300f6","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000276aea71963b604d2232ca7b6e2fc0ba9a584e21c199cfef3b1cf802fa8a55552020000006b483045022100c1689ac6f5bf90ed8d70612fff5fa275eecbbf1cbaa7768e3f56e610d1af2bca022069e5ffc3c74878b5c9addf0f8730514d14047c0cbdb74aebabcb6e6f2768854b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff76aea71963b604d2232ca7b6e2fc0ba9a584e21c199cfef3b1cf802fa8a55552030000006a47304402205f460fa1e3b82b364551446ad60aa218e77ab04af3c9db72eeb0dbbea2f5fe9a02206a5dcba75809dda38e370c4f8b1d0de3f7b44e34f3d115c59981e329dce9d9274121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000012102e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac07b24701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac30cede60","tx_hash":"5815d51287c537b89c7ebcbe4c86e7c5f8c5eb850124658c7cf161d4d2734c62","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21478847","spent_by_me":"0.21478847","received_by_me":"0.21476847","my_balance_change":"-0.00002000","block_height":1454479,"timestamp":1625215221,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"5815d51287c537b89c7ebcbe4c86e7c5f8c5eb850124658c7cf161d4d2734c62","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000276aea71963b604d2232ca7b6e2fc0ba9a584e21c199cfef3b1cf802fa8a55552020000006b483045022100c1689ac6f5bf90ed8d70612fff5fa275eecbbf1cbaa7768e3f56e610d1af2bca022069e5ffc3c74878b5c9addf0f8730514d14047c0cbdb74aebabcb6e6f2768854b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff76aea71963b604d2232ca7b6e2fc0ba9a584e21c199cfef3b1cf802fa8a55552030000006a47304402205f460fa1e3b82b364551446ad60aa218e77ab04af3c9db72eeb0dbbea2f5fe9a02206a5dcba75809dda38e370c4f8b1d0de3f7b44e34f3d115c59981e329dce9d9274121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000012102e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac07b24701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac30cede60","tx_hash":"5815d51287c537b89c7ebcbe4c86e7c5f8c5eb850124658c7cf161d4d2734c62","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.3987","spent_by_me":"7.3987","received_by_me":"7.3986","my_balance_change":"-0.0001","block_height":1454479,"timestamp":1625215221,"fee_details":null,"coin":"tBCH","internal_id":"cd72e89cb7d7ef8311f019acf44a0d6fc4e2c3f3682e103ded1be9b9e95e95b7","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002606f410f3a1c5e3ce51c6db1c23304af679b39a0d28a5f68175c569084ed8eec020000006b483045022100b52e86356200712da855e10b02ef62148bb05f26eb6ff8a851a6765b12d4f7f502206df1ba9aa53ee0e9d49e3c5f63f250045bc73d16d66b0387dcd36666e03162f74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff606f410f3a1c5e3ce51c6db1c23304af679b39a0d28a5f68175c569084ed8eec030000006a47304402207ce91e1cf6ace3165e66018123b17d7fcd11bfcf75c2e529916746123c899359022072b40bcebfd4f535de42f837c762b4723ecb3d98213258af4d35dcc6412fcb404121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000012103e80300000000000017a9149a1411ace5b6c6a4b683a88cfedb343d2e7f1c7487e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd7b94701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac65ccde60","tx_hash":"5255a5a82f80cfb1f3fe9c191ce284a5a90bfce2b6a72c23d204b66319a7ae76","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzdpgydvukmvdf9ksw5gelkmxs7julcuwse7d2n3n2","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21480847","spent_by_me":"0.21480847","received_by_me":"0.21478847","my_balance_change":"-0.00002000","block_height":1454479,"timestamp":1625215221,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"5255a5a82f80cfb1f3fe9c191ce284a5a90bfce2b6a72c23d204b66319a7ae76","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002606f410f3a1c5e3ce51c6db1c23304af679b39a0d28a5f68175c569084ed8eec020000006b483045022100b52e86356200712da855e10b02ef62148bb05f26eb6ff8a851a6765b12d4f7f502206df1ba9aa53ee0e9d49e3c5f63f250045bc73d16d66b0387dcd36666e03162f74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff606f410f3a1c5e3ce51c6db1c23304af679b39a0d28a5f68175c569084ed8eec030000006a47304402207ce91e1cf6ace3165e66018123b17d7fcd11bfcf75c2e529916746123c899359022072b40bcebfd4f535de42f837c762b4723ecb3d98213258af4d35dcc6412fcb404121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000012103e80300000000000017a9149a1411ace5b6c6a4b683a88cfedb343d2e7f1c7487e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd7b94701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac65ccde60","tx_hash":"5255a5a82f80cfb1f3fe9c191ce284a5a90bfce2b6a72c23d204b66319a7ae76","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzdpgydvukmvdf9ksw5gelkmxs7julcuwsz223fxph","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.4987","spent_by_me":"7.4987","received_by_me":"7.3987","my_balance_change":"-0.1000","block_height":1454479,"timestamp":1625215221,"fee_details":null,"coin":"tBCH","internal_id":"ad9ec7b0c12fed34a7f859abfc18cdcad5bb046e4a20c6d52fb7e43efaecf195","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002381f4c7570e528446c92c2b9d28cce1d457ddeb8d6ae5590995852592b2ba8ab020000006b483045022100fba4e3d9bfc56c6ece835cec5ee14178918065241389661fd89d7db1eea357a302207e892529c9e3324f5d11b0492484f871dab3457631aa55cc1d72ceb4078717064121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff381f4c7570e528446c92c2b9d28cce1d457ddeb8d6ae5590995852592b2ba8ab030000006a47304402203907a215422e6816403301d2829b11b5d984ee89c55a7a612d4321b418c61d7702202a59c70515751d320d27e0d4d4b058b12f54a6d992e739829cfbd4b29faa2e0d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000128d4e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac47d14701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb4c9de60","tx_hash":"875d961219c90391427eaf86ca6ad1d1f67d787cb004c39fe9fe284c6191c258","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21486847","spent_by_me":"0.21486847","received_by_me":"0.21484847","my_balance_change":"-0.00002000","block_height":1454477,"timestamp":1625213445,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"875d961219c90391427eaf86ca6ad1d1f67d787cb004c39fe9fe284c6191c258","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002381f4c7570e528446c92c2b9d28cce1d457ddeb8d6ae5590995852592b2ba8ab020000006b483045022100fba4e3d9bfc56c6ece835cec5ee14178918065241389661fd89d7db1eea357a302207e892529c9e3324f5d11b0492484f871dab3457631aa55cc1d72ceb4078717064121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff381f4c7570e528446c92c2b9d28cce1d457ddeb8d6ae5590995852592b2ba8ab030000006a47304402203907a215422e6816403301d2829b11b5d984ee89c55a7a612d4321b418c61d7702202a59c70515751d320d27e0d4d4b058b12f54a6d992e739829cfbd4b29faa2e0d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000128d4e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac47d14701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb4c9de60","tx_hash":"875d961219c90391427eaf86ca6ad1d1f67d787cb004c39fe9fe284c6191c258","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.5989","spent_by_me":"7.5989","received_by_me":"7.5988","my_balance_change":"-0.0001","block_height":1454477,"timestamp":1625213445,"fee_details":null,"coin":"tBCH","internal_id":"7913669d09ec17078156a5765f4a356d3186a34eedff2f8a51fabfc4c28e955c","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000258c291614c28fee99fc304b07c787df6d1d16aca86af7e429103c91912965d87020000006a47304402204d2bbeb9a5defa77ef04a6ec115c925e76dee55203df6c4714c5b2122ed81a46022052f696df673dff637ee2db36b1f760c5d58a9dbf74a8ec5e8d976b430ca49d334121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff58c291614c28fee99fc304b07c787df6d1d16aca86af7e429103c91912965d87030000006b483045022100a6d6b9ec4023662628401bf524ac2713d8579026a275cf346c10843eadd7f141022074721fff37a3665a80c0f7324f0499f686cf73ad827c6ff9acea3bf99080448a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000124ece80300000000000017a914a85daa483c80249a83beaa8defdff18c4e8b5b1287e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac77c94701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc6c9de60","tx_hash":"27a2f4d93b0824540285a7a0160191aef8418b6b713adabade9af4950f062fbc","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pz59m2jg8jqzfx5rh64gmm7l7xxyaz6mzgqzr8dnzs","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21484847","spent_by_me":"0.21484847","received_by_me":"0.21482847","my_balance_change":"-0.00002000","block_height":1454477,"timestamp":1625213445,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"27a2f4d93b0824540285a7a0160191aef8418b6b713adabade9af4950f062fbc","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000258c291614c28fee99fc304b07c787df6d1d16aca86af7e429103c91912965d87020000006a47304402204d2bbeb9a5defa77ef04a6ec115c925e76dee55203df6c4714c5b2122ed81a46022052f696df673dff637ee2db36b1f760c5d58a9dbf74a8ec5e8d976b430ca49d334121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff58c291614c28fee99fc304b07c787df6d1d16aca86af7e429103c91912965d87030000006b483045022100a6d6b9ec4023662628401bf524ac2713d8579026a275cf346c10843eadd7f141022074721fff37a3665a80c0f7324f0499f686cf73ad827c6ff9acea3bf99080448a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000124ece80300000000000017a914a85daa483c80249a83beaa8defdff18c4e8b5b1287e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac77c94701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc6c9de60","tx_hash":"27a2f4d93b0824540285a7a0160191aef8418b6b713adabade9af4950f062fbc","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pz59m2jg8jqzfx5rh64gmm7l7xxyaz6mzgmkyuhysd","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.5988","spent_by_me":"7.5988","received_by_me":"7.4988","my_balance_change":"-0.1000","block_height":1454477,"timestamp":1625213445,"fee_details":null,"coin":"tBCH","internal_id":"df5314098d5124ac85f35adec6243b1c6222b08d1b4592dcb6a3be5dd5eb92df","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b14ff412501d21f232f57f6f712feb4499a58cf614b88834e6a730d36661dd17020000006a473044022078af5d9b47d6f1c17fce8dacb078e8a83fcc1451ad5fcfb0bd6a2208541bcc610220471178547c4c0136bcd0d43bc922b82fe97b9bcaf00f9e790a7396eb7a857b6b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb14ff412501d21f232f57f6f712feb4499a58cf614b88834e6a730d36661dd17030000006b483045022100d4152ffdb6a5cd0cc821a0210ada7f505d05439a2bc7210a6e6dbeb520b5bb5602202a1f0d1587b92bd518e9272c4d89002245f2c431c3b624fc14acd7358c686ae14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000128d5e80300000000000017a914b0deb23cc680b5916cff0e43a6c3cb40d470a95287e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac17d94701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdebfde60","tx_hash":"aba82b2b595258999055aed6b8de7d451dce8cd2b9c2926c4428e570754c1f38","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzcdav3uc6qttytvlu8y8fkredqdgu9f2gq6epdgy3","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21488847","spent_by_me":"0.21488847","received_by_me":"0.21486847","my_balance_change":"-0.00002000","block_height":1454471,"timestamp":1625210966,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"aba82b2b595258999055aed6b8de7d451dce8cd2b9c2926c4428e570754c1f38","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b14ff412501d21f232f57f6f712feb4499a58cf614b88834e6a730d36661dd17020000006a473044022078af5d9b47d6f1c17fce8dacb078e8a83fcc1451ad5fcfb0bd6a2208541bcc610220471178547c4c0136bcd0d43bc922b82fe97b9bcaf00f9e790a7396eb7a857b6b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb14ff412501d21f232f57f6f712feb4499a58cf614b88834e6a730d36661dd17030000006b483045022100d4152ffdb6a5cd0cc821a0210ada7f505d05439a2bc7210a6e6dbeb520b5bb5602202a1f0d1587b92bd518e9272c4d89002245f2c431c3b624fc14acd7358c686ae14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000128d5e80300000000000017a914b0deb23cc680b5916cff0e43a6c3cb40d470a95287e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac17d94701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdebfde60","tx_hash":"aba82b2b595258999055aed6b8de7d451dce8cd2b9c2926c4428e570754c1f38","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzcdav3uc6qttytvlu8y8fkredqdgu9f2gmw76hlkv","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.6989","spent_by_me":"7.6989","received_by_me":"7.5989","my_balance_change":"-0.1000","block_height":1454471,"timestamp":1625210966,"fee_details":null,"coin":"tBCH","internal_id":"3941fda591fbabaa4b2b9bb5bd5d774e3e8d417e7b19a092ab2dfd2124d70277","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b264484d1a7bbd70b3b241631097807996523c717fc780e9db2cc9567c84504c020000006a47304402205125b6b70030809178251997c95efdfcfbafe28eac68b6f571348c24d705fcfd02206ca33eeca12657574bbddde106e9b3073cb7fd44ad9818bc14dc451fd2b65d704121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb264484d1a7bbd70b3b241631097807996523c717fc780e9db2cc9567c84504c030000006b483045022100f8eddf3d5e9b5cff19735e5f61e7198228bd35a56ace386a2b62c559263967e602205e89690bbe2c93bc92baafe31a60d2435e434a34c5aed89e04be7af2f80b687e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000012cbde8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace7e04701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdabfde60","tx_hash":"17dd6166d330a7e63488b814f68ca59944eb2f716f7ff532f2211d5012f44fb1","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21490847","spent_by_me":"0.21490847","received_by_me":"0.21488847","my_balance_change":"-0.00002000","block_height":1454471,"timestamp":1625210966,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"17dd6166d330a7e63488b814f68ca59944eb2f716f7ff532f2211d5012f44fb1","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b264484d1a7bbd70b3b241631097807996523c717fc780e9db2cc9567c84504c020000006a47304402205125b6b70030809178251997c95efdfcfbafe28eac68b6f571348c24d705fcfd02206ca33eeca12657574bbddde106e9b3073cb7fd44ad9818bc14dc451fd2b65d704121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb264484d1a7bbd70b3b241631097807996523c717fc780e9db2cc9567c84504c030000006b483045022100f8eddf3d5e9b5cff19735e5f61e7198228bd35a56ace386a2b62c559263967e602205e89690bbe2c93bc92baafe31a60d2435e434a34c5aed89e04be7af2f80b687e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000012cbde8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace7e04701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdabfde60","tx_hash":"17dd6166d330a7e63488b814f68ca59944eb2f716f7ff532f2211d5012f44fb1","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.699","spent_by_me":"7.699","received_by_me":"7.6989","my_balance_change":"-0.0001","block_height":1454471,"timestamp":1625210966,"fee_details":null,"coin":"tBCH","internal_id":"e3e26682d20fbfb643e1a74e9d0f87d70b06f1900b9df3033dab6b76bbce34d3","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002745e24ccb72de11bb5b1a1232f0847e777bd1d9cd075356122864e029c6a7e4c020000006a47304402204303e231d3b6b8bce817c6db01e5800aec588d0e50d9d3786a66c69daf1190f502205805d5ace2e7a143b94899529dbe02b004152026891c1c616bb64d982e8ae4984121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff745e24ccb72de11bb5b1a1232f0847e777bd1d9cd075356122864e029c6a7e4c030000006b483045022100f386e5b02696878c7a1f34b3b5f6ecf83aabb4ebf0c9831bcb5c2ef52fbae918022018c0c90f3fb35aaa666c355d40f295d5542442398d31f3bc540b334349ceeb284121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000003dee8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9fec4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac93a9dd60","tx_hash":"b3427413c0f84d9eca4bfba66133ff781e7569f69f451f20786be7d2df5e39b6","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21493847","spent_by_me":"0.21493847","received_by_me":"0.21491847","my_balance_change":"-0.00002000","block_height":1454353,"timestamp":1625139879,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"b3427413c0f84d9eca4bfba66133ff781e7569f69f451f20786be7d2df5e39b6","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002745e24ccb72de11bb5b1a1232f0847e777bd1d9cd075356122864e029c6a7e4c020000006a47304402204303e231d3b6b8bce817c6db01e5800aec588d0e50d9d3786a66c69daf1190f502205805d5ace2e7a143b94899529dbe02b004152026891c1c616bb64d982e8ae4984121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff745e24ccb72de11bb5b1a1232f0847e777bd1d9cd075356122864e029c6a7e4c030000006b483045022100f386e5b02696878c7a1f34b3b5f6ecf83aabb4ebf0c9831bcb5c2ef52fbae918022018c0c90f3fb35aaa666c355d40f295d5542442398d31f3bc540b334349ceeb284121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000003dee8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9fec4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac93a9dd60","tx_hash":"b3427413c0f84d9eca4bfba66133ff781e7569f69f451f20786be7d2df5e39b6","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.0991","spent_by_me":"0.0991","received_by_me":"0.099","my_balance_change":"-0.0001","block_height":1454353,"timestamp":1625139879,"fee_details":null,"coin":"tBCH","internal_id":"4f213288582062897888cfe263628e2aa1ab9d90562da1a8f6951dd6f57e942a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000003b6395edfd2e76b78201f459ff669751e78ff3361a6fb4bca9e4df8c0137442b3020000006a473044022004c90086c6990d9764b5ed20c7e0edf9ba10328ff4536bd088bc24b851f9929402202f7c9d525e79c85bd2734d3de06432c1464f392c7fc5482c50b8ae2e9ff9f4734121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffafece59188497a02c4aca4a05c8da14b545fd9ceed94d4f44e74a3c10759a535020000006a47304402203a14293b5b7cae47f2bfcb47c4323d029669fd57505cd7085877deb1f839829702203957e8624a0d1abc8dfd44d6443e61146469031f474eff7de342bb42626767814121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb6395edfd2e76b78201f459ff669751e78ff3361a6fb4bca9e4df8c0137442b3030000006b4830450221008f0a6397407f57ea7a78d413e80c5249739a3694bbccb85b61cf8b29f1a0fc940220362b2fcbded953c8dc38dcb320b2f69ade2b0a17be7f89a6da1290465b6fa7364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000012cbee80300000000000017a9149e8513db6a052a73d09f3db084d76d666b7d3b0c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb7e84701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac97a9dd60","tx_hash":"4c50847c56c92cdbe980c77f713c5296798097106341b2b370bd7b1a4d4864b2","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pz0g2y7mdgzj5u7snu7mppxhd4nxklfmpseptch3ch","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21492847","spent_by_me":"0.21492847","received_by_me":"0.21490847","my_balance_change":"-0.00002000","block_height":1454353,"timestamp":1625139879,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"4c50847c56c92cdbe980c77f713c5296798097106341b2b370bd7b1a4d4864b2","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000003b6395edfd2e76b78201f459ff669751e78ff3361a6fb4bca9e4df8c0137442b3020000006a473044022004c90086c6990d9764b5ed20c7e0edf9ba10328ff4536bd088bc24b851f9929402202f7c9d525e79c85bd2734d3de06432c1464f392c7fc5482c50b8ae2e9ff9f4734121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffafece59188497a02c4aca4a05c8da14b545fd9ceed94d4f44e74a3c10759a535020000006a47304402203a14293b5b7cae47f2bfcb47c4323d029669fd57505cd7085877deb1f839829702203957e8624a0d1abc8dfd44d6443e61146469031f474eff7de342bb42626767814121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb6395edfd2e76b78201f459ff669751e78ff3361a6fb4bca9e4df8c0137442b3030000006b4830450221008f0a6397407f57ea7a78d413e80c5249739a3694bbccb85b61cf8b29f1a0fc940220362b2fcbded953c8dc38dcb320b2f69ade2b0a17be7f89a6da1290465b6fa7364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000012cbee80300000000000017a9149e8513db6a052a73d09f3db084d76d666b7d3b0c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb7e84701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac97a9dd60","tx_hash":"4c50847c56c92cdbe980c77f713c5296798097106341b2b370bd7b1a4d4864b2","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pz0g2y7mdgzj5u7snu7mppxhd4nxklfmpsz4vrdx22","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"7.799","spent_by_me":"7.799","received_by_me":"7.699","my_balance_change":"-0.100","block_height":1454353,"timestamp":1625139879,"fee_details":null,"coin":"tBCH","internal_id":"f753153240944a31b59dc5918baaa8135ca06f82209e98b1ef258b8b084500d5","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b6fa38deca7b73a3f32973b02228316240889b837e4ac086d4038f714b983248020000006a4730440220370c51125798e3ec8fb69575dc28d348f328f8ecf472360219bb72738ba511ec0220590df2673525d0bf62b25a2060626cd1802189895e3d649b7f192b8c81155b054121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb6fa38deca7b73a3f32973b02228316240889b837e4ac086d4038f714b983248030000006b483045022100c22856aeffa0c2adee96e7e5a17b743bd70f6830985d846f046e3d0da0e44f7802201a59294c8e5dc51e5049744d773e08c8626e9446ba48095f03b36b5353b576ae4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000003dfe80300000000000017a91412009a5b3c6cea48a56aa118c7ce956de1c0144c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6ff44701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdfa5dd60","tx_hash":"4c7e6a9c024e8622613575d09c1dbd77e747082f23a1b1b51be12db7cc245e74","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pqfqpxjm83kw5j99d2s3337wj4k7rsq5fsngexvak8","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21495847","spent_by_me":"0.21495847","received_by_me":"0.21493847","my_balance_change":"-0.00002000","block_height":1454352,"timestamp":1625138664,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"4c7e6a9c024e8622613575d09c1dbd77e747082f23a1b1b51be12db7cc245e74","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b6fa38deca7b73a3f32973b02228316240889b837e4ac086d4038f714b983248020000006a4730440220370c51125798e3ec8fb69575dc28d348f328f8ecf472360219bb72738ba511ec0220590df2673525d0bf62b25a2060626cd1802189895e3d649b7f192b8c81155b054121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb6fa38deca7b73a3f32973b02228316240889b837e4ac086d4038f714b983248030000006b483045022100c22856aeffa0c2adee96e7e5a17b743bd70f6830985d846f046e3d0da0e44f7802201a59294c8e5dc51e5049744d773e08c8626e9446ba48095f03b36b5353b576ae4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000003dfe80300000000000017a91412009a5b3c6cea48a56aa118c7ce956de1c0144c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6ff44701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdfa5dd60","tx_hash":"4c7e6a9c024e8622613575d09c1dbd77e747082f23a1b1b51be12db7cc245e74","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pqfqpxjm83kw5j99d2s3337wj4k7rsq5fsgu7ak2y6","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1991","spent_by_me":"0.1991","received_by_me":"0.0991","my_balance_change":"-0.1000","block_height":1454352,"timestamp":1625138664,"fee_details":null,"coin":"tBCH","internal_id":"54e9e51fab97edde4696049c04ee322711920e792047fda1dbe9590884ab312c","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002606e9b9101d8cf579a7c10992ab425111295388d81b3bce466d6a028ead11b21020000006a473044022100f6bc368f8a049aaa177f43c5cc2b3426f59e0ae05778f225ba312862e4efc0a6021f4435be0843850fbfaabe415ed11db44551019d72e25528d2a75d6a80962fd64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff606e9b9101d8cf579a7c10992ab425111295388d81b3bce466d6a028ead11b21030000006b483045022100f450a3eed8521ad8e06c9b7403739653f6ff6d4ea259ffd0b936bb8d0329a527022033006270d50b46f542e0d1a77b9050fc37d0ddbe89180a0aa64fd51645f397244121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000007c7e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3ffc4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdba5dd60","tx_hash":"4832984b718f03d486c04a7e839b884062312822b07329f3a3737bcade38fab6","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21497847","spent_by_me":"0.21497847","received_by_me":"0.21495847","my_balance_change":"-0.00002000","block_height":1454352,"timestamp":1625138664,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"4832984b718f03d486c04a7e839b884062312822b07329f3a3737bcade38fab6","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002606e9b9101d8cf579a7c10992ab425111295388d81b3bce466d6a028ead11b21020000006a473044022100f6bc368f8a049aaa177f43c5cc2b3426f59e0ae05778f225ba312862e4efc0a6021f4435be0843850fbfaabe415ed11db44551019d72e25528d2a75d6a80962fd64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff606e9b9101d8cf579a7c10992ab425111295388d81b3bce466d6a028ead11b21030000006b483045022100f450a3eed8521ad8e06c9b7403739653f6ff6d4ea259ffd0b936bb8d0329a527022033006270d50b46f542e0d1a77b9050fc37d0ddbe89180a0aa64fd51645f397244121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000007c7e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3ffc4701000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdba5dd60","tx_hash":"4832984b718f03d486c04a7e839b884062312822b07329f3a3737bcade38fab6","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1992","spent_by_me":"0.1992","received_by_me":"0.1991","my_balance_change":"-0.0001","block_height":1454352,"timestamp":1625138664,"fee_details":null,"coin":"tBCH","internal_id":"7fe7d452f05a91f3fa0cce061cea66d9dde340ef6827ea138b46c23c30b1817f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002484f0fe857e30fa9650ea31f9a985e7f5fd446d782ab133e999b2e755f8d78aa020000006a473044022028197c9ccc954c6a8dc9943d8c0567d1cb03012fb424e1bf926184fa2348818802206737f2eaccbaeec3db04593d151e08e98e4072a38c17225e5e8e57f8df207eb44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff484f0fe857e30fa9650ea31f9a985e7f5fd446d782ab133e999b2e755f8d78aa030000006b483045022100fdd6886519021be6ecd9223adcd281ecfa30c0d63e4db3d04868f4321f47a32f02202069e3916205c6b286b7baf307fc697118936d51d6b58b4353279474d4c7849f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000000bb0e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf0b4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f53dc60","tx_hash":"6b386c5d39cf82738fdf29ef330b0583e3ce9503a98ca2474fde2c539a346e28","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21501847","spent_by_me":"0.21501847","received_by_me":"0.21499847","my_balance_change":"-0.00002000","block_height":1454208,"timestamp":1625052599,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"6b386c5d39cf82738fdf29ef330b0583e3ce9503a98ca2474fde2c539a346e28","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002484f0fe857e30fa9650ea31f9a985e7f5fd446d782ab133e999b2e755f8d78aa020000006a473044022028197c9ccc954c6a8dc9943d8c0567d1cb03012fb424e1bf926184fa2348818802206737f2eaccbaeec3db04593d151e08e98e4072a38c17225e5e8e57f8df207eb44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff484f0fe857e30fa9650ea31f9a985e7f5fd446d782ab133e999b2e755f8d78aa030000006b483045022100fdd6886519021be6ecd9223adcd281ecfa30c0d63e4db3d04868f4321f47a32f02202069e3916205c6b286b7baf307fc697118936d51d6b58b4353279474d4c7849f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000000bb0e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf0b4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f53dc60","tx_hash":"6b386c5d39cf82738fdf29ef330b0583e3ce9503a98ca2474fde2c539a346e28","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.2993","spent_by_me":"0.2993","received_by_me":"0.2992","my_balance_change":"-0.0001","block_height":1454208,"timestamp":1625052599,"fee_details":null,"coin":"tBCH","internal_id":"542af7b65cb4a844fa59e8acf48bbae2df00dfb298d25a6a53addc7121f336c1","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002286e349a532cde4f47a28ca90395cee383050b33ef29df8f7382cf395d6c386b020000006a47304402204471099da0be58324ccfd44f6d2174a7ae2e52d83d4361ec36224ebba1e90f6b022045e601f05e215c09bf9f5bef4cbec8405a1f811b7be65938bca49307d4a012d04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff286e349a532cde4f47a28ca90395cee383050b33ef29df8f7382cf395d6c386b030000006a4730440220711074ad3cd3e52be20dc880a2f0209f5f026af3d7e8634d831815f75177180a02201cc04718debe4d3ec4d57d5ef653e985bacd0394a6788f3ce0a11f90bd3c1a164121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000007c8e80300000000000017a9148898ff6101d77e1cb7a6f83bf7842b79a766c77287e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0f044801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5353dc60","tx_hash":"211bd1ea28a0d666e4bcb3818d3895121125b42a99107c9a57cfd801919b6e60","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzyf3lmpq8thu89h5murhauy9du6wek8wgjmxqakvv","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21499847","spent_by_me":"0.21499847","received_by_me":"0.21497847","my_balance_change":"-0.00002000","block_height":1454208,"timestamp":1625052599,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"211bd1ea28a0d666e4bcb3818d3895121125b42a99107c9a57cfd801919b6e60","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002286e349a532cde4f47a28ca90395cee383050b33ef29df8f7382cf395d6c386b020000006a47304402204471099da0be58324ccfd44f6d2174a7ae2e52d83d4361ec36224ebba1e90f6b022045e601f05e215c09bf9f5bef4cbec8405a1f811b7be65938bca49307d4a012d04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff286e349a532cde4f47a28ca90395cee383050b33ef29df8f7382cf395d6c386b030000006a4730440220711074ad3cd3e52be20dc880a2f0209f5f026af3d7e8634d831815f75177180a02201cc04718debe4d3ec4d57d5ef653e985bacd0394a6788f3ce0a11f90bd3c1a164121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000007c8e80300000000000017a9148898ff6101d77e1cb7a6f83bf7842b79a766c77287e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0f044801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5353dc60","tx_hash":"211bd1ea28a0d666e4bcb3818d3895121125b42a99107c9a57cfd801919b6e60","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzyf3lmpq8thu89h5murhauy9du6wek8wgf0pm8p73","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.2992","spent_by_me":"0.2992","received_by_me":"0.1992","my_balance_change":"-0.1000","block_height":1454208,"timestamp":1625052599,"fee_details":null,"coin":"tBCH","internal_id":"a9522765d09e3d1fb53377f8bb6bb032bef17d8ce3e0183a075502134bcea9de","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002fd24acecb2c35ae5420799d8da8b45cfa892479bd9fd2ec1153f1696390a7908020000006b483045022100b1b53abea221bf3dffb9ffc29a83a9808fbd52d42148b52b5c2d60b63879d5e60220557a4b60f5d13144ad53c5be8c025080167725800bf41ccbe63075526714ee8f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cfffffffffd24acecb2c35ae5420799d8da8b45cfa892479bd9fd2ec1153f1696390a7908030000006a47304402206c3ae471148a8963a9d260ed6cc341658e774e65d6e55bd3bd6837d9854cbce60220241b4222bf42096ba190f0243982058ec03e3beab52e9d4801cf4e5bd153107a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000000bb1e80300000000000017a914ba3828c392666b5f7a0d1740c09903bbcf03794387e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acaf134801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf09db60","tx_hash":"aa788d5f752e9b993e13ab82d746d45f7f5e989a1fa30e65a90fe357e80f4f48","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzars2xrjfnxkhm6p5t5psyeqwau7qmegvmp67a2g2","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21503847","spent_by_me":"0.21503847","received_by_me":"0.21501847","my_balance_change":"-0.00002000","block_height":1454069,"timestamp":1624968647,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"aa788d5f752e9b993e13ab82d746d45f7f5e989a1fa30e65a90fe357e80f4f48","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002fd24acecb2c35ae5420799d8da8b45cfa892479bd9fd2ec1153f1696390a7908020000006b483045022100b1b53abea221bf3dffb9ffc29a83a9808fbd52d42148b52b5c2d60b63879d5e60220557a4b60f5d13144ad53c5be8c025080167725800bf41ccbe63075526714ee8f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cfffffffffd24acecb2c35ae5420799d8da8b45cfa892479bd9fd2ec1153f1696390a7908030000006a47304402206c3ae471148a8963a9d260ed6cc341658e774e65d6e55bd3bd6837d9854cbce60220241b4222bf42096ba190f0243982058ec03e3beab52e9d4801cf4e5bd153107a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000000bb1e80300000000000017a914ba3828c392666b5f7a0d1740c09903bbcf03794387e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acaf134801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf09db60","tx_hash":"aa788d5f752e9b993e13ab82d746d45f7f5e989a1fa30e65a90fe357e80f4f48","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzars2xrjfnxkhm6p5t5psyeqwau7qmegvq4a98a6h","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.3993","spent_by_me":"0.3993","received_by_me":"0.2993","my_balance_change":"-0.1000","block_height":1454069,"timestamp":1624968647,"fee_details":null,"coin":"tBCH","internal_id":"d0c497e3523a4616fdb3fe23e07381edd1de5d0a368daf42f222b11553d65e87","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002719f36a33aec61ba5833511b9348436d4823996e03a00842595f7840df2b3648020000006a473044022071d1f37e21109d5c75cc3fa07a84a53259528d3acabbe885e6b9210637f14c3802205b87daecbcb9a45c690e8ea84b9fa7a30879d7d3b86747732e90e4d734f287fd4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff719f36a33aec61ba5833511b9348436d4823996e03a00842595f7840df2b3648030000006b4830450221008581c9b36c3f7041051fbf22eafa2032a9dca65d6e9500d3636df1b4777a415502201a22260b15675f9e0983d4b246c37579dc482878237a49e2c897f4802c24f02f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000000f99e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7f1b4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdc09db60","tx_hash":"08790a3996163f15c12efdd99b4792a8cf458bdad8990742e55ac3b2ecac24fd","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21505847","spent_by_me":"0.21505847","received_by_me":"0.21503847","my_balance_change":"-0.00002000","block_height":1454069,"timestamp":1624968647,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"08790a3996163f15c12efdd99b4792a8cf458bdad8990742e55ac3b2ecac24fd","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002719f36a33aec61ba5833511b9348436d4823996e03a00842595f7840df2b3648020000006a473044022071d1f37e21109d5c75cc3fa07a84a53259528d3acabbe885e6b9210637f14c3802205b87daecbcb9a45c690e8ea84b9fa7a30879d7d3b86747732e90e4d734f287fd4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff719f36a33aec61ba5833511b9348436d4823996e03a00842595f7840df2b3648030000006b4830450221008581c9b36c3f7041051fbf22eafa2032a9dca65d6e9500d3636df1b4777a415502201a22260b15675f9e0983d4b246c37579dc482878237a49e2c897f4802c24f02f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000000f99e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7f1b4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdc09db60","tx_hash":"08790a3996163f15c12efdd99b4792a8cf458bdad8990742e55ac3b2ecac24fd","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.3994","spent_by_me":"0.3994","received_by_me":"0.3993","my_balance_change":"-0.0001","block_height":1454069,"timestamp":1624968647,"fee_details":null,"coin":"tBCH","internal_id":"a940cbe5c7e40fcd2a933029ae6b6106e5ebb379e3c5092cfbf09051d023a191","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002ca93a81b3cc4d41793169a7698479a41c0598f53b27159db11eba1ec4c6b7564020000006b483045022100ef7f948d86a99993fdb352718244c0f3286225063ac4287a8263b8138800b7cd02200d8667ec71cab66ef0e2bc39ab39bc6f5beea33020b2ed496f8997acc31a472e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffca93a81b3cc4d41793169a7698479a41c0598f53b27159db11eba1ec4c6b7564030000006b483045022100fd1a44ff9c079add9233e806215ce64108faafbd057a7317f9d6604625d5eb85022006b5c1650fe8c245a2303d516a90bb843de811c4f30819c8efbbc54527acabaa4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000001382e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1f2b4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2007db60","tx_hash":"d5b0c5505d128e1763070a1eccf0f6f8112c5a19d3d099d930c3fbcfde947310","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21509847","spent_by_me":"0.21509847","received_by_me":"0.21507847","my_balance_change":"-0.00002000","block_height":1454067,"timestamp":1624967412,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"d5b0c5505d128e1763070a1eccf0f6f8112c5a19d3d099d930c3fbcfde947310","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002ca93a81b3cc4d41793169a7698479a41c0598f53b27159db11eba1ec4c6b7564020000006b483045022100ef7f948d86a99993fdb352718244c0f3286225063ac4287a8263b8138800b7cd02200d8667ec71cab66ef0e2bc39ab39bc6f5beea33020b2ed496f8997acc31a472e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffca93a81b3cc4d41793169a7698479a41c0598f53b27159db11eba1ec4c6b7564030000006b483045022100fd1a44ff9c079add9233e806215ce64108faafbd057a7317f9d6604625d5eb85022006b5c1650fe8c245a2303d516a90bb843de811c4f30819c8efbbc54527acabaa4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000001382e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1f2b4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2007db60","tx_hash":"d5b0c5505d128e1763070a1eccf0f6f8112c5a19d3d099d930c3fbcfde947310","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.4995","spent_by_me":"0.4995","received_by_me":"0.4994","my_balance_change":"-0.0001","block_height":1454067,"timestamp":1624967412,"fee_details":null,"coin":"tBCH","internal_id":"b7da4342782f017c6d2b2137685669002d8110be6c0871dc50b0faeec1aa060f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002107394decffbc330d999d0d3195a2c11f8f6f0cc1e0a0763178e125d50c5b0d5020000006a473044022064d75b688e8b0abed68fefb7b4bca0b48fe5e1d6509a7845f0916d3588f5ea980220663f2d457a96fabbfd7ba96d04eb5174227c2431db8e45e3eac7c3c832ed61164121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff107394decffbc330d999d0d3195a2c11f8f6f0cc1e0a0763178e125d50c5b0d5030000006a47304402204dc0aff8fea6834b79d9e0672faa00eed90c5dc6f8668fa24ae514e64630010902203aab6b0b68082201c6a783e5e01f13a0ccb1e6ff5a2be26418dbf2a55bbea90d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000000f9ae80300000000000017a91465d345bf85c86b496f4a0adb5158087bfdd41afd87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f234801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2207db60","tx_hash":"48362bdf40785f594208a0036e9923486d4348931b513358ba61ec3aa3369f71","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppjax3dlshyxkjt0fg9dk52cppalm4q6l5v6k2s8qh","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21507847","spent_by_me":"0.21507847","received_by_me":"0.21505847","my_balance_change":"-0.00002000","block_height":1454067,"timestamp":1624967412,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"48362bdf40785f594208a0036e9923486d4348931b513358ba61ec3aa3369f71","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002107394decffbc330d999d0d3195a2c11f8f6f0cc1e0a0763178e125d50c5b0d5020000006a473044022064d75b688e8b0abed68fefb7b4bca0b48fe5e1d6509a7845f0916d3588f5ea980220663f2d457a96fabbfd7ba96d04eb5174227c2431db8e45e3eac7c3c832ed61164121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff107394decffbc330d999d0d3195a2c11f8f6f0cc1e0a0763178e125d50c5b0d5030000006a47304402204dc0aff8fea6834b79d9e0672faa00eed90c5dc6f8668fa24ae514e64630010902203aab6b0b68082201c6a783e5e01f13a0ccb1e6ff5a2be26418dbf2a55bbea90d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000000f9ae80300000000000017a91465d345bf85c86b496f4a0adb5158087bfdd41afd87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f234801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2207db60","tx_hash":"48362bdf40785f594208a0036e9923486d4348931b513358ba61ec3aa3369f71","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppjax3dlshyxkjt0fg9dk52cppalm4q6l5hw332sj2","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.4994","spent_by_me":"0.4994","received_by_me":"0.3994","my_balance_change":"-0.1000","block_height":1454067,"timestamp":1624967412,"fee_details":null,"coin":"tBCH","internal_id":"7252512b3bc9266a2b975ef7824ebec128b38094596ae0e9b8c88cb233546d22","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002c768520d2e03203f3a5a4f55e92d62fcfb70f84943333c0d8f8ccbfadcba4943020000006b483045022100d9cfb5b8ab11bbe54f9565b0c60ddebbe0e89b7f80a96b27eb2614790d551ab8022064badd7ae055c1584fd2b9df63ed1b647eb51c52d68317a4e338b614f9175cf94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc768520d2e03203f3a5a4f55e92d62fcfb70f84943333c0d8f8ccbfadcba4943030000006a473044022028e8ed10835b13d1982eab1af2da309fef19ee7837960ac3b73b8e4e7af51b9b02204b0d4c7c959dedccaf52b958cf665dda02c378a45912892ca5b0a96d3c47c6634121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000000176be8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbf3a4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf5c9d960","tx_hash":"80f4eec1d8b306695210ee47bb533e0bf7c8f7d4bfa9d16dae5045beea0806af","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21513847","spent_by_me":"0.21513847","received_by_me":"0.21511847","my_balance_change":"-0.00002000","block_height":1453937,"timestamp":1624886141,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"80f4eec1d8b306695210ee47bb533e0bf7c8f7d4bfa9d16dae5045beea0806af","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002c768520d2e03203f3a5a4f55e92d62fcfb70f84943333c0d8f8ccbfadcba4943020000006b483045022100d9cfb5b8ab11bbe54f9565b0c60ddebbe0e89b7f80a96b27eb2614790d551ab8022064badd7ae055c1584fd2b9df63ed1b647eb51c52d68317a4e338b614f9175cf94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc768520d2e03203f3a5a4f55e92d62fcfb70f84943333c0d8f8ccbfadcba4943030000006a473044022028e8ed10835b13d1982eab1af2da309fef19ee7837960ac3b73b8e4e7af51b9b02204b0d4c7c959dedccaf52b958cf665dda02c378a45912892ca5b0a96d3c47c6634121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb708000000000000000108000000000000176be8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbf3a4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf5c9d960","tx_hash":"80f4eec1d8b306695210ee47bb533e0bf7c8f7d4bfa9d16dae5045beea0806af","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.5996","spent_by_me":"0.5996","received_by_me":"0.5995","my_balance_change":"-0.0001","block_height":1453937,"timestamp":1624886141,"fee_details":null,"coin":"tBCH","internal_id":"fc2805af1ab0a96830e54451dcc701bc4f9fc42988fe3508710f814b1719dfb6","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002af0608eabe4550ae6dd1a9bfd4f7c8f70b3e53bb47ee10526906b3d8c1eef480020000006a47304402205926028c225d9cfe0b848338ab9d7aa9b307dc894a14a32017927c6df78333a202205b93595f0d8f60425f81015ee93a131bf8b7cb7838f77dc174aedb4de593c0a44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffaf0608eabe4550ae6dd1a9bfd4f7c8f70b3e53bb47ee10526906b3d8c1eef480030000006a47304402207556d56d124a9f3d14eded152e944e33335a36c2f517899fdee50d40ec2e0a92022048a1d9b3ef72dd89595a900dbe7a2416151593711e22af2a7dc6d2bffa10053d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001383e80300000000000017a914e14c86f86b702a81293c9b4f044fefaec74b717887e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acef324801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf8c9d960","tx_hash":"64756b4ceca1eb11db5971b2538f59c0419a4798769a169317d4c43c1ba893ca","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prs5ephcddcz4qff8jd57pz0a7hvwjm30qfrrgsyld","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21511847","spent_by_me":"0.21511847","received_by_me":"0.21509847","my_balance_change":"-0.00002000","block_height":1453937,"timestamp":1624886141,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"64756b4ceca1eb11db5971b2538f59c0419a4798769a169317d4c43c1ba893ca","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002af0608eabe4550ae6dd1a9bfd4f7c8f70b3e53bb47ee10526906b3d8c1eef480020000006a47304402205926028c225d9cfe0b848338ab9d7aa9b307dc894a14a32017927c6df78333a202205b93595f0d8f60425f81015ee93a131bf8b7cb7838f77dc174aedb4de593c0a44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffaf0608eabe4550ae6dd1a9bfd4f7c8f70b3e53bb47ee10526906b3d8c1eef480030000006a47304402207556d56d124a9f3d14eded152e944e33335a36c2f517899fdee50d40ec2e0a92022048a1d9b3ef72dd89595a900dbe7a2416151593711e22af2a7dc6d2bffa10053d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001383e80300000000000017a914e14c86f86b702a81293c9b4f044fefaec74b717887e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acef324801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf8c9d960","tx_hash":"64756b4ceca1eb11db5971b2538f59c0419a4798769a169317d4c43c1ba893ca","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prs5ephcddcz4qff8jd57pz0a7hvwjm30qjhyn2nds","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.5995","spent_by_me":"0.5995","received_by_me":"0.4995","my_balance_change":"-0.1000","block_height":1453937,"timestamp":1624886141,"fee_details":null,"coin":"tBCH","internal_id":"37c0458520cd8c90b00b39efaf39d26bd9da8ad8f24220627d74b01fc2c928d1","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000244dfc25d083a84dd6f6b7e20e1df5125ee14e3dabfa14633e4d1b6e388f8172f020000006a47304402207712ee78491d287bc451bcd8065a56c514db29dbbd194dea21dd52646a51f2ae02206c37d7d5d80511d8d302bd3e9be9880faac730c906d9ed26cbe6e557f9fdb2174121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff44dfc25d083a84dd6f6b7e20e1df5125ee14e3dabfa14633e4d1b6e388f8172f030000006a47304402201a244bf563679202b2aa5237d00227423463102b8d1d402b7b15694e065b6d5102201f26706918081fd99a34966bc9b51c3d244fbd56ac78df3fd64e3b601904ce8f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000001b54e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5f4a4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c2d960","tx_hash":"ddcd0c6edba3462b3b7cc52108d8a3efc5f81e0eaea99c62efdb2577c26acf75","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21517847","spent_by_me":"0.21517847","received_by_me":"0.21515847","my_balance_change":"-0.00002000","block_height":1453933,"timestamp":1624884016,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"ddcd0c6edba3462b3b7cc52108d8a3efc5f81e0eaea99c62efdb2577c26acf75","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000244dfc25d083a84dd6f6b7e20e1df5125ee14e3dabfa14633e4d1b6e388f8172f020000006a47304402207712ee78491d287bc451bcd8065a56c514db29dbbd194dea21dd52646a51f2ae02206c37d7d5d80511d8d302bd3e9be9880faac730c906d9ed26cbe6e557f9fdb2174121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff44dfc25d083a84dd6f6b7e20e1df5125ee14e3dabfa14633e4d1b6e388f8172f030000006a47304402201a244bf563679202b2aa5237d00227423463102b8d1d402b7b15694e065b6d5102201f26706918081fd99a34966bc9b51c3d244fbd56ac78df3fd64e3b601904ce8f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000001b54e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5f4a4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c2d960","tx_hash":"ddcd0c6edba3462b3b7cc52108d8a3efc5f81e0eaea99c62efdb2577c26acf75","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.6997","spent_by_me":"0.6997","received_by_me":"0.6996","my_balance_change":"-0.0001","block_height":1453933,"timestamp":1624884016,"fee_details":null,"coin":"tBCH","internal_id":"56c200ecd4f819f46e0954f87fb829cac1a2be27f10922eff982f68145c74cdc","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000275cf6ac27725dbef629ca9ae0e1ef8c5efa3d80821c57c3b2b46a3db6e0ccddd020000006a47304402204161d535f2494050dc10c1cd24ff0bcfe8c5df9e6389ad01eb4dffdf6478cdc402205ef8737bc6b18f1171237cbc46517ff362d6760738a228ee147a6ea7c22c5a784121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff75cf6ac27725dbef629ca9ae0e1ef8c5efa3d80821c57c3b2b46a3db6e0ccddd030000006a47304402203d2783dd35d55ebc0522d0551b1f50f3c2d694b5b77abfc8e8ca18efea3d3eeb022019a6fa027b4f6be432ae318b522f3169c6d0c3434f59af69c24adf34e0b906a04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000176ce80300000000000017a9145bbccc15f66b9c23a09fedd529e62fdcb40737bd87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8f424801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace8c2d960","tx_hash":"4349badcfacb8c8f0d3c334349f870fbfc622de9554f5a3a3f20032e0d5268c7","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppdmenq47e4ecgaqnlka220x9lwtgpehh5f9g8tku6","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21515847","spent_by_me":"0.21515847","received_by_me":"0.21513847","my_balance_change":"-0.00002000","block_height":1453933,"timestamp":1624884016,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"4349badcfacb8c8f0d3c334349f870fbfc622de9554f5a3a3f20032e0d5268c7","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000275cf6ac27725dbef629ca9ae0e1ef8c5efa3d80821c57c3b2b46a3db6e0ccddd020000006a47304402204161d535f2494050dc10c1cd24ff0bcfe8c5df9e6389ad01eb4dffdf6478cdc402205ef8737bc6b18f1171237cbc46517ff362d6760738a228ee147a6ea7c22c5a784121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff75cf6ac27725dbef629ca9ae0e1ef8c5efa3d80821c57c3b2b46a3db6e0ccddd030000006a47304402203d2783dd35d55ebc0522d0551b1f50f3c2d694b5b77abfc8e8ca18efea3d3eeb022019a6fa027b4f6be432ae318b522f3169c6d0c3434f59af69c24adf34e0b906a04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000176ce80300000000000017a9145bbccc15f66b9c23a09fedd529e62fdcb40737bd87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8f424801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace8c2d960","tx_hash":"4349badcfacb8c8f0d3c334349f870fbfc622de9554f5a3a3f20032e0d5268c7","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppdmenq47e4ecgaqnlka220x9lwtgpehh5j30u3pw8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.6996","spent_by_me":"0.6996","received_by_me":"0.5996","my_balance_change":"-0.1000","block_height":1453933,"timestamp":1624884016,"fee_details":null,"coin":"tBCH","internal_id":"89a6f9c88e1eab39e65d2cb5ee152f7d99d5cff386b71615e838c6ca2b7f9d9a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002c808ec40b3b5efbfd4f44da81812af98b42f50d246f18ac21862575087f3820d020000006a4730440220508fac4b539cde4afc40a1acb8d36977254f14f38d224a3d4b16e6d6a9e6bedc022021cb03286f6eede49727ba6e7ca3fd152ac16414e2caf648d0542914acf163e44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc808ec40b3b5efbfd4f44da81812af98b42f50d246f18ac21862575087f3820d030000006a47304402200e08f25dae26dbd0c4e001478c3e5c046d52358da8eb15524e8b183de42ced1d022028961d5639337864351f40bd7f50f7b88fe649bb9e34b69ba3d7cde7a8c0f58e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001b55e80300000000000017a9146c7e381da62699d3e1986a101d91046d4affa0a887e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f524801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6c99d960","tx_hash":"2f17f888e3b6d1e43346a1bfdae314ee2551dfe1207e6b6fdd843a085dc2df44","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppk8uwqa5cnfn5lpnp4pq8v3q3k54laq4qpxj823qc","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21519847","spent_by_me":"0.21519847","received_by_me":"0.21517847","my_balance_change":"-0.00002000","block_height":1453914,"timestamp":1624873371,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"2f17f888e3b6d1e43346a1bfdae314ee2551dfe1207e6b6fdd843a085dc2df44","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002c808ec40b3b5efbfd4f44da81812af98b42f50d246f18ac21862575087f3820d020000006a4730440220508fac4b539cde4afc40a1acb8d36977254f14f38d224a3d4b16e6d6a9e6bedc022021cb03286f6eede49727ba6e7ca3fd152ac16414e2caf648d0542914acf163e44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc808ec40b3b5efbfd4f44da81812af98b42f50d246f18ac21862575087f3820d030000006a47304402200e08f25dae26dbd0c4e001478c3e5c046d52358da8eb15524e8b183de42ced1d022028961d5639337864351f40bd7f50f7b88fe649bb9e34b69ba3d7cde7a8c0f58e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001b55e80300000000000017a9146c7e381da62699d3e1986a101d91046d4affa0a887e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f524801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6c99d960","tx_hash":"2f17f888e3b6d1e43346a1bfdae314ee2551dfe1207e6b6fdd843a085dc2df44","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppk8uwqa5cnfn5lpnp4pq8v3q3k54laq4q6j4usxj9","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.7997","spent_by_me":"0.7997","received_by_me":"0.6997","my_balance_change":"-0.1000","block_height":1453914,"timestamp":1624873371,"fee_details":null,"coin":"tBCH","internal_id":"d127f5c07cf70753f059e039900e0b7c918bf211dce31f193c058b6ae44ef964","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b249bb0a56d954fb1f1f737365df288f61dae8fbf8c60f7a00455bfb0b1635e9020000006a4730440220367a94a77ea8d8ba3fb401cd27204e163490d8186be8447ec57dea6f28cb983f022018b9de29b3c58686d7b76d3c73b1ccd5fe0821dbf85ce0c22dd02422115aac224121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb249bb0a56d954fb1f1f737365df288f61dae8fbf8c60f7a00455bfb0b1635e9030000006b483045022100c5acda6db723a488b5762c69e2030a5513173c49fa2b14db301c50cd8fab03490220257e50ada7fc92ff2071b57d05185aaa458d7d270b9a5c44324f0ac6b95976f94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000001f3de8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acff594801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6999d960","tx_hash":"0d82f38750576218c28af146d2502fb498af1218a84df4d4bfefb5b340ec08c8","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21521847","spent_by_me":"0.21521847","received_by_me":"0.21519847","my_balance_change":"-0.00002000","block_height":1453914,"timestamp":1624873371,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"0d82f38750576218c28af146d2502fb498af1218a84df4d4bfefb5b340ec08c8","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b249bb0a56d954fb1f1f737365df288f61dae8fbf8c60f7a00455bfb0b1635e9020000006a4730440220367a94a77ea8d8ba3fb401cd27204e163490d8186be8447ec57dea6f28cb983f022018b9de29b3c58686d7b76d3c73b1ccd5fe0821dbf85ce0c22dd02422115aac224121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb249bb0a56d954fb1f1f737365df288f61dae8fbf8c60f7a00455bfb0b1635e9030000006b483045022100c5acda6db723a488b5762c69e2030a5513173c49fa2b14db301c50cd8fab03490220257e50ada7fc92ff2071b57d05185aaa458d7d270b9a5c44324f0ac6b95976f94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000001f3de8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acff594801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6999d960","tx_hash":"0d82f38750576218c28af146d2502fb498af1218a84df4d4bfefb5b340ec08c8","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.7998","spent_by_me":"0.7998","received_by_me":"0.7997","my_balance_change":"-0.0001","block_height":1453914,"timestamp":1624873371,"fee_details":null,"coin":"tBCH","internal_id":"c747951c681709645102156e2e289823482513014433a5db0d4938c66e49236e","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5020000006a47304402206be99fe56a98e7a8c2ffe6f2d05c5c1f46a6577064b84d27d45fe0e959f6e77402201c512629313b48cd4df873222aa49046ae9a3a6e34e359d10d4308cb40438fba4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5030000006a473044022020d774d045bbe3dce5b04af836f6a5629c6c4ce75b0b5ba8a1da0ae9a4ecc0530220522f86d20c9e4142e40f9a9c8d25db16fde91d4a0ad6f6ff2107e201386131b64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001f3ee80300000000000017a914b0ca1fea17cf522c7e858416093fc6d95e55824087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accf614801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8c83d460","tx_hash":"e935160bfb5b45007a0fc6f8fbe8da618f28df6573731f1ffb54d9560abb49b2","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzcv58l2zl84ytr7skzpvzflcmv4u4vzgqc2sdq3kz","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21523847","spent_by_me":"0.21523847","received_by_me":"0.21521847","my_balance_change":"-0.00002000","block_height":1453354,"timestamp":1624540312,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"e935160bfb5b45007a0fc6f8fbe8da618f28df6573731f1ffb54d9560abb49b2","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5020000006a47304402206be99fe56a98e7a8c2ffe6f2d05c5c1f46a6577064b84d27d45fe0e959f6e77402201c512629313b48cd4df873222aa49046ae9a3a6e34e359d10d4308cb40438fba4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5030000006a473044022020d774d045bbe3dce5b04af836f6a5629c6c4ce75b0b5ba8a1da0ae9a4ecc0530220522f86d20c9e4142e40f9a9c8d25db16fde91d4a0ad6f6ff2107e201386131b64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001f3ee80300000000000017a914b0ca1fea17cf522c7e858416093fc6d95e55824087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accf614801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8c83d460","tx_hash":"e935160bfb5b45007a0fc6f8fbe8da618f28df6573731f1ffb54d9560abb49b2","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzcv58l2zl84ytr7skzpvzflcmv4u4vzgqr7hk6xyl","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.8998","spent_by_me":"0.8998","received_by_me":"0.7998","my_balance_change":"-0.1000","block_height":1453354,"timestamp":1624540312,"fee_details":null,"coin":"tBCH","internal_id":"9145538486e5c0fec6ec12f8a93b6769a4ec31bdd197777ca9e2b9c96a5a5d8e","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000232809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b020000006a473044022057c88d815fa563eda8ef7d0dd5c522f4501ffa6110df455b151b31609f149c22022048fecfc9b16e983fbfd05b0d2b7c011c3dbec542577fa00cd9bd192b81961f8e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff32809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b030000006a4730440220539e1204d2805c0474111a1f233ff82c0ab06e6e2bfc0cbe4975eacae64a0b1f02200ec83d32c2180f5567d0f760e85f1efc99d9341cfebd86c9a334310f6d4381494121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000002326e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f694801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8983d460","tx_hash":"c5f46ccc5431687154335d5b6526f1b9cfa961c44b97956b7bec77f884f56c73","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21525847","spent_by_me":"0.21525847","received_by_me":"0.21523847","my_balance_change":"-0.00002000","block_height":1453354,"timestamp":1624540312,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"c5f46ccc5431687154335d5b6526f1b9cfa961c44b97956b7bec77f884f56c73","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000232809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b020000006a473044022057c88d815fa563eda8ef7d0dd5c522f4501ffa6110df455b151b31609f149c22022048fecfc9b16e983fbfd05b0d2b7c011c3dbec542577fa00cd9bd192b81961f8e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff32809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b030000006a4730440220539e1204d2805c0474111a1f233ff82c0ab06e6e2bfc0cbe4975eacae64a0b1f02200ec83d32c2180f5567d0f760e85f1efc99d9341cfebd86c9a334310f6d4381494121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000002326e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f694801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8983d460","tx_hash":"c5f46ccc5431687154335d5b6526f1b9cfa961c44b97956b7bec77f884f56c73","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.8999","spent_by_me":"0.8999","received_by_me":"0.8998","my_balance_change":"-0.0001","block_height":1453354,"timestamp":1624540312,"fee_details":null,"coin":"tBCH","internal_id":"070c126f57e38edc060ae9636aab5ed1fbf0fcd29f288863aeba8aaacf629232","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002f6859c372f562f72b9935499310c50707a6630d6550e8220227beb6666718b91010000006a4730440220566c9f2184a1c7911449f81ec78255a103c46dff96d4912491fae7d96c606a6b02202213eb87ed44145ff2afb83d177a9b5d8a8555b23bc8fb425dbfd037fe9b290e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cfffffffff6859c372f562f72b9935499310c50707a6630d6550e8220227beb6666718b91020000006b483045022100a2e4426090de97c9a0e3d78d6146bc8d56deb3124e0c37e27ae63cc8ffad531402204d3ed43b7a98e6b003bb2487ead570c9aeb5c0398e1ffdc712ac37ee1ad86cf84121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000003e7e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac57754801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0482d460","tx_hash":"26516535a6f61f750522ae7e459133b0aad0ba41aa04dbb384d037290a242e19","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58uu0a8dg36","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21528847","spent_by_me":"0.21528847","received_by_me":"0.21526847","my_balance_change":"-0.00002000","block_height":1453354,"timestamp":1624540312,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"26516535a6f61f750522ae7e459133b0aad0ba41aa04dbb384d037290a242e19","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002f6859c372f562f72b9935499310c50707a6630d6550e8220227beb6666718b91010000006a4730440220566c9f2184a1c7911449f81ec78255a103c46dff96d4912491fae7d96c606a6b02202213eb87ed44145ff2afb83d177a9b5d8a8555b23bc8fb425dbfd037fe9b290e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cfffffffff6859c372f562f72b9935499310c50707a6630d6550e8220227beb6666718b91020000006b483045022100a2e4426090de97c9a0e3d78d6146bc8d56deb3124e0c37e27ae63cc8ffad531402204d3ed43b7a98e6b003bb2487ead570c9aeb5c0398e1ffdc712ac37ee1ad86cf84121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000000010800000000000003e7e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac57754801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0482d460","tx_hash":"26516535a6f61f750522ae7e459133b0aad0ba41aa04dbb384d037290a242e19","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:qr9pupr5t6x2p3sd33vgz5ca2xlvgur58u8m6uhlr8","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0.0999","my_balance_change":"-0.0001","block_height":1453354,"timestamp":1624540312,"fee_details":null,"coin":"tBCH","internal_id":"3494cf5ac3a03a85f03d73bacce5a331cfaafd735e4522eed3cc405f77f351bd","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000003192e240a2937d084b3db04aa41bad0aab03391457eae2205751ff6a635655126020000006a47304402205df1f20c02835ab8b7f687d2bcdb028dffc6b1772b3813e4cc75475fba4def6f0220131559457a20df685137fa249e72428e8e7d2d27968df351a7044dab8e7778a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff2682816d0706d48c45fbfa4a4946e6cdad9ddc3e2f61b4c848f474ab49a2a0bd020000006a473044022034b496e18d8f4255ee840c9f97102b59a43a6fc50f2c18248eed1f932c30d247022005053a85b80af9539eed1232a8bc389c6d1b088587366b4afe8fd9729fc3ef034121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff192e240a2937d084b3db04aa41bad0aab03391457eae2205751ff6a635655126030000006b48304502210098fc91a689f922c16614dd548639711c47a5ca6efe8aa0603a4ba192e2e394850220586b571f9eee789746e64d8a270c18e6e246cb95d5d5ce88cbac69581baa20dd4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000002327e80300000000000017a914600760da42613ec484d739a52c672aa4dc3b29dd87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6f714801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0882d460","tx_hash":"0ba1b91abbfceaa0777424165edb2928dace87d59669c913989950da31968032","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppsqwcx6gfsna3yy6uu62tr892jdcwefm5qy04gp3q","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21527847","spent_by_me":"0.21527847","received_by_me":"0.21525847","my_balance_change":"-0.00002000","block_height":1453354,"timestamp":1624540312,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"0ba1b91abbfceaa0777424165edb2928dace87d59669c913989950da31968032","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000003192e240a2937d084b3db04aa41bad0aab03391457eae2205751ff6a635655126020000006a47304402205df1f20c02835ab8b7f687d2bcdb028dffc6b1772b3813e4cc75475fba4def6f0220131559457a20df685137fa249e72428e8e7d2d27968df351a7044dab8e7778a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff2682816d0706d48c45fbfa4a4946e6cdad9ddc3e2f61b4c848f474ab49a2a0bd020000006a473044022034b496e18d8f4255ee840c9f97102b59a43a6fc50f2c18248eed1f932c30d247022005053a85b80af9539eed1232a8bc389c6d1b088587366b4afe8fd9729fc3ef034121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff192e240a2937d084b3db04aa41bad0aab03391457eae2205751ff6a635655126030000006b48304502210098fc91a689f922c16614dd548639711c47a5ca6efe8aa0603a4ba192e2e394850220586b571f9eee789746e64d8a270c18e6e246cb95d5d5ce88cbac69581baa20dd4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000002327e80300000000000017a914600760da42613ec484d739a52c672aa4dc3b29dd87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6f714801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0882d460","tx_hash":"0ba1b91abbfceaa0777424165edb2928dace87d59669c913989950da31968032","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppsqwcx6gfsna3yy6uu62tr892jdcwefm5msgwjkra","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.9999","spent_by_me":"0.9999","received_by_me":"0.8999","my_balance_change":"-0.1000","block_height":1453354,"timestamp":1624540312,"fee_details":null,"coin":"tBCH","internal_id":"8ac5a09bd55cd5875e57bf6b2ad46ded395e038edc13e69670720884602e9d52","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000023b73ed4180f25328865e326356890047e448911b14ea013cc086e3ad73b57b0301000000d8483045022100ba5cfb6dfe65296dad41023252593c99776c5ae34526f93029058db8463604ca0220500d93700e67702b60c10d88188b818b001dea81a8a13dd7ce678643fb89237a41200000000000000000000000000000000000000000000000000000000000000000004c6b6304c09dc860b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff3b73ed4180f25328865e326356890047e448911b14ea013cc086e3ad73b57b03020000006a47304402204329285e2fcbb6f5ff1bd6d23eaee132e0e0494cdc3ec05092a9782e866e4aee02202395943dd6e11fe2e13c79873c5e47c1ef986f78e97dc882adb37ee2424de9f14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac277d4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc09dc860","tx_hash":"918b716666eb7b2220820e55d630667a70500c31995493b9722f562f379c85f6","from":["bchtest:prlh6yhf8tlwnnvyk3klaath66dq3gd27yvc5anfy4","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21529847","spent_by_me":"0.21528847","received_by_me":"0.21528847","my_balance_change":"0.00000000","block_height":1452134,"timestamp":1623760650,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"918b716666eb7b2220820e55d630667a70500c31995493b9722f562f379c85f6","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000023b73ed4180f25328865e326356890047e448911b14ea013cc086e3ad73b57b0301000000d8483045022100ba5cfb6dfe65296dad41023252593c99776c5ae34526f93029058db8463604ca0220500d93700e67702b60c10d88188b818b001dea81a8a13dd7ce678643fb89237a41200000000000000000000000000000000000000000000000000000000000000000004c6b6304c09dc860b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff3b73ed4180f25328865e326356890047e448911b14ea013cc086e3ad73b57b03020000006a47304402204329285e2fcbb6f5ff1bd6d23eaee132e0e0494cdc3ec05092a9782e866e4aee02202395943dd6e11fe2e13c79873c5e47c1ef986f78e97dc882adb37ee2424de9f14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac277d4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc09dc860","tx_hash":"918b716666eb7b2220820e55d630667a70500c31995493b9722f562f379c85f6","from":["slptest:prlh6yhf8tlwnnvyk3klaath66dq3gd27yhvnxf7kg"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1452134,"timestamp":1623760650,"fee_details":null,"coin":"tBCH","internal_id":"7e23adb9b707f842ce5c633cca58f5a4c3ec15fca31278d7576380429543b3b1","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002a2685746afd55241c7860e4fb9ad7fbc2d1be032738dc1209f2188d2a07e70a1010000006a47304402207ba49344eee4c5d03b349cd20498e6b326fda219d2bc235fd0077405f89c3ab4022010a40351ce3337386bb28acfce5ae5abb63965b5daddbfcf0b6abe7110dc2c164121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffa2685746afd55241c7860e4fb9ad7fbc2d1be032738dc1209f2188d2a07e70a1020000006a4730440220259fcb86b2cdd3d41d52a1f04eea77491d1c87ffd3f4c1be99b9a3858ee90e46022063728ab5b0c9e7e0ac4d6e99c6549dc57b6804fae6bd78257d60f3f0483461e14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914ff7d12e93afee9cd84b46dfef577d69a08a1aaf1870f814801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc09dc860","tx_hash":"037bb573ade386c03c01ea141b9148e44700895663325e862853f28041ed733b","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prlh6yhf8tlwnnvyk3klaath66dq3gd27yvc5anfy4","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21530847","spent_by_me":"0.21530847","received_by_me":"0.21528847","my_balance_change":"-0.00002000","block_height":1452134,"timestamp":1623760650,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"037bb573ade386c03c01ea141b9148e44700895663325e862853f28041ed733b","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002a2685746afd55241c7860e4fb9ad7fbc2d1be032738dc1209f2188d2a07e70a1010000006a47304402207ba49344eee4c5d03b349cd20498e6b326fda219d2bc235fd0077405f89c3ab4022010a40351ce3337386bb28acfce5ae5abb63965b5daddbfcf0b6abe7110dc2c164121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffa2685746afd55241c7860e4fb9ad7fbc2d1be032738dc1209f2188d2a07e70a1020000006a4730440220259fcb86b2cdd3d41d52a1f04eea77491d1c87ffd3f4c1be99b9a3858ee90e46022063728ab5b0c9e7e0ac4d6e99c6549dc57b6804fae6bd78257d60f3f0483461e14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914ff7d12e93afee9cd84b46dfef577d69a08a1aaf1870f814801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc09dc860","tx_hash":"037bb573ade386c03c01ea141b9148e44700895663325e862853f28041ed733b","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prlh6yhf8tlwnnvyk3klaath66dq3gd27yhvnxf7kg"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1452134,"timestamp":1623760650,"fee_details":null,"coin":"tBCH","internal_id":"0e7bf55e1c0fd31ece3febcffba8366d1fde3f87c5457e55c32edcc899a2055c","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002410a8a85384fbbe8648b3a85cc20065aa9ae5b46bfbd67eb9a8e404c58f71177010000006a473044022029550c628335be94cf7366b40bc60da2b9157a3e71a10d50af259e0d98b52ea702205ff9ed3eab4255cb6c4d5cd910edb9e0c7460d3e6747e6e3994533753d7a89504121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff410a8a85384fbbe8648b3a85cc20065aa9ae5b46bfbd67eb9a8e404c58f71177020000006a47304402206dccbd9ef82d300f3f4af4fe625c67aaf8254851e5515413c6e166f0b536e47a02206c1d7b7142c2204adc31ff6f037f2ed497baf7905df832915dc58ccb897917344121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914c3699d1d972d8ec7db7baf37b6493126fc364c2187af904801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac738dc860","tx_hash":"e80d66fd0b4b8cba533789719f06341ee0715e32068a41e4198b0cc697280740","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prpkn8gajukca37m0whn0djfxyn0cdjvyytta8w7m6","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21534847","spent_by_me":"0.21534847","received_by_me":"0.21532847","my_balance_change":"-0.00002000","block_height":1452131,"timestamp":1623756980,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"e80d66fd0b4b8cba533789719f06341ee0715e32068a41e4198b0cc697280740","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002410a8a85384fbbe8648b3a85cc20065aa9ae5b46bfbd67eb9a8e404c58f71177010000006a473044022029550c628335be94cf7366b40bc60da2b9157a3e71a10d50af259e0d98b52ea702205ff9ed3eab4255cb6c4d5cd910edb9e0c7460d3e6747e6e3994533753d7a89504121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff410a8a85384fbbe8648b3a85cc20065aa9ae5b46bfbd67eb9a8e404c58f71177020000006a47304402206dccbd9ef82d300f3f4af4fe625c67aaf8254851e5515413c6e166f0b536e47a02206c1d7b7142c2204adc31ff6f037f2ed497baf7905df832915dc58ccb897917344121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914c3699d1d972d8ec7db7baf37b6493126fc364c2187af904801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac738dc860","tx_hash":"e80d66fd0b4b8cba533789719f06341ee0715e32068a41e4198b0cc697280740","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prpkn8gajukca37m0whn0djfxyn0cdjvyysl6u5ff8"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1452131,"timestamp":1623756980,"fee_details":null,"coin":"tBCH","internal_id":"ea1da4ab1b0970b3f05bda183a7bb7e2d13abfb4b0d732e93072cd65d96aa4a0","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002aab749c051de90b293772ca8b89aa793dd53896d764499ab61f7a945bebc9a0101000000d747304402205cbf6b72120cb686b8723c07b144ecd64f6dd264ab633c4e3e4f15c35bcf7dc902206e1a87cfec14807ccd8e721153de284c928d9f8c4c5b3a329d9b3a9a642bec9641200000000000000000000000000000000000000000000000000000000000000000004c6b63046390c860b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffaab749c051de90b293772ca8b89aa793dd53896d764499ab61f7a945bebc9a01020000006b483045022100a1fea0fb751ca2509525ddfa65b3bac1bd27a93986dd4466dab0dd07810364dc02207428be9d24d414048111488e9ea0bea7f453a866181df8fd70fba13ae3fe7cb14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf7844801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6390c860","tx_hash":"a1707ea0d288219f20c18d7332e01b2dbc7fadb94f0e86c74152d5af465768a2","from":["bchtest:pr805s2lsjgc5prldg8tjtu720rdld6lqssjl22saf","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21531847","spent_by_me":"0.21530847","received_by_me":"0.21530847","my_balance_change":"0.00000000","block_height":1452131,"timestamp":1623756980,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"a1707ea0d288219f20c18d7332e01b2dbc7fadb94f0e86c74152d5af465768a2","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002aab749c051de90b293772ca8b89aa793dd53896d764499ab61f7a945bebc9a0101000000d747304402205cbf6b72120cb686b8723c07b144ecd64f6dd264ab633c4e3e4f15c35bcf7dc902206e1a87cfec14807ccd8e721153de284c928d9f8c4c5b3a329d9b3a9a642bec9641200000000000000000000000000000000000000000000000000000000000000000004c6b63046390c860b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffaab749c051de90b293772ca8b89aa793dd53896d764499ab61f7a945bebc9a01020000006b483045022100a1fea0fb751ca2509525ddfa65b3bac1bd27a93986dd4466dab0dd07810364dc02207428be9d24d414048111488e9ea0bea7f453a866181df8fd70fba13ae3fe7cb14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf7844801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6390c860","tx_hash":"a1707ea0d288219f20c18d7332e01b2dbc7fadb94f0e86c74152d5af465768a2","from":["slptest:pr805s2lsjgc5prldg8tjtu720rdld6lqstxc3s805"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1452131,"timestamp":1623756980,"fee_details":null,"coin":"tBCH","internal_id":"beed6e74f8d6818b97e93fa6af50922621041be59129a8646e981c62e112b657","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000240072897c60c8b19e4418a06325e71e01e34069f71893753ba8c4b0bfd660de801000000d7473044022067bf6d382b26ea5010a02822e1e4ad3983450fef71dc90713fdd71cda537f45202202845eba1b72e172ca8f4e8e1cef297517ae13ee1e23b6bd587e5e3c7709dfe4e41200000000000000000000000000000000000000000000000000000000000000000004c6b6304728dc860b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff40072897c60c8b19e4418a06325e71e01e34069f71893753ba8c4b0bfd660de8020000006a47304402206e7e7e013e58c05b9811072050957661afa2e769451dfd45bab866fe80bd330102203e6c9aeeeb3c4e693404140e33fc9e9c0360188d7e569c968768f30e0c5035f04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc78c4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac728dc860","tx_hash":"0d14600f4054dd60cfc51625010c31f1cc1300f8f22e6e9865120f5ec0294616","from":["bchtest:prpkn8gajukca37m0whn0djfxyn0cdjvyytta8w7m6","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21533847","spent_by_me":"0.21532847","received_by_me":"0.21532847","my_balance_change":"0.00000000","block_height":1452131,"timestamp":1623756980,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"0d14600f4054dd60cfc51625010c31f1cc1300f8f22e6e9865120f5ec0294616","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000240072897c60c8b19e4418a06325e71e01e34069f71893753ba8c4b0bfd660de801000000d7473044022067bf6d382b26ea5010a02822e1e4ad3983450fef71dc90713fdd71cda537f45202202845eba1b72e172ca8f4e8e1cef297517ae13ee1e23b6bd587e5e3c7709dfe4e41200000000000000000000000000000000000000000000000000000000000000000004c6b6304728dc860b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff40072897c60c8b19e4418a06325e71e01e34069f71893753ba8c4b0bfd660de8020000006a47304402206e7e7e013e58c05b9811072050957661afa2e769451dfd45bab866fe80bd330102203e6c9aeeeb3c4e693404140e33fc9e9c0360188d7e569c968768f30e0c5035f04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc78c4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac728dc860","tx_hash":"0d14600f4054dd60cfc51625010c31f1cc1300f8f22e6e9865120f5ec0294616","from":["slptest:prpkn8gajukca37m0whn0djfxyn0cdjvyysl6u5ff8"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1452131,"timestamp":1623756980,"fee_details":null,"coin":"tBCH","internal_id":"06756d80c727a8b9622d2c71ce711e951770ac4ce941be05956d46b1ae66dc35","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002164629c05e0f1265986e2ef2f80013ccf1310c012516c5cf60dd54400f60140d010000006b483045022100c8c22ac7e4788adaa1907771092a54280120969aa38ed3076a4fcb197134ced9022015f50a4866f85ce1b8d069e344a885836c33c2afdb53632ff407114987c9462f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff164629c05e0f1265986e2ef2f80013ccf1310c012516c5cf60dd54400f60140d020000006b483045022100f7fef47051925d395ab5dd237322ed3ef1070e91375e4f49d85e6ecd2a8bc01702200727b678032300035b21c96a69298daedaecf434b82df0edd09cfe21ab7cd0234121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914cefa415f84918a047f6a0eb92f9e53c6dfb75f0487df884801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6490c860","tx_hash":"019abcbe45a9f761ab9944766d8953dd93a79ab8a82c7793b290de51c049b7aa","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pr805s2lsjgc5prldg8tjtu720rdld6lqssjl22saf","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21532847","spent_by_me":"0.21532847","received_by_me":"0.21530847","my_balance_change":"-0.00002000","block_height":1452131,"timestamp":1623756980,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"019abcbe45a9f761ab9944766d8953dd93a79ab8a82c7793b290de51c049b7aa","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002164629c05e0f1265986e2ef2f80013ccf1310c012516c5cf60dd54400f60140d010000006b483045022100c8c22ac7e4788adaa1907771092a54280120969aa38ed3076a4fcb197134ced9022015f50a4866f85ce1b8d069e344a885836c33c2afdb53632ff407114987c9462f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff164629c05e0f1265986e2ef2f80013ccf1310c012516c5cf60dd54400f60140d020000006b483045022100f7fef47051925d395ab5dd237322ed3ef1070e91375e4f49d85e6ecd2a8bc01702200727b678032300035b21c96a69298daedaecf434b82df0edd09cfe21ab7cd0234121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914cefa415f84918a047f6a0eb92f9e53c6dfb75f0487df884801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6490c860","tx_hash":"019abcbe45a9f761ab9944766d8953dd93a79ab8a82c7793b290de51c049b7aa","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pr805s2lsjgc5prldg8tjtu720rdld6lqstxc3s805"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1452131,"timestamp":1623756980,"fee_details":null,"coin":"tBCH","internal_id":"c28747759edb023a57cf8cb86259548d3f1aa48b26683924d2e64f13811738d6","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002e34e90e127bbe6740a13a079a6cf19dab7f8f8e6bf84796487e55504056e0c3801000000d7473044022059220530aca5131991b9c7cee76bd1d57530c53e9418132e56f131f1f33efc4a022022d87c69f635a1d8103ddc5d76a5d0a85255c9b2672ad5daee0b458826a4682d41200000000000000000000000000000000000000000000000000000000000000000004c6b6304a001c260b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe34e90e127bbe6740a13a079a6cf19dab7f8f8e6bf84796487e55504056e0c38020000006a47304402201d6a1ad6094ebb7cd7e7921ccc49fce2e628ab6c510149f69505711c60351365022021c7f3bcad9ae1fd75f2e65e13dba4bd6bf7af5850566f74d9dbd48b8fe466914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac97944801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca001c260","tx_hash":"7711f7584c408e9aeb67bdbf465baea95a0620cc853a8b64e8bb4f38858a0a41","from":["bchtest:pzdlyeepfu7a85yjqs8kjhmqmtt84a2w056yc2ccax","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21535847","spent_by_me":"0.21534847","received_by_me":"0.21534847","my_balance_change":"0.00000000","block_height":1449202,"timestamp":1623327926,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"7711f7584c408e9aeb67bdbf465baea95a0620cc853a8b64e8bb4f38858a0a41","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002e34e90e127bbe6740a13a079a6cf19dab7f8f8e6bf84796487e55504056e0c3801000000d7473044022059220530aca5131991b9c7cee76bd1d57530c53e9418132e56f131f1f33efc4a022022d87c69f635a1d8103ddc5d76a5d0a85255c9b2672ad5daee0b458826a4682d41200000000000000000000000000000000000000000000000000000000000000000004c6b6304a001c260b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe34e90e127bbe6740a13a079a6cf19dab7f8f8e6bf84796487e55504056e0c38020000006a47304402201d6a1ad6094ebb7cd7e7921ccc49fce2e628ab6c510149f69505711c60351365022021c7f3bcad9ae1fd75f2e65e13dba4bd6bf7af5850566f74d9dbd48b8fe466914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac97944801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca001c260","tx_hash":"7711f7584c408e9aeb67bdbf465baea95a0620cc853a8b64e8bb4f38858a0a41","from":["slptest:pzdlyeepfu7a85yjqs8kjhmqmtt84a2w05psl3z00m"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1449202,"timestamp":1623327926,"fee_details":null,"coin":"tBCH","internal_id":"8ed0dd4cdb558f5d425d577676b8795c109cef7b27e5d9744ea6cc0086009bb1","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002cf434aca56ad8f23162765f944782ba76cd2694307e39a0ce00a401f7f83baef010000006a473044022058f4e2b7306b063cf97af4dd9fcdcbd45feed4160a418708f3e62539499404f7022050fc3bc7a13e634c4dc41657474d0629e576d7b4e0c5b8ef8623b77afcff996f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffcf434aca56ad8f23162765f944782ba76cd2694307e39a0ce00a401f7f83baef020000006b483045022100c638bc57150d9f53048f25ab5c9799af31d9f6ede98d9d04982bfa2f1730a14f02200af28c72f35ae09111f9d7047776a6571d57de532ebe1315b62b9086793301224121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a9149bf267214f3dd3d092040f695f60dad67af54e7d877f984801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca001c260","tx_hash":"380c6e050455e587647984bfe6f8f8b7da19cfa679a0130a74e6bb27e1904ee3","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzdlyeepfu7a85yjqs8kjhmqmtt84a2w056yc2ccax","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21536847","spent_by_me":"0.21536847","received_by_me":"0.21534847","my_balance_change":"-0.00002000","block_height":1449202,"timestamp":1623327926,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"380c6e050455e587647984bfe6f8f8b7da19cfa679a0130a74e6bb27e1904ee3","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002cf434aca56ad8f23162765f944782ba76cd2694307e39a0ce00a401f7f83baef010000006a473044022058f4e2b7306b063cf97af4dd9fcdcbd45feed4160a418708f3e62539499404f7022050fc3bc7a13e634c4dc41657474d0629e576d7b4e0c5b8ef8623b77afcff996f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffcf434aca56ad8f23162765f944782ba76cd2694307e39a0ce00a401f7f83baef020000006b483045022100c638bc57150d9f53048f25ab5c9799af31d9f6ede98d9d04982bfa2f1730a14f02200af28c72f35ae09111f9d7047776a6571d57de532ebe1315b62b9086793301224121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a9149bf267214f3dd3d092040f695f60dad67af54e7d877f984801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca001c260","tx_hash":"380c6e050455e587647984bfe6f8f8b7da19cfa679a0130a74e6bb27e1904ee3","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzdlyeepfu7a85yjqs8kjhmqmtt84a2w05psl3z00m"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1449202,"timestamp":1623327926,"fee_details":null,"coin":"tBCH","internal_id":"3564c09cca002561f56b05abd63500018bd7b2633fac3605f28a40cba003dacf","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000256333aaa3bd3f67ad5c0dd1f8b999d58766bab0416e149f7111ac0c4b448344301000000d747304402203bcd71f0b8a61dba3e1ad5cc4833873343235f429acd2f5108bccd2a78fd4c1c02201f10102ee2f7c968dd19700c23b193f55d587c3e7add9c775d127786ef9eb26b41200000000000000000000000000000000000000000000000000000000000000000004c6b6304c358bf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff56333aaa3bd3f67ad5c0dd1f8b999d58766bab0416e149f7111ac0c4b4483443020000006b483045022100b017d816fe381c0fb200cc154117d1f65ddd668800a75d5fa6099bd16f23be1e02200e0635852d63580259a2479b88065c5e75d61eb6af45eb6dff42ef3654fafba44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac679c4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc358bf60","tx_hash":"efba837f1f400ae00c9ae3074369d26ca72b7844f9652716238fad56ca4a43cf","from":["bchtest:pzgwyss0ajdyvfxgjelqu85fy9yx2yfk9u4m7ad4zy","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21537847","spent_by_me":"0.21536847","received_by_me":"0.21536847","my_balance_change":"0.00000000","block_height":1449059,"timestamp":1623153240,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"efba837f1f400ae00c9ae3074369d26ca72b7844f9652716238fad56ca4a43cf","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000256333aaa3bd3f67ad5c0dd1f8b999d58766bab0416e149f7111ac0c4b448344301000000d747304402203bcd71f0b8a61dba3e1ad5cc4833873343235f429acd2f5108bccd2a78fd4c1c02201f10102ee2f7c968dd19700c23b193f55d587c3e7add9c775d127786ef9eb26b41200000000000000000000000000000000000000000000000000000000000000000004c6b6304c358bf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff56333aaa3bd3f67ad5c0dd1f8b999d58766bab0416e149f7111ac0c4b4483443020000006b483045022100b017d816fe381c0fb200cc154117d1f65ddd668800a75d5fa6099bd16f23be1e02200e0635852d63580259a2479b88065c5e75d61eb6af45eb6dff42ef3654fafba44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac679c4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc358bf60","tx_hash":"efba837f1f400ae00c9ae3074369d26ca72b7844f9652716238fad56ca4a43cf","from":["slptest:pzgwyss0ajdyvfxgjelqu85fy9yx2yfk9uw0exhzse"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1449059,"timestamp":1623153240,"fee_details":null,"coin":"tBCH","internal_id":"7a87dc602fb74b66ffdadc35efb67cdd4688c4c57e5bdbd4f4335d25eceee309","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000025bda96aeabdc64916e14920236d4df010ad6aa009ed77375370a0450131fd211010000006b483045022100ad6f91abd961da2f87bd60911dc937bcbb0cab9c054d89c5f93fc3ed755a158402203eac6c254cfb808b42e449f3a395b0f7cf4566e45ccc2b5a752c9fb52d95cc934121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5bda96aeabdc64916e14920236d4df010ad6aa009ed77375370a0450131fd211020000006a47304402203db71882057cb8f590954d15f740f70f30ee3db57af1c6822d76dfa0d4c14742022008767a3df6a2bfef875b5922a4131e884ad99208a4a31b6dadc9c11517ee7a044121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a91490e2420fec9a4624c8967e0e1e8921486511362f874fa04801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc358bf60","tx_hash":"433448b4c4c01a11f749e11604ab6b76589d998b1fddc0d57af6d33baa3a3356","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzgwyss0ajdyvfxgjelqu85fy9yx2yfk9u4m7ad4zy","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21538847","spent_by_me":"0.21538847","received_by_me":"0.21536847","my_balance_change":"-0.00002000","block_height":1449059,"timestamp":1623153240,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"433448b4c4c01a11f749e11604ab6b76589d998b1fddc0d57af6d33baa3a3356","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000025bda96aeabdc64916e14920236d4df010ad6aa009ed77375370a0450131fd211010000006b483045022100ad6f91abd961da2f87bd60911dc937bcbb0cab9c054d89c5f93fc3ed755a158402203eac6c254cfb808b42e449f3a395b0f7cf4566e45ccc2b5a752c9fb52d95cc934121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5bda96aeabdc64916e14920236d4df010ad6aa009ed77375370a0450131fd211020000006a47304402203db71882057cb8f590954d15f740f70f30ee3db57af1c6822d76dfa0d4c14742022008767a3df6a2bfef875b5922a4131e884ad99208a4a31b6dadc9c11517ee7a044121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a91490e2420fec9a4624c8967e0e1e8921486511362f874fa04801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc358bf60","tx_hash":"433448b4c4c01a11f749e11604ab6b76589d998b1fddc0d57af6d33baa3a3356","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzgwyss0ajdyvfxgjelqu85fy9yx2yfk9uw0exhzse"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1449059,"timestamp":1623153240,"fee_details":null,"coin":"tBCH","internal_id":"b590067f740be1f064fe3914a94d20daa3c6030e96a121a92a48733f6838926a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000261c03a8fa3713a1c69f5d72e49535bda965fee2b108b817a2963a209107eb176010000006a4730440220562c4ceee979119d1c2195369bbe62aba1e3fc44c1f5db2c8ae26b767feae8df0220331550ba31fedc8904e25ff2d7387f33d19d9c9fd91749ce00e4992ea75a1d484121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff61c03a8fa3713a1c69f5d72e49535bda965fee2b108b817a2963a209107eb176020000006a4730440220550ae9fa5bb1c12e7272eef9a32f3664fca340199826de16323100e11138a8c6022058b2a7c1bebeed29e436f5b7d5a0a7794830ae5c210e986a87083dbfca59e0da4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000002328e80300000000000017a914fb01b4ac662ae5b17ef686d78d353c28f26c228c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1fa84801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9e50bf60","tx_hash":"bda0a249ab74f448c8b4612f3edc9dadcde646494afafb458cd406076d818226","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prasrd9vvc4wtvt776rd0rf48s50ympz3s24vepcad","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21541847","spent_by_me":"0.21541847","received_by_me":"0.21539847","my_balance_change":"-0.00002000","block_height":1449057,"timestamp":1623150810,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"bda0a249ab74f448c8b4612f3edc9dadcde646494afafb458cd406076d818226","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000261c03a8fa3713a1c69f5d72e49535bda965fee2b108b817a2963a209107eb176010000006a4730440220562c4ceee979119d1c2195369bbe62aba1e3fc44c1f5db2c8ae26b767feae8df0220331550ba31fedc8904e25ff2d7387f33d19d9c9fd91749ce00e4992ea75a1d484121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff61c03a8fa3713a1c69f5d72e49535bda965fee2b108b817a2963a209107eb176020000006a4730440220550ae9fa5bb1c12e7272eef9a32f3664fca340199826de16323100e11138a8c6022058b2a7c1bebeed29e436f5b7d5a0a7794830ae5c210e986a87083dbfca59e0da4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000002328e80300000000000017a914fb01b4ac662ae5b17ef686d78d353c28f26c228c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1fa84801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9e50bf60","tx_hash":"bda0a249ab74f448c8b4612f3edc9dadcde646494afafb458cd406076d818226","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prasrd9vvc4wtvt776rd0rf48s50ympz3s3ptzm00s","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"1","received_by_me":"0.9","my_balance_change":"-0.1","block_height":1449057,"timestamp":1623150810,"fee_details":null,"coin":"tBCH","internal_id":"b87b0c4a4487dd7f0727fb1484b7bef702d865e438afb4c74a784b5d369a8d30","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000022682816d0706d48c45fbfa4a4946e6cdad9ddc3e2f61b4c848f474ab49a2a0bd01000000d747304402201b17877e953cf30a4c6f454f6b5bb848b8e22d63314faf10d6dd84eb58890c1c022027a710c07477a35f8a676dca775b60cf60d8ff50fb9435d8dffd7f5cb329db7441200000000000000000000000000000000000000000000000000000000000000000004c6b63049e50bf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff2682816d0706d48c45fbfa4a4946e6cdad9ddc3e2f61b4c848f474ab49a2a0bd030000006b483045022100b3cc1ff2e40d708111e822dc44a0531f635268815a33907946abd6e9e463bc0902203699ed5e35bd96151959d99081ffc00a4284b2fb6796d99f2b1e755add919ddd4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac37a44801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9e50bf60","tx_hash":"11d21f1350040a377573d79e00aad60a01dfd4360292146e9164dcabae96da5b","from":["bchtest:prasrd9vvc4wtvt776rd0rf48s50ympz3s24vepcad","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21539847","spent_by_me":"0.21538847","received_by_me":"0.21538847","my_balance_change":"0.00000000","block_height":1449057,"timestamp":1623150810,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"11d21f1350040a377573d79e00aad60a01dfd4360292146e9164dcabae96da5b","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000022682816d0706d48c45fbfa4a4946e6cdad9ddc3e2f61b4c848f474ab49a2a0bd01000000d747304402201b17877e953cf30a4c6f454f6b5bb848b8e22d63314faf10d6dd84eb58890c1c022027a710c07477a35f8a676dca775b60cf60d8ff50fb9435d8dffd7f5cb329db7441200000000000000000000000000000000000000000000000000000000000000000004c6b63049e50bf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff2682816d0706d48c45fbfa4a4946e6cdad9ddc3e2f61b4c848f474ab49a2a0bd030000006b483045022100b3cc1ff2e40d708111e822dc44a0531f635268815a33907946abd6e9e463bc0902203699ed5e35bd96151959d99081ffc00a4284b2fb6796d99f2b1e755add919ddd4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac37a44801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9e50bf60","tx_hash":"11d21f1350040a377573d79e00aad60a01dfd4360292146e9164dcabae96da5b","from":["slptest:prasrd9vvc4wtvt776rd0rf48s50ympz3s3ptzm00s"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1449057,"timestamp":1623150810,"fee_details":null,"coin":"tBCH","internal_id":"ad73b00f1f0bf7635e480573b31574f38a257cac39b0a9a8134ac53a16f5e980","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000247721382b1cbadd5a935b7ea5054ee9c47ef93f8a1c804ea8228057ca5f5625b01000000b6473044022007e1a1e08c86c4d67bc48b468ee1bff60204135e35b14b72dc46c27a34600097022026205ef3706f44094d464d47a54bc0f2a21762abaff4f9aa34527a2f8232baf941514c6b63041b24bf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffff47721382b1cbadd5a935b7ea5054ee9c47ef93f8a1c804ea8228057ca5f5625b020000006b483045022100906ae8f5b2e75571ec7442264f2b775731ca98d1e56bda6671ef869d1ae0156902200d1367b5adaec03158633a6380f60aa3a6a6a668320b333eb2f0efb3635684d84121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acefaf4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace625bf60","tx_hash":"76b17e1009a263297a818b102bee5f96da5b53492ed7f5691c3a71a38f3ac061","from":["bchtest:pp2zukdgpr7u6x45v8kg30hc8c9mndvavs30ttm4v3","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21542847","spent_by_me":"0.21541847","received_by_me":"0.21541847","my_balance_change":"0.00000000","block_height":1449054,"timestamp":1623147145,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"76b17e1009a263297a818b102bee5f96da5b53492ed7f5691c3a71a38f3ac061","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000247721382b1cbadd5a935b7ea5054ee9c47ef93f8a1c804ea8228057ca5f5625b01000000b6473044022007e1a1e08c86c4d67bc48b468ee1bff60204135e35b14b72dc46c27a34600097022026205ef3706f44094d464d47a54bc0f2a21762abaff4f9aa34527a2f8232baf941514c6b63041b24bf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffff47721382b1cbadd5a935b7ea5054ee9c47ef93f8a1c804ea8228057ca5f5625b020000006b483045022100906ae8f5b2e75571ec7442264f2b775731ca98d1e56bda6671ef869d1ae0156902200d1367b5adaec03158633a6380f60aa3a6a6a668320b333eb2f0efb3635684d84121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acefaf4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace625bf60","tx_hash":"76b17e1009a263297a818b102bee5f96da5b53492ed7f5691c3a71a38f3ac061","from":["slptest:pp2zukdgpr7u6x45v8kg30hc8c9mndvavs2mvspz7v"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1449054,"timestamp":1623147145,"fee_details":null,"coin":"tBCH","internal_id":"c2ebf21255a77ea055e56b796c8aea5346f09de21c04acce3256775b3b78aeb0","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002addbd6e7f33432871f2c5a0a568b85f4ef6aca3ebc1cfe2810ba33def3f9d355010000006a473044022013ddc4993f9466d220b53ef2716bd53cdb8fdfecb54e69192013cf6c10c8af4802203fff4654ea16c31f313d2013b958974c3e2f57c888351b0b76266ba82d798ff74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffaddbd6e7f33432871f2c5a0a568b85f4ef6aca3ebc1cfe2810ba33def3f9d355020000006a4730440220332a1361aa1a5980796f9c65d901087ce799589e94c5c581664f056dde63e17b022028c5c82bb173c8e51995f4325a0f56ffe1b07be8901ae395facdcc5c19b2371e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914542e59a808fdcd1ab461ec88bef83e0bb9b59d6487d7b34801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3c40bf60","tx_hash":"5b62f5a57c052882ea04c8a1f893ef479cee5450eab735a9d5adcbb182137247","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pp2zukdgpr7u6x45v8kg30hc8c9mndvavs30ttm4v3","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21543847","spent_by_me":"0.21543847","received_by_me":"0.21541847","my_balance_change":"-0.00002000","block_height":1449054,"timestamp":1623147145,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"5b62f5a57c052882ea04c8a1f893ef479cee5450eab735a9d5adcbb182137247","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002addbd6e7f33432871f2c5a0a568b85f4ef6aca3ebc1cfe2810ba33def3f9d355010000006a473044022013ddc4993f9466d220b53ef2716bd53cdb8fdfecb54e69192013cf6c10c8af4802203fff4654ea16c31f313d2013b958974c3e2f57c888351b0b76266ba82d798ff74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffaddbd6e7f33432871f2c5a0a568b85f4ef6aca3ebc1cfe2810ba33def3f9d355020000006a4730440220332a1361aa1a5980796f9c65d901087ce799589e94c5c581664f056dde63e17b022028c5c82bb173c8e51995f4325a0f56ffe1b07be8901ae395facdcc5c19b2371e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914542e59a808fdcd1ab461ec88bef83e0bb9b59d6487d7b34801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3c40bf60","tx_hash":"5b62f5a57c052882ea04c8a1f893ef479cee5450eab735a9d5adcbb182137247","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pp2zukdgpr7u6x45v8kg30hc8c9mndvavs2mvspz7v"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1449054,"timestamp":1623147145,"fee_details":null,"coin":"tBCH","internal_id":"2ed101b6d14b4837dcc630be904fb8985ee7a3fdd8fd26909784fdbfb10cf64a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002afece59188497a02c4aca4a05c8da14b545fd9ceed94d4f44e74a3c10759a53501000000b7483045022100f00a64f90282a063d887a4a8cbc06adcad7c437f85dcee8c8cd95371bf7664eb02203a5a0a8ccf15c43c0f3f80bb0fa762a975d810937cab93070f9062fdab01954741514c6b6304c71ebf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffffafece59188497a02c4aca4a05c8da14b545fd9ceed94d4f44e74a3c10759a535030000006a47304402207b48da2aaae3600782d847b9bdc1a463ac84db39c72c5ed2ccb4ef62547adf21022079736eb9c4554c4e6b323ae78414d54b5122062ac3798b44664210d88fe20af24121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbfb74801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1821bf60","tx_hash":"55d3f9f3de33ba1028fe1cbc3eca6aeff4858b560a5a2c1f873234f3e7d6dbad","from":["bchtest:pp422sn4fflcuvfvkfaqnrkwl7tjkm75lqwvyk3s9g","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21544847","spent_by_me":"0.21543847","received_by_me":"0.21543847","my_balance_change":"0.00000000","block_height":1449053,"timestamp":1623145925,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"55d3f9f3de33ba1028fe1cbc3eca6aeff4858b560a5a2c1f873234f3e7d6dbad","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002afece59188497a02c4aca4a05c8da14b545fd9ceed94d4f44e74a3c10759a53501000000b7483045022100f00a64f90282a063d887a4a8cbc06adcad7c437f85dcee8c8cd95371bf7664eb02203a5a0a8ccf15c43c0f3f80bb0fa762a975d810937cab93070f9062fdab01954741514c6b6304c71ebf60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffffafece59188497a02c4aca4a05c8da14b545fd9ceed94d4f44e74a3c10759a535030000006a47304402207b48da2aaae3600782d847b9bdc1a463ac84db39c72c5ed2ccb4ef62547adf21022079736eb9c4554c4e6b323ae78414d54b5122062ac3798b44664210d88fe20af24121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbfb74801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1821bf60","tx_hash":"55d3f9f3de33ba1028fe1cbc3eca6aeff4858b560a5a2c1f873234f3e7d6dbad","from":["slptest:pp422sn4fflcuvfvkfaqnrkwl7tjkm75lq4crdt8h4"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1449053,"timestamp":1623145925,"fee_details":null,"coin":"tBCH","internal_id":"d68d695eb3338366bb4382effdf295f311651e9f135b36777359f0083a13d661","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000225e1230d5c75a6eee27b9927c6b3157b0863f3877ee2e9a912c2a907664da37f010000006a47304402200960739cd5f8af37a9fd4001c6730d491c1deab1de01f3029c58296457783d240220261b14e3b5dde5d3ea58534425fba176697008ae137ba2540ffc4182616c9fdf4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff25e1230d5c75a6eee27b9927c6b3157b0863f3877ee2e9a912c2a907664da37f020000006b483045022100d9e2be197b9abfc5dd426f6ce38a2549d214897a7b93f4c59cf7ad07a64a0b8802202bb44e708df28d3d6f9eff46ce951b206f1551d605f6dff8dd5d069f3f92e4f04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914dce608c2df96812f8ff8246d9abfec0249204bca878fbf4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace73abf60","tx_hash":"4238cf14335697e3512af0ec047fdcb58de45dbed0d77b031877f0eb47d90ab5","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prwwvzxzm7tgztu0lqjxmx4laspyjgztegks0enazx","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21546847","spent_by_me":"0.21546847","received_by_me":"0.21544847","my_balance_change":"-0.00002000","block_height":1449053,"timestamp":1623145925,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"4238cf14335697e3512af0ec047fdcb58de45dbed0d77b031877f0eb47d90ab5","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000225e1230d5c75a6eee27b9927c6b3157b0863f3877ee2e9a912c2a907664da37f010000006a47304402200960739cd5f8af37a9fd4001c6730d491c1deab1de01f3029c58296457783d240220261b14e3b5dde5d3ea58534425fba176697008ae137ba2540ffc4182616c9fdf4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff25e1230d5c75a6eee27b9927c6b3157b0863f3877ee2e9a912c2a907664da37f020000006b483045022100d9e2be197b9abfc5dd426f6ce38a2549d214897a7b93f4c59cf7ad07a64a0b8802202bb44e708df28d3d6f9eff46ce951b206f1551d605f6dff8dd5d069f3f92e4f04121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914dce608c2df96812f8ff8246d9abfec0249204bca878fbf4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace73abf60","tx_hash":"4238cf14335697e3512af0ec047fdcb58de45dbed0d77b031877f0eb47d90ab5","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prwwvzxzm7tgztu0lqjxmx4laspyjgztegdygzf2sm"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1449053,"timestamp":1623145925,"fee_details":null,"coin":"tBCH","internal_id":"926ec71808b36d4e794d0cc40305fa427eefe8b0dde82d72c4db96f51129656f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000303897e15b3384ad328adfdf81f2a9c3b3aeca4e7f643eb331bc4afd9f36a28f3020000006a473044022048cc5e2103d3d02092dea7cf75bd1a87b09a0aedef205a35e6a7c83259823b4102203ccaabcd115b0f033c67f21ccbcca87ed5c5323c58278439af3b141e4fcd39d54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb62a5f43d321a4f4e6585e92415747bf38719582b99ea37e0bd3310ce2969a1a020000006b483045022100f4a3148fff695d5cb6839c67a2dcc392e5efc793cf1b7cb952e711a6b6649a4702203c6f675eb30782964e55dead027cdb87cf916f3b717a5aa0599b8ff001011b004121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb50ad947ebf07718037bd7d0be5de48db5dc7f04ecf02a51e397563314cf3842020000006a47304402204681615e42b599e0febd9b8107080903f03be146eefcc07efa243f929360bc2f02202a2afcfe72f45d06e8c48fca98fda5ee8005a6a0a35fa521f1444bf0ebb928574121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710080000000000012cc8e80300000000000017a9146aa542754a7f8e312cb27a098eceff972b6fd4f887e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca7bb4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace73abf60","tx_hash":"35a55907c1a3744ef4d494edced95f544ba18d5ca0a4acc4027a498891e5ecaf","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pp422sn4fflcuvfvkfaqnrkwl7tjkm75lqwvyk3s9g","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21546847","spent_by_me":"0.21546847","received_by_me":"0.21544847","my_balance_change":"-0.00002000","block_height":1449053,"timestamp":1623145925,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"35a55907c1a3744ef4d494edced95f544ba18d5ca0a4acc4027a498891e5ecaf","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000303897e15b3384ad328adfdf81f2a9c3b3aeca4e7f643eb331bc4afd9f36a28f3020000006a473044022048cc5e2103d3d02092dea7cf75bd1a87b09a0aedef205a35e6a7c83259823b4102203ccaabcd115b0f033c67f21ccbcca87ed5c5323c58278439af3b141e4fcd39d54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb62a5f43d321a4f4e6585e92415747bf38719582b99ea37e0bd3310ce2969a1a020000006b483045022100f4a3148fff695d5cb6839c67a2dcc392e5efc793cf1b7cb952e711a6b6649a4702203c6f675eb30782964e55dead027cdb87cf916f3b717a5aa0599b8ff001011b004121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb50ad947ebf07718037bd7d0be5de48db5dc7f04ecf02a51e397563314cf3842020000006a47304402204681615e42b599e0febd9b8107080903f03be146eefcc07efa243f929360bc2f02202a2afcfe72f45d06e8c48fca98fda5ee8005a6a0a35fa521f1444bf0ebb928574121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710080000000000012cc8e80300000000000017a9146aa542754a7f8e312cb27a098eceff972b6fd4f887e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88aca7bb4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace73abf60","tx_hash":"35a55907c1a3744ef4d494edced95f544ba18d5ca0a4acc4027a498891e5ecaf","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pp422sn4fflcuvfvkfaqnrkwl7tjkm75lq4crdt8h4","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"8.7","spent_by_me":"8.7","received_by_me":"7.7","my_balance_change":"-1.0","block_height":1449053,"timestamp":1623145925,"fee_details":null,"coin":"tBCH","internal_id":"6c2441a91cac06cb087ae55d216d52cbc6f8c4e47a955dc32829814325c64653","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002c26e8b5503cf67379fdf81adf2747ffafff43d50b746d19ca7e39612fc05ac92010000006a4730440220033a209e7072eaa46bed21a7d27c4d45f38f068ca855883bbc568dc89cc2fd15022053165e8b959535c5aa269794c18bf617e43499166ae2bf0d36d5ec2c1f2390204121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc26e8b5503cf67379fdf81adf2747ffafff43d50b746d19ca7e39612fc05ac92020000006a47304402207bac287b5a8f6d2bd3ecfac57b7a992c56f8303fe89130efb4b42cb2472d92ff02206f196c89b7b1cbd9bd52a7c3f584d27871cd290c74c30c63f1fffb4052d542614121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a91469a0891adb04109c8d31e9fc6f27edc41e87206c875fc74801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac221dbe60","tx_hash":"b0dde35f1a1b9c98dd775c03e46afdf8072dcc68ad36cac7148ad9d2048d016c","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pp56pzg6mvzpp8ydx85lcme8ahzpapeqds2lhdxyta","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21548847","spent_by_me":"0.21548847","received_by_me":"0.21546847","my_balance_change":"-0.00002000","block_height":1448993,"timestamp":1623072673,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"b0dde35f1a1b9c98dd775c03e46afdf8072dcc68ad36cac7148ad9d2048d016c","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002c26e8b5503cf67379fdf81adf2747ffafff43d50b746d19ca7e39612fc05ac92010000006a4730440220033a209e7072eaa46bed21a7d27c4d45f38f068ca855883bbc568dc89cc2fd15022053165e8b959535c5aa269794c18bf617e43499166ae2bf0d36d5ec2c1f2390204121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc26e8b5503cf67379fdf81adf2747ffafff43d50b746d19ca7e39612fc05ac92020000006a47304402207bac287b5a8f6d2bd3ecfac57b7a992c56f8303fe89130efb4b42cb2472d92ff02206f196c89b7b1cbd9bd52a7c3f584d27871cd290c74c30c63f1fffb4052d542614121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a91469a0891adb04109c8d31e9fc6f27edc41e87206c875fc74801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac221dbe60","tx_hash":"b0dde35f1a1b9c98dd775c03e46afdf8072dcc68ad36cac7148ad9d2048d016c","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pp56pzg6mvzpp8ydx85lcme8ahzpapeqds3tskuneq"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1448993,"timestamp":1623072673,"fee_details":null,"coin":"tBCH","internal_id":"db5de208cc0504197c0314d2c65e3ac3d3f18e40b9e5ca96d5323652a768326f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002e98601b61821a5369f9e5d74bed4ae624166ce77df427a8e420ddc46e2666a8801000000d74730440220413afe0ff2672516caae61ee09156ba2f09098c71c7a0c019bca7e15fcee59a8022027846c0fd3a1df05dc95cf28d81cc46b1e8b5783bcac758e1fc4b0e2bc786dfd41200000000000000000000000000000000000000000000000000000000000000000004c6b63049f1cbe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe98601b61821a5369f9e5d74bed4ae624166ce77df427a8e420ddc46e2666a88020000006b483045022100eb6044621a663634bf559dbea3d0ecf9495cdcc833c7da3faba5cef2612d16c1022056215d69ed28c10b50f531e3bfeb79f751ede2ac5086d398d1ee91768e7bf6274121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac47cb4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f1cbe60","tx_hash":"92ac05fc1296e3a79cd146b7503df4fffa7f74f2ad81df9f3767cf03558b6ec2","from":["bchtest:pzj6q9rrdzr9wlrvlqznt8cuzlf7gfhlhc04n8kkkw","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21549847","spent_by_me":"0.21548847","received_by_me":"0.21548847","my_balance_change":"0.00000000","block_height":1448993,"timestamp":1623072673,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"92ac05fc1296e3a79cd146b7503df4fffa7f74f2ad81df9f3767cf03558b6ec2","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002e98601b61821a5369f9e5d74bed4ae624166ce77df427a8e420ddc46e2666a8801000000d74730440220413afe0ff2672516caae61ee09156ba2f09098c71c7a0c019bca7e15fcee59a8022027846c0fd3a1df05dc95cf28d81cc46b1e8b5783bcac758e1fc4b0e2bc786dfd41200000000000000000000000000000000000000000000000000000000000000000004c6b63049f1cbe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe98601b61821a5369f9e5d74bed4ae624166ce77df427a8e420ddc46e2666a88020000006b483045022100eb6044621a663634bf559dbea3d0ecf9495cdcc833c7da3faba5cef2612d16c1022056215d69ed28c10b50f531e3bfeb79f751ede2ac5086d398d1ee91768e7bf6274121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac47cb4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f1cbe60","tx_hash":"92ac05fc1296e3a79cd146b7503df4fffa7f74f2ad81df9f3767cf03558b6ec2","from":["slptest:pzj6q9rrdzr9wlrvlqznt8cuzlf7gfhlhc5p5uvpyn"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1448993,"timestamp":1623072673,"fee_details":null,"coin":"tBCH","internal_id":"2f16d6629b3da90140cb3bce4fc1149add1a5d43f2bda8ecb18032e909d64061","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000238edeb1b3f37607ef191934d0b4f56f98faa05df894aead091313c3d08289b0b010000006b483045022100c42500ba0e9275de19c2b48f38680a86fc7f0e7ec3e4597797fe2829a954b50c02204c456f45c54ab89714ded72cbd4b88679d09220f928b9eb85c16c75da89b287c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff38edeb1b3f37607ef191934d0b4f56f98faa05df894aead091313c3d08289b0b020000006b483045022100e83e62bb7500a163bb49a938aedf6bb8ba2d181732f4dd6b3503996299a6223b022025c6962467ea069fb28b3dc0473b448fe60c743ef60fdb365f4c72d87fa1512e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914a5a014636886577c6cf805359f1c17d3e426ffbe872fcf4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f1cbe60","tx_hash":"886a66e246dc0d428e7a42df77ce664162aed4be745d9e9f36a52118b60186e9","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzj6q9rrdzr9wlrvlqznt8cuzlf7gfhlhc04n8kkkw","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21550847","spent_by_me":"0.21550847","received_by_me":"0.21548847","my_balance_change":"-0.00002000","block_height":1448993,"timestamp":1623072673,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"886a66e246dc0d428e7a42df77ce664162aed4be745d9e9f36a52118b60186e9","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000238edeb1b3f37607ef191934d0b4f56f98faa05df894aead091313c3d08289b0b010000006b483045022100c42500ba0e9275de19c2b48f38680a86fc7f0e7ec3e4597797fe2829a954b50c02204c456f45c54ab89714ded72cbd4b88679d09220f928b9eb85c16c75da89b287c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff38edeb1b3f37607ef191934d0b4f56f98faa05df894aead091313c3d08289b0b020000006b483045022100e83e62bb7500a163bb49a938aedf6bb8ba2d181732f4dd6b3503996299a6223b022025c6962467ea069fb28b3dc0473b448fe60c743ef60fdb365f4c72d87fa1512e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914a5a014636886577c6cf805359f1c17d3e426ffbe872fcf4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f1cbe60","tx_hash":"886a66e246dc0d428e7a42df77ce664162aed4be745d9e9f36a52118b60186e9","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzj6q9rrdzr9wlrvlqznt8cuzlf7gfhlhc5p5uvpyn"],"total_amount":"0.1","spent_by_me":"0.1","received_by_me":"0","my_balance_change":"-0.1","block_height":1448993,"timestamp":1623072673,"fee_details":null,"coin":"tBCH","internal_id":"0f28bec12eadfbf239b019f2314ef9bf3d664d6ba0299ecf2c4b25fe853e0f84","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000026c018d04d2d98a14c7ca36ad68cc2d07f8fd6ae4035c77dd989c1b1a5fe3ddb001000000d8483045022100ac5ecbb037892a26e296c1e4c97f8e4b51cb46877a921248ca3f2af06d49d3a102202d70e0afc20c0e81ca18a54b125a676a3e67c892c6e817ae9f279ed0681e15d941200000000000000000000000000000000000000000000000000000000000000000004c6b6304211dbe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff6c018d04d2d98a14c7ca36ad68cc2d07f8fd6ae4035c77dd989c1b1a5fe3ddb0020000006a47304402201eaa2b3c2a074cafd734a9deec5f649dcdef044f0cba1a1a3d30939cf024bd37022024927f9e61ec3f260fe496e4afbd3e6e262861dfe255305c9c86fd89409b464a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac77c34801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac211dbe60","tx_hash":"7fa34d6607a9c212a9e9e27e87f363087b15b3c627997be2eea6755c0d23e125","from":["bchtest:pp56pzg6mvzpp8ydx85lcme8ahzpapeqds2lhdxyta","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21547847","spent_by_me":"0.21546847","received_by_me":"0.21546847","my_balance_change":"0.00000000","block_height":1448993,"timestamp":1623072673,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"7fa34d6607a9c212a9e9e27e87f363087b15b3c627997be2eea6755c0d23e125","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000026c018d04d2d98a14c7ca36ad68cc2d07f8fd6ae4035c77dd989c1b1a5fe3ddb001000000d8483045022100ac5ecbb037892a26e296c1e4c97f8e4b51cb46877a921248ca3f2af06d49d3a102202d70e0afc20c0e81ca18a54b125a676a3e67c892c6e817ae9f279ed0681e15d941200000000000000000000000000000000000000000000000000000000000000000004c6b6304211dbe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff6c018d04d2d98a14c7ca36ad68cc2d07f8fd6ae4035c77dd989c1b1a5fe3ddb0020000006a47304402201eaa2b3c2a074cafd734a9deec5f649dcdef044f0cba1a1a3d30939cf024bd37022024927f9e61ec3f260fe496e4afbd3e6e262861dfe255305c9c86fd89409b464a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac77c34801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac211dbe60","tx_hash":"7fa34d6607a9c212a9e9e27e87f363087b15b3c627997be2eea6755c0d23e125","from":["slptest:pp56pzg6mvzpp8ydx85lcme8ahzpapeqds3tskuneq"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1448993,"timestamp":1623072673,"fee_details":null,"coin":"tBCH","internal_id":"280b66943031c696ec5917538f12140e4cc739442d5caf51c4ee665f02648150","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002030e0d7566fc734f1cb9e7eed0fe75fd5804e53c05a2252cd97cb67337479952020000006b483045022100acdc3c9c95ac4201ffac479ba605aca31473b28035e2111f4ddcd2a48459eb89022004d5a2846a2474a2ad7883253ba3eef61b78f8e4e9060ced5baa5b7a55a40a3f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030e0d7566fc734f1cb9e7eed0fe75fd5804e53c05a2252cd97cb67337479952030000006a473044022027e720db123438e86d6c22b039aea73a5ed861d1dd8511c745bdb73a07267f5402201f39d23b1f68cc56286b3fffe38d1f7bb60e560c8635a4aae08f3ce1e4e37e914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001f40e80300000000000017a9143dc0ff80ccbabd473d3837493304b02ee07a179f87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acffd64801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4e17be60","tx_hash":"f3286af3d9afc41b33eb43f6e7a4ec3a3b9c2a1ff8fdad28d34a38b3157e8903","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pq7upluqejat63ea8qm5jvcykqhwq7shnu2zklyu30","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21553847","spent_by_me":"0.21553847","received_by_me":"0.21551847","my_balance_change":"-0.00002000","block_height":1448992,"timestamp":1623071467,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"f3286af3d9afc41b33eb43f6e7a4ec3a3b9c2a1ff8fdad28d34a38b3157e8903","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002030e0d7566fc734f1cb9e7eed0fe75fd5804e53c05a2252cd97cb67337479952020000006b483045022100acdc3c9c95ac4201ffac479ba605aca31473b28035e2111f4ddcd2a48459eb89022004d5a2846a2474a2ad7883253ba3eef61b78f8e4e9060ced5baa5b7a55a40a3f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030e0d7566fc734f1cb9e7eed0fe75fd5804e53c05a2252cd97cb67337479952030000006a473044022027e720db123438e86d6c22b039aea73a5ed861d1dd8511c745bdb73a07267f5402201f39d23b1f68cc56286b3fffe38d1f7bb60e560c8635a4aae08f3ce1e4e37e914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001f40e80300000000000017a9143dc0ff80ccbabd473d3837493304b02ee07a179f87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acffd64801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4e17be60","tx_hash":"f3286af3d9afc41b33eb43f6e7a4ec3a3b9c2a1ff8fdad28d34a38b3157e8903","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pq7upluqejat63ea8qm5jvcykqhwq7shnu3k3y7trj","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.9","spent_by_me":"0.9","received_by_me":"0.8","my_balance_change":"-0.1","block_height":1448992,"timestamp":1623071467,"fee_details":null,"coin":"tBCH","internal_id":"a37998be419f60124b0f181de9f007a6de8af97acbe1f9a2205bdec4af09c4f2","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002473519679e2222927e2e4b500a9d6b4a16ce7ac6aa8d888c0888a5a47ff2c572010000006b483045022100b84086ebca7e9feedf83f1808e6126d43ff806cf027988150562bcf4f5857db40220231932caf6c852847879d77d01f94bb18e5e54005865c449ccb2b88fe77ec2b44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff473519679e2222927e2e4b500a9d6b4a16ce7ac6aa8d888c0888a5a47ff2c572020000006a473044022043ca455e96018b72aecd8279af8aba38f0a703fd6aae1c35ac10d20b953125b302203a1e5ce6c476f67c026ce9763d8847feceb7712bb5e6775bd64e74aaf6cce5a34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000002328e80300000000000017a9148d3b2f3ede519beeb220fbd67ca9207f8b8652f487e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accfde4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf316be60","tx_hash":"5299473773b67cd92c25a2053ce50458fd75fed0eee7b91c4f73fc66750d0e03","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzxnkte7megehm4jyraavl9fyplchpjj7s8d9hpss3","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21555847","spent_by_me":"0.21555847","received_by_me":"0.21553847","my_balance_change":"-0.00002000","block_height":1448992,"timestamp":1623071467,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"5299473773b67cd92c25a2053ce50458fd75fed0eee7b91c4f73fc66750d0e03","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002473519679e2222927e2e4b500a9d6b4a16ce7ac6aa8d888c0888a5a47ff2c572010000006b483045022100b84086ebca7e9feedf83f1808e6126d43ff806cf027988150562bcf4f5857db40220231932caf6c852847879d77d01f94bb18e5e54005865c449ccb2b88fe77ec2b44121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff473519679e2222927e2e4b500a9d6b4a16ce7ac6aa8d888c0888a5a47ff2c572020000006a473044022043ca455e96018b72aecd8279af8aba38f0a703fd6aae1c35ac10d20b953125b302203a1e5ce6c476f67c026ce9763d8847feceb7712bb5e6775bd64e74aaf6cce5a34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000002328e80300000000000017a9148d3b2f3ede519beeb220fbd67ca9207f8b8652f487e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accfde4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acf316be60","tx_hash":"5299473773b67cd92c25a2053ce50458fd75fed0eee7b91c4f73fc66750d0e03","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzxnkte7megehm4jyraavl9fyplchpjj7suezvm8zv","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"1","received_by_me":"0.9","my_balance_change":"-0.1","block_height":1448992,"timestamp":1623071467,"fee_details":null,"coin":"tBCH","internal_id":"74177c389de71ea31757e5cf1f99741ebc103b340c135ba6944d5b28d872d21e","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000203897e15b3384ad328adfdf81f2a9c3b3aeca4e7f643eb331bc4afd9f36a28f301000000d8483045022100e079f6b6d627fe58ab7454e5501623cc2a205ec6b77ccb6e18ac468c13f7e090022038f39424c06a5b8ae80a58dfa197839050cb1e10985fb2ca31a202387ddb530b41200000000000000000000000000000000000000000000000000000000000000000004c6b63044e17be60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff03897e15b3384ad328adfdf81f2a9c3b3aeca4e7f643eb331bc4afd9f36a28f3030000006b483045022100b38320d57ce4bd33b4ec2aa3a3471aa063677d3e4f768ec532271e66df81334e02202a54df0d82c7a1efd57b853c29390a5a12a02dce935d3ad0d11a0b0b7739bee64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac17d34801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4e17be60","tx_hash":"0b9b28083d3c3191d0ea4a89df05aa8ff9564f0b4d9391f17e60373f1bebed38","from":["bchtest:pq7upluqejat63ea8qm5jvcykqhwq7shnu2zklyu30","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21551847","spent_by_me":"0.21550847","received_by_me":"0.21550847","my_balance_change":"0.00000000","block_height":1448992,"timestamp":1623071467,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"0b9b28083d3c3191d0ea4a89df05aa8ff9564f0b4d9391f17e60373f1bebed38","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000203897e15b3384ad328adfdf81f2a9c3b3aeca4e7f643eb331bc4afd9f36a28f301000000d8483045022100e079f6b6d627fe58ab7454e5501623cc2a205ec6b77ccb6e18ac468c13f7e090022038f39424c06a5b8ae80a58dfa197839050cb1e10985fb2ca31a202387ddb530b41200000000000000000000000000000000000000000000000000000000000000000004c6b63044e17be60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff03897e15b3384ad328adfdf81f2a9c3b3aeca4e7f643eb331bc4afd9f36a28f3030000006b483045022100b38320d57ce4bd33b4ec2aa3a3471aa063677d3e4f768ec532271e66df81334e02202a54df0d82c7a1efd57b853c29390a5a12a02dce935d3ad0d11a0b0b7739bee64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac17d34801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4e17be60","tx_hash":"0b9b28083d3c3191d0ea4a89df05aa8ff9564f0b4d9391f17e60373f1bebed38","from":["slptest:pq7upluqejat63ea8qm5jvcykqhwq7shnu3k3y7trj"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"0.1","spent_by_me":"0","received_by_me":"0.1","my_balance_change":"0.1","block_height":1448992,"timestamp":1623071467,"fee_details":null,"coin":"tBCH","internal_id":"76c92ad50b78118449cb01575ee8535b32703b56d72badfe90db45d855831bb8","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000024c40732416a3bf28aca49fdeaa3c74e4c37d44db9a1a8cab830fbd751284560a01000000d7473044022016083f68dae0cbe440d4c674ca3db9010e7cb0485f86a569ac5cf717d65f746c02202669fe140ba642a71a7fd15f3dc5c59d2f757ca12e49bb928ca695750d80bbc541200000000000000000000000000000000000000000000000000000000000000000004c6b6304240ebe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff4c40732416a3bf28aca49fdeaa3c74e4c37d44db9a1a8cab830fbd751284560a020000006b483045022100afc972c131187f3dc00df05c07164499e5b587a1adc880fb3394d02b1c2df831022018dc3e7da4113e98ac847a9d1d372ebdf0895de8835c803547e41011e05ce0914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9fe64801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac240ebe60","tx_hash":"72c5f27fa4a588088c888daac67ace164a6b9d0a504b2e7e9222229e67193547","from":["bchtest:pzaaxmwyk9x6vfkk5y9vck2dk88vr5jd6yts8zusej","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21556847","spent_by_me":"0.21555847","received_by_me":"0.21555847","my_balance_change":"0.00000000","block_height":1448990,"timestamp":1623069027,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"72c5f27fa4a588088c888daac67ace164a6b9d0a504b2e7e9222229e67193547","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000024c40732416a3bf28aca49fdeaa3c74e4c37d44db9a1a8cab830fbd751284560a01000000d7473044022016083f68dae0cbe440d4c674ca3db9010e7cb0485f86a569ac5cf717d65f746c02202669fe140ba642a71a7fd15f3dc5c59d2f757ca12e49bb928ca695750d80bbc541200000000000000000000000000000000000000000000000000000000000000000004c6b6304240ebe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff4c40732416a3bf28aca49fdeaa3c74e4c37d44db9a1a8cab830fbd751284560a020000006b483045022100afc972c131187f3dc00df05c07164499e5b587a1adc880fb3394d02b1c2df831022018dc3e7da4113e98ac847a9d1d372ebdf0895de8835c803547e41011e05ce0914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9fe64801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac240ebe60","tx_hash":"72c5f27fa4a588088c888daac67ace164a6b9d0a504b2e7e9222229e67193547","from":["slptest:pzaaxmwyk9x6vfkk5y9vck2dk88vr5jd6ysyqex8t0"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448990,"timestamp":1623069027,"fee_details":null,"coin":"tBCH","internal_id":"6fd296ec8afb8f471733829c61ad3338c58e66b568c2495bc10ba01c59d017e2","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000028d372281608c372e656dfb6c0e08605552a59fb63dc17cd15f63101904efe874010000006b483045022100be47ac47975dc15e952d822dfebae2fffd8a9a8d88b31700150fd199604c52ee02206e5405c8d173cf345485ce580800e040f0700f4ab3c73f689caf4705010497374121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff8d372281608c372e656dfb6c0e08605552a59fb63dc17cd15f63101904efe874020000006b483045022100cb771d6df08b9a1b1c29ba13bd7ef73f274df3f52de89845a2701a203b8b02e0022041444bf0f2ef0311511df4b65461880aba5c8108557050cc7e4dc68a4aa43edf4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914bbd36dc4b14da626d6a10acc594db1cec1d24dd18787ea4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac250ebe60","tx_hash":"0a56841275bd0f83ab8c1a9adb447dc3e4743caade9fa4ac28bfa3162473404c","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzaaxmwyk9x6vfkk5y9vck2dk88vr5jd6yts8zusej","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21557847","spent_by_me":"0.21557847","received_by_me":"0.21555847","my_balance_change":"-0.00002000","block_height":1448990,"timestamp":1623069027,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"0a56841275bd0f83ab8c1a9adb447dc3e4743caade9fa4ac28bfa3162473404c","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000028d372281608c372e656dfb6c0e08605552a59fb63dc17cd15f63101904efe874010000006b483045022100be47ac47975dc15e952d822dfebae2fffd8a9a8d88b31700150fd199604c52ee02206e5405c8d173cf345485ce580800e040f0700f4ab3c73f689caf4705010497374121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff8d372281608c372e656dfb6c0e08605552a59fb63dc17cd15f63101904efe874020000006b483045022100cb771d6df08b9a1b1c29ba13bd7ef73f274df3f52de89845a2701a203b8b02e0022041444bf0f2ef0311511df4b65461880aba5c8108557050cc7e4dc68a4aa43edf4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914bbd36dc4b14da626d6a10acc594db1cec1d24dd18787ea4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac250ebe60","tx_hash":"0a56841275bd0f83ab8c1a9adb447dc3e4743caade9fa4ac28bfa3162473404c","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzaaxmwyk9x6vfkk5y9vck2dk88vr5jd6ysyqex8t0"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448990,"timestamp":1623069027,"fee_details":null,"coin":"tBCH","internal_id":"de700a925438bd828eb789ce0da9243fa79bef20405d7d34328ef1ea9fb1ad14","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000020ced642178dd794991b49e680e3a1b7292b657b5f4496515b0f15008073da81701000000d747304402201133296646156e6de500f5d56b7c00ccfdbc3928b2bdd5646c8e4c16196e410f02205133ddf69d72c5db416c1d447bfd80f90d1d827bed80fe16b934212b9d41785041200000000000000000000000000000000000000000000000000000000000000000004c6b63049a0bbe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff0ced642178dd794991b49e680e3a1b7292b657b5f4496515b0f15008073da817020000006b483045022100db1eb4b1cd1b606f131ac77ef0e4c5c24401e03e1d95d8b9f01c9dbace485bad02203b0281aba051f7ac2e1fece64c499b78bb928efff589d7286df6f605b14086204121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6fee4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9a0bbe60","tx_hash":"74e8ef041910635fd17cc13db69fa5525560080e6cfb6d652e378c608122378d","from":["bchtest:ppfk6n4rhvnfyxemegc7whsxmuqqcgc9g502thwzj7","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21558847","spent_by_me":"0.21557847","received_by_me":"0.21557847","my_balance_change":"0.00000000","block_height":1448989,"timestamp":1623067807,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"74e8ef041910635fd17cc13db69fa5525560080e6cfb6d652e378c608122378d","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000020ced642178dd794991b49e680e3a1b7292b657b5f4496515b0f15008073da81701000000d747304402201133296646156e6de500f5d56b7c00ccfdbc3928b2bdd5646c8e4c16196e410f02205133ddf69d72c5db416c1d447bfd80f90d1d827bed80fe16b934212b9d41785041200000000000000000000000000000000000000000000000000000000000000000004c6b63049a0bbe60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff0ced642178dd794991b49e680e3a1b7292b657b5f4496515b0f15008073da817020000006b483045022100db1eb4b1cd1b606f131ac77ef0e4c5c24401e03e1d95d8b9f01c9dbace485bad02203b0281aba051f7ac2e1fece64c499b78bb928efff589d7286df6f605b14086204121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6fee4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9a0bbe60","tx_hash":"74e8ef041910635fd17cc13db69fa5525560080e6cfb6d652e378c608122378d","from":["slptest:ppfk6n4rhvnfyxemegc7whsxmuqqcgc9g557vv54qr"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448989,"timestamp":1623067807,"fee_details":null,"coin":"tBCH","internal_id":"ebc8206ac816600285c0cc362e31a8bfaac3df56d5fccd053bf37d5953011e87","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000021c213665e6720e83cbf8eb2c9c57669e40f404b848e21627ef02a7fbc061c60e010000006a47304402201238eee290c2a687b48b4f4d2568b97c37e19b7e5ca2a2fb567895b7448d00c602203c3bc584f4bc77d57b9801067ee6f3fbc766ecd79f64bbb153fde68ed33bef734121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff1c213665e6720e83cbf8eb2c9c57669e40f404b848e21627ef02a7fbc061c60e020000006a473044022015fe771d1ec5cc545c41e52fbd278ab32a8a89c69013db52d2523e5e38228a4a022008d25953117ca9cfe8bf5ecf406b3e9a7dd34f6c615d6b7b3d5c71d57ac569a14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914536d4ea3bb26921b3bca31e75e06df000c2305458757f24801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9a0bbe60","tx_hash":"17a83d070850f1b0156549f4b557b692721b3a0e689eb4914979dd782164ed0c","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppfk6n4rhvnfyxemegc7whsxmuqqcgc9g502thwzj7","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21559847","spent_by_me":"0.21559847","received_by_me":"0.21557847","my_balance_change":"-0.00002000","block_height":1448989,"timestamp":1623067807,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"17a83d070850f1b0156549f4b557b692721b3a0e689eb4914979dd782164ed0c","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000021c213665e6720e83cbf8eb2c9c57669e40f404b848e21627ef02a7fbc061c60e010000006a47304402201238eee290c2a687b48b4f4d2568b97c37e19b7e5ca2a2fb567895b7448d00c602203c3bc584f4bc77d57b9801067ee6f3fbc766ecd79f64bbb153fde68ed33bef734121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff1c213665e6720e83cbf8eb2c9c57669e40f404b848e21627ef02a7fbc061c60e020000006a473044022015fe771d1ec5cc545c41e52fbd278ab32a8a89c69013db52d2523e5e38228a4a022008d25953117ca9cfe8bf5ecf406b3e9a7dd34f6c615d6b7b3d5c71d57ac569a14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914536d4ea3bb26921b3bca31e75e06df000c2305458757f24801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9a0bbe60","tx_hash":"17a83d070850f1b0156549f4b557b692721b3a0e689eb4914979dd782164ed0c","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppfk6n4rhvnfyxemegc7whsxmuqqcgc9g557vv54qr"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448989,"timestamp":1623067807,"fee_details":null,"coin":"tBCH","internal_id":"e6a9f22657479057367138f2c5668140033b7cb090338f91fa6ed858119c075f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002bec21db1d300d9ef27d50618842e958b8137723e29cea3864716a8348e2ab566010000006a47304402206a8f3705675d6ee112a64611a70830eeb60a6674cbb17b6c322e827077b6f7a50220520bb3454ecd4174939b0e41d661ce6eea5dbae36ad65e1ae4f9c4dd568d1a914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbec21db1d300d9ef27d50618842e958b8137723e29cea3864716a8348e2ab566020000006a47304402205188db5d2e9bade41b204fd7e7a244aac4cba6d276c5671ee87ad2afa65d5df00220442cf7f68492597303de5ba6d5b77666eb673374ec6ca2b887a7be1cbba268e64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914746fc9a5f758c8a422484f24b45f538cc0e26d6a8727fa4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb8ffbd60","tx_hash":"8df08337cb7755ee1d9d7e4f0015b3dce123e8db9cb04c9adf11d753fb3a6891","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pp6xljd97avv3fpzfp8jfdzl2wxvpcnddgkk85xs4n","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21561847","spent_by_me":"0.21561847","received_by_me":"0.21559847","my_balance_change":"-0.00002000","block_height":1448987,"timestamp":1623065357,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"8df08337cb7755ee1d9d7e4f0015b3dce123e8db9cb04c9adf11d753fb3a6891","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002bec21db1d300d9ef27d50618842e958b8137723e29cea3864716a8348e2ab566010000006a47304402206a8f3705675d6ee112a64611a70830eeb60a6674cbb17b6c322e827077b6f7a50220520bb3454ecd4174939b0e41d661ce6eea5dbae36ad65e1ae4f9c4dd568d1a914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffbec21db1d300d9ef27d50618842e958b8137723e29cea3864716a8348e2ab566020000006a47304402205188db5d2e9bade41b204fd7e7a244aac4cba6d276c5671ee87ad2afa65d5df00220442cf7f68492597303de5ba6d5b77666eb673374ec6ca2b887a7be1cbba268e64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914746fc9a5f758c8a422484f24b45f538cc0e26d6a8727fa4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb8ffbd60","tx_hash":"8df08337cb7755ee1d9d7e4f0015b3dce123e8db9cb04c9adf11d753fb3a6891","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pp6xljd97avv3fpzfp8jfdzl2wxvpcnddgdzq0u88w"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448987,"timestamp":1623065357,"fee_details":null,"coin":"tBCH","internal_id":"29e5a4ee599d058989e0aa3ea35963f039e6e505a01bd9140238fad1fb358a19","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000291683afb53d711df9a4cb09cdbe823e1dcb315004f7e9d1dee5577cb3783f08d01000000d84830450221008ab8f20ca1d670c169baec53044c51062539e4d9b144ff6a1019ad43497f9b8e02204b7081af2f26779b61368ec4f90157b2e4ed073c46c50b3080234bbab0e73c1a41200000000000000000000000000000000000000000000000000000000000000000004c6b6304b7ffbd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff91683afb53d711df9a4cb09cdbe823e1dcb315004f7e9d1dee5577cb3783f08d020000006b48304502210093e395ebd62a80a756476069124b41cc33adbfcc9a3961cd7aaee9843649593d02207fc1b1a16cebf63e2fb6f85375c7ee6de07f266d1239f69a64c0adbd7fc15be74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3ff64801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb7ffbd60","tx_hash":"0ec661c0fba702ef2716e248b804f4409e66579c2cebf8cb830e72e66536211c","from":["bchtest:pp6xljd97avv3fpzfp8jfdzl2wxvpcnddgkk85xs4n","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21560847","spent_by_me":"0.21559847","received_by_me":"0.21559847","my_balance_change":"0.00000000","block_height":1448987,"timestamp":1623065357,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"0ec661c0fba702ef2716e248b804f4409e66579c2cebf8cb830e72e66536211c","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000291683afb53d711df9a4cb09cdbe823e1dcb315004f7e9d1dee5577cb3783f08d01000000d84830450221008ab8f20ca1d670c169baec53044c51062539e4d9b144ff6a1019ad43497f9b8e02204b7081af2f26779b61368ec4f90157b2e4ed073c46c50b3080234bbab0e73c1a41200000000000000000000000000000000000000000000000000000000000000000004c6b6304b7ffbd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff91683afb53d711df9a4cb09cdbe823e1dcb315004f7e9d1dee5577cb3783f08d020000006b48304502210093e395ebd62a80a756476069124b41cc33adbfcc9a3961cd7aaee9843649593d02207fc1b1a16cebf63e2fb6f85375c7ee6de07f266d1239f69a64c0adbd7fc15be74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3ff64801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb7ffbd60","tx_hash":"0ec661c0fba702ef2716e248b804f4409e66579c2cebf8cb830e72e66536211c","from":["slptest:pp6xljd97avv3fpzfp8jfdzl2wxvpcnddgdzq0u88w"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448987,"timestamp":1623065357,"fee_details":null,"coin":"tBCH","internal_id":"5369720668b62322dc28e81b6dcfe0e02f766376015ce8ff903955a867ceebaf","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002e8cb661f49a212f4a7daa46bb5bba024859dd520767e1e6b7b8dbcee4c843695010000006a47304402203384a1aa2e3366006ed1460541b84c9b3790f0b16b2ea1611d470bc646d2a27a022062633c7ffe5286ef56d83468a0d39e180a0a001723dd76a75d364bf19f697db64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffe8cb661f49a212f4a7daa46bb5bba024859dd520767e1e6b7b8dbcee4c843695020000006a473044022075372ba8c37fdd8a9ecfe3d821b90893d0fb3095284e928e9f75751fd492fb9a02202405dbbfffec129afe195c224b37ce0179e5ad999d65af37f8d9705745c8302b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914460dd524ea15822352e3e817380114f96ddbdd6987f7014901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acebf1bd60","tx_hash":"8dbcd953732a1f5ab474d96913bc565858c60fb96cdea1be3d88f85cd335ade7","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pprqm4fyag2cyg6ju05pwwqpznukmk7adypch6rq6t","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21563847","spent_by_me":"0.21563847","received_by_me":"0.21561847","my_balance_change":"-0.00002000","block_height":1448984,"timestamp":1623061716,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"8dbcd953732a1f5ab474d96913bc565858c60fb96cdea1be3d88f85cd335ade7","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002e8cb661f49a212f4a7daa46bb5bba024859dd520767e1e6b7b8dbcee4c843695010000006a47304402203384a1aa2e3366006ed1460541b84c9b3790f0b16b2ea1611d470bc646d2a27a022062633c7ffe5286ef56d83468a0d39e180a0a001723dd76a75d364bf19f697db64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffe8cb661f49a212f4a7daa46bb5bba024859dd520767e1e6b7b8dbcee4c843695020000006a473044022075372ba8c37fdd8a9ecfe3d821b90893d0fb3095284e928e9f75751fd492fb9a02202405dbbfffec129afe195c224b37ce0179e5ad999d65af37f8d9705745c8302b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914460dd524ea15822352e3e817380114f96ddbdd6987f7014901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acebf1bd60","tx_hash":"8dbcd953732a1f5ab474d96913bc565858c60fb96cdea1be3d88f85cd335ade7","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pprqm4fyag2cyg6ju05pwwqpznukmk7ady6vspehgk"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448984,"timestamp":1623061716,"fee_details":null,"coin":"tBCH","internal_id":"d17b4dcf7a76093fb6043b2d3b689b3dcd6d96f563a986b44c25b6c808634982","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002e7ad35d35cf8883dbea1de6cb90fc6585856bc1369d974b45a1f2a7353d9bc8d01000000d7473044022006fc5db60f583c351d96f5844025018d8b65a39cff8c6d13c54f2a5d338c74af0220324b0a60acc95cbf8bf5d708d6e5e649da291d8163d967dcdbb1f382c8cbac7941200000000000000000000000000000000000000000000000000000000000000000004c6b6304ebf1bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe7ad35d35cf8883dbea1de6cb90fc6585856bc1369d974b45a1f2a7353d9bc8d020000006b483045022100e7d8a8e7b3169a2e4f7c3955a8818e13206e9eb2b870e870fde814a9b96e5d0402204141202de05dcf0c491f3118b4a3dfb125cdd21b8760cf82383dabe1691787a34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0ffe4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acebf1bd60","tx_hash":"66b52a8e34a8164786a3ce293e7237818b952e841806d527efd900d3b11dc2be","from":["bchtest:pprqm4fyag2cyg6ju05pwwqpznukmk7adypch6rq6t","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21562847","spent_by_me":"0.21561847","received_by_me":"0.21561847","my_balance_change":"0.00000000","block_height":1448984,"timestamp":1623061716,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"66b52a8e34a8164786a3ce293e7237818b952e841806d527efd900d3b11dc2be","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002e7ad35d35cf8883dbea1de6cb90fc6585856bc1369d974b45a1f2a7353d9bc8d01000000d7473044022006fc5db60f583c351d96f5844025018d8b65a39cff8c6d13c54f2a5d338c74af0220324b0a60acc95cbf8bf5d708d6e5e649da291d8163d967dcdbb1f382c8cbac7941200000000000000000000000000000000000000000000000000000000000000000004c6b6304ebf1bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe7ad35d35cf8883dbea1de6cb90fc6585856bc1369d974b45a1f2a7353d9bc8d020000006b483045022100e7d8a8e7b3169a2e4f7c3955a8818e13206e9eb2b870e870fde814a9b96e5d0402204141202de05dcf0c491f3118b4a3dfb125cdd21b8760cf82383dabe1691787a34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac0ffe4801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acebf1bd60","tx_hash":"66b52a8e34a8164786a3ce293e7237818b952e841806d527efd900d3b11dc2be","from":["slptest:pprqm4fyag2cyg6ju05pwwqpznukmk7ady6vspehgk"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448984,"timestamp":1623061716,"fee_details":null,"coin":"tBCH","internal_id":"fe0ae7a5662b7f83ae3e6537a2938f2cd29c0ba6844eb23a259a61a49d024ccf","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000261d6cd1c6b14fc8f790ad2c430b163f9547c3a8f1afb65892d264726227cfe3101000000d8483045022100e07f1c59fd6305f249dd7f12f0d8db8257086236783f3980c1756e6e5f9e2429022059dd0a797eb56b548cee46e786aa3bf56a2a49f2f31e87cd837437160caea25a41200000000000000000000000000000000000000000000000000000000000000000004c6b630412edbd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff61d6cd1c6b14fc8f790ad2c430b163f9547c3a8f1afb65892d264726227cfe31020000006b483045022100ebdd5374355658a2792db69ecd10333f2b3e242c265e22a59f401f7222d3e61e02205e9a3e0ac55f430bfbcbde0b87d6ea77ff0b6a0733ed3512c940b6f56e8470bf4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7f154901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac12edbd60","tx_hash":"ba6acd2ab2d7bd2d57c8e01d5bb46ca94017633ab4ef3f492f65ab14e3c44666","from":["bchtest:pqy2nmkf0z4a496j9vusgrl9racx07fydq8qak75mv","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21568847","spent_by_me":"0.21567847","received_by_me":"0.21567847","my_balance_change":"0.00000000","block_height":1448983,"timestamp":1623060512,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"ba6acd2ab2d7bd2d57c8e01d5bb46ca94017633ab4ef3f492f65ab14e3c44666","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000261d6cd1c6b14fc8f790ad2c430b163f9547c3a8f1afb65892d264726227cfe3101000000d8483045022100e07f1c59fd6305f249dd7f12f0d8db8257086236783f3980c1756e6e5f9e2429022059dd0a797eb56b548cee46e786aa3bf56a2a49f2f31e87cd837437160caea25a41200000000000000000000000000000000000000000000000000000000000000000004c6b630412edbd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff61d6cd1c6b14fc8f790ad2c430b163f9547c3a8f1afb65892d264726227cfe31020000006b483045022100ebdd5374355658a2792db69ecd10333f2b3e242c265e22a59f401f7222d3e61e02205e9a3e0ac55f430bfbcbde0b87d6ea77ff0b6a0733ed3512c940b6f56e8470bf4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7f154901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac12edbd60","tx_hash":"ba6acd2ab2d7bd2d57c8e01d5bb46ca94017633ab4ef3f492f65ab14e3c44666","from":["slptest:pqy2nmkf0z4a496j9vusgrl9racx07fydqu56dyrf3"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448983,"timestamp":1623060512,"fee_details":null,"coin":"tBCH","internal_id":"2e327fb6476cbfcdfcaa629a145c363ce42139148b7afb6bb10c96603e43e22d","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002d2e5e3432e407641b5754143c8cb18333c03c5e659528ab6f89567d8d7dd012f010000006b483045022100adf485b76d97f1679fbf5a8354fa25e6fcb56ce6fdd658e326862f58a05d7d1f022001d2a5cc3cf29ea5bd72fd9218c0842f889d137a20a78e18bd4aae2c93d2dee64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffd2e5e3432e407641b5754143c8cb18333c03c5e659528ab6f89567d8d7dd012f020000006a47304402207ca5780c73ab3a1f12a51b413519865bc68b10359fd99676f26bb805c6be40ba0220099cb4d444782bd3dc035adc304b264bb392d9c3285dac91d51d937869be841a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91422142d4b9ae623e9892b05b9dbc6e4c649b65b0387c7094901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac88efbd60","tx_hash":"a3cf3e996893e8b6657adca71368c03bd4839f8961a7e7e55d86f0dba5576ae9","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pq3pgt2tntnz86vf9vzmnk7xunryndjmqvczt7agdp","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21565847","spent_by_me":"0.21565847","received_by_me":"0.21563847","my_balance_change":"-0.00002000","block_height":1448983,"timestamp":1623060512,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"a3cf3e996893e8b6657adca71368c03bd4839f8961a7e7e55d86f0dba5576ae9","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002d2e5e3432e407641b5754143c8cb18333c03c5e659528ab6f89567d8d7dd012f010000006b483045022100adf485b76d97f1679fbf5a8354fa25e6fcb56ce6fdd658e326862f58a05d7d1f022001d2a5cc3cf29ea5bd72fd9218c0842f889d137a20a78e18bd4aae2c93d2dee64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffd2e5e3432e407641b5754143c8cb18333c03c5e659528ab6f89567d8d7dd012f020000006a47304402207ca5780c73ab3a1f12a51b413519865bc68b10359fd99676f26bb805c6be40ba0220099cb4d444782bd3dc035adc304b264bb392d9c3285dac91d51d937869be841a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91422142d4b9ae623e9892b05b9dbc6e4c649b65b0387c7094901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac88efbd60","tx_hash":"a3cf3e996893e8b6657adca71368c03bd4839f8961a7e7e55d86f0dba5576ae9","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pq3pgt2tntnz86vf9vzmnk7xunryndjmqvrkv98llu"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448983,"timestamp":1623060512,"fee_details":null,"coin":"tBCH","internal_id":"ee9abad0053f22f6910db1cd2520d5c1e416209b9ce89afe72d34cf911c17f60","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002e96a57a5dbf0865de5e7a761899f83d43bc06813a7dc7a65b6e89368993ecfa301000000d8483045022100c927451bc5eeba0b6a0e186000c916c8230add92088ebd6cf13d3457ff73001b02202bef90393de9eac6db17078fdf2300cc677fe4471c57d855ebaa164a04c82c2a41200000000000000000000000000000000000000000000000000000000000000000004c6b630488efbd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe96a57a5dbf0865de5e7a761899f83d43bc06813a7dc7a65b6e89368993ecfa3020000006a473044022055d30fd50898767ec6589c749862534293286014face1181d966a079fd2255f2022003afbce939dd8f42962c039a3c67dace0a2f473163707b2323bece1fa216c22e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf054901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac88efbd60","tx_hash":"9536844ceebc8d7b6b1e7e7620d59d8524a0bbb56ba4daa7f412a2491f66cbe8","from":["bchtest:pq3pgt2tntnz86vf9vzmnk7xunryndjmqvczt7agdp","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21564847","spent_by_me":"0.21563847","received_by_me":"0.21563847","my_balance_change":"0.00000000","block_height":1448983,"timestamp":1623060512,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"9536844ceebc8d7b6b1e7e7620d59d8524a0bbb56ba4daa7f412a2491f66cbe8","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002e96a57a5dbf0865de5e7a761899f83d43bc06813a7dc7a65b6e89368993ecfa301000000d8483045022100c927451bc5eeba0b6a0e186000c916c8230add92088ebd6cf13d3457ff73001b02202bef90393de9eac6db17078fdf2300cc677fe4471c57d855ebaa164a04c82c2a41200000000000000000000000000000000000000000000000000000000000000000004c6b630488efbd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffffe96a57a5dbf0865de5e7a761899f83d43bc06813a7dc7a65b6e89368993ecfa3020000006a473044022055d30fd50898767ec6589c749862534293286014face1181d966a079fd2255f2022003afbce939dd8f42962c039a3c67dace0a2f473163707b2323bece1fa216c22e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf054901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac88efbd60","tx_hash":"9536844ceebc8d7b6b1e7e7620d59d8524a0bbb56ba4daa7f412a2491f66cbe8","from":["slptest:pq3pgt2tntnz86vf9vzmnk7xunryndjmqvrkv98llu"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448983,"timestamp":1623060512,"fee_details":null,"coin":"tBCH","internal_id":"f2e367fe86013767afdbf17dd1fdd00bd99b1bd3b35cafc1f2491c999f73d328","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000026646c4e314ab652f493fefb43a631740a96cb45b1de0c8572dbdd7b22acd6aba010000006a4730440220751dde7ce8fa749bfd1d876cb389751b679a1273cd146a441323d72e5fc64aaf0220280340a6a1255f8b2964832f1f6ba587e820672ecf83c2725d785c5c6249c2704121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6646c4e314ab652f493fefb43a631740a96cb45b1de0c8572dbdd7b22acd6aba020000006a47304402202bd479f7d6270ac3de8022fcff1b7febe4fd1e7c19bdb14ac07738f376baa0aa0220320fc182f01fd707e14ccc52f587371b05e949e1e185e08d57409aa28694dd7b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91459be927343984e5202ebb0fcb4615e1d24d0db788797114901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac85eebd60","tx_hash":"4739a8e36f94b8e53d8250fb42a0e1ec9de509cffe0990ba43e8f791ba5a87fb","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppvmaynngwvyu5szawc0edrptcwjf5xm0qp2l20gfx","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21567847","spent_by_me":"0.21567847","received_by_me":"0.21565847","my_balance_change":"-0.00002000","block_height":1448983,"timestamp":1623060512,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"4739a8e36f94b8e53d8250fb42a0e1ec9de509cffe0990ba43e8f791ba5a87fb","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000026646c4e314ab652f493fefb43a631740a96cb45b1de0c8572dbdd7b22acd6aba010000006a4730440220751dde7ce8fa749bfd1d876cb389751b679a1273cd146a441323d72e5fc64aaf0220280340a6a1255f8b2964832f1f6ba587e820672ecf83c2725d785c5c6249c2704121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6646c4e314ab652f493fefb43a631740a96cb45b1de0c8572dbdd7b22acd6aba020000006a47304402202bd479f7d6270ac3de8022fcff1b7febe4fd1e7c19bdb14ac07738f376baa0aa0220320fc182f01fd707e14ccc52f587371b05e949e1e185e08d57409aa28694dd7b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91459be927343984e5202ebb0fcb4615e1d24d0db788797114901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac85eebd60","tx_hash":"4739a8e36f94b8e53d8250fb42a0e1ec9de509cffe0990ba43e8f791ba5a87fb","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppvmaynngwvyu5szawc0edrptcwjf5xm0q67c34lmm"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448983,"timestamp":1623060512,"fee_details":null,"coin":"tBCH","internal_id":"b3f2a55c23fa55c78ae94db413436fc454ec0935a4292b1adfcce86d5547dd4f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002c66715333dee76a1e1deb51c0aab6b95f0b2ef5c39f65550f3c76c1d90e873ed010000006a47304402202f0b32c9ec246f34bab48302ce275a705f526054547dbd5a9b1e75676e682d76022009c446f734ed582d4cc2bad5b4ab4b17078edd7ec89b69edac62b37ffa4cfb9f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc66715333dee76a1e1deb51c0aab6b95f0b2ef5c39f65550f3c76c1d90e873ed020000006a47304402202b9306f536fecf767a0d6c0f5ef064eaba177a10f764dca1405a42a0a8e2789002203e7366a9f1a25666fc44859f70f7b858b70747622f9694059a60e80d8355c4924121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91408a9eec978abda97522b39040fe51f7067f924688767194901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac12edbd60","tx_hash":"31fe7c222647262d8965fb1a8f3a7c54f963b130c4d20a798ffc146b1ccdd661","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pqy2nmkf0z4a496j9vusgrl9racx07fydq8qak75mv","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21569847","spent_by_me":"0.21569847","received_by_me":"0.21567847","my_balance_change":"-0.00002000","block_height":1448983,"timestamp":1623060512,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"31fe7c222647262d8965fb1a8f3a7c54f963b130c4d20a798ffc146b1ccdd661","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002c66715333dee76a1e1deb51c0aab6b95f0b2ef5c39f65550f3c76c1d90e873ed010000006a47304402202f0b32c9ec246f34bab48302ce275a705f526054547dbd5a9b1e75676e682d76022009c446f734ed582d4cc2bad5b4ab4b17078edd7ec89b69edac62b37ffa4cfb9f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc66715333dee76a1e1deb51c0aab6b95f0b2ef5c39f65550f3c76c1d90e873ed020000006a47304402202b9306f536fecf767a0d6c0f5ef064eaba177a10f764dca1405a42a0a8e2789002203e7366a9f1a25666fc44859f70f7b858b70747622f9694059a60e80d8355c4924121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91408a9eec978abda97522b39040fe51f7067f924688767194901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac12edbd60","tx_hash":"31fe7c222647262d8965fb1a8f3a7c54f963b130c4d20a798ffc146b1ccdd661","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pqy2nmkf0z4a496j9vusgrl9racx07fydqu56dyrf3"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448983,"timestamp":1623060512,"fee_details":null,"coin":"tBCH","internal_id":"f29d3076b7f68e91cee0b33de0e825871b7ae1f31997fefac7b6f6305f7c9108","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002fb875aba91f7e843ba9009fecf09e59dece1a042fb50823de5b8946fe3a8394701000000d747304402205304ccb5f1cfeee3181c6d5f41f2a3e3ae7da1756776ed627f15035fd67bed4602200beffdd4aec720c93d679123d9e6acfb3c5ec6251bdcb6b7b48f9c08888935b441200000000000000000000000000000000000000000000000000000000000000000004c6b630485eebd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68fffffffffb875aba91f7e843ba9009fecf09e59dece1a042fb50823de5b8946fe3a83947020000006a473044022048fe68b727125b7e9154319db07bc60090b2e99a8edb90bebd867c2e1c0891bb022010b442ca3bea131da2a14ee8f629140ff29a7a177b9c20802316a418f2c5671c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acaf0d4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac85eebd60","tx_hash":"2f01ddd7d86795f8b68a5259e6c5033c3318cbc8434175b54176402e43e3e5d2","from":["bchtest:ppvmaynngwvyu5szawc0edrptcwjf5xm0qp2l20gfx","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21566847","spent_by_me":"0.21565847","received_by_me":"0.21565847","my_balance_change":"0.00000000","block_height":1448983,"timestamp":1623060512,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"2f01ddd7d86795f8b68a5259e6c5033c3318cbc8434175b54176402e43e3e5d2","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002fb875aba91f7e843ba9009fecf09e59dece1a042fb50823de5b8946fe3a8394701000000d747304402205304ccb5f1cfeee3181c6d5f41f2a3e3ae7da1756776ed627f15035fd67bed4602200beffdd4aec720c93d679123d9e6acfb3c5ec6251bdcb6b7b48f9c08888935b441200000000000000000000000000000000000000000000000000000000000000000004c6b630485eebd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68fffffffffb875aba91f7e843ba9009fecf09e59dece1a042fb50823de5b8946fe3a83947020000006a473044022048fe68b727125b7e9154319db07bc60090b2e99a8edb90bebd867c2e1c0891bb022010b442ca3bea131da2a14ee8f629140ff29a7a177b9c20802316a418f2c5671c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acaf0d4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac85eebd60","tx_hash":"2f01ddd7d86795f8b68a5259e6c5033c3318cbc8434175b54176402e43e3e5d2","from":["slptest:ppvmaynngwvyu5szawc0edrptcwjf5xm0q67c34lmm"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448983,"timestamp":1623060512,"fee_details":null,"coin":"tBCH","internal_id":"52d14fbbf5bccb69704797c22c72e42b2340c73d2429fec743f3887c4bada513","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000281b24f0023a60bf0e9e5f7890cdb262898cf6c2f669f1d1e80b7d775d45be93101000000d74730440220345a848e10f1c50e7c08af6a0083c223dfc326fb96aedc6aad6f42585ca8d253022045b335c86dc7f2ab04375f87d44ea6e551a66233aef79425b24649a7712cf3f441200000000000000000000000000000000000000000000000000000000000000000004c6b630483e7bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff81b24f0023a60bf0e9e5f7890cdb262898cf6c2f669f1d1e80b7d775d45be931020000006b483045022100feac49df391ab602ed381c7923d7d39b9b816886316a8ba809395510567e5238022008db6e325845bd8abe31d4ae84d8cb49f01de5df93e0d9b13778978bdc6bcec74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f1d4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac83e7bd60","tx_hash":"ed73e8901d6cc7f35055f6395cefb2f0956bab0a1cb5dee1a176ee3d331567c6","from":["bchtest:pph4aex9zhqhkeax7c87k9jv5dwe0h8zx5g8v9pwdy","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21570847","spent_by_me":"0.21569847","received_by_me":"0.21569847","my_balance_change":"0.00000000","block_height":1448982,"timestamp":1623059292,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"ed73e8901d6cc7f35055f6395cefb2f0956bab0a1cb5dee1a176ee3d331567c6","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000281b24f0023a60bf0e9e5f7890cdb262898cf6c2f669f1d1e80b7d775d45be93101000000d74730440220345a848e10f1c50e7c08af6a0083c223dfc326fb96aedc6aad6f42585ca8d253022045b335c86dc7f2ab04375f87d44ea6e551a66233aef79425b24649a7712cf3f441200000000000000000000000000000000000000000000000000000000000000000004c6b630483e7bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff81b24f0023a60bf0e9e5f7890cdb262898cf6c2f669f1d1e80b7d775d45be931020000006b483045022100feac49df391ab602ed381c7923d7d39b9b816886316a8ba809395510567e5238022008db6e325845bd8abe31d4ae84d8cb49f01de5df93e0d9b13778978bdc6bcec74121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4f1d4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac83e7bd60","tx_hash":"ed73e8901d6cc7f35055f6395cefb2f0956bab0a1cb5dee1a176ee3d331567c6","from":["slptest:pph4aex9zhqhkeax7c87k9jv5dwe0h8zx5nnt7mele"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448982,"timestamp":1623059292,"fee_details":null,"coin":"tBCH","internal_id":"294bdf000824a966898c940e934fbbc6097fb97fbb87b27fdb4a46ffeaa2893a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000020d2614aa2b88026aef1d7a478244aded4bc30cad7f97055b8e1c6f636e154339010000006b483045022100ff683b0c28bd5b92e12f1813ad89b0eba014ecdbf51cefaeb280531f94bdc4b302203457fa2af3f1935f47a316923d146693539514118c12aa95dea46fe8c08c09284121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0d2614aa2b88026aef1d7a478244aded4bc30cad7f97055b8e1c6f636e154339020000006b483045022100dbbb1a39cae424103d68e2544c6ec9d518f0d29713179c8cdc3ef17033ad0b1a02201ae5974383dd18d9cb78838623cc7349a3b32055c8de7e27e1996aac3e1600574121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91452401fa60edd8f41b54f16f895f59f74f100764c8707294901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acfce6bd60","tx_hash":"e1d52d89ea18f1e8481768ba644fb8c4b1aefa5a440567c037cf3165ee25ac51","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppfyq8axpmwc7sd4fut03904na60zqrkfszvct9qh4","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21573847","spent_by_me":"0.21573847","received_by_me":"0.21571847","my_balance_change":"-0.00002000","block_height":1448982,"timestamp":1623059292,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"e1d52d89ea18f1e8481768ba644fb8c4b1aefa5a440567c037cf3165ee25ac51","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000020d2614aa2b88026aef1d7a478244aded4bc30cad7f97055b8e1c6f636e154339010000006b483045022100ff683b0c28bd5b92e12f1813ad89b0eba014ecdbf51cefaeb280531f94bdc4b302203457fa2af3f1935f47a316923d146693539514118c12aa95dea46fe8c08c09284121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0d2614aa2b88026aef1d7a478244aded4bc30cad7f97055b8e1c6f636e154339020000006b483045022100dbbb1a39cae424103d68e2544c6ec9d518f0d29713179c8cdc3ef17033ad0b1a02201ae5974383dd18d9cb78838623cc7349a3b32055c8de7e27e1996aac3e1600574121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a91452401fa60edd8f41b54f16f895f59f74f100764c8707294901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acfce6bd60","tx_hash":"e1d52d89ea18f1e8481768ba644fb8c4b1aefa5a440567c037cf3165ee25ac51","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppfyq8axpmwc7sd4fut03904na60zqrkfseclslh9g"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448982,"timestamp":1623059292,"fee_details":null,"coin":"tBCH","internal_id":"1c4c13bc66014629c3b740e4a0fdc6056c4d17a3ef6015d061dc75285f45f5e5","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000251ac25ee6531cf37c06705445afaaeb1c4b84f64ba681748e8f118ea892dd5e101000000d8483045022100bf505f3622712cc9eb28ce8b2e243eeea47dd151bce0608666b375e87c7ed80202207a00f813034214d1996ec5a4ef4ab1d37968473ac3d024b5df40ff4f98809f6e41200000000000000000000000000000000000000000000000000000000000000000004c6b6304fbe6bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff51ac25ee6531cf37c06705445afaaeb1c4b84f64ba681748e8f118ea892dd5e1020000006b4830450221009a71afff96779e6e3ac23a069d2dd617cbeb9aca9bfba05f6c3efaff24d417990220734e2f07d8659287bb6d87d83887796a9224cf7500929ddf0a506a611d3275b54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1f254901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acfbe6bd60","tx_hash":"804a357229dfd1513737da9350156051b7bf455dc4f47f3b55e5172cc84d1e7b","from":["bchtest:ppfyq8axpmwc7sd4fut03904na60zqrkfszvct9qh4","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21572847","spent_by_me":"0.21571847","received_by_me":"0.21571847","my_balance_change":"0.00000000","block_height":1448982,"timestamp":1623059292,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"804a357229dfd1513737da9350156051b7bf455dc4f47f3b55e5172cc84d1e7b","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000251ac25ee6531cf37c06705445afaaeb1c4b84f64ba681748e8f118ea892dd5e101000000d8483045022100bf505f3622712cc9eb28ce8b2e243eeea47dd151bce0608666b375e87c7ed80202207a00f813034214d1996ec5a4ef4ab1d37968473ac3d024b5df40ff4f98809f6e41200000000000000000000000000000000000000000000000000000000000000000004c6b6304fbe6bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff51ac25ee6531cf37c06705445afaaeb1c4b84f64ba681748e8f118ea892dd5e1020000006b4830450221009a71afff96779e6e3ac23a069d2dd617cbeb9aca9bfba05f6c3efaff24d417990220734e2f07d8659287bb6d87d83887796a9224cf7500929ddf0a506a611d3275b54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1f254901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acfbe6bd60","tx_hash":"804a357229dfd1513737da9350156051b7bf455dc4f47f3b55e5172cc84d1e7b","from":["slptest:ppfyq8axpmwc7sd4fut03904na60zqrkfseclslh9g"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448982,"timestamp":1623059292,"fee_details":null,"coin":"tBCH","internal_id":"8d0cd035534eed79ea612e11354e63a96a4e623e0ee6de5603e56b5fe530cdb6","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000027b1e4dc82c17e5553b7ff4c45d45bfb75160155093da373751d1df2972354a80010000006b483045022100db9096d5d187a83da35d0f548a106f3c124001559bfafe0ef672f6c4c40cf632022008f89189e5d31c694b9ef940afc1d4d141d4349df29ed9e5ec6b819bbc14a3954121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff7b1e4dc82c17e5553b7ff4c45d45bfb75160155093da373751d1df2972354a80020000006b483045022100aef72036d7324c61807b7517900df36090c6e0743106f15d380f3f3fba565bd8022048885301964f0f319cd96926d3cc62b073749af9701dd98aea9555e69e5ec0614121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a9146f5ee4c515c17b67a6f60feb164ca35d97dce2358737214901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac84e7bd60","tx_hash":"31e95bd475d7b7801e1d9f662f6ccf982826db0c89f7e5e9f00ba623004fb281","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pph4aex9zhqhkeax7c87k9jv5dwe0h8zx5g8v9pwdy","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21571847","spent_by_me":"0.21571847","received_by_me":"0.21569847","my_balance_change":"-0.00002000","block_height":1448982,"timestamp":1623059292,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"31e95bd475d7b7801e1d9f662f6ccf982826db0c89f7e5e9f00ba623004fb281","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000027b1e4dc82c17e5553b7ff4c45d45bfb75160155093da373751d1df2972354a80010000006b483045022100db9096d5d187a83da35d0f548a106f3c124001559bfafe0ef672f6c4c40cf632022008f89189e5d31c694b9ef940afc1d4d141d4349df29ed9e5ec6b819bbc14a3954121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff7b1e4dc82c17e5553b7ff4c45d45bfb75160155093da373751d1df2972354a80020000006b483045022100aef72036d7324c61807b7517900df36090c6e0743106f15d380f3f3fba565bd8022048885301964f0f319cd96926d3cc62b073749af9701dd98aea9555e69e5ec0614121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a9146f5ee4c515c17b67a6f60feb164ca35d97dce2358737214901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac84e7bd60","tx_hash":"31e95bd475d7b7801e1d9f662f6ccf982826db0c89f7e5e9f00ba623004fb281","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pph4aex9zhqhkeax7c87k9jv5dwe0h8zx5nnt7mele"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448982,"timestamp":1623059292,"fee_details":null,"coin":"tBCH","internal_id":"30468ca5f542169af50153c167ed01f1f269abd7dee0c6001e738d6c72b2135c","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002c9e8fe17429d092f4c707c6fa2b0e568bd76a3adee663ebdca841935d0e896f4010000006a4730440220648f29f63aef5e84c30b3af157d113a294fef830502b037ccbff924ef287931502206d42b2a31e7ac32487cfc127c07607fae056c83de05d113dec4c1697f3d162e24121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc9e8fe17429d092f4c707c6fa2b0e568bd76a3adee663ebdca841935d0e896f4020000006b483045022100b8a0100b1c0f26a1011aa0057177578426f169345c731176a5e9f2e281bf00c602200682ae012ed909bfba19ca1982db297748c5fd83d013c655f98abee1465d851b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914173cf5e4b0bc1db5ebbf8a4ce14dad646b2d78298777404901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5be3bd60","tx_hash":"ad947c93d048fc0092c07e5b667dee6c6707955a11cd92d720c5781edc1db48d","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pqtnea0ykz7pmd0th79yec2d44jxkttc9y5uwsgrtg","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21579847","spent_by_me":"0.21579847","received_by_me":"0.21577847","my_balance_change":"-0.00002000","block_height":1448981,"timestamp":1623058067,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"ad947c93d048fc0092c07e5b667dee6c6707955a11cd92d720c5781edc1db48d","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002c9e8fe17429d092f4c707c6fa2b0e568bd76a3adee663ebdca841935d0e896f4010000006a4730440220648f29f63aef5e84c30b3af157d113a294fef830502b037ccbff924ef287931502206d42b2a31e7ac32487cfc127c07607fae056c83de05d113dec4c1697f3d162e24121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffc9e8fe17429d092f4c707c6fa2b0e568bd76a3adee663ebdca841935d0e896f4020000006b483045022100b8a0100b1c0f26a1011aa0057177578426f169345c731176a5e9f2e281bf00c602200682ae012ed909bfba19ca1982db297748c5fd83d013c655f98abee1465d851b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914173cf5e4b0bc1db5ebbf8a4ce14dad646b2d78298777404901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5be3bd60","tx_hash":"ad947c93d048fc0092c07e5b667dee6c6707955a11cd92d720c5781edc1db48d","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pqtnea0ykz7pmd0th79yec2d44jxkttc9y0gftj5e4"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448981,"timestamp":1623058067,"fee_details":null,"coin":"tBCH","internal_id":"77767aa5f40c48a27d22565d02aa669698372502695b8f89618463afc93c8480","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002e2516dc1e6ddf2f829ffe899d8bbdd72b276b0d1d818676368028457c696ba43010000006a47304402201f4afa08d87957ec2b6f5f524dbee3295c1134508a7b07654d0087f38dff466b022067553b4bbc1a7e41c4a66dad093414296c787897ebcb56a52464d70efe352ba94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffe2516dc1e6ddf2f829ffe899d8bbdd72b276b0d1d818676368028457c696ba43020000006b483045022100fab2c87fef91116a723de5c200f2dbc1b4d0f077e54195e299244840126e89e002207ffc10bb70038eda05f371e59e4d9c6938662f3fea878e4c7610ae3f75a0e8364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a9141e5373a7ca04506a71701eaf73f1d219337cd79a87d7304901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7de4bd60","tx_hash":"6a7836c2c35548944a86a00dea0a6f070eac4611c1b0ee3bf6d6a398174d460a","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pq09xua8egz9q6n3wq027ul36gvnxlxhngh59889lt","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21575847","spent_by_me":"0.21575847","received_by_me":"0.21573847","my_balance_change":"-0.00002000","block_height":1448981,"timestamp":1623058067,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"6a7836c2c35548944a86a00dea0a6f070eac4611c1b0ee3bf6d6a398174d460a","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002e2516dc1e6ddf2f829ffe899d8bbdd72b276b0d1d818676368028457c696ba43010000006a47304402201f4afa08d87957ec2b6f5f524dbee3295c1134508a7b07654d0087f38dff466b022067553b4bbc1a7e41c4a66dad093414296c787897ebcb56a52464d70efe352ba94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffe2516dc1e6ddf2f829ffe899d8bbdd72b276b0d1d818676368028457c696ba43020000006b483045022100fab2c87fef91116a723de5c200f2dbc1b4d0f077e54195e299244840126e89e002207ffc10bb70038eda05f371e59e4d9c6938662f3fea878e4c7610ae3f75a0e8364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a9141e5373a7ca04506a71701eaf73f1d219337cd79a87d7304901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7de4bd60","tx_hash":"6a7836c2c35548944a86a00dea0a6f070eac4611c1b0ee3bf6d6a398174d460a","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pq09xua8egz9q6n3wq027ul36gvnxlxhngvqzuajdk"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448981,"timestamp":1623058067,"fee_details":null,"coin":"tBCH","internal_id":"0dfb8bef02991b571367240d81e5d278c82ae74adf1ce55a07f74c53b0b6ed26","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002025b2359779f0f8de247f1e3636243e83f14bd03aa30fa20362fbdc505d89b0401000000b7483045022100aaf3dd9263301250ad7ba746e85d8e299df99db2915fc80d0165048170d13b1b02204f95ca4ed98ae452ed41e787bd6f88398937bfaaade1e78b75d1e5f5be7241ca41514c6b6304f8c7bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffff025b2359779f0f8de247f1e3636243e83f14bd03aa30fa20362fbdc505d89b04020000006a4730440220327e09c8eeba7bf952b75e3c0788b6b6d3340fcb75b87ca903a7405320404e02022075d5dc9283037ece5d6609481fa5dbc7bba5c7d136321298f468b1056ab90c0d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbf344901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c9bd60","tx_hash":"43ba96c657840268636718d8d1b076b272ddbbd899e8ff29f8f2dde6c16d51e2","from":["bchtest:presvtclnyz57rsqc5l3xs0cs8xpftxy7vfjya7qww","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21576847","spent_by_me":"0.21575847","received_by_me":"0.21575847","my_balance_change":"0.00000000","block_height":1448981,"timestamp":1623058067,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"43ba96c657840268636718d8d1b076b272ddbbd899e8ff29f8f2dde6c16d51e2","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002025b2359779f0f8de247f1e3636243e83f14bd03aa30fa20362fbdc505d89b0401000000b7483045022100aaf3dd9263301250ad7ba746e85d8e299df99db2915fc80d0165048170d13b1b02204f95ca4ed98ae452ed41e787bd6f88398937bfaaade1e78b75d1e5f5be7241ca41514c6b6304f8c7bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffff025b2359779f0f8de247f1e3636243e83f14bd03aa30fa20362fbdc505d89b04020000006a4730440220327e09c8eeba7bf952b75e3c0788b6b6d3340fcb75b87ca903a7405320404e02022075d5dc9283037ece5d6609481fa5dbc7bba5c7d136321298f468b1056ab90c0d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acbf344901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c9bd60","tx_hash":"43ba96c657840268636718d8d1b076b272ddbbd899e8ff29f8f2dde6c16d51e2","from":["slptest:presvtclnyz57rsqc5l3xs0cs8xpftxy7vjxrxyhun"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448981,"timestamp":1623058067,"fee_details":null,"coin":"tBCH","internal_id":"711b7ec3e347fd49c511168f684caabd00f0edc29790dacb821fa329c654db7e","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000020a464d1798a3d6f63beeb0c11146ac0e076f0aea0da0864a944855c3c236786a01000000b6473044022050d0bf1e449ccb2499c5bbdb2ee4f4bf7b4c238fbe02581641c98fd715f5298b02205b67e08155ac2d64bbee8731d791fb2044e4a9de3c478ec6c2b956c7915f908a41514c6b63045cc8bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffff0a464d1798a3d6f63beeb0c11146ac0e076f0aea0da0864a944855c3c236786a020000006a47304402202b438547d1eb7118b35d89c38e0d8c8dd27469b6a055211f11527bb785c00741022019168de07cbdebf5bf51cd502460a723beae4862798b9f75cb4d5abaceda6e364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acef2c4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c9bd60","tx_hash":"3943156e636f1c8e5b05977fad0cc34bedad4482477a1def6a02882baa14260d","from":["bchtest:pq09xua8egz9q6n3wq027ul36gvnxlxhngh59889lt","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21574847","spent_by_me":"0.21573847","received_by_me":"0.21573847","my_balance_change":"0.00000000","block_height":1448981,"timestamp":1623058067,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"3943156e636f1c8e5b05977fad0cc34bedad4482477a1def6a02882baa14260d","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000020a464d1798a3d6f63beeb0c11146ac0e076f0aea0da0864a944855c3c236786a01000000b6473044022050d0bf1e449ccb2499c5bbdb2ee4f4bf7b4c238fbe02581641c98fd715f5298b02205b67e08155ac2d64bbee8731d791fb2044e4a9de3c478ec6c2b956c7915f908a41514c6b63045cc8bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821010101010101010101010101010101010101010101010101010101010101010101ac68feffffff0a464d1798a3d6f63beeb0c11146ac0e076f0aea0da0864a944855c3c236786a020000006a47304402202b438547d1eb7118b35d89c38e0d8c8dd27469b6a055211f11527bb785c00741022019168de07cbdebf5bf51cd502460a723beae4862798b9f75cb4d5abaceda6e364121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acef2c4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c9bd60","tx_hash":"3943156e636f1c8e5b05977fad0cc34bedad4482477a1def6a02882baa14260d","from":["slptest:pq09xua8egz9q6n3wq027ul36gvnxlxhngvqzuajdk"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448981,"timestamp":1623058067,"fee_details":null,"coin":"tBCH","internal_id":"052a317c46538a9909ec3ee762b1858f14226b55634e4d31bc12aa490980c59f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000028db41ddc1e78c520d792cd115a9507676cee7d665b7ec09200fc48d0937c94ad01000000b7483045022100af09669cf2c6a7d99466f4c91707608c31239e1fd617111990ba0ad64d80678502204b44003cf57ead30571643cc26eb25d9db117d810029b635c731c09be6d7582941514c6b63043bc7bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff8db41ddc1e78c520d792cd115a9507676cee7d665b7ec09200fc48d0937c94ad020000006a4730440220172c864b5f0bb3c93029c4d9a86d1ce391810c5d9be92b4867d5ac50fe0bceb602204e5b01ed308a67f90c71f050319701ecea7095c357265b46d5bd707a795653004121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8f3c4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c9bd60","tx_hash":"1d909ab0da84973b2a8dece0b3b2c54d6d22e2fe1b2f2fb84b42203e23d45392","from":["bchtest:pqtnea0ykz7pmd0th79yec2d44jxkttc9y5uwsgrtg","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21578847","spent_by_me":"0.21577847","received_by_me":"0.21577847","my_balance_change":"0.00000000","block_height":1448981,"timestamp":1623058067,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"1d909ab0da84973b2a8dece0b3b2c54d6d22e2fe1b2f2fb84b42203e23d45392","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000028db41ddc1e78c520d792cd115a9507676cee7d665b7ec09200fc48d0937c94ad01000000b7483045022100af09669cf2c6a7d99466f4c91707608c31239e1fd617111990ba0ad64d80678502204b44003cf57ead30571643cc26eb25d9db117d810029b635c731c09be6d7582941514c6b63043bc7bd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff8db41ddc1e78c520d792cd115a9507676cee7d665b7ec09200fc48d0937c94ad020000006a4730440220172c864b5f0bb3c93029c4d9a86d1ce391810c5d9be92b4867d5ac50fe0bceb602204e5b01ed308a67f90c71f050319701ecea7095c357265b46d5bd707a795653004121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8f3c4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ace3c9bd60","tx_hash":"1d909ab0da84973b2a8dece0b3b2c54d6d22e2fe1b2f2fb84b42203e23d45392","from":["slptest:pqtnea0ykz7pmd0th79yec2d44jxkttc9y0gftj5e4"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448981,"timestamp":1623058067,"fee_details":null,"coin":"tBCH","internal_id":"b8fdd342ce47c9560ea75eefd1596e8efebe0673d8251c5fe896a2ef71d96a7f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000029253d4233e20424bb82f2f1bfee2226d4dc5b2b3e0ec8d2a3b9784dab09a901d010000006b48304502210080bdcb450dce368184393981092d80154510ebccc747049aa09797be08ec5714022020cf5412eb7ecb45a099cab997e8e04e9bc568bffa687ace37e35d5881c499214121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff9253d4233e20424bb82f2f1bfee2226d4dc5b2b3e0ec8d2a3b9784dab09a901d020000006b483045022100c561e126f60eaf9c34d5aa4a1b2103f083c95570ee9d9856cdd2f71f1911d43b022039df2709cd0d6af4ba3406479245e9b308558baa42e77abe5f261938370da8104121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914f3062f1f99054f0e00c53f1341f881cc14acc4f387a7384901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac19e4bd60","tx_hash":"049bd805c5bd2f3620fa30aa03bd143fe8436263e3f147e28d0f9f7759235b02","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:presvtclnyz57rsqc5l3xs0cs8xpftxy7vfjya7qww","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21577847","spent_by_me":"0.21577847","received_by_me":"0.21575847","my_balance_change":"-0.00002000","block_height":1448981,"timestamp":1623058067,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"049bd805c5bd2f3620fa30aa03bd143fe8436263e3f147e28d0f9f7759235b02","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000029253d4233e20424bb82f2f1bfee2226d4dc5b2b3e0ec8d2a3b9784dab09a901d010000006b48304502210080bdcb450dce368184393981092d80154510ebccc747049aa09797be08ec5714022020cf5412eb7ecb45a099cab997e8e04e9bc568bffa687ace37e35d5881c499214121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff9253d4233e20424bb82f2f1bfee2226d4dc5b2b3e0ec8d2a3b9784dab09a901d020000006b483045022100c561e126f60eaf9c34d5aa4a1b2103f083c95570ee9d9856cdd2f71f1911d43b022039df2709cd0d6af4ba3406479245e9b308558baa42e77abe5f261938370da8104121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914f3062f1f99054f0e00c53f1341f881cc14acc4f387a7384901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac19e4bd60","tx_hash":"049bd805c5bd2f3620fa30aa03bd143fe8436263e3f147e28d0f9f7759235b02","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:presvtclnyz57rsqc5l3xs0cs8xpftxy7vjxrxyhun"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448981,"timestamp":1623058067,"fee_details":null,"coin":"tBCH","internal_id":"a3d37a930f179f044d119037c2ca06e4d910e3e3ed85fec217bf8d9570da3b66","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000022e8f723af79d13f3d05c23aef11d9d094c246784dfe686807e25b11087bc1a8b01000000b6473044022064fdab4412e25cba07cfc3075a42af3dea7c8f84ccab8fd9819d4ef8370ebdc302203e7d03c11a057192a3fa223710d7324d77fb87e4b96cf9a1df109af430b8dc0b41514c6b630452babd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff2e8f723af79d13f3d05c23aef11d9d094c246784dfe686807e25b11087bc1a8b020000006b483045022100b8e002014f60210662c647f25ca23d0af29563ca6cbaf375d24d7549c633ea2202201491fe1fd024ed99c09c8fe0a6c73663af424a42e26019a2c02085746b82a1a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5f444901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac97bbbd60","tx_hash":"f496e8d0351984cabd3e66eeada376bd68e5b0a26f7c704c2f099d4217fee8c9","from":["bchtest:pp0mu82rlztc3mzdz7knpvk9m6t5yrkn5sewsqr9y3","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21580847","spent_by_me":"0.21579847","received_by_me":"0.21579847","my_balance_change":"0.00000000","block_height":1448978,"timestamp":1623054396,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"f496e8d0351984cabd3e66eeada376bd68e5b0a26f7c704c2f099d4217fee8c9","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000022e8f723af79d13f3d05c23aef11d9d094c246784dfe686807e25b11087bc1a8b01000000b6473044022064fdab4412e25cba07cfc3075a42af3dea7c8f84ccab8fd9819d4ef8370ebdc302203e7d03c11a057192a3fa223710d7324d77fb87e4b96cf9a1df109af430b8dc0b41514c6b630452babd60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff2e8f723af79d13f3d05c23aef11d9d094c246784dfe686807e25b11087bc1a8b020000006b483045022100b8e002014f60210662c647f25ca23d0af29563ca6cbaf375d24d7549c633ea2202201491fe1fd024ed99c09c8fe0a6c73663af424a42e26019a2c02085746b82a1a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac5f444901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac97bbbd60","tx_hash":"f496e8d0351984cabd3e66eeada376bd68e5b0a26f7c704c2f099d4217fee8c9","from":["slptest:pp0mu82rlztc3mzdz7knpvk9m6t5yrkn5sz6hmejkv"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448978,"timestamp":1623054396,"fee_details":null,"coin":"tBCH","internal_id":"15cae3ece8450ec511d4aae630a4ed808504e1eb79b9da4139ce444f580cb043","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000025511dba5b0ba801ae50d725217a41fb3329678a8f3bee3d4d3f4a2aeacf4cf59010000006a47304402201014b3fbd217d4007008ed9e02ca91b8af6c3b957eefc73dcdd32a1dbba5ebc10220536785bda7bf014b6624b261cced5e09f9db126b993ead405148f7dccc28fdf64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5511dba5b0ba801ae50d725217a41fb3329678a8f3bee3d4d3f4a2aeacf4cf59020000006b483045022100e75c5bd3717f71f74ef425b59628e496c8268bb279e1d324f8d25106356382da022011f37dc96d083a20b41777b4e83fe95b89e8be7f28c40918afb9140ba6e5b6654121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a9145fbe1d43f89788ec4d17ad30b2c5de97420ed3a48747484901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac72d6bd60","tx_hash":"8b1abc8710b1257e8086e6df8467244c099d1df1ae235cd0f3139df73a728f2e","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pp0mu82rlztc3mzdz7knpvk9m6t5yrkn5sewsqr9y3","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21581847","spent_by_me":"0.21581847","received_by_me":"0.21579847","my_balance_change":"-0.00002000","block_height":1448978,"timestamp":1623054396,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"8b1abc8710b1257e8086e6df8467244c099d1df1ae235cd0f3139df73a728f2e","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000025511dba5b0ba801ae50d725217a41fb3329678a8f3bee3d4d3f4a2aeacf4cf59010000006a47304402201014b3fbd217d4007008ed9e02ca91b8af6c3b957eefc73dcdd32a1dbba5ebc10220536785bda7bf014b6624b261cced5e09f9db126b993ead405148f7dccc28fdf64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff5511dba5b0ba801ae50d725217a41fb3329678a8f3bee3d4d3f4a2aeacf4cf59020000006b483045022100e75c5bd3717f71f74ef425b59628e496c8268bb279e1d324f8d25106356382da022011f37dc96d083a20b41777b4e83fe95b89e8be7f28c40918afb9140ba6e5b6654121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a9145fbe1d43f89788ec4d17ad30b2c5de97420ed3a48747484901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac72d6bd60","tx_hash":"8b1abc8710b1257e8086e6df8467244c099d1df1ae235cd0f3139df73a728f2e","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pp0mu82rlztc3mzdz7knpvk9m6t5yrkn5sz6hmejkv"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448978,"timestamp":1623054396,"fee_details":null,"coin":"tBCH","internal_id":"c176bd7bbb36515a42c6b6df15006513d2e7cc5f60108e7bd2c11f84bf98fc00","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b3ef43aa024a106908deacccd94302b9076d2c69498a71fcd23a4a6b60fc4e0a010000006a47304402201dd728a677e6ea0412014447ad9acf92fd87a8fb41583aef7647d5b00a5a0bb10220033b57ba2a54ceae4ff27b5018e8333918fae8a9439e8d75ae4cc9adb93f84b14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb3ef43aa024a106908deacccd94302b9076d2c69498a71fcd23a4a6b60fc4e0a020000006b483045022100fc577a2e09251aef54f5810f69a931d0fec7f0fca52714ae81354c4188d23e4a022022c3fc494ef78f9e7fde72a420ea9c910f6f2d4fb85f1c4a65fd5c2d3ef6a0714121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914396a533a23b3700a753359592b3374ade703a9818717504901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1132ba60","tx_hash":"d49e92afd58a1b654e975548588f8e410b6efd459dff902d62bd51d5f68bc12d","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pquk55e6ywehqzn4xdv4j2enwjk7wqafsygyvlrvl6","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21583847","spent_by_me":"0.21583847","received_by_me":"0.21581847","my_balance_change":"-0.00002000","block_height":1448783,"timestamp":1622816281,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"d49e92afd58a1b654e975548588f8e410b6efd459dff902d62bd51d5f68bc12d","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b3ef43aa024a106908deacccd94302b9076d2c69498a71fcd23a4a6b60fc4e0a010000006a47304402201dd728a677e6ea0412014447ad9acf92fd87a8fb41583aef7647d5b00a5a0bb10220033b57ba2a54ceae4ff27b5018e8333918fae8a9439e8d75ae4cc9adb93f84b14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb3ef43aa024a106908deacccd94302b9076d2c69498a71fcd23a4a6b60fc4e0a020000006b483045022100fc577a2e09251aef54f5810f69a931d0fec7f0fca52714ae81354c4188d23e4a022022c3fc494ef78f9e7fde72a420ea9c910f6f2d4fb85f1c4a65fd5c2d3ef6a0714121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914396a533a23b3700a753359592b3374ade703a9818717504901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac1132ba60","tx_hash":"d49e92afd58a1b654e975548588f8e410b6efd459dff902d62bd51d5f68bc12d","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pquk55e6ywehqzn4xdv4j2enwjk7wqafsynstyemd8"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448783,"timestamp":1622816281,"fee_details":null,"coin":"tBCH","internal_id":"9a89ec96d924763c588d9d98a6289d4fccaa0575f6d6dd7834d17ea0d778d7d8","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000022dc18bf6d551bd622d90ff9d45fd6e0b418e8f584855974e651b8ad5af929ed401000000b7483045022100918eabe812b517bcaf3d1fa4bbea606d55128214aecf7e638e0c404038f838b702203bb0a8806fff558ad5203eb7162c8c9b4804742f6a3b13e072d77d7b1a1458d241514c6b6304f115ba60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff2dc18bf6d551bd622d90ff9d45fd6e0b418e8f584855974e651b8ad5af929ed4020000006b48304502210088f1279901c508834246d9c710976424003c58ce97f0b669d663a3868f740cbf02201e239405ec8bba599e9fde8b5642b08f81afc829f835ff05626b01ae4d73199c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f4c4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7b19ba60","tx_hash":"59cff4acaea2f4d3d4e3bef3a8789632b31fa41752720de51a80bab0a5db1155","from":["bchtest:pquk55e6ywehqzn4xdv4j2enwjk7wqafsygyvlrvl6","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21582847","spent_by_me":"0.21581847","received_by_me":"0.21581847","my_balance_change":"0.00000000","block_height":1448783,"timestamp":1622816281,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"59cff4acaea2f4d3d4e3bef3a8789632b31fa41752720de51a80bab0a5db1155","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000022dc18bf6d551bd622d90ff9d45fd6e0b418e8f584855974e651b8ad5af929ed401000000b7483045022100918eabe812b517bcaf3d1fa4bbea606d55128214aecf7e638e0c404038f838b702203bb0a8806fff558ad5203eb7162c8c9b4804742f6a3b13e072d77d7b1a1458d241514c6b6304f115ba60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff2dc18bf6d551bd622d90ff9d45fd6e0b418e8f584855974e651b8ad5af929ed4020000006b48304502210088f1279901c508834246d9c710976424003c58ce97f0b669d663a3868f740cbf02201e239405ec8bba599e9fde8b5642b08f81afc829f835ff05626b01ae4d73199c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2f4c4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7b19ba60","tx_hash":"59cff4acaea2f4d3d4e3bef3a8789632b31fa41752720de51a80bab0a5db1155","from":["slptest:pquk55e6ywehqzn4xdv4j2enwjk7wqafsynstyemd8"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448783,"timestamp":1622816281,"fee_details":null,"coin":"tBCH","internal_id":"6e9b3bb36689832aa32b1f7a5f200dc6682cd9ad69e7321a2137eba07a9b93b7","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000020189e764ee43a90c8fa31b458741b569ed7501980dd6c1e07766c186872f9bc9010000006b483045022100ba98457a7cf571b70c0fc4e4ae7cfbefdaabf9704233e6f70058317435af42e10220630cf02dae2e705b17cb22fcd8b452159a136a83b7d8efa75ab37d7f88478f234121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0189e764ee43a90c8fa31b458741b569ed7501980dd6c1e07766c186872f9bc9020000006a473044022024e40b8089dd60e3bf0847faaf68f8ae746bc677cf554ddbda97d04ca61e30e902207c9ef17a84e32f1fecd2164d47f330e74a978a3f56d7d9388cdff44cb8077b9f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914521da80525e5bd677da9ff9c60ef2ab67490454987e7574901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac862dba60","tx_hash":"50c387362d62d445be3cb15cd7f0fec9f87aafd0d23198a1dce8358b3648b7d4","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppfpm2q9yhjm6ema48lecc8092m8fyz9fyqr84njrs","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21585847","spent_by_me":"0.21585847","received_by_me":"0.21583847","my_balance_change":"-0.00002000","block_height":1448782,"timestamp":1622815061,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"50c387362d62d445be3cb15cd7f0fec9f87aafd0d23198a1dce8358b3648b7d4","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000020189e764ee43a90c8fa31b458741b569ed7501980dd6c1e07766c186872f9bc9010000006b483045022100ba98457a7cf571b70c0fc4e4ae7cfbefdaabf9704233e6f70058317435af42e10220630cf02dae2e705b17cb22fcd8b452159a136a83b7d8efa75ab37d7f88478f234121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0189e764ee43a90c8fa31b458741b569ed7501980dd6c1e07766c186872f9bc9020000006a473044022024e40b8089dd60e3bf0847faaf68f8ae746bc677cf554ddbda97d04ca61e30e902207c9ef17a84e32f1fecd2164d47f330e74a978a3f56d7d9388cdff44cb8077b9f4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914521da80525e5bd677da9ff9c60ef2ab67490454987e7574901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac862dba60","tx_hash":"50c387362d62d445be3cb15cd7f0fec9f87aafd0d23198a1dce8358b3648b7d4","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppfpm2q9yhjm6ema48lecc8092m8fyz9fymhqwf93d"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448782,"timestamp":1622815061,"fee_details":null,"coin":"tBCH","internal_id":"ca81e22dc430e8556caf905bd4aa4330422732f61c2d39403c0850ff5655a282","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002d4b748368b35e8dca19831d2d0af7af8c9fef0d75cb13cbe45d4622d3687c35001000000b647304402207307b33a6eb87e7fbf4c8fb5b045521904d0b063ba95b9487119f10e449f305102204fdf0e4a64b139d7a6b7323e869e35d25c6723c2dfdff66125a24e13c256c12141514c6b63046511ba60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffd4b748368b35e8dca19831d2d0af7af8c9fef0d75cb13cbe45d4622d3687c350020000006b483045022100b30abde7b4e72fc928f361c9e06d0ae57fe8c2f364f5ba5841e5fca38715fb98022023f4b239d54a8fc1f9e962a4c1be54848af10a8be663b88db6c95461051fb3584121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acff534901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6511ba60","tx_hash":"0a4efc606b4a3ad2fc718a49692c6d07b90243d9ccacde0869104a02aa43efb3","from":["bchtest:ppfpm2q9yhjm6ema48lecc8092m8fyz9fyqr84njrs","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21584847","spent_by_me":"0.21583847","received_by_me":"0.21583847","my_balance_change":"0.00000000","block_height":1448782,"timestamp":1622815061,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"0a4efc606b4a3ad2fc718a49692c6d07b90243d9ccacde0869104a02aa43efb3","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002d4b748368b35e8dca19831d2d0af7af8c9fef0d75cb13cbe45d4622d3687c35001000000b647304402207307b33a6eb87e7fbf4c8fb5b045521904d0b063ba95b9487119f10e449f305102204fdf0e4a64b139d7a6b7323e869e35d25c6723c2dfdff66125a24e13c256c12141514c6b63046511ba60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffd4b748368b35e8dca19831d2d0af7af8c9fef0d75cb13cbe45d4622d3687c350020000006b483045022100b30abde7b4e72fc928f361c9e06d0ae57fe8c2f364f5ba5841e5fca38715fb98022023f4b239d54a8fc1f9e962a4c1be54848af10a8be663b88db6c95461051fb3584121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acff534901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6511ba60","tx_hash":"0a4efc606b4a3ad2fc718a49692c6d07b90243d9ccacde0869104a02aa43efb3","from":["slptest:ppfpm2q9yhjm6ema48lecc8092m8fyz9fymhqwf93d"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448782,"timestamp":1622815061,"fee_details":null,"coin":"tBCH","internal_id":"694e8bcc82f8e41f5c1fa38926dd525925ebadbd45597b69a73865f0002bdf0b","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000020cec14a95a69f699659517bcbac9d01fa0b6407fe117b03e7da9e59782e8b24801000000b6473044022025d7ab1fbdb6e21b6802f8888e2cf46b9367062c81bdc3477a31720a53e3bf1802205b6c7aaadc2ebf50262ee58754d47100211339f2d5cb081711139fe0646b1ff541514c6b63042d0dba60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff0cec14a95a69f699659517bcbac9d01fa0b6407fe117b03e7da9e59782e8b248020000006a4730440220785a8f92aeb088579c1620b2767b94fdeaaf20d719c274259e81b03b68cf3dd202203f241a3a7859469590616a8672990f2f9ac570d5f7572971fb7339244fc1c1d34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accf5b4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2d0dba60","tx_hash":"c99b2f8786c16677e0c1d60d980175ed69b54187451ba38f0ca943ee64e78901","from":["bchtest:prqs2sj4f30er06gyu4cy3uz9we5tpg8jvvyv5vjfn","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21586847","spent_by_me":"0.21585847","received_by_me":"0.21585847","my_balance_change":"0.00000000","block_height":1448781,"timestamp":1622813841,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"c99b2f8786c16677e0c1d60d980175ed69b54187451ba38f0ca943ee64e78901","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000020cec14a95a69f699659517bcbac9d01fa0b6407fe117b03e7da9e59782e8b24801000000b6473044022025d7ab1fbdb6e21b6802f8888e2cf46b9367062c81bdc3477a31720a53e3bf1802205b6c7aaadc2ebf50262ee58754d47100211339f2d5cb081711139fe0646b1ff541514c6b63042d0dba60b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffff0cec14a95a69f699659517bcbac9d01fa0b6407fe117b03e7da9e59782e8b248020000006a4730440220785a8f92aeb088579c1620b2767b94fdeaaf20d719c274259e81b03b68cf3dd202203f241a3a7859469590616a8672990f2f9ac570d5f7572971fb7339244fc1c1d34121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accf5b4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2d0dba60","tx_hash":"c99b2f8786c16677e0c1d60d980175ed69b54187451ba38f0ca943ee64e78901","from":["slptest:prqs2sj4f30er06gyu4cy3uz9we5tpg8jvhst0k9mw"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448781,"timestamp":1622813841,"fee_details":null,"coin":"tBCH","internal_id":"f8e7ddbdd4b2e14abd83f43e9b4e4764dca3ccfc91e0d5dd16b627f8da2b7b73","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000022e4b6fb0b5937a3b65db99737d73b3b431226593f8c56a78d0cb07d0e162c0d7010000006a473044022052335a84b7a8665bfc42b5c0e5c13f3adcf502f304df6971881e69203ea6b9a102201a56ebacf179206d5ac20f511fc2f29c400de8c6ed93255b7ca76faac90b953e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff2e4b6fb0b5937a3b65db99737d73b3b431226593f8c56a78d0cb07d0e162c0d7020000006a47304402201f8c809b5b2715553c43334aaec96885342153210efec415775c24572a757e3a022023408a0be6286e0dde33f2114b7c455b3b270f48475bdbfcdc4e2cd23fa247f94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914c10542554c5f91bf48272b8247822bb34585079387b75f4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4e29ba60","tx_hash":"48b2e88297e5a97d3eb017e17f40b6a01fd0c9babc17956599f6695aa914ec0c","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:prqs2sj4f30er06gyu4cy3uz9we5tpg8jvvyv5vjfn","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21587847","spent_by_me":"0.21587847","received_by_me":"0.21585847","my_balance_change":"-0.00002000","block_height":1448781,"timestamp":1622813841,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"48b2e88297e5a97d3eb017e17f40b6a01fd0c9babc17956599f6695aa914ec0c","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000022e4b6fb0b5937a3b65db99737d73b3b431226593f8c56a78d0cb07d0e162c0d7010000006a473044022052335a84b7a8665bfc42b5c0e5c13f3adcf502f304df6971881e69203ea6b9a102201a56ebacf179206d5ac20f511fc2f29c400de8c6ed93255b7ca76faac90b953e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff2e4b6fb0b5937a3b65db99737d73b3b431226593f8c56a78d0cb07d0e162c0d7020000006a47304402201f8c809b5b2715553c43334aaec96885342153210efec415775c24572a757e3a022023408a0be6286e0dde33f2114b7c455b3b270f48475bdbfcdc4e2cd23fa247f94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914c10542554c5f91bf48272b8247822bb34585079387b75f4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4e29ba60","tx_hash":"48b2e88297e5a97d3eb017e17f40b6a01fd0c9babc17956599f6695aa914ec0c","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:prqs2sj4f30er06gyu4cy3uz9we5tpg8jvhst0k9mw"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448781,"timestamp":1622813841,"fee_details":null,"coin":"tBCH","internal_id":"0bed4b0e9513781343bb20b835fe3046d23719142a7576713b391941e5252b17","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002bdb9bc1b680b76eceba6e56d8d738bdeeed122361424c42682478455201d054701000000b7483045022100ceb2aeeeed61be3ab66337458419d0b50dcf980bc3db2445f51ca407ed50ab11022000cd7ef15f715a8fb0d964d5ad4744358c2f65f9193cfb60666c29eaf95e253741514c6b6304b9feb960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffbdb9bc1b680b76eceba6e56d8d738bdeeed122361424c42682478455201d0547020000006b483045022100c486564b03dd6d4021aed95e38694ff8163d2a2c69853820372a783b001e0ed1022073d6679a324352d8dbca4d51837217b787ec49ff284b6703960a086e26dc253b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f634901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb9feb960","tx_hash":"d7c062e1d007cbd0786ac5f893652231b4b3737d7399db653b7a93b5b06f4b2e","from":["bchtest:pqgk69yyj6dzag4mdyur9lykye89ucz9vsddce5q2t","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21588847","spent_by_me":"0.21587847","received_by_me":"0.21587847","my_balance_change":"0.00000000","block_height":1448778,"timestamp":1622810181,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"d7c062e1d007cbd0786ac5f893652231b4b3737d7399db653b7a93b5b06f4b2e","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002bdb9bc1b680b76eceba6e56d8d738bdeeed122361424c42682478455201d054701000000b7483045022100ceb2aeeeed61be3ab66337458419d0b50dcf980bc3db2445f51ca407ed50ab11022000cd7ef15f715a8fb0d964d5ad4744358c2f65f9193cfb60666c29eaf95e253741514c6b6304b9feb960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffbdb9bc1b680b76eceba6e56d8d738bdeeed122361424c42682478455201d0547020000006b483045022100c486564b03dd6d4021aed95e38694ff8163d2a2c69853820372a783b001e0ed1022073d6679a324352d8dbca4d51837217b787ec49ff284b6703960a086e26dc253b4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f634901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acb9feb960","tx_hash":"d7c062e1d007cbd0786ac5f893652231b4b3737d7399db653b7a93b5b06f4b2e","from":["slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448778,"timestamp":1622810181,"fee_details":null,"coin":"tBCH","internal_id":"660d57aad6e7807ee99459a77ed6b526771db8567fff99ca055d652913555d08","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002826181fbca65995c3acb4ccc1153fe6aa2514e7fbc52124aa52fe77c861f1af5010000006a4730440220593ebbfb4ae66807d87fe201d216e2f66785fba9f1d0a7494fbc7c30a83cce8a022002c74fe866e5491fedbbe03116c094053bb85bc0d1fb2ab5df1e2f976d92d6ba4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff826181fbca65995c3acb4ccc1153fe6aa2514e7fbc52124aa52fe77c861f1af5020000006a4730440220780d63fbb982c0e1c2d06db19676e6cee1fc3c900ec9c4092f83160deb18c1bc022071ca86381164f0da02a5643c0e3d1b1c0ee5ceb26a19fb71abdaf16cbdfde8ae4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914116d1484969a2ea2bb693832fc96264e5e6045648787674901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd91aba60","tx_hash":"47051d205584478226c424143622d1eede8b738d6de5a6ebec760b681bbcb9bd","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pqgk69yyj6dzag4mdyur9lykye89ucz9vsddce5q2t","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21589847","spent_by_me":"0.21589847","received_by_me":"0.21587847","my_balance_change":"-0.00002000","block_height":1448778,"timestamp":1622810181,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"47051d205584478226c424143622d1eede8b738d6de5a6ebec760b681bbcb9bd","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002826181fbca65995c3acb4ccc1153fe6aa2514e7fbc52124aa52fe77c861f1af5010000006a4730440220593ebbfb4ae66807d87fe201d216e2f66785fba9f1d0a7494fbc7c30a83cce8a022002c74fe866e5491fedbbe03116c094053bb85bc0d1fb2ab5df1e2f976d92d6ba4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff826181fbca65995c3acb4ccc1153fe6aa2514e7fbc52124aa52fe77c861f1af5020000006a4730440220780d63fbb982c0e1c2d06db19676e6cee1fc3c900ec9c4092f83160deb18c1bc022071ca86381164f0da02a5643c0e3d1b1c0ee5ceb26a19fb71abdaf16cbdfde8ae4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914116d1484969a2ea2bb693832fc96264e5e6045648787674901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd91aba60","tx_hash":"47051d205584478226c424143622d1eede8b738d6de5a6ebec760b681bbcb9bd","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448778,"timestamp":1622810181,"fee_details":null,"coin":"tBCH","internal_id":"e46fa0836be0534f7799b2ef5b538551ea25b6f430b7e015a95731efb7a0cd4f","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002ba95a3a80f0f8396d5ed9c8a13b122c4a9f6b338fff2b483e78ee3d9d8b75b0601000000b6473044022031bb6d5f22d205eea401c64bb0e0bf9dc9cce5d4c237a627e4742e2cce91fc6a022035db7a3be1ea37df202fc3f1e054b5b62e2f79d3530fedbd3ba7b579d9e9e89e41514c6b630477d3b960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffba95a3a80f0f8396d5ed9c8a13b122c4a9f6b338fff2b483e78ee3d9d8b75b06020000006a4730440220677b3221e3e2ff3cffe61ee51ae8d11fb8bb420f2a152992e4e02242bdb49fbb022028855abb6aec4ad6007c078ef1f5e9ed7055e7486972200b1fce8089ed7fdee64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6f6b4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac77d3b960","tx_hash":"f51a1f867ce72fa54a1252bc7f4e51a26afe5311cc4ccb3a5c9965cafb816182","from":["bchtest:pztgwc96yenmmh3jdw7y2h9zk0wjspzldggnphckpq","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21590847","spent_by_me":"0.21589847","received_by_me":"0.21589847","my_balance_change":"0.00000000","block_height":1448769,"timestamp":1622799170,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"f51a1f867ce72fa54a1252bc7f4e51a26afe5311cc4ccb3a5c9965cafb816182","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002ba95a3a80f0f8396d5ed9c8a13b122c4a9f6b338fff2b483e78ee3d9d8b75b0601000000b6473044022031bb6d5f22d205eea401c64bb0e0bf9dc9cce5d4c237a627e4742e2cce91fc6a022035db7a3be1ea37df202fc3f1e054b5b62e2f79d3530fedbd3ba7b579d9e9e89e41514c6b630477d3b960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffba95a3a80f0f8396d5ed9c8a13b122c4a9f6b338fff2b483e78ee3d9d8b75b06020000006a4730440220677b3221e3e2ff3cffe61ee51ae8d11fb8bb420f2a152992e4e02242bdb49fbb022028855abb6aec4ad6007c078ef1f5e9ed7055e7486972200b1fce8089ed7fdee64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac6f6b4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac77d3b960","tx_hash":"f51a1f867ce72fa54a1252bc7f4e51a26afe5311cc4ccb3a5c9965cafb816182","from":["slptest:pztgwc96yenmmh3jdw7y2h9zk0wjspzldgn8xvzpna"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448769,"timestamp":1622799170,"fee_details":null,"coin":"tBCH","internal_id":"2b5965f90654c62f42f0d03bf97e2f4890064012006bbedebf6f7a6cbf23859a","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002cba67d2031c614825447da0b97ca6c4c0192b6eef757ffe3a79f2924a3657860010000006b483045022100d1bbead6d6e72564cebba4fefcf58897e7a959e39ecba5ce0634242c8cf4dd9f02203d946ff23259bbf3501e0a15aad32a64adc162f5cdf6a9c64ce08ae147f6b87c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffcba67d2031c614825447da0b97ca6c4c0192b6eef757ffe3a79f2924a3657860020000006a47304402202a0469e94bb829a314a10ddc0d9e8631e129615cb24ffb03093a1051fd4d4be00220072baeb82d9044edfaac6cc1f9a7614c9ab381f92801b0ec7e15740cc26dd6f54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914968760ba2667bdde326bbc455ca2b3dd28045f6a87576f4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac98efb960","tx_hash":"065bb7d8d9e38ee783b4f2ff38b3f6a9c422b1138a9cedd596830f0fa8a395ba","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pztgwc96yenmmh3jdw7y2h9zk0wjspzldggnphckpq","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21591847","spent_by_me":"0.21591847","received_by_me":"0.21589847","my_balance_change":"-0.00002000","block_height":1448769,"timestamp":1622799170,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"065bb7d8d9e38ee783b4f2ff38b3f6a9c422b1138a9cedd596830f0fa8a395ba","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002cba67d2031c614825447da0b97ca6c4c0192b6eef757ffe3a79f2924a3657860010000006b483045022100d1bbead6d6e72564cebba4fefcf58897e7a959e39ecba5ce0634242c8cf4dd9f02203d946ff23259bbf3501e0a15aad32a64adc162f5cdf6a9c64ce08ae147f6b87c4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffcba67d2031c614825447da0b97ca6c4c0192b6eef757ffe3a79f2924a3657860020000006a47304402202a0469e94bb829a314a10ddc0d9e8631e129615cb24ffb03093a1051fd4d4be00220072baeb82d9044edfaac6cc1f9a7614c9ab381f92801b0ec7e15740cc26dd6f54121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914968760ba2667bdde326bbc455ca2b3dd28045f6a87576f4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac98efb960","tx_hash":"065bb7d8d9e38ee783b4f2ff38b3f6a9c422b1138a9cedd596830f0fa8a395ba","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pztgwc96yenmmh3jdw7y2h9zk0wjspzldgn8xvzpna"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448769,"timestamp":1622799170,"fee_details":null,"coin":"tBCH","internal_id":"d852d3768df093a28c370803bb793b3cead3d7754a961a1d668ab36d96d599ee","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b06721589d2b86bea464fa1ea0463e0ca7c34a740d1aa8f83dd2d5a29585f306010000006b48304502210095949388142ae76b11828ac056c54fbfe1639008a4150ea4448738e4211c884b02203d85bce130c61cea1a507e071a37b68fff046e1b25e6e1e285416959b6cdec374121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb06721589d2b86bea464fa1ea0463e0ca7c34a740d1aa8f83dd2d5a29585f306020000006a473044022041a2e3f5512d0187c64e8ba9f30f6b48c8a2295be5991b825f0754933fabb88902207be81190f92ef2dca4beff8872cdcaefd18dcd8de5d07b6d84b783c310e4b8b64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914bb8b9fc2957a4f3fa71ef1bb5c6d8736e426406387f77e4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9eeab960","tx_hash":"b15e1c55f9a5906d74142becffc53869c022ecea3748aa2028943195a93c456e","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pzach87zj4ay70a8rmcmkhrdsumwgfjqvv22hqa5n7","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21595847","spent_by_me":"0.21595847","received_by_me":"0.21593847","my_balance_change":"-0.00002000","block_height":1448768,"timestamp":1622797945,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"b15e1c55f9a5906d74142becffc53869c022ecea3748aa2028943195a93c456e","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b06721589d2b86bea464fa1ea0463e0ca7c34a740d1aa8f83dd2d5a29585f306010000006b48304502210095949388142ae76b11828ac056c54fbfe1639008a4150ea4448738e4211c884b02203d85bce130c61cea1a507e071a37b68fff046e1b25e6e1e285416959b6cdec374121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffb06721589d2b86bea464fa1ea0463e0ca7c34a740d1aa8f83dd2d5a29585f306020000006a473044022041a2e3f5512d0187c64e8ba9f30f6b48c8a2295be5991b825f0754933fabb88902207be81190f92ef2dca4beff8872cdcaefd18dcd8de5d07b6d84b783c310e4b8b64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e80300000000000017a914bb8b9fc2957a4f3fa71ef1bb5c6d8736e426406387f77e4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9eeab960","tx_hash":"b15e1c55f9a5906d74142becffc53869c022ecea3748aa2028943195a93c456e","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pzach87zj4ay70a8rmcmkhrdsumwgfjqvv37sm8rpr"],"total_amount":"1","spent_by_me":"1","received_by_me":"0","my_balance_change":"-1","block_height":1448768,"timestamp":1622797945,"fee_details":null,"coin":"tBCH","internal_id":"5fcf9bd0019e3d35616b21f872888804d897f74dae2191b6fa3b734ee15aabf1","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000002b62a5f43d321a4f4e6585e92415747bf38719582b99ea37e0bd3310ce2969a1a01000000b647304402207a5be062e97d9db2426a531bd73320295f0a3a2b36f1c840415360daf37e9d69022051a31dc179df30f9193c1b433c87aaa00e89368cff2f852f8279e657867f1aa541514c6b63042fcfb960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffb62a5f43d321a4f4e6585e92415747bf38719582b99ea37e0bd3310ce2969a1a030000006b483045022100e9d76e8581c2f17d9131f3078f33c88d90016ad81f6842c19eba9a1eca07b08a0220091d90a4ec9e31d25cceaff5fb8625772af9f5925d57105d56fec23aacea6a6d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3f734901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2fcfb960","tx_hash":"607865a324299fa7e3ff57f7eeb692014c6cca970bda47548214c631207da6cb","from":["bchtest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu3d5sdzs2","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21592847","spent_by_me":"0.21591847","received_by_me":"0.21591847","my_balance_change":"0.00000000","block_height":1448768,"timestamp":1622797945,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"607865a324299fa7e3ff57f7eeb692014c6cca970bda47548214c631207da6cb","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000002b62a5f43d321a4f4e6585e92415747bf38719582b99ea37e0bd3310ce2969a1a01000000b647304402207a5be062e97d9db2426a531bd73320295f0a3a2b36f1c840415360daf37e9d69022051a31dc179df30f9193c1b433c87aaa00e89368cff2f852f8279e657867f1aa541514c6b63042fcfb960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68feffffffb62a5f43d321a4f4e6585e92415747bf38719582b99ea37e0bd3310ce2969a1a030000006b483045022100e9d76e8581c2f17d9131f3078f33c88d90016ad81f6842c19eba9a1eca07b08a0220091d90a4ec9e31d25cceaff5fb8625772af9f5925d57105d56fec23aacea6a6d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac3f734901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2fcfb960","tx_hash":"607865a324299fa7e3ff57f7eeb692014c6cca970bda47548214c631207da6cb","from":["slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448768,"timestamp":1622797945,"fee_details":null,"coin":"tBCH","internal_id":"fc666307cafcbf29e4b95ccc261a24603c8168535283c6ed8243d4cd8c2543c8","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000022bf9a77501f51dc1c2aa5b0998c385813c18fa67649baa49e6490edb5f78a7af020000006a473044022051d38d2d762d868f00040584b5f7fccf396eccb5d4099ac952ea00f788c672f5022030d0d1a31e15a1935db5f079a898c586b360bc62259ed313156e4913fa6271514121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6e453ca99531942820aa4837eaec22c06938c5ffec2b14746d90a5f9551c5eb1020000006b4830450221009645b0710ac1427a2deba4721d68caccf811bae1f52a29acac2c7b3a6f160ea202206b28cde5ce396abf4d5bb37104cc7d9aef12a9a1ea70aca79b4889d56ac31a2a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710080000000000013498e80300000000000017a91452d0e96a043c3c78ae34821731f77307ef68d46787e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac27774901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4febb960","tx_hash":"1a9a96e20c31d30b7ea39eb982957138bf475741925e58e6f4a421d3435f2ab6","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu3d5sdzs2","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21594847","spent_by_me":"0.21594847","received_by_me":"0.21592847","my_balance_change":"-0.00002000","block_height":1448768,"timestamp":1622797945,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"1a9a96e20c31d30b7ea39eb982957138bf475741925e58e6f4a421d3435f2ab6","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000022bf9a77501f51dc1c2aa5b0998c385813c18fa67649baa49e6490edb5f78a7af020000006a473044022051d38d2d762d868f00040584b5f7fccf396eccb5d4099ac952ea00f788c672f5022030d0d1a31e15a1935db5f079a898c586b360bc62259ed313156e4913fa6271514121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6e453ca99531942820aa4837eaec22c06938c5ffec2b14746d90a5f9551c5eb1020000006b4830450221009645b0710ac1427a2deba4721d68caccf811bae1f52a29acac2c7b3a6f160ea202206b28cde5ce396abf4d5bb37104cc7d9aef12a9a1ea70aca79b4889d56ac31a2a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710080000000000013498e80300000000000017a91452d0e96a043c3c78ae34821731f77307ef68d46787e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac27774901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac4febb960","tx_hash":"1a9a96e20c31d30b7ea39eb982957138bf475741925e58e6f4a421d3435f2ab6","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"8.9","spent_by_me":"8.9","received_by_me":"7.9","my_balance_change":"-1.0","block_height":1448768,"timestamp":1622797945,"fee_details":null,"coin":"tBCH","internal_id":"fe78e04399219ef75271019f6d5db5d77179e9f310f8364604a6e4e05c4d7563","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"010000000259eb9eb93d9e2a571e44997132248b3e595422375f9f134395fdef1211633ecf020000006b483045022100c8abc9eed50341d8ab008efed4e56080a494999cdc53d173622be59e46e262ea02201077d04e01561af4b14adea0611a52134084385524fa37409c566cb98a39aa914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff59eb9eb93d9e2a571e44997132248b3e595422375f9f134395fdef1211633ecf030000006a473044022049dd947c0b5ccceb1920ef0bb297de0fe287c34a8d7d9ed39209776a191850fe022069d98060c395e61fac90bcecb800e981ab5903fe50eaa0e1073d9efdadf227ce4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710080000000000015ba8e80300000000000017a914169fdaecb872081837b47440f82052a0be7b2d8c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc7864901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac00d2b960","tx_hash":"afa7785fdb0e49e649aa9b6467fa183c8185c398095baac2c11df50175a7f92b","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3sqfxsdt7x","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21598847","spent_by_me":"0.21598847","received_by_me":"0.21596847","my_balance_change":"-0.00002000","block_height":1448763,"timestamp":1622791834,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"afa7785fdb0e49e649aa9b6467fa183c8185c398095baac2c11df50175a7f92b","transaction_type":"StandardTransfer"},
+{"tx_hex":"010000000259eb9eb93d9e2a571e44997132248b3e595422375f9f134395fdef1211633ecf020000006b483045022100c8abc9eed50341d8ab008efed4e56080a494999cdc53d173622be59e46e262ea02201077d04e01561af4b14adea0611a52134084385524fa37409c566cb98a39aa914121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff59eb9eb93d9e2a571e44997132248b3e595422375f9f134395fdef1211633ecf030000006a473044022049dd947c0b5ccceb1920ef0bb297de0fe287c34a8d7d9ed39209776a191850fe022069d98060c395e61fac90bcecb800e981ab5903fe50eaa0e1073d9efdadf227ce4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710080000000000015ba8e80300000000000017a914169fdaecb872081837b47440f82052a0be7b2d8c87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acc7864901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac00d2b960","tx_hash":"afa7785fdb0e49e649aa9b6467fa183c8185c398095baac2c11df50175a7f92b","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3smapthuvm","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"9.9","spent_by_me":"9.9","received_by_me":"8.9","my_balance_change":"-1.0","block_height":1448763,"timestamp":1622791834,"fee_details":null,"coin":"tBCH","internal_id":"97108642f76be5a9f4be8f35ea4057d12240c680ff782badc4a54b32c86c3b92","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000022bf9a77501f51dc1c2aa5b0998c385813c18fa67649baa49e6490edb5f78a7af01000000d7473044022010073013a6fe700b0d8c81a027f32a0d0a35c14511a45f65c57d644531b7f0c602206d070b6fb1bb6d5b8c073e2e10fb7eca0386473b2c88839a99e61f54ec8d855b41200000000000000000000000000000000000000000000000000000000000000000004c6b6304ffd1b960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff2bf9a77501f51dc1c2aa5b0998c385813c18fa67649baa49e6490edb5f78a7af030000006a47304402205278a8722609beb16cf872622224255327238f46b28b90650b8307ce634053ca022003b03a2b1abbe57f6031bcfad7b1ddb31e853dcc275de07728ba45e396bb0bd14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf824901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac00d2b960","tx_hash":"06f38595a2d5d23df8a81a0d744ac3a70c3e46a01efa64a4be862b9d582167b0","from":["bchtest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3sqfxsdt7x","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21596847","spent_by_me":"0.21595847","received_by_me":"0.21595847","my_balance_change":"0.00000000","block_height":1448763,"timestamp":1622791834,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"06f38595a2d5d23df8a81a0d744ac3a70c3e46a01efa64a4be862b9d582167b0","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000022bf9a77501f51dc1c2aa5b0998c385813c18fa67649baa49e6490edb5f78a7af01000000d7473044022010073013a6fe700b0d8c81a027f32a0d0a35c14511a45f65c57d644531b7f0c602206d070b6fb1bb6d5b8c073e2e10fb7eca0386473b2c88839a99e61f54ec8d855b41200000000000000000000000000000000000000000000000000000000000000000004c6b6304ffd1b960b17521036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac6782012088a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc68821036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cac68ffffffff2bf9a77501f51dc1c2aa5b0998c385813c18fa67649baa49e6490edb5f78a7af030000006a47304402205278a8722609beb16cf872622224255327238f46b28b90650b8307ce634053ca022003b03a2b1abbe57f6031bcfad7b1ddb31e853dcc275de07728ba45e396bb0bd14121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000002710e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acdf824901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac00d2b960","tx_hash":"06f38595a2d5d23df8a81a0d744ac3a70c3e46a01efa64a4be862b9d582167b0","from":["slptest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3smapthuvm"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"1","spent_by_me":"0","received_by_me":"1","my_balance_change":"1","block_height":1448763,"timestamp":1622791834,"fee_details":null,"coin":"tBCH","internal_id":"adbef43a6d839be9edbc03620c9e2fdd5ef4292db33d8fee3e554b8beb55438b","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"01000000026eb9e68f3760e787a0924defa136b9d164b789cfb46ccf732c33a22ef29ccc0f010000006b483045022100fd0cba042d5834d2777a0fd1896ce55324375f636e914e654c6489218eb094250220401442f474bc86e63251a24f20c6704e2507b06ba88b84a539ad96a43bbc8d024121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6eb9e68f3760e787a0924defa136b9d164b789cfb46ccf732c33a22ef29ccc0f020000006b483045022100cfe2f7fd47f9178f266c81a51f7dc69f5c16e397bb3f768383f7fff8123d15f002203582254c5f3eee2af4da7ee9600ef1e5a77c811d9353b23c85dd0f230dd83def4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000182b8e80300000000000017a9141fc203324c09e033000eb5914b6341b3dad3128087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac978e4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2bbfb960","tx_hash":"cf3e631112effd9543139f5f372254593e8b24327199441e572a9e3db99eeb59","from":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"to":["bchtest:pq0uyqejfsy7qvcqp66ezjmrgxea45cjsqnw5tuq4p","bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21600847","spent_by_me":"0.21600847","received_by_me":"0.21598847","my_balance_change":"-0.00002000","block_height":1448759,"timestamp":1622786934,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"tBCH","internal_id":"cf3e631112effd9543139f5f372254593e8b24327199441e572a9e3db99eeb59","transaction_type":"StandardTransfer"},
+{"tx_hex":"01000000026eb9e68f3760e787a0924defa136b9d164b789cfb46ccf732c33a22ef29ccc0f010000006b483045022100fd0cba042d5834d2777a0fd1896ce55324375f636e914e654c6489218eb094250220401442f474bc86e63251a24f20c6704e2507b06ba88b84a539ad96a43bbc8d024121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff6eb9e68f3760e787a0924defa136b9d164b789cfb46ccf732c33a22ef29ccc0f020000006b483045022100cfe2f7fd47f9178f266c81a51f7dc69f5c16e397bb3f768383f7fff8123d15f002203582254c5f3eee2af4da7ee9600ef1e5a77c811d9353b23c85dd0f230dd83def4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e80800000000000182b8e80300000000000017a9141fc203324c09e033000eb5914b6341b3dad3128087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac978e4901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2bbfb960","tx_hash":"cf3e631112effd9543139f5f372254593e8b24327199441e572a9e3db99eeb59","from":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"to":["slptest:pq0uyqejfsy7qvcqp66ezjmrgxea45cjsqg6nsxh8u","slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"10","spent_by_me":"10","received_by_me":"9.9","my_balance_change":"-0.1","block_height":1448759,"timestamp":1622786934,"fee_details":null,"coin":"tBCH","internal_id":"860c0638239fd474aa912ea59e59fa1293f10618248333ad15f6b71e0c3f0467","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}},
+{"tx_hex":"0100000007ef36129aeafbb5b35dbc2338ad48b73104ab776fa4c50bfc2ba5c4dafb76c4be020000006441cbdb096620d569f33a9d474f51736aab010c719f97b6c4603815cc92d11d1bd66c377b833e3c40c6205bbdbe9baa927e7f1280fa3e015fa17bd2c9c5e885b2a0412102d35051b984db235450829ea9a8e4dfde91e27be7ab7153224394eacd97046461feffffff133a04916fe4d25cc36598f7af4c3398f79b1aa3e85d47b857543bf0d1e1fdd2010000006441511f8178c54d56b178aa40293bb72b7556405b8fbd28d343160e8e9ea082710641028d7a1fd8b2c6b9e44cba10e210ab56fc531fc0fff5b79c3e00d810ced7f541210392a76e77f476e89b447c2f1fea192701f6c0fa2f49f04794294746997e8b3536feffffffd3cf85f86c071c3583f33d40c145e7ffd1cc039cfcb12faf2e326638f5fe0048010000006441a1885a66ac77008f5d487e37dba4fe4db222840a5efb3e4c4a7aeb6b7432ec5455e48941cf16ec55c90db91f63e9ad9b785eecb270b4d07de14384bee0fd2536412103dbd12a3753e7863223f8ac82f01ffa590714b8cdb42512153335025e5404dc94feffffffe319a50fda84c5bc87e92e16aebe83789aa7724f23e619087ab516d3f74e40a30100000064419c70094bef4954117c189692c184528946baf09cc5215eb2dd5103f08025f1e1ccb3efc4087b17535a7aa6fa1fd835c3b0e52159d01eba9f165be931f1962e7c4121032ab3389e0b58bbb6962dc804917293b995a25a44e6028e73894ecdfe5ff9f208feffffffa2621f1149fd3f230c051e1b210c6494f32fa398e8335d0894d56e9f2c8d955e010000006441c21f3a04f7c71dd04773fe862ec53193764b5b1eef81f5d3085e565ecb6a0d16a3a213b65ed2137f2f66701aab8f625a1a49b1f128ed87e5ce44b2c7d5363dc44121024b669a41202061b0cb954e17488f6c7191f54e2fe06304a59eaa903be19ff3d0feffffffdf196c6edbac91a9c3d73b385c98c93e01d7dc58e425e6d4d2a5e3164192017501000000644117e9fda726464c2ae70409ee983aacb4888f11335c9fa3ceedb5c2ca4f9c57ec516364c41e6c994691ef98df780e4d7540be9afb2fde5fea20d39d0432f65548412103eb08706246d042f3e76cdf9a87db6d7a3d2432a58043be35f3f6277a6898c1dffeffffff2cbbdd13b3577043cc175d77a82b08e27302703d6d6a0628a7e77a3aa4593ab7000000006441360b9cb442639b313f3c98755c7992b08462ed73e2869468372438af21fbf714e656f27238267125212423e0bd4fcb2dd8131ef3cc752bf234700df46d96203d41210359a24bddf1ebfb6bcf43dbbccc6f59d2bbc3bc836f896aaf28dd67ed3e210a51feffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000186a022020000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2d984901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac351b1600","tx_hash":"0fcc9cf22ea2332c73cf6cb4cf89b764d1b936a1ef4d92a087e760378fe6b96e","from":["bchtest:qp5fphvvj3pvrrv2awhm7dyu8xjueydapg3ju9kwmm","bchtest:qqayyhsx4p9am5gd54sjeelzpqxm0jncs5mgp452d8","bchtest:qqqxycuccwny828aqylsw8uugrpa33gelg8znan59t","bchtest:qr28js92h5gjv2dcau4twu8tma296kqt6yw9490acu","bchtest:qrrh9jq3zkagxnncyv60e94kv4jnt3yw9s63ykwahy","bchtest:qz7yzmqjfx0wa9hvyfjp7sdc8fkevk44svnvtuepnf","bchtest:qzlf6nyj7aag69l5h862w254ftd75anegcxecncczh"],"to":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"total_amount":"0.21601976","spent_by_me":"0","received_by_me":"0.21600847","my_balance_change":"0.21600847","block_height":1448758,"timestamp":1622785714,"fee_details":{"type":"Utxo","amount":"0.00001129"},"coin":"tBCH","internal_id":"0fcc9cf22ea2332c73cf6cb4cf89b764d1b936a1ef4d92a087e760378fe6b96e","transaction_type":"StandardTransfer"},
+{"tx_hex":"0100000007ef36129aeafbb5b35dbc2338ad48b73104ab776fa4c50bfc2ba5c4dafb76c4be020000006441cbdb096620d569f33a9d474f51736aab010c719f97b6c4603815cc92d11d1bd66c377b833e3c40c6205bbdbe9baa927e7f1280fa3e015fa17bd2c9c5e885b2a0412102d35051b984db235450829ea9a8e4dfde91e27be7ab7153224394eacd97046461feffffff133a04916fe4d25cc36598f7af4c3398f79b1aa3e85d47b857543bf0d1e1fdd2010000006441511f8178c54d56b178aa40293bb72b7556405b8fbd28d343160e8e9ea082710641028d7a1fd8b2c6b9e44cba10e210ab56fc531fc0fff5b79c3e00d810ced7f541210392a76e77f476e89b447c2f1fea192701f6c0fa2f49f04794294746997e8b3536feffffffd3cf85f86c071c3583f33d40c145e7ffd1cc039cfcb12faf2e326638f5fe0048010000006441a1885a66ac77008f5d487e37dba4fe4db222840a5efb3e4c4a7aeb6b7432ec5455e48941cf16ec55c90db91f63e9ad9b785eecb270b4d07de14384bee0fd2536412103dbd12a3753e7863223f8ac82f01ffa590714b8cdb42512153335025e5404dc94feffffffe319a50fda84c5bc87e92e16aebe83789aa7724f23e619087ab516d3f74e40a30100000064419c70094bef4954117c189692c184528946baf09cc5215eb2dd5103f08025f1e1ccb3efc4087b17535a7aa6fa1fd835c3b0e52159d01eba9f165be931f1962e7c4121032ab3389e0b58bbb6962dc804917293b995a25a44e6028e73894ecdfe5ff9f208feffffffa2621f1149fd3f230c051e1b210c6494f32fa398e8335d0894d56e9f2c8d955e010000006441c21f3a04f7c71dd04773fe862ec53193764b5b1eef81f5d3085e565ecb6a0d16a3a213b65ed2137f2f66701aab8f625a1a49b1f128ed87e5ce44b2c7d5363dc44121024b669a41202061b0cb954e17488f6c7191f54e2fe06304a59eaa903be19ff3d0feffffffdf196c6edbac91a9c3d73b385c98c93e01d7dc58e425e6d4d2a5e3164192017501000000644117e9fda726464c2ae70409ee983aacb4888f11335c9fa3ceedb5c2ca4f9c57ec516364c41e6c994691ef98df780e4d7540be9afb2fde5fea20d39d0432f65548412103eb08706246d042f3e76cdf9a87db6d7a3d2432a58043be35f3f6277a6898c1dffeffffff2cbbdd13b3577043cc175d77a82b08e27302703d6d6a0628a7e77a3aa4593ab7000000006441360b9cb442639b313f3c98755c7992b08462ed73e2869468372438af21fbf714e656f27238267125212423e0bd4fcb2dd8131ef3cc752bf234700df46d96203d41210359a24bddf1ebfb6bcf43dbbccc6f59d2bbc3bc836f896aaf28dd67ed3e210a51feffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000186a022020000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac2d984901000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac351b1600","tx_hash":"0fcc9cf22ea2332c73cf6cb4cf89b764d1b936a1ef4d92a087e760378fe6b96e","from":["slptest:qp5fphvvj3pvrrv2awhm7dyu8xjueydapg2xm7vefx","slptest:qqayyhsx4p9am5gd54sjeelzpqxm0jncs5quxwwal6","slptest:qqqxycuccwny828aqylsw8uugrpa33gelguk5xfrhk","slptest:qr28js92h5gjv2dcau4twu8tma296kqt6y43j7422p","slptest:qrrh9jq3zkagxnncyv60e94kv4jnt3yw9sp9rd529e","slptest:qz7yzmqjfx0wa9hvyfjp7sdc8fkevk44svgcv8rkp5"],"to":["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8"],"total_amount":"10","spent_by_me":"0","received_by_me":"10","my_balance_change":"10","block_height":1448758,"timestamp":1622785714,"fee_details":null,"coin":"tBCH","internal_id":"fe1e72fc17cda2ad5e8d52e73a65ca89d6ab364311d940f2f0600329ce40de7e","transaction_type":{"TokenTransfer":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7"}}
+]
diff --git a/mm2src/coins/hd_pubkey.rs b/mm2src/coins/hd_pubkey.rs
new file mode 100644
index 0000000000..a90accbc69
--- /dev/null
+++ b/mm2src/coins/hd_pubkey.rs
@@ -0,0 +1,208 @@
+use crate::hd_wallet::{HDWalletRpcError, NewAccountCreatingError};
+use async_trait::async_trait;
+use crypto::hw_rpc_task::{HwConnectStatuses, TrezorRpcTaskConnectProcessor};
+use crypto::trezor::trezor_rpc_task::TrezorRpcTaskProcessor;
+use crypto::trezor::utxo::TrezorUtxoCoin;
+use crypto::trezor::{ProcessTrezorResponse, TrezorError, TrezorPinMatrix3x3Response, TrezorProcessingError};
+use crypto::{Bip32Error, CryptoCtx, CryptoInitError, DerivationPath, EcdsaCurve, HardwareWalletArc, HwError,
+             HwProcessingError, XPub};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle};
+use std::convert::TryInto;
+
+#[derive(Clone)]
+pub enum HDExtractPubkeyError {
+    HwContextNotInitialized,
+    CoinDoesntSupportTrezor,
+    RpcTaskError(RpcTaskError),
+    HardwareWalletError(HwError),
+    InvalidXpub(Bip32Error),
+    Internal(String),
+}
+
+impl From<CryptoInitError> for HDExtractPubkeyError {
+    fn from(e: CryptoInitError) -> Self { HDExtractPubkeyError::Internal(e.to_string()) }
+}
+
+impl From<TrezorError> for HDExtractPubkeyError {
+    fn from(e: TrezorError) -> Self { HDExtractPubkeyError::HardwareWalletError(HwError::from(e)) }
+}
+
+impl From<HwError> for HDExtractPubkeyError {
+    fn from(e: HwError) -> Self { HDExtractPubkeyError::HardwareWalletError(e) }
+}
+
+impl From<TrezorProcessingError<RpcTaskError>> for HDExtractPubkeyError {
+    fn from(e: TrezorProcessingError<RpcTaskError>) -> Self {
+        match e {
+            TrezorProcessingError::TrezorError(trezor) => HDExtractPubkeyError::from(HwError::from(trezor)),
+            TrezorProcessingError::ProcessorError(rpc) => HDExtractPubkeyError::RpcTaskError(rpc),
+        }
+    }
+}
+
+impl From<HwProcessingError<RpcTaskError>> for HDExtractPubkeyError {
+    fn from(e: HwProcessingError<RpcTaskError>) -> Self {
+        match e {
+            HwProcessingError::HwError(hw) => HDExtractPubkeyError::from(hw),
+            HwProcessingError::ProcessorError(rpc) => HDExtractPubkeyError::RpcTaskError(rpc),
+        }
+    }
+}
+
+impl From<HDExtractPubkeyError> for NewAccountCreatingError {
+    fn from(e: HDExtractPubkeyError) -> Self {
+        match e {
+            HDExtractPubkeyError::HwContextNotInitialized => NewAccountCreatingError::HwContextNotInitialized,
+            HDExtractPubkeyError::CoinDoesntSupportTrezor => NewAccountCreatingError::CoinDoesntSupportTrezor,
+            HDExtractPubkeyError::RpcTaskError(rpc) => NewAccountCreatingError::RpcTaskError(rpc),
+            HDExtractPubkeyError::HardwareWalletError(hw) => NewAccountCreatingError::HardwareWalletError(hw),
+            HDExtractPubkeyError::InvalidXpub(xpub) => {
+                NewAccountCreatingError::HardwareWalletError(HwError::InvalidXpub(xpub))
+            },
+            HDExtractPubkeyError::Internal(internal) => NewAccountCreatingError::Internal(internal),
+        }
+    }
+}
+
+impl From<HDExtractPubkeyError> for HDWalletRpcError {
+    fn from(e: HDExtractPubkeyError) -> Self {
+        match e {
+            HDExtractPubkeyError::HwContextNotInitialized => HDWalletRpcError::HwContextNotInitialized,
+            HDExtractPubkeyError::CoinDoesntSupportTrezor => HDWalletRpcError::CoinDoesntSupportTrezor,
+            HDExtractPubkeyError::RpcTaskError(rpc) => HDWalletRpcError::from(rpc),
+            HDExtractPubkeyError::HardwareWalletError(hw) => HDWalletRpcError::from(hw),
+            HDExtractPubkeyError::InvalidXpub(xpub) => HDWalletRpcError::from(HwError::InvalidXpub(xpub)),
+            HDExtractPubkeyError::Internal(internal) => HDWalletRpcError::Internal(internal),
+        }
+    }
+}
+
+#[async_trait]
+pub trait ExtractExtendedPubkey {
+    type ExtendedPublicKey;
+
+    async fn extract_extended_pubkey<XPubExtractor>(
+        &self,
+        xpub_extractor: &XPubExtractor,
+        derivation_path: DerivationPath,
+    ) -> MmResult<Self::ExtendedPublicKey, HDExtractPubkeyError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync;
+}
+
+#[async_trait]
+pub trait HDXPubExtractor {
+    async fn extract_utxo_xpub(
+        &self,
+        trezor_utxo_coin: TrezorUtxoCoin,
+        derivation_path: DerivationPath,
+    ) -> MmResult<XPub, HDExtractPubkeyError>;
+}
+
+pub enum RpcTaskXPubExtractor<'task, Task: RpcTask> {
+    Trezor {
+        hw_ctx: HardwareWalletArc,
+        task_handle: &'task RpcTaskHandle<Task>,
+        statuses: HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    },
+}
+
+#[async_trait]
+impl<'task, Task> HDXPubExtractor for RpcTaskXPubExtractor<'task, Task>
+where
+    Task: RpcTask,
+    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError> + Send,
+{
+    async fn extract_utxo_xpub(
+        &self,
+        trezor_utxo_coin: TrezorUtxoCoin,
+        derivation_path: DerivationPath,
+    ) -> MmResult<XPub, HDExtractPubkeyError> {
+        match self {
+            RpcTaskXPubExtractor::Trezor {
+                hw_ctx,
+                task_handle,
+                statuses,
+            } => {
+                Self::extract_utxo_xpub_from_trezor(hw_ctx, task_handle, statuses, trezor_utxo_coin, derivation_path)
+                    .await
+            },
+        }
+    }
+}
+
+impl<'task, Task> RpcTaskXPubExtractor<'task, Task>
+where
+    Task: RpcTask,
+    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError> + Send,
+{
+    pub fn new(
+        ctx: &MmArc,
+        task_handle: &'task RpcTaskHandle<Task>,
+        statuses: HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    ) -> MmResult<RpcTaskXPubExtractor<'task, Task>, HDExtractPubkeyError> {
+        let crypto_ctx = CryptoCtx::from_ctx(ctx)?;
+        let hw_ctx = crypto_ctx
+            .hw_ctx()
+            .or_mm_err(|| HDExtractPubkeyError::HwContextNotInitialized)?;
+        Ok(RpcTaskXPubExtractor::Trezor {
+            hw_ctx,
+            task_handle,
+            statuses,
+        })
+    }
+
+    /// Constructs an Xpub extractor without checking if the MarketMaker is initialized with a hardware wallet.
+    pub fn new_unchecked(
+        ctx: &MmArc,
+        task_handle: &'task RpcTaskHandle<Task>,
+        statuses: HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    ) -> XPubExtractorUnchecked<RpcTaskXPubExtractor<'task, Task>> {
+        XPubExtractorUnchecked(Self::new(ctx, task_handle, statuses))
+    }
+
+    async fn extract_utxo_xpub_from_trezor(
+        hw_ctx: &HardwareWalletArc,
+        task_handle: &RpcTaskHandle<Task>,
+        statuses: &HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+        trezor_coin: TrezorUtxoCoin,
+        derivation_path: DerivationPath,
+    ) -> MmResult<XPub, HDExtractPubkeyError> {
+        let connect_processor = TrezorRpcTaskConnectProcessor::new(task_handle, statuses.clone());
+        let trezor = hw_ctx.trezor(&connect_processor).await?;
+        let mut trezor_session = trezor.session().await?;
+
+        let pubkey_processor = TrezorRpcTaskProcessor::new(task_handle, statuses.to_trezor_request_statuses());
+        trezor_session
+            .get_public_key(derivation_path, trezor_coin, EcdsaCurve::Secp256k1)
+            .await?
+            .process(&pubkey_processor)
+            .await
+            .mm_err(HDExtractPubkeyError::from)
+    }
+}
+
+/// This is a wrapper over `XPubExtractor`. The main goal of this structure is to allow construction of an Xpub extractor
+/// even if HD wallet is not supported. But if someone tries to extract an Xpub despite HD wallet is not supported,
+/// it fails with an inner `HDExtractPubkeyError` error.
+pub struct XPubExtractorUnchecked<XPubExtractor>(MmResult<XPubExtractor, HDExtractPubkeyError>);
+
+#[async_trait]
+impl<XPubExtractor> HDXPubExtractor for XPubExtractorUnchecked<XPubExtractor>
+where
+    XPubExtractor: HDXPubExtractor + Send + Sync,
+{
+    async fn extract_utxo_xpub(
+        &self,
+        trezor_utxo_coin: TrezorUtxoCoin,
+        derivation_path: DerivationPath,
+    ) -> MmResult<XPub, HDExtractPubkeyError> {
+        self.0
+            .as_ref()
+            .map_err(Clone::clone)?
+            .extract_utxo_xpub(trezor_utxo_coin, derivation_path)
+            .await
+    }
+}
diff --git a/mm2src/coins/hd_wallet.rs b/mm2src/coins/hd_wallet.rs
new file mode 100644
index 0000000000..cb365a01e5
--- /dev/null
+++ b/mm2src/coins/hd_wallet.rs
@@ -0,0 +1,549 @@
+use crate::coin_balance::HDAddressBalance;
+use crate::hd_pubkey::HDXPubExtractor;
+use crate::hd_wallet_storage::HDWalletStorageError;
+use crate::{lp_coinfind_or_err, BalanceError, CoinFindError, CoinWithDerivationMethod, MmCoinEnum,
+            UnexpectedDerivationMethod, WithdrawError};
+use async_trait::async_trait;
+use common::HttpStatusCode;
+use crypto::{Bip32DerPathError, Bip32Error, Bip44Chain, Bip44DerPathError, Bip44DerivationPath, ChildNumber,
+             DerivationPath, HwError};
+use derive_more::Display;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::RpcTaskError;
+use serde::Serialize;
+use std::collections::BTreeMap;
+use std::time::Duration;
+
+pub use futures::lock::{MappedMutexGuard as AsyncMappedMutexGuard, Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
+
+pub type HDAccountsMap<HDAccount> = BTreeMap<u32, HDAccount>;
+pub type HDAccountsMutex<HDAccount> = AsyncMutex<HDAccountsMap<HDAccount>>;
+pub type HDAccountsMut<'a, HDAccount> = AsyncMutexGuard<'a, HDAccountsMap<HDAccount>>;
+pub type HDAccountMut<'a, HDAccount> = AsyncMappedMutexGuard<'a, HDAccountsMap<HDAccount>, HDAccount>;
+
+#[derive(Display)]
+pub enum AddressDerivingError {
+    #[display(fmt = "BIP32 address deriving error: {}", _0)]
+    Bip32Error(Bip32Error),
+}
+
+impl From<Bip32Error> for AddressDerivingError {
+    fn from(e: Bip32Error) -> Self { AddressDerivingError::Bip32Error(e) }
+}
+
+impl From<AddressDerivingError> for BalanceError {
+    fn from(e: AddressDerivingError) -> Self {
+        match e {
+            AddressDerivingError::Bip32Error(bip32) => BalanceError::Internal(bip32.to_string()),
+        }
+    }
+}
+
+impl From<AddressDerivingError> for WithdrawError {
+    fn from(e: AddressDerivingError) -> Self { WithdrawError::UnexpectedFromAddress(e.to_string()) }
+}
+
+pub enum NewAddressDerivingError {
+    AddressLimitReached { max_addresses_number: u32 },
+    InvalidBip44Chain { chain: Bip44Chain },
+    Bip32Error(Bip32Error),
+    WalletStorageError(HDWalletStorageError),
+}
+
+impl From<Bip32Error> for NewAddressDerivingError {
+    fn from(e: Bip32Error) -> Self { NewAddressDerivingError::Bip32Error(e) }
+}
+
+impl From<AddressDerivingError> for NewAddressDerivingError {
+    fn from(e: AddressDerivingError) -> Self {
+        match e {
+            AddressDerivingError::Bip32Error(bip32) => NewAddressDerivingError::Bip32Error(bip32),
+        }
+    }
+}
+
+impl From<InvalidBip44ChainError> for NewAddressDerivingError {
+    fn from(e: InvalidBip44ChainError) -> Self { NewAddressDerivingError::InvalidBip44Chain { chain: e.chain } }
+}
+
+impl From<AccountUpdatingError> for NewAddressDerivingError {
+    fn from(e: AccountUpdatingError) -> Self {
+        match e {
+            AccountUpdatingError::AddressLimitReached { max_addresses_number } => {
+                NewAddressDerivingError::AddressLimitReached { max_addresses_number }
+            },
+            AccountUpdatingError::InvalidBip44Chain(e) => NewAddressDerivingError::from(e),
+            AccountUpdatingError::WalletStorageError(storage) => NewAddressDerivingError::WalletStorageError(storage),
+        }
+    }
+}
+
+#[derive(Display)]
+pub enum NewAccountCreatingError {
+    #[display(fmt = "Hardware Wallet context is not initialized")]
+    HwContextNotInitialized,
+    #[display(fmt = "HD wallet is unavailable")]
+    HDWalletUnavailable,
+    #[display(
+        fmt = "Coin doesn't support Trezor hardware wallet. Please consider adding the 'trezor_coin' field to the coins config"
+    )]
+    CoinDoesntSupportTrezor,
+    RpcTaskError(RpcTaskError),
+    HardwareWalletError(HwError),
+    #[display(fmt = "Accounts limit reached. Max number of accounts: {}", max_accounts_number)]
+    AccountLimitReached {
+        max_accounts_number: u32,
+    },
+    #[display(fmt = "Error saving HD account to storage: {}", _0)]
+    ErrorSavingAccountToStorage(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<Bip32DerPathError> for NewAccountCreatingError {
+    fn from(e: Bip32DerPathError) -> Self { NewAccountCreatingError::Internal(Bip44DerPathError::from(e).to_string()) }
+}
+
+impl From<HDWalletStorageError> for NewAccountCreatingError {
+    fn from(e: HDWalletStorageError) -> Self {
+        match e {
+            HDWalletStorageError::ErrorSaving(e) | HDWalletStorageError::ErrorSerializing(e) => {
+                NewAccountCreatingError::ErrorSavingAccountToStorage(e)
+            },
+            HDWalletStorageError::HDWalletUnavailable => NewAccountCreatingError::HDWalletUnavailable,
+            HDWalletStorageError::Internal(internal) => NewAccountCreatingError::Internal(internal),
+            other => NewAccountCreatingError::Internal(other.to_string()),
+        }
+    }
+}
+
+impl From<NewAccountCreatingError> for HDWalletRpcError {
+    fn from(e: NewAccountCreatingError) -> Self {
+        match e {
+            NewAccountCreatingError::HwContextNotInitialized => HDWalletRpcError::HwContextNotInitialized,
+            NewAccountCreatingError::HDWalletUnavailable => HDWalletRpcError::CoinIsActivatedNotWithHDWallet,
+            NewAccountCreatingError::CoinDoesntSupportTrezor => HDWalletRpcError::CoinDoesntSupportTrezor,
+            NewAccountCreatingError::RpcTaskError(rpc) => HDWalletRpcError::from(rpc),
+            NewAccountCreatingError::HardwareWalletError(hw) => HDWalletRpcError::from(hw),
+            NewAccountCreatingError::AccountLimitReached { max_accounts_number } => {
+                HDWalletRpcError::AccountLimitReached { max_accounts_number }
+            },
+            NewAccountCreatingError::ErrorSavingAccountToStorage(e) => {
+                let error = format!("Error uploading HD account info to the storage: {}", e);
+                HDWalletRpcError::WalletStorageError(error)
+            },
+            NewAccountCreatingError::Internal(internal) => HDWalletRpcError::Internal(internal),
+        }
+    }
+}
+
+/// Currently, we suppose that ETH/ERC20/QRC20 don't have [`Bip44Chain::Internal`] addresses.
+#[derive(Display)]
+#[display(fmt = "Coin doesn't support the given BIP44 chain: {:?}", chain)]
+pub struct InvalidBip44ChainError {
+    pub chain: Bip44Chain,
+}
+
+#[derive(Display)]
+pub enum AccountUpdatingError {
+    AddressLimitReached { max_addresses_number: u32 },
+    InvalidBip44Chain(InvalidBip44ChainError),
+    WalletStorageError(HDWalletStorageError),
+}
+
+impl From<InvalidBip44ChainError> for AccountUpdatingError {
+    fn from(e: InvalidBip44ChainError) -> Self { AccountUpdatingError::InvalidBip44Chain(e) }
+}
+
+impl From<HDWalletStorageError> for AccountUpdatingError {
+    fn from(e: HDWalletStorageError) -> Self { AccountUpdatingError::WalletStorageError(e) }
+}
+
+impl From<AccountUpdatingError> for BalanceError {
+    fn from(e: AccountUpdatingError) -> Self {
+        let error = e.to_string();
+        match e {
+            AccountUpdatingError::AddressLimitReached { .. } | AccountUpdatingError::InvalidBip44Chain(_) => {
+                // Account updating is expected to be called after `address_id` and `chain` validation.
+                BalanceError::Internal(format!("Unexpected internal error: {}", error))
+            },
+            AccountUpdatingError::WalletStorageError(_) => BalanceError::WalletStorageError(error),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum HDWalletRpcError {
+    /* ----------- Trezor device errors ----------- */
+    #[display(fmt = "Trezor device disconnected")]
+    TrezorDisconnected,
+    #[display(fmt = "Trezor internal error: {}", _0)]
+    HardwareWalletInternal(String),
+    #[display(fmt = "No Trezor device available")]
+    NoTrezorDeviceAvailable,
+    #[display(fmt = "Unexpected Hardware Wallet device: {}", _0)]
+    FoundUnexpectedDevice(String),
+    #[display(
+        fmt = "Coin doesn't support Trezor hardware wallet. Please consider adding the 'trezor_coin' field to the coins config"
+    )]
+    CoinDoesntSupportTrezor,
+    /* ----------- HD Wallet RPC error ------------ */
+    #[display(fmt = "Hardware Wallet context is not initialized")]
+    HwContextNotInitialized,
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "RPC timed out {:?}", _0)]
+    Timeout(Duration),
+    #[display(fmt = "Coin is expected to be activated with the HD wallet derivation method")]
+    CoinIsActivatedNotWithHDWallet,
+    #[display(fmt = "HD account '{}' is not activated", account_id)]
+    UnknownAccount { account_id: u32 },
+    #[display(fmt = "Coin doesn't support the given BIP44 chain: {:?}", chain)]
+    InvalidBip44Chain { chain: Bip44Chain },
+    #[display(fmt = "Error deriving an address: {}", _0)]
+    ErrorDerivingAddress(String),
+    #[display(fmt = "Accounts limit reached. Max number of accounts: {}", max_accounts_number)]
+    AccountLimitReached { max_accounts_number: u32 },
+    #[display(fmt = "Addresses limit reached. Max number of addresses: {}", max_addresses_number)]
+    AddressLimitReached { max_addresses_number: u32 },
+    #[display(fmt = "Electrum/Native RPC invalid response: {}", _0)]
+    RpcInvalidResponse(String),
+    #[display(fmt = "HD wallet storage error: {}", _0)]
+    WalletStorageError(String),
+    #[display(fmt = "Transport: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal: {}", _0)]
+    Internal(String),
+}
+
+impl From<CoinFindError> for HDWalletRpcError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => HDWalletRpcError::NoSuchCoin { coin },
+        }
+    }
+}
+
+impl From<UnexpectedDerivationMethod> for HDWalletRpcError {
+    fn from(e: UnexpectedDerivationMethod) -> Self {
+        match e {
+            UnexpectedDerivationMethod::HDWalletUnavailable => HDWalletRpcError::CoinIsActivatedNotWithHDWallet,
+            unexpected_error => HDWalletRpcError::Internal(unexpected_error.to_string()),
+        }
+    }
+}
+
+impl From<BalanceError> for HDWalletRpcError {
+    fn from(e: BalanceError) -> Self {
+        match e {
+            BalanceError::Transport(transport) => HDWalletRpcError::Transport(transport),
+            BalanceError::InvalidResponse(rpc) => HDWalletRpcError::RpcInvalidResponse(rpc),
+            BalanceError::UnexpectedDerivationMethod(der_path) => HDWalletRpcError::from(der_path),
+            BalanceError::WalletStorageError(internal) | BalanceError::Internal(internal) => {
+                HDWalletRpcError::Internal(internal)
+            },
+        }
+    }
+}
+
+impl From<InvalidBip44ChainError> for HDWalletRpcError {
+    fn from(e: InvalidBip44ChainError) -> Self { HDWalletRpcError::InvalidBip44Chain { chain: e.chain } }
+}
+
+impl From<AddressDerivingError> for HDWalletRpcError {
+    fn from(e: AddressDerivingError) -> Self {
+        match e {
+            AddressDerivingError::Bip32Error(bip32) => HDWalletRpcError::ErrorDerivingAddress(bip32.to_string()),
+        }
+    }
+}
+
+impl From<NewAddressDerivingError> for HDWalletRpcError {
+    fn from(e: NewAddressDerivingError) -> HDWalletRpcError {
+        match e {
+            NewAddressDerivingError::AddressLimitReached { max_addresses_number } => {
+                HDWalletRpcError::AddressLimitReached { max_addresses_number }
+            },
+            NewAddressDerivingError::InvalidBip44Chain { chain } => HDWalletRpcError::InvalidBip44Chain { chain },
+            NewAddressDerivingError::Bip32Error(bip32) => HDWalletRpcError::Internal(bip32.to_string()),
+            NewAddressDerivingError::WalletStorageError(storage) => {
+                HDWalletRpcError::WalletStorageError(storage.to_string())
+            },
+        }
+    }
+}
+
+impl From<RpcTaskError> for HDWalletRpcError {
+    fn from(e: RpcTaskError) -> Self {
+        let error = e.to_string();
+        match e {
+            RpcTaskError::Canceled => HDWalletRpcError::Internal("Canceled".to_owned()),
+            RpcTaskError::Timeout(timeout) => HDWalletRpcError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
+                HDWalletRpcError::Internal(error)
+            },
+            RpcTaskError::Internal(internal) => HDWalletRpcError::Internal(internal),
+        }
+    }
+}
+
+impl From<HwError> for HDWalletRpcError {
+    fn from(e: HwError) -> Self {
+        let error = e.to_string();
+        match e {
+            HwError::NoTrezorDeviceAvailable => HDWalletRpcError::NoTrezorDeviceAvailable,
+            HwError::FoundUnexpectedDevice { .. } => HDWalletRpcError::FoundUnexpectedDevice(error),
+            _ => HDWalletRpcError::HardwareWalletInternal(error),
+        }
+    }
+}
+
+impl HttpStatusCode for HDWalletRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            HDWalletRpcError::CoinDoesntSupportTrezor
+            | HDWalletRpcError::HwContextNotInitialized
+            | HDWalletRpcError::NoSuchCoin { .. }
+            | HDWalletRpcError::CoinIsActivatedNotWithHDWallet
+            | HDWalletRpcError::UnknownAccount { .. }
+            | HDWalletRpcError::InvalidBip44Chain { .. }
+            | HDWalletRpcError::ErrorDerivingAddress(_)
+            | HDWalletRpcError::AddressLimitReached { .. }
+            | HDWalletRpcError::AccountLimitReached { .. } => StatusCode::BAD_REQUEST,
+            HDWalletRpcError::TrezorDisconnected
+            | HDWalletRpcError::HardwareWalletInternal(_)
+            | HDWalletRpcError::NoTrezorDeviceAvailable
+            | HDWalletRpcError::FoundUnexpectedDevice(_)
+            | HDWalletRpcError::Timeout(_)
+            | HDWalletRpcError::Transport(_)
+            | HDWalletRpcError::RpcInvalidResponse(_)
+            | HDWalletRpcError::WalletStorageError(_)
+            | HDWalletRpcError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+pub struct HDAddress<Address, Pubkey> {
+    pub address: Address,
+    pub pubkey: Pubkey,
+    pub derivation_path: DerivationPath,
+}
+
+#[derive(Clone, Deserialize, Serialize)]
+pub struct HDAddressId {
+    pub account_id: u32,
+    pub chain: Bip44Chain,
+    pub address_id: u32,
+}
+
+impl From<Bip44DerivationPath> for HDAddressId {
+    fn from(der_path: Bip44DerivationPath) -> Self {
+        HDAddressId {
+            account_id: der_path.account_id(),
+            chain: der_path.chain(),
+            address_id: der_path.address_id(),
+        }
+    }
+}
+
+#[async_trait]
+pub trait HDWalletCoinOps {
+    type Address: Send + Sync;
+    type Pubkey: Send;
+    type HDWallet: HDWalletOps<HDAccount = Self::HDAccount>;
+    type HDAccount: HDAccountOps;
+
+    /// Derives an address from the given info.
+    fn derive_address(
+        &self,
+        hd_account: &Self::HDAccount,
+        chain: Bip44Chain,
+        address_id: u32,
+    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, AddressDerivingError>;
+
+    /// Generates a new address and updates the corresponding number of used `hd_account` addresses.
+    async fn generate_new_address(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        chain: Bip44Chain,
+    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, NewAddressDerivingError> {
+        let known_addresses_number = hd_account.known_addresses_number(chain)?;
+        // Address IDs start from 0, so the `known_addresses_number = last_known_address_id + 1`.
+        let new_address_id = known_addresses_number;
+        if new_address_id >= ChildNumber::HARDENED_FLAG {
+            return MmError::err(NewAddressDerivingError::AddressLimitReached {
+                max_addresses_number: ChildNumber::HARDENED_FLAG,
+            });
+        }
+        let new_address = self
+            .derive_address(hd_account, chain, new_address_id)
+            .mm_err(NewAddressDerivingError::from)?;
+        self.set_known_addresses_number(hd_wallet, hd_account, chain, known_addresses_number + 1)
+            .await?;
+        Ok(new_address)
+    }
+
+    /// Creates a new HD account, registers it within the given `hd_wallet`
+    /// and returns a mutable reference to the registered account.
+    async fn create_new_account<'a, XPubExtractor>(
+        &self,
+        hd_wallet: &'a Self::HDWallet,
+        xpub_extractor: &XPubExtractor,
+    ) -> MmResult<HDAccountMut<'a, Self::HDAccount>, NewAccountCreatingError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync;
+
+    async fn set_known_addresses_number(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        chain: Bip44Chain,
+        new_known_addresses_number: u32,
+    ) -> MmResult<(), AccountUpdatingError>;
+}
+
+#[async_trait]
+pub trait HDWalletOps: Send + Sync {
+    type HDAccount: HDAccountOps + Clone + Send;
+
+    fn coin_type(&self) -> u32;
+
+    fn gap_limit(&self) -> u32;
+
+    fn get_accounts_mutex(&self) -> &HDAccountsMutex<Self::HDAccount>;
+
+    /// Returns a copy of an account by the given `account_id` if it's activated.
+    async fn get_account(&self, account_id: u32) -> Option<Self::HDAccount> {
+        let accounts = self.get_accounts_mutex().lock().await;
+        accounts.get(&account_id).cloned()
+    }
+
+    /// Returns a mutable reference to an account by the given `account_id` if it's activated.
+    async fn get_account_mut(&self, account_id: u32) -> Option<HDAccountMut<'_, Self::HDAccount>> {
+        let accounts = self.get_accounts_mutex().lock().await;
+        if !accounts.contains_key(&account_id) {
+            return None;
+        }
+
+        Some(AsyncMutexGuard::map(accounts, |accounts| {
+            accounts
+                .get_mut(&account_id)
+                .expect("getting an element should never fail due to the checks above")
+        }))
+    }
+
+    /// Returns copies of all activated accounts.
+    async fn get_accounts(&self) -> HDAccountsMap<Self::HDAccount> { self.get_accounts_mutex().lock().await.clone() }
+
+    /// Returns a mutable reference to all activated accounts.
+    async fn get_accounts_mut(&self) -> HDAccountsMut<'_, Self::HDAccount> { self.get_accounts_mutex().lock().await }
+}
+
+pub trait HDAccountOps: Send + Sync {
+    /// Returns a number of used addresses of this account
+    /// or an `InvalidBip44ChainError` error if the coin doesn't support the given `chain`.
+    fn known_addresses_number(&self, chain: Bip44Chain) -> MmResult<u32, InvalidBip44ChainError>;
+
+    /// Returns a derivation path of this account.
+    fn account_derivation_path(&self) -> DerivationPath;
+
+    /// Returns an index of this account.
+    fn account_id(&self) -> u32;
+
+    /// Returns true if the given address is known at this time.
+    fn is_address_activated(&self, chain: Bip44Chain, address_id: u32) -> MmResult<bool, InvalidBip44ChainError> {
+        let is_activated = address_id < self.known_addresses_number(chain)?;
+        Ok(is_activated)
+    }
+}
+
+#[derive(Deserialize)]
+pub struct GetNewHDAddressRequest {
+    coin: String,
+    #[serde(flatten)]
+    params: GetNewHDAddressParams,
+}
+
+#[derive(Deserialize)]
+pub struct GetNewHDAddressParams {
+    account_id: u32,
+    chain: Bip44Chain,
+}
+
+#[derive(Serialize)]
+pub struct GetNewHDAddressResponse {
+    new_address: HDAddressBalance,
+}
+
+#[async_trait]
+pub trait HDWalletRpcOps {
+    async fn get_new_address_rpc(
+        &self,
+        params: GetNewHDAddressParams,
+    ) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError>;
+}
+
+pub async fn get_new_address(
+    ctx: MmArc,
+    req: GetNewHDAddressRequest,
+) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    match coin {
+        MmCoinEnum::UtxoCoin(utxo) => utxo.get_new_address_rpc(req.params).await,
+        MmCoinEnum::QtumCoin(qtum) => qtum.get_new_address_rpc(req.params).await,
+        _ => MmError::err(HDWalletRpcError::CoinIsActivatedNotWithHDWallet),
+    }
+}
+
+pub mod common_impl {
+    use super::*;
+    use crate::coin_balance::HDWalletBalanceOps;
+    use crate::MarketCoinOps;
+    use crypto::RpcDerivationPath;
+    use std::fmt;
+    use std::ops::DerefMut;
+
+    pub async fn get_new_address_rpc<Coin>(
+        coin: &Coin,
+        params: GetNewHDAddressParams,
+    ) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError>
+    where
+        Coin: HDWalletBalanceOps
+            + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet>
+            + MarketCoinOps
+            + Sync
+            + Send,
+        <Coin as HDWalletCoinOps>::Address: fmt::Display,
+    {
+        let account_id = params.account_id;
+        let chain = params.chain;
+
+        let hd_wallet = coin.derivation_method().hd_wallet_or_err()?;
+        let mut hd_account = hd_wallet
+            .get_account_mut(params.account_id)
+            .await
+            .or_mm_err(|| HDWalletRpcError::UnknownAccount { account_id })?;
+
+        let HDAddress {
+            address,
+            derivation_path,
+            ..
+        } = coin
+            .generate_new_address(hd_wallet, hd_account.deref_mut(), chain)
+            .await?;
+        let balance = coin.known_address_balance(&address).await?;
+
+        Ok(GetNewHDAddressResponse {
+            new_address: HDAddressBalance {
+                address: address.to_string(),
+                derivation_path: RpcDerivationPath(derivation_path),
+                chain,
+                balance,
+            },
+        })
+    }
+}
diff --git a/mm2src/coins/hd_wallet_storage/mock_storage.rs b/mm2src/coins/hd_wallet_storage/mock_storage.rs
new file mode 100644
index 0000000000..67e694ed44
--- /dev/null
+++ b/mm2src/coins/hd_wallet_storage/mock_storage.rs
@@ -0,0 +1,57 @@
+use crate::hd_wallet_storage::{HDAccountStorageItem, HDWalletId, HDWalletStorageInternalOps, HDWalletStorageResult};
+use async_trait::async_trait;
+use mm2_core::mm_ctx::MmArc;
+use mocktopus::macros::*;
+
+pub struct HDWalletMockStorage;
+
+#[async_trait]
+#[mockable]
+impl HDWalletStorageInternalOps for HDWalletMockStorage {
+    async fn init(_ctx: &MmArc) -> HDWalletStorageResult<Self>
+    where
+        Self: Sized,
+    {
+        unimplemented!()
+    }
+
+    async fn load_accounts(&self, _wallet_id: HDWalletId) -> HDWalletStorageResult<Vec<HDAccountStorageItem>> {
+        unimplemented!()
+    }
+
+    async fn load_account(
+        &self,
+        _wallet_id: HDWalletId,
+        _account_id: u32,
+    ) -> HDWalletStorageResult<Option<HDAccountStorageItem>> {
+        unimplemented!()
+    }
+
+    async fn update_external_addresses_number(
+        &self,
+        _wallet_id: HDWalletId,
+        _account_id: u32,
+        _new_external_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        unimplemented!()
+    }
+
+    async fn update_internal_addresses_number(
+        &self,
+        _wallet_id: HDWalletId,
+        _account_id: u32,
+        _new_internal_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        unimplemented!()
+    }
+
+    async fn upload_new_account(
+        &self,
+        _wallet_id: HDWalletId,
+        _account: HDAccountStorageItem,
+    ) -> HDWalletStorageResult<()> {
+        unimplemented!()
+    }
+
+    async fn clear_accounts(&self, _wallet_id: HDWalletId) -> HDWalletStorageResult<()> { unimplemented!() }
+}
diff --git a/mm2src/coins/hd_wallet_storage/mod.rs b/mm2src/coins/hd_wallet_storage/mod.rs
new file mode 100644
index 0000000000..95506f52fe
--- /dev/null
+++ b/mm2src/coins/hd_wallet_storage/mod.rs
@@ -0,0 +1,585 @@
+use crate::hd_wallet::HDWalletCoinOps;
+use async_trait::async_trait;
+use crypto::{CryptoCtx, CryptoInitError, XPub};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+#[cfg(test)] use mocktopus::macros::*;
+use primitives::hash::H160;
+use serde::{Deserialize, Serialize};
+use std::fmt;
+use std::fmt::Formatter;
+use std::ops::Deref;
+
+#[cfg(not(target_arch = "wasm32"))] mod sqlite_storage;
+#[cfg(target_arch = "wasm32")] mod wasm_storage;
+
+#[cfg(test)] mod mock_storage;
+#[cfg(test)] pub use mock_storage::HDWalletMockStorage;
+
+cfg_wasm32! {
+    use wasm_storage::HDWalletIndexedDbStorage as HDWalletStorageInstance;
+
+    pub use wasm_storage::{HDWalletDb, HDWalletDbLocked};
+}
+
+cfg_native! {
+    use sqlite_storage::HDWalletSqliteStorage as HDWalletStorageInstance;
+}
+
+pub type HDWalletStorageResult<T> = MmResult<T, HDWalletStorageError>;
+type HDWalletStorageBoxed = Box<dyn HDWalletStorageInternalOps + Send + Sync>;
+
+#[derive(Debug, Display)]
+pub enum HDWalletStorageError {
+    #[display(fmt = "HD wallet not allowed")]
+    HDWalletUnavailable,
+    #[display(fmt = "HD account '{:?}':{} not found", wallet_id, account_id)]
+    HDAccountNotFound { wallet_id: HDWalletId, account_id: u32 },
+    #[display(fmt = "Error saving changes in HD wallet storage: {}", _0)]
+    ErrorSaving(String),
+    #[display(fmt = "Error loading from HD wallet storage: {}", _0)]
+    ErrorLoading(String),
+    #[display(fmt = "Error deserializing a swap: {}", _0)]
+    ErrorDeserializing(String),
+    #[display(fmt = "Error serializing a swap: {}", _0)]
+    ErrorSerializing(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<CryptoInitError> for HDWalletStorageError {
+    fn from(e: CryptoInitError) -> Self { HDWalletStorageError::Internal(e.to_string()) }
+}
+
+impl HDWalletStorageError {
+    pub fn is_deserializing_err(&self) -> bool { matches!(self, HDWalletStorageError::ErrorDeserializing(_)) }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct HDWalletId {
+    coin: String,
+    /// RIPEMD160(SHA256(x)) where x is a pubkey with which mm2 is launched.
+    /// It's expected to be equal to [`MmCtx::rmd160`].
+    /// This property allows us to store DB items that are unique to each user (passphrase).
+    mm2_rmd160: String,
+    /// RIPEMD160(SHA256(x)) where x is a pubkey extracted from a Hardware Wallet device or passphrase.
+    /// This property allows us to store DB items that are unique to each Hardware Wallet device.
+    /// Please note it can be equal to [`HDWalletId::mm2_rmd160`] if mm2 is launched with a HD private key derived from a passphrase.
+    hd_wallet_rmd160: String,
+}
+
+impl HDWalletId {
+    pub fn new(coin: String, mm2_rmd160: &H160, hd_wallet_rmd160: &H160) -> HDWalletId {
+        HDWalletId {
+            coin,
+            mm2_rmd160: display_rmd160(mm2_rmd160),
+            hd_wallet_rmd160: display_rmd160(hd_wallet_rmd160),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct HDAccountStorageItem {
+    pub account_id: u32,
+    pub account_xpub: XPub,
+    /// The number of addresses that we know have been used by the user.
+    pub external_addresses_number: u32,
+    pub internal_addresses_number: u32,
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+pub trait HDWalletStorageInternalOps {
+    async fn init(ctx: &MmArc) -> HDWalletStorageResult<Self>
+    where
+        Self: Sized;
+
+    async fn load_accounts(&self, wallet_id: HDWalletId) -> HDWalletStorageResult<Vec<HDAccountStorageItem>>;
+
+    async fn load_account(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+    ) -> HDWalletStorageResult<Option<HDAccountStorageItem>>;
+
+    async fn update_external_addresses_number(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+        new_external_addresses_number: u32,
+    ) -> HDWalletStorageResult<()>;
+
+    async fn update_internal_addresses_number(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+        new_internal_addresses_number: u32,
+    ) -> HDWalletStorageResult<()>;
+
+    async fn upload_new_account(
+        &self,
+        wallet_id: HDWalletId,
+        account: HDAccountStorageItem,
+    ) -> HDWalletStorageResult<()>;
+
+    async fn clear_accounts(&self, wallet_id: HDWalletId) -> HDWalletStorageResult<()>;
+}
+
+#[async_trait]
+pub trait HDWalletCoinWithStorageOps: HDWalletCoinOps {
+    fn hd_wallet_storage<'a>(&self, hd_wallet: &'a Self::HDWallet) -> &'a HDWalletCoinStorage;
+
+    async fn load_all_accounts(&self, hd_wallet: &Self::HDWallet) -> HDWalletStorageResult<Vec<HDAccountStorageItem>> {
+        let storage = self.hd_wallet_storage(hd_wallet);
+        storage.load_all_accounts().await
+    }
+
+    async fn load_account(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        account_id: u32,
+    ) -> HDWalletStorageResult<Option<HDAccountStorageItem>> {
+        let storage = self.hd_wallet_storage(hd_wallet);
+        storage.load_account(account_id).await
+    }
+
+    async fn update_external_addresses_number(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        account_id: u32,
+        new_external_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        let storage = self.hd_wallet_storage(hd_wallet);
+        storage
+            .update_external_addresses_number(account_id, new_external_addresses_number)
+            .await
+    }
+
+    async fn update_internal_addresses_number(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        account_id: u32,
+        new_internal_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        let storage = self.hd_wallet_storage(hd_wallet);
+        storage
+            .update_internal_addresses_number(account_id, new_internal_addresses_number)
+            .await
+    }
+
+    async fn upload_new_account(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        account_info: HDAccountStorageItem,
+    ) -> HDWalletStorageResult<()> {
+        let storage = self.hd_wallet_storage(hd_wallet);
+        storage.upload_new_account(account_info).await
+    }
+
+    async fn clear_accounts(&self, hd_wallet: &Self::HDWallet) -> HDWalletStorageResult<()> {
+        let storage = self.hd_wallet_storage(hd_wallet);
+        storage.clear_accounts().await
+    }
+}
+
+/// The wrapper over the [`HDWalletStorage::inner`] database implementation.
+/// It's associated with a specific mm2 user, HD wallet and coin.
+pub struct HDWalletCoinStorage {
+    coin: String,
+    /// RIPEMD160(SHA256(x)) where x is a pubkey with which mm2 is launched.
+    /// It's expected to be equal to [`MmCtx::rmd160`].
+    /// This property allows us to store DB items that are unique to each user (passphrase).
+    mm2_rmd160: H160,
+    /// RIPEMD160(SHA256(x)) where x is a pubkey extracted from a Hardware Wallet device or passphrase.
+    /// This property allows us to store DB items that are unique to each Hardware Wallet device.
+    /// Please note it can be equal to [`HDWalletId::mm2_rmd160`] if mm2 is launched with a HD private key derived from a passphrase.
+    hd_wallet_rmd160: H160,
+    inner: HDWalletStorageBoxed,
+}
+
+impl fmt::Debug for HDWalletCoinStorage {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        f.debug_struct("HDWalletCoinStorage")
+            .field("coin", &self.coin)
+            .field("mm2_rmd160", &self.mm2_rmd160)
+            .field("hd_wallet_rmd160", &self.hd_wallet_rmd160)
+            .finish()
+    }
+}
+
+#[cfg(test)]
+impl Default for HDWalletCoinStorage {
+    fn default() -> Self {
+        HDWalletCoinStorage {
+            coin: String::default(),
+            mm2_rmd160: H160::default(),
+            hd_wallet_rmd160: H160::default(),
+            inner: Box::new(HDWalletMockStorage),
+        }
+    }
+}
+
+impl HDWalletCoinStorage {
+    pub async fn init(ctx: &MmArc, coin: String) -> HDWalletStorageResult<HDWalletCoinStorage> {
+        let inner = Box::new(HDWalletStorageInstance::init(ctx).await?);
+        let crypto_ctx = CryptoCtx::from_ctx(ctx)?;
+        let hd_wallet_rmd160 = crypto_ctx
+            .hd_wallet_rmd160()
+            .or_mm_err(|| HDWalletStorageError::HDWalletUnavailable)?;
+        Ok(HDWalletCoinStorage {
+            coin,
+            mm2_rmd160: *ctx.rmd160(),
+            hd_wallet_rmd160,
+            inner,
+        })
+    }
+
+    #[cfg(any(test, target_arch = "wasm32"))]
+    pub async fn init_with_rmd160(
+        ctx: &MmArc,
+        coin: String,
+        mm2_rmd160: H160,
+        hd_wallet_rmd160: H160,
+    ) -> HDWalletStorageResult<HDWalletCoinStorage> {
+        let inner = Box::new(HDWalletStorageInstance::init(ctx).await?);
+        Ok(HDWalletCoinStorage {
+            coin,
+            mm2_rmd160,
+            hd_wallet_rmd160,
+            inner,
+        })
+    }
+
+    pub fn wallet_id(&self) -> HDWalletId {
+        HDWalletId::new(self.coin.clone(), &self.mm2_rmd160, &self.hd_wallet_rmd160)
+    }
+
+    pub async fn load_all_accounts(&self) -> HDWalletStorageResult<Vec<HDAccountStorageItem>> {
+        let wallet_id = self.wallet_id();
+        self.inner.load_accounts(wallet_id).await
+    }
+
+    async fn load_account(&self, account_id: u32) -> HDWalletStorageResult<Option<HDAccountStorageItem>> {
+        let wallet_id = self.wallet_id();
+        self.inner.load_account(wallet_id, account_id).await
+    }
+
+    async fn update_external_addresses_number(
+        &self,
+        account_id: u32,
+        new_external_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        let wallet_id = self.wallet_id();
+        self.inner
+            .update_external_addresses_number(wallet_id, account_id, new_external_addresses_number)
+            .await
+    }
+
+    async fn update_internal_addresses_number(
+        &self,
+        account_id: u32,
+        new_internal_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        let wallet_id = self.wallet_id();
+        self.inner
+            .update_internal_addresses_number(wallet_id, account_id, new_internal_addresses_number)
+            .await
+    }
+
+    async fn upload_new_account(&self, account_info: HDAccountStorageItem) -> HDWalletStorageResult<()> {
+        let wallet_id = self.wallet_id();
+        self.inner.upload_new_account(wallet_id, account_info).await
+    }
+
+    pub async fn clear_accounts(&self) -> HDWalletStorageResult<()> {
+        let wallet_id = self.wallet_id();
+        self.inner.clear_accounts(wallet_id).await
+    }
+}
+
+fn display_rmd160(rmd160: &H160) -> String { hex::encode(rmd160.deref()) }
+
+#[cfg(any(test, target_arch = "wasm32"))]
+mod tests {
+    use super::*;
+    use itertools::Itertools;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+    use primitives::hash::H160;
+
+    cfg_wasm32! {
+        use crate::hd_wallet_storage::wasm_storage::get_all_storage_items;
+        use wasm_bindgen_test::*;
+
+        wasm_bindgen_test_configure!(run_in_browser);
+    }
+
+    cfg_native! {
+        use crate::hd_wallet_storage::sqlite_storage::get_all_storage_items;
+        use common::block_on;
+    }
+
+    async fn test_unique_wallets_impl() {
+        let rick_user0_device0_account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6DEHSksajpRPM59RPw7Eg6PKdU7E2ehxJWtYdrfQ6JFmMGBsrR6jA78ANCLgzKYm4s5UqQ4ydLEYPbh3TRVvn5oAZVtWfi4qJLMntpZ8uGJ".to_owned(),
+            external_addresses_number: 1,
+            internal_addresses_number: 2,
+        };
+        let rick_user0_device0_account1 = HDAccountStorageItem {
+            account_id: 1,
+            account_xpub: "xpub6DEHSksajpRPQq2FdGT6JoieiQZUpTZ3WZn8fcuLJhFVmtCpXbuXxp5aPzaokwcLV2V9LE55Dwt8JYkpuMv7jXKwmyD28WbHYjBH2zhbW2p".to_owned(),
+            external_addresses_number: 1,
+            internal_addresses_number: 2,
+        };
+        let rick_user0_device1_account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6EuV33a2DXxAhoJTRTnr8qnysu81AA4YHpLY6o8NiGkEJ8KADJ35T64eJsStWsmRf1xXkEANVjXFXnaUKbRtFwuSPCLfDdZwYNZToh4LBCd".to_owned(),
+            external_addresses_number: 3,
+            internal_addresses_number: 4,
+        };
+        let rick_user1_device0_account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6CUGRUonZSQ4TWtTMmzXdrXDtypWKiKrhko4egpiMZbpiaQL2jkwSB1icqYh2cfDfVxdx4df189oLKnC5fSwqPfgyP3hooxujYzAu3fDVmz".to_owned(),
+            external_addresses_number: 5,
+            internal_addresses_number: 6,
+        };
+        let morty_user0_device0_account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6AHA9hZDN11k2ijHMeS5QqHx2KP9aMBRhTDqANMnwVtdyw2TDYRmF8PjpvwUFcL1Et8Hj59S3gTSMcUQ5gAqTz3Wd8EsMTmF3DChhqPQBnU".to_owned(),
+            external_addresses_number: 7,
+            internal_addresses_number: 8,
+        };
+
+        let ctx = mm_ctx_with_custom_db();
+        let user0_rmd160 = H160::from("0000000000000000000000000000000000000000");
+        let user1_rmd160 = H160::from("0000000000000000000000000000000000000001");
+        let device0_rmd160 = H160::from("0000000000000000000000000000000000000020");
+        let device1_rmd160 = H160::from("0000000000000000000000000000000000000030");
+
+        let rick_user0_device0_db =
+            HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user0_rmd160, device0_rmd160)
+                .await
+                .expect("!HDWalletCoinStorage::new");
+        let rick_user0_device1_db =
+            HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user0_rmd160, device1_rmd160)
+                .await
+                .expect("!HDWalletCoinStorage::new");
+        let rick_user1_device0_db =
+            HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user1_rmd160, device0_rmd160)
+                .await
+                .expect("!HDWalletCoinStorage::new");
+        let morty_user0_device0_db =
+            HDWalletCoinStorage::init_with_rmd160(&ctx, "MORTY".to_owned(), user0_rmd160, device0_rmd160)
+                .await
+                .expect("!HDWalletCoinStorage::new");
+
+        rick_user0_device0_db
+            .upload_new_account(rick_user0_device0_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK user=0 device=0 account=0");
+        rick_user0_device0_db
+            .upload_new_account(rick_user0_device0_account1.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK user=0 device=0 account=1");
+        rick_user0_device1_db
+            .upload_new_account(rick_user0_device1_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK user=0 device=1 account=0");
+        rick_user1_device0_db
+            .upload_new_account(rick_user1_device0_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK user=1 device=0 account=0");
+        morty_user0_device0_db
+            .upload_new_account(morty_user0_device0_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: MORTY user=0 device=0 account=0");
+
+        // All accounts must be in the only one database.
+        // Rows in the database must differ by only `coin`, `mm2_rmd160`, `hd_wallet_rmd160` and `account_id` values.
+        let all_accounts: Vec<_> = get_all_storage_items(&ctx)
+            .await
+            .into_iter()
+            .sorted_by(|x, y| x.external_addresses_number.cmp(&y.external_addresses_number))
+            .collect();
+        assert_eq!(all_accounts, vec![
+            rick_user0_device0_account0.clone(),
+            rick_user0_device0_account1.clone(),
+            rick_user0_device1_account0.clone(),
+            rick_user1_device0_account0.clone(),
+            morty_user0_device0_account0.clone()
+        ]);
+
+        let mut actual = rick_user0_device0_db
+            .load_all_accounts()
+            .await
+            .expect("HDWalletCoinStorage::load_all_accounts: RICK user=0 device=0");
+        actual.sort_by(|x, y| x.account_id.cmp(&y.account_id));
+        assert_eq!(actual, vec![rick_user0_device0_account0, rick_user0_device0_account1]);
+
+        let actual = rick_user0_device1_db
+            .load_all_accounts()
+            .await
+            .expect("HDWalletCoinStorage::load_all_accounts: RICK user=0 device=1");
+        assert_eq!(actual, vec![rick_user0_device1_account0]);
+
+        let actual = rick_user1_device0_db
+            .load_all_accounts()
+            .await
+            .expect("HDWalletCoinStorage::load_all_accounts: RICK user=1 device=0");
+        assert_eq!(actual, vec![rick_user1_device0_account0]);
+
+        let actual = morty_user0_device0_db
+            .load_all_accounts()
+            .await
+            .expect("HDWalletCoinStorage::load_all_accounts: MORTY user=0 device=0");
+        assert_eq!(actual, vec![morty_user0_device0_account0]);
+    }
+
+    async fn test_delete_accounts_impl() {
+        let wallet0_account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6DEHSksajpRPM59RPw7Eg6PKdU7E2ehxJWtYdrfQ6JFmMGBsrR6jA78ANCLgzKYm4s5UqQ4ydLEYPbh3TRVvn5oAZVtWfi4qJLMntpZ8uGJ".to_owned(),
+            external_addresses_number: 1,
+            internal_addresses_number: 2,
+        };
+        let wallet0_account1 = HDAccountStorageItem {
+            account_id: 1,
+            account_xpub: "xpub6DEHSksajpRPQq2FdGT6JoieiQZUpTZ3WZn8fcuLJhFVmtCpXbuXxp5aPzaokwcLV2V9LE55Dwt8JYkpuMv7jXKwmyD28WbHYjBH2zhbW2p".to_owned(),
+            external_addresses_number: 1,
+            internal_addresses_number: 2,
+        };
+        let wallet1_account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6EuV33a2DXxAhoJTRTnr8qnysu81AA4YHpLY6o8NiGkEJ8KADJ35T64eJsStWsmRf1xXkEANVjXFXnaUKbRtFwuSPCLfDdZwYNZToh4LBCd".to_owned(),
+            external_addresses_number: 3,
+            internal_addresses_number: 4,
+        };
+        let wallet2_account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6CUGRUonZSQ4TWtTMmzXdrXDtypWKiKrhko4egpiMZbpiaQL2jkwSB1icqYh2cfDfVxdx4df189oLKnC5fSwqPfgyP3hooxujYzAu3fDVmz".to_owned(),
+            external_addresses_number: 5,
+            internal_addresses_number: 6,
+        };
+
+        let ctx = mm_ctx_with_custom_db();
+        let user_rmd160 = H160::from("0000000000000000000000000000000000000000");
+        let device0_rmd160 = H160::from("0000000000000000000000000000000000000010");
+        let device1_rmd160 = H160::from("0000000000000000000000000000000000000020");
+        let device2_rmd160 = H160::from("0000000000000000000000000000000000000030");
+
+        let wallet0_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user_rmd160, device0_rmd160)
+            .await
+            .expect("!HDWalletCoinStorage::new");
+        let wallet1_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user_rmd160, device1_rmd160)
+            .await
+            .expect("!HDWalletCoinStorage::new");
+        let wallet2_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user_rmd160, device2_rmd160)
+            .await
+            .expect("!HDWalletCoinStorage::new");
+
+        wallet0_db
+            .upload_new_account(wallet0_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK wallet=0 account=0");
+        wallet0_db
+            .upload_new_account(wallet0_account1.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK wallet=0 account=1");
+        wallet1_db
+            .upload_new_account(wallet1_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK wallet=1 account=0");
+        wallet2_db
+            .upload_new_account(wallet2_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK wallet=2 account=0");
+
+        wallet0_db
+            .clear_accounts()
+            .await
+            .expect("HDWalletCoinStorage::clear_accounts: RICK wallet=0");
+
+        // All accounts must be in the only one database.
+        // Rows in the database must differ by only `coin`, `mm2_rmd160`, `hd_wallet_rmd160` and `account_id` values.
+        let all_accounts: Vec<_> = get_all_storage_items(&ctx)
+            .await
+            .into_iter()
+            .sorted_by(|x, y| x.external_addresses_number.cmp(&y.external_addresses_number))
+            .collect();
+        assert_eq!(all_accounts, vec![wallet1_account0, wallet2_account0]);
+    }
+
+    async fn test_update_account_impl() {
+        let mut account0 = HDAccountStorageItem {
+            account_id: 0,
+            account_xpub: "xpub6DEHSksajpRPM59RPw7Eg6PKdU7E2ehxJWtYdrfQ6JFmMGBsrR6jA78ANCLgzKYm4s5UqQ4ydLEYPbh3TRVvn5oAZVtWfi4qJLMntpZ8uGJ".to_owned(),
+            external_addresses_number: 1,
+            internal_addresses_number: 2,
+        };
+        let mut account1 = HDAccountStorageItem {
+            account_id: 1,
+            account_xpub: "xpub6DEHSksajpRPQq2FdGT6JoieiQZUpTZ3WZn8fcuLJhFVmtCpXbuXxp5aPzaokwcLV2V9LE55Dwt8JYkpuMv7jXKwmyD28WbHYjBH2zhbW2p".to_owned(),
+            external_addresses_number: 3,
+            internal_addresses_number: 4,
+        };
+
+        let ctx = mm_ctx_with_custom_db();
+        let user_rmd160 = H160::from("0000000000000000000000000000000000000000");
+        let device_rmd160 = H160::from("0000000000000000000000000000000000000010");
+
+        let db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user_rmd160, device_rmd160)
+            .await
+            .expect("!HDWalletCoinStorage::new");
+
+        db.upload_new_account(account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK wallet=0 account=0");
+        db.upload_new_account(account1.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK wallet=0 account=1");
+
+        db.update_internal_addresses_number(0, 5)
+            .await
+            .expect("!HDWalletCoinStorage::update_internal_addresses_number");
+        db.update_external_addresses_number(1, 10)
+            .await
+            .expect("!HDWalletCoinStorage::update_external_addresses_number");
+
+        let actual: Vec<_> = db
+            .load_all_accounts()
+            .await
+            .expect("!HDWalletCoinStorage::load_all_accounts")
+            .into_iter()
+            .sorted_by(|x, y| x.external_addresses_number.cmp(&y.external_addresses_number))
+            .collect();
+
+        account0.internal_addresses_number = 5;
+        account1.external_addresses_number = 10;
+        assert_eq!(actual, vec![account0, account1]);
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    #[wasm_bindgen_test]
+    async fn test_unique_wallets() { test_unique_wallets_impl().await }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    #[test]
+    fn test_unique_wallets() { block_on(test_unique_wallets_impl()) }
+
+    #[cfg(target_arch = "wasm32")]
+    #[wasm_bindgen_test]
+    async fn test_delete_accounts() { test_delete_accounts_impl().await }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    #[test]
+    fn test_delete_accounts() { block_on(test_delete_accounts_impl()) }
+
+    #[cfg(target_arch = "wasm32")]
+    #[wasm_bindgen_test]
+    async fn test_update_account() { test_update_account_impl().await }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    #[test]
+    fn test_update_account() { block_on(test_update_account_impl()) }
+}
diff --git a/mm2src/coins/hd_wallet_storage/sqlite_storage.rs b/mm2src/coins/hd_wallet_storage/sqlite_storage.rs
new file mode 100644
index 0000000000..8a061fddb5
--- /dev/null
+++ b/mm2src/coins/hd_wallet_storage/sqlite_storage.rs
@@ -0,0 +1,309 @@
+use crate::hd_wallet_storage::{HDAccountStorageItem, HDWalletId, HDWalletStorageError, HDWalletStorageInternalOps,
+                               HDWalletStorageResult};
+use async_trait::async_trait;
+use common::async_blocking;
+use db_common::sqlite::rusqlite::{Connection, Error as SqlError, Row, ToSql, NO_PARAMS};
+use db_common::sqlite::{SqliteConnShared, SqliteConnWeak};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use std::convert::TryFrom;
+use std::sync::MutexGuard;
+
+const CREATE_HD_ACCOUNT_TABLE: &str = "CREATE TABLE IF NOT EXISTS hd_account (
+    coin VARCHAR(255) NOT NULL,
+    mm2_rmd160 VARCHAR(255) NOT NULL,
+    hd_wallet_rmd160 VARCHAR(255) NOT NULL,
+    account_id INTEGER NOT NULL,
+    account_xpub VARCHAR(255) NOT NULL,
+    external_addresses_number INTEGER NOT NULL,
+    internal_addresses_number INTEGER NOT NULL
+);";
+
+const INSERT_ACCOUNT: &str = "INSERT INTO hd_account
+    (coin, mm2_rmd160, hd_wallet_rmd160, account_id, account_xpub, external_addresses_number, internal_addresses_number)
+    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7);";
+
+const DELETE_ACCOUNTS_BY_WALLET_ID: &str =
+    "DELETE FROM hd_account WHERE coin=?1 AND mm2_rmd160=?2 AND hd_wallet_rmd160=?3;";
+
+const SELECT_ACCOUNT: &str = "SELECT account_id, account_xpub, external_addresses_number, internal_addresses_number
+    FROM hd_account
+    WHERE coin=?1 AND mm2_rmd160=?2 AND hd_wallet_rmd160=?3 AND account_id=?4;";
+
+const SELECT_ACCOUNTS_BY_WALLET_ID: &str =
+    "SELECT account_id, account_xpub, external_addresses_number, internal_addresses_number
+    FROM hd_account
+    WHERE coin=?1 AND mm2_rmd160=?2 AND hd_wallet_rmd160=?3;";
+
+/// The max number of SQL query params.
+const PARAMS_CAPACITY: usize = 7;
+
+impl From<SqlError> for HDWalletStorageError {
+    fn from(e: SqlError) -> Self {
+        let error = e.to_string();
+        match e {
+            SqlError::FromSqlConversionFailure(_, _, _)
+            | SqlError::IntegralValueOutOfRange(_, _)
+            | SqlError::InvalidColumnIndex(_)
+            | SqlError::InvalidColumnType(_, _, _) => HDWalletStorageError::ErrorDeserializing(error),
+            SqlError::Utf8Error(_) | SqlError::NulError(_) | SqlError::ToSqlConversionFailure(_) => {
+                HDWalletStorageError::ErrorSerializing(error)
+            },
+            _ => HDWalletStorageError::Internal(error),
+        }
+    }
+}
+
+impl TryFrom<&Row<'_>> for HDAccountStorageItem {
+    type Error = SqlError;
+
+    fn try_from(row: &Row<'_>) -> Result<Self, Self::Error> {
+        Ok(HDAccountStorageItem {
+            account_id: row.get(0)?,
+            account_xpub: row.get(1)?,
+            external_addresses_number: row.get(2)?,
+            internal_addresses_number: row.get(3)?,
+        })
+    }
+}
+
+impl HDAccountStorageItem {
+    fn to_sql_params_with_wallet_id(&self, wallet_id: HDWalletId) -> Vec<String> {
+        let mut params = Vec::with_capacity(PARAMS_CAPACITY);
+        wallet_id.fill_sql_params(&mut params);
+        self.fill_sql_params(&mut params);
+        params
+    }
+
+    fn fill_sql_params(&self, params: &mut Vec<String>) {
+        params.push(self.account_id.to_string());
+        params.push(self.account_xpub.clone());
+        params.push(self.external_addresses_number.to_string());
+        params.push(self.internal_addresses_number.to_string());
+    }
+}
+
+impl HDWalletId {
+    fn to_sql_params(&self) -> Vec<String> {
+        let mut params = Vec::with_capacity(PARAMS_CAPACITY);
+        self.fill_sql_params(&mut params);
+        params
+    }
+
+    fn fill_sql_params(&self, params: &mut Vec<String>) {
+        params.push(self.coin.clone());
+        params.push(self.mm2_rmd160.clone());
+        params.push(self.hd_wallet_rmd160.clone());
+    }
+}
+
+#[derive(Clone)]
+pub struct HDWalletSqliteStorage {
+    conn: SqliteConnWeak,
+}
+
+#[async_trait]
+impl HDWalletStorageInternalOps for HDWalletSqliteStorage {
+    async fn init(ctx: &MmArc) -> HDWalletStorageResult<Self>
+    where
+        Self: Sized,
+    {
+        let shared = ctx
+            .sqlite_connection
+            .as_option()
+            .or_mm_err(|| HDWalletStorageError::Internal("'MmCtx::sqlite_connection' is not initialized".to_owned()))?;
+        let storage = HDWalletSqliteStorage {
+            conn: SqliteConnShared::downgrade(shared),
+        };
+        storage.init_tables().await?;
+        Ok(storage)
+    }
+
+    async fn load_accounts(&self, wallet_id: HDWalletId) -> HDWalletStorageResult<Vec<HDAccountStorageItem>> {
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn_shared = selfi.get_shared_conn()?;
+            let conn = Self::lock_conn(&conn_shared)?;
+
+            let mut statement = conn.prepare(SELECT_ACCOUNTS_BY_WALLET_ID)?;
+
+            let params = wallet_id.to_sql_params();
+            let rows = statement
+                .query_map(params, |row: &Row<'_>| HDAccountStorageItem::try_from(row))?
+                .collect::<Result<Vec<_>, _>>()?;
+            Ok(rows)
+        })
+        .await
+    }
+
+    async fn load_account(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+    ) -> HDWalletStorageResult<Option<HDAccountStorageItem>> {
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn_shared = selfi.get_shared_conn()?;
+            let conn = Self::lock_conn(&conn_shared)?;
+
+            let mut params = wallet_id.to_sql_params();
+            params.push(account_id.to_string());
+            query_single_row(&conn, SELECT_ACCOUNT, params, |row: &Row<'_>| {
+                HDAccountStorageItem::try_from(row)
+            })
+            .mm_err(HDWalletStorageError::from)
+        })
+        .await
+    }
+
+    async fn update_external_addresses_number(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+        new_external_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        self.update_addresses_number(
+            UpdatingProperty::ExternalAddressesNumber,
+            wallet_id,
+            account_id,
+            new_external_addresses_number,
+        )
+        .await
+    }
+
+    async fn update_internal_addresses_number(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+        new_internal_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        self.update_addresses_number(
+            UpdatingProperty::InternalAddressesNumber,
+            wallet_id,
+            account_id,
+            new_internal_addresses_number,
+        )
+        .await
+    }
+
+    async fn upload_new_account(
+        &self,
+        wallet_id: HDWalletId,
+        account: HDAccountStorageItem,
+    ) -> HDWalletStorageResult<()> {
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn_shared = selfi.get_shared_conn()?;
+            let conn = Self::lock_conn(&conn_shared)?;
+
+            let params = account.to_sql_params_with_wallet_id(wallet_id);
+            conn.execute(INSERT_ACCOUNT, params)
+                .map(|_| ())
+                .map_to_mm(HDWalletStorageError::from)
+        })
+        .await
+    }
+
+    async fn clear_accounts(&self, wallet_id: HDWalletId) -> HDWalletStorageResult<()> {
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn_shared = selfi.get_shared_conn()?;
+            let conn = Self::lock_conn(&conn_shared)?;
+
+            let params = wallet_id.to_sql_params();
+            conn.execute(DELETE_ACCOUNTS_BY_WALLET_ID, params)
+                .map(|_| ())
+                .map_to_mm(HDWalletStorageError::from)
+        })
+        .await
+    }
+}
+
+impl HDWalletSqliteStorage {
+    fn get_shared_conn(&self) -> HDWalletStorageResult<SqliteConnShared> {
+        self.conn
+            .upgrade()
+            .or_mm_err(|| HDWalletStorageError::Internal("'HDWalletSqliteStorage::conn' doesn't exist".to_owned()))
+    }
+
+    fn lock_conn(conn: &SqliteConnShared) -> HDWalletStorageResult<MutexGuard<Connection>> {
+        conn.lock()
+            .map_to_mm(|e| HDWalletStorageError::Internal(format!("Error locking sqlite connection: {}", e)))
+    }
+
+    async fn init_tables(&self) -> HDWalletStorageResult<()> {
+        let conn_shared = self.get_shared_conn()?;
+        let conn = Self::lock_conn(&conn_shared)?;
+        conn.execute(CREATE_HD_ACCOUNT_TABLE, NO_PARAMS)
+            .map(|_| ())
+            .map_to_mm(HDWalletStorageError::from)
+    }
+
+    async fn update_addresses_number(
+        &self,
+        updating_property: UpdatingProperty,
+        wallet_id: HDWalletId,
+        account_id: u32,
+        new_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        let sql = format!(
+            "UPDATE hd_account SET {}=?1 WHERE coin=?2 AND mm2_rmd160=?3 AND hd_wallet_rmd160=?4 AND account_id=?5;",
+            updating_property
+        );
+
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn_shared = selfi.get_shared_conn()?;
+            let conn = Self::lock_conn(&conn_shared)?;
+
+            let mut params = vec![new_addresses_number.to_string()];
+            wallet_id.fill_sql_params(&mut params);
+            params.push(account_id.to_string());
+
+            conn.execute(&sql, params)
+                .map(|_| ())
+                .map_to_mm(HDWalletStorageError::from)
+        })
+        .await
+    }
+}
+
+#[derive(Display)]
+enum UpdatingProperty {
+    #[display(fmt = "external_addresses_number")]
+    ExternalAddressesNumber,
+    #[display(fmt = "internal_addresses_number")]
+    InternalAddressesNumber,
+}
+
+/// TODO remove this when `db_common::query_single_row` is merged into `dev`.
+fn query_single_row<T, P, F>(conn: &Connection, query: &str, params: P, map_fn: F) -> MmResult<Option<T>, SqlError>
+where
+    P: IntoIterator,
+    P::Item: ToSql,
+    F: FnOnce(&Row<'_>) -> Result<T, SqlError>,
+{
+    let maybe_result = conn.query_row(query, params, map_fn);
+    if let Err(SqlError::QueryReturnedNoRows) = maybe_result {
+        return Ok(None);
+    }
+
+    let result = maybe_result?;
+    Ok(Some(result))
+}
+
+/// This function is used in `hd_wallet_storage::tests`.
+#[cfg(test)]
+pub(super) async fn get_all_storage_items(ctx: &MmArc) -> Vec<HDAccountStorageItem> {
+    const SELECT_ALL_ACCOUNTS: &str =
+        "SELECT account_id, account_xpub, external_addresses_number, internal_addresses_number FROM hd_account";
+
+    let conn = ctx.sqlite_connection();
+    let mut statement = conn.prepare(SELECT_ALL_ACCOUNTS).unwrap();
+    statement
+        .query_map(NO_PARAMS, |row: &Row<'_>| HDAccountStorageItem::try_from(row))
+        .unwrap()
+        .collect::<Result<Vec<_>, _>>()
+        .unwrap()
+}
diff --git a/mm2src/coins/hd_wallet_storage/wasm_storage.rs b/mm2src/coins/hd_wallet_storage/wasm_storage.rs
new file mode 100644
index 0000000000..fb9dbd2bbd
--- /dev/null
+++ b/mm2src/coins/hd_wallet_storage/wasm_storage.rs
@@ -0,0 +1,341 @@
+use crate::hd_wallet_storage::{HDAccountStorageItem, HDWalletId, HDWalletStorageError, HDWalletStorageInternalOps,
+                               HDWalletStorageResult};
+use crate::CoinsContext;
+use async_trait::async_trait;
+use crypto::XPub;
+use mm2_core::mm_ctx::MmArc;
+use mm2_db::indexed_db::cursor_prelude::*;
+use mm2_db::indexed_db::{DbIdentifier, DbInstance, DbLocked, DbTable, DbTransactionError, DbUpgrader, IndexedDb,
+                         IndexedDbBuilder, InitDbError, InitDbResult, ItemId, MultiIndex, OnUpgradeResult, SharedDb,
+                         TableSignature, WeakDb};
+use mm2_err_handle::prelude::*;
+
+const DB_NAME: &str = "hd_wallet";
+const DB_VERSION: u32 = 1;
+/// An index of the `HDAccountTable` table that consists of the following properties:
+/// * coin - coin ticker
+/// * mm2_rmd160 - RIPEMD160(SHA256(x)) where x is a pubkey with which mm2 is launched
+/// * hd_wallet_rmd160 - RIPEMD160(SHA256(x)) where x is a pubkey extracted from a Hardware Wallet device or passphrase.
+const WALLET_ID_INDEX: &str = "wallet_id";
+/// A **unique** index of the `HDAccountTable` table that consists of the following properties:
+/// * coin - coin ticker
+/// * mm2_rmd160 - RIPEMD160(SHA256(x)) where x is a pubkey with which mm2 is launched
+/// * hd_wallet_rmd160 - RIPEMD160(SHA256(x)) where x is a pubkey extracted from a Hardware Wallet device or passphrase.
+/// * account_id - HD account id
+const WALLET_ACCOUNT_ID_INDEX: &str = "wallet_account_id";
+
+pub type HDWalletDbLocked<'a> = DbLocked<'a, HDWalletDb>;
+
+impl From<DbTransactionError> for HDWalletStorageError {
+    fn from(e: DbTransactionError) -> Self {
+        let desc = e.to_string();
+        match e {
+            DbTransactionError::NoSuchTable { .. }
+            | DbTransactionError::ErrorCreatingTransaction(_)
+            | DbTransactionError::ErrorOpeningTable { .. }
+            | DbTransactionError::ErrorSerializingIndex { .. }
+            | DbTransactionError::MultipleItemsByUniqueIndex { .. }
+            | DbTransactionError::NoSuchIndex { .. }
+            | DbTransactionError::InvalidIndex { .. }
+            | DbTransactionError::UnexpectedState(_)
+            | DbTransactionError::TransactionAborted => HDWalletStorageError::Internal(desc),
+            DbTransactionError::ErrorDeserializingItem(_) => HDWalletStorageError::ErrorDeserializing(desc),
+            DbTransactionError::ErrorSerializingItem(_) => HDWalletStorageError::ErrorSerializing(desc),
+            DbTransactionError::ErrorGettingItems(_) | DbTransactionError::ErrorCountingItems(_) => {
+                HDWalletStorageError::ErrorLoading(desc)
+            },
+            DbTransactionError::ErrorUploadingItem(_) | DbTransactionError::ErrorDeletingItems(_) => {
+                HDWalletStorageError::ErrorSaving(desc)
+            },
+        }
+    }
+}
+
+impl From<CursorError> for HDWalletStorageError {
+    fn from(e: CursorError) -> Self {
+        let stringified_error = e.to_string();
+        match e {
+            // We don't expect that the `String` and `u32` types serialization to fail.
+            CursorError::ErrorSerializingIndexFieldValue {..}
+            // We don't expect that the `String` and `u32` types deserialization to fail.
+            | CursorError::ErrorDeserializingIndexValue {..}
+            | CursorError::ErrorOpeningCursor {..}
+            | CursorError::AdvanceError {..}
+            | CursorError::InvalidKeyRange {..}
+            | CursorError::TypeMismatch {..}
+            | CursorError::IncorrectNumberOfKeysPerIndex {..}
+            | CursorError::UnexpectedState(..)
+            | CursorError::IncorrectUsage {..} => HDWalletStorageError::Internal(stringified_error),
+            CursorError::ErrorDeserializingItem {..} => HDWalletStorageError::ErrorDeserializing(stringified_error),
+        }
+    }
+}
+
+impl From<InitDbError> for HDWalletStorageError {
+    fn from(e: InitDbError) -> Self { HDWalletStorageError::Internal(e.to_string()) }
+}
+
+/// The table has the following individually non-unique indexes: `coin`, `mm2_rmd160`, `hd_wallet_rmd160`, `account_id`,
+/// one non-unique multi-index `wallet_id` that consists of `coin`, `mm2_rmd160`, `hd_wallet_rmd160`,
+/// and one unique multi-index `wallet_account_id` that consists of these four indexes in a row.
+/// See [`HDAccountTable::on_update_needed`].
+#[derive(Deserialize, Serialize)]
+pub struct HDAccountTable {
+    /// [`HDWalletId::coin`].
+    /// Non-unique index that is used to fetch/remove items from the storage.
+    coin: String,
+    /// [`HDWalletId::mm2_rmd160`].
+    /// Non-unique index that is used to fetch/remove items from the storage.
+    mm2_rmd160: String,
+    /// [`HDWalletId::hd_wallet_rmd160`].
+    /// Non-unique index that is used to fetch/remove items from the storage.
+    hd_wallet_rmd160: String,
+    /// HD Account ID.
+    /// Non-unique index that is used to fetch/remove items from the storage.
+    account_id: u32,
+    account_xpub: XPub,
+    /// The number of addresses that we know have been used by the user.
+    external_addresses_number: u32,
+    internal_addresses_number: u32,
+}
+
+impl TableSignature for HDAccountTable {
+    fn table_name() -> &'static str { "hd_account" }
+
+    fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+        match (old_version, new_version) {
+            (0, 1) => {
+                let table = upgrader.create_table(Self::table_name())?;
+                table.create_multi_index(WALLET_ID_INDEX, &["coin", "mm2_rmd160", "hd_wallet_rmd160"], false)?;
+                table.create_multi_index(
+                    WALLET_ACCOUNT_ID_INDEX,
+                    &["coin", "mm2_rmd160", "hd_wallet_rmd160", "account_id"],
+                    true,
+                )?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
+
+impl HDAccountTable {
+    fn new(wallet_id: HDWalletId, account_info: HDAccountStorageItem) -> HDAccountTable {
+        HDAccountTable {
+            coin: wallet_id.coin,
+            mm2_rmd160: wallet_id.mm2_rmd160,
+            hd_wallet_rmd160: wallet_id.hd_wallet_rmd160,
+            account_id: account_info.account_id,
+            account_xpub: account_info.account_xpub,
+            external_addresses_number: account_info.external_addresses_number,
+            internal_addresses_number: account_info.internal_addresses_number,
+        }
+    }
+}
+
+impl From<HDAccountTable> for HDAccountStorageItem {
+    fn from(account: HDAccountTable) -> Self {
+        HDAccountStorageItem {
+            account_id: account.account_id,
+            account_xpub: account.account_xpub,
+            external_addresses_number: account.external_addresses_number,
+            internal_addresses_number: account.internal_addresses_number,
+        }
+    }
+}
+
+pub struct HDWalletDb {
+    pub(crate) inner: IndexedDb,
+}
+
+#[async_trait]
+impl DbInstance for HDWalletDb {
+    fn db_name() -> &'static str { DB_NAME }
+
+    async fn init(db_id: DbIdentifier) -> InitDbResult<Self> {
+        let inner = IndexedDbBuilder::new(db_id)
+            .with_version(DB_VERSION)
+            .with_table::<HDAccountTable>()
+            .build()
+            .await?;
+        Ok(HDWalletDb { inner })
+    }
+}
+
+/// The wrapper over the [`CoinsContext::hd_wallet_db`] weak pointer.
+pub struct HDWalletIndexedDbStorage {
+    db: WeakDb<HDWalletDb>,
+}
+
+#[async_trait]
+impl HDWalletStorageInternalOps for HDWalletIndexedDbStorage {
+    async fn init(ctx: &MmArc) -> HDWalletStorageResult<Self>
+    where
+        Self: Sized,
+    {
+        let coins_ctx = CoinsContext::from_ctx(ctx).map_to_mm(HDWalletStorageError::Internal)?;
+        let db = SharedDb::downgrade(&coins_ctx.hd_wallet_db);
+        Ok(HDWalletIndexedDbStorage { db })
+    }
+
+    async fn load_accounts(&self, wallet_id: HDWalletId) -> HDWalletStorageResult<Vec<HDAccountStorageItem>> {
+        let shared_db = self.get_shared_db()?;
+        let locked_db = Self::lock_db(&shared_db).await?;
+
+        let transaction = locked_db.inner.transaction().await?;
+        let table = transaction.table::<HDAccountTable>().await?;
+
+        let index_keys = MultiIndex::new(WALLET_ID_INDEX)
+            .with_value(wallet_id.coin)?
+            .with_value(wallet_id.mm2_rmd160)?
+            .with_value(wallet_id.hd_wallet_rmd160)?;
+        Ok(table
+            .get_items_by_multi_index(index_keys)
+            .await?
+            .into_iter()
+            .map(|(_item_id, item)| HDAccountStorageItem::from(item))
+            .collect())
+    }
+
+    async fn load_account(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+    ) -> HDWalletStorageResult<Option<HDAccountStorageItem>> {
+        let shared_db = self.get_shared_db()?;
+        let locked_db = Self::lock_db(&shared_db).await?;
+
+        let transaction = locked_db.inner.transaction().await?;
+        let table = transaction.table::<HDAccountTable>().await?;
+
+        let maybe_account = Self::find_account(&table, wallet_id, account_id).await?;
+        match maybe_account {
+            Some((_account_item_id, account_item)) => Ok(Some(HDAccountStorageItem::from(account_item))),
+            None => Ok(None),
+        }
+    }
+
+    async fn update_external_addresses_number(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+        new_external_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        self.update_account(wallet_id, account_id, |account| {
+            account.external_addresses_number = new_external_addresses_number;
+        })
+        .await
+    }
+
+    async fn update_internal_addresses_number(
+        &self,
+        wallet_id: HDWalletId,
+        account_id: u32,
+        new_internal_addresses_number: u32,
+    ) -> HDWalletStorageResult<()> {
+        self.update_account(wallet_id, account_id, |account| {
+            account.internal_addresses_number = new_internal_addresses_number;
+        })
+        .await
+    }
+
+    async fn upload_new_account(
+        &self,
+        wallet_id: HDWalletId,
+        account: HDAccountStorageItem,
+    ) -> HDWalletStorageResult<()> {
+        let shared_db = self.get_shared_db()?;
+        let locked_db = Self::lock_db(&shared_db).await?;
+
+        let transaction = locked_db.inner.transaction().await?;
+        let table = transaction.table::<HDAccountTable>().await?;
+
+        let new_account = HDAccountTable::new(wallet_id, account);
+        table
+            .add_item(&new_account)
+            .await
+            .map(|_| ())
+            .mm_err(HDWalletStorageError::from)
+    }
+
+    async fn clear_accounts(&self, wallet_id: HDWalletId) -> HDWalletStorageResult<()> {
+        let shared_db = self.get_shared_db()?;
+        let locked_db = Self::lock_db(&shared_db).await?;
+
+        let transaction = locked_db.inner.transaction().await?;
+        let table = transaction.table::<HDAccountTable>().await?;
+
+        let index_keys = MultiIndex::new(WALLET_ID_INDEX)
+            .with_value(wallet_id.coin)?
+            .with_value(wallet_id.mm2_rmd160)?
+            .with_value(wallet_id.hd_wallet_rmd160)?;
+        table.delete_items_by_multi_index(index_keys).await?;
+        Ok(())
+    }
+}
+
+impl HDWalletIndexedDbStorage {
+    fn get_shared_db(&self) -> HDWalletStorageResult<SharedDb<HDWalletDb>> {
+        self.db
+            .upgrade()
+            .or_mm_err(|| HDWalletStorageError::Internal("'HDWalletIndexedDbStorage::db' doesn't exist".to_owned()))
+    }
+
+    async fn lock_db(db: &SharedDb<HDWalletDb>) -> HDWalletStorageResult<HDWalletDbLocked<'_>> {
+        db.get_or_initialize().await.mm_err(HDWalletStorageError::from)
+    }
+
+    async fn find_account(
+        table: &DbTable<'_, HDAccountTable>,
+        wallet_id: HDWalletId,
+        account_id: u32,
+    ) -> HDWalletStorageResult<Option<(ItemId, HDAccountTable)>> {
+        let index_keys = MultiIndex::new(WALLET_ACCOUNT_ID_INDEX)
+            .with_value(wallet_id.coin)?
+            .with_value(wallet_id.mm2_rmd160)?
+            .with_value(wallet_id.hd_wallet_rmd160)?
+            .with_value(account_id)?;
+        table
+            .get_item_by_unique_multi_index(index_keys)
+            .await
+            .mm_err(HDWalletStorageError::from)
+    }
+
+    async fn update_account<F>(&self, wallet_id: HDWalletId, account_id: u32, f: F) -> HDWalletStorageResult<()>
+    where
+        F: FnOnce(&mut HDAccountTable),
+    {
+        let shared_db = self.get_shared_db()?;
+        let locked_db = Self::lock_db(&shared_db).await?;
+
+        let transaction = locked_db.inner.transaction().await?;
+        let table = transaction.table::<HDAccountTable>().await?;
+
+        let (account_item_id, mut account) = Self::find_account(&table, wallet_id.clone(), account_id)
+            .await?
+            .or_mm_err(|| HDWalletStorageError::HDAccountNotFound { wallet_id, account_id })?;
+
+        // Apply `f` to `account` and upload the changes to the storage.
+        f(&mut account);
+        table
+            .replace_item(account_item_id, &account)
+            .await
+            .map(|_| ())
+            .mm_err(HDWalletStorageError::from)
+    }
+}
+
+/// This function is used in `hd_wallet_storage::tests`.
+pub(super) async fn get_all_storage_items(ctx: &MmArc) -> Vec<HDAccountStorageItem> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+    let db = coins_ctx.hd_wallet_db.get_or_initialize().await.unwrap();
+    let transaction = db.inner.transaction().await.unwrap();
+    let table = transaction.table::<HDAccountTable>().await.unwrap();
+    table
+        .get_all_items()
+        .await
+        .expect("Error getting items")
+        .into_iter()
+        .map(|(_item_id, item)| HDAccountStorageItem::from(item))
+        .collect()
+}
diff --git a/mm2src/coins/lightning.rs b/mm2src/coins/lightning.rs
new file mode 100644
index 0000000000..08e2acbb00
--- /dev/null
+++ b/mm2src/coins/lightning.rs
@@ -0,0 +1,1585 @@
+pub mod ln_conf;
+pub mod ln_errors;
+mod ln_events;
+mod ln_p2p;
+mod ln_platform;
+mod ln_serialization;
+mod ln_utils;
+
+use super::{lp_coinfind_or_err, DerivationMethod, MmCoinEnum};
+use crate::utxo::rpc_clients::UtxoRpcClientEnum;
+use crate::utxo::utxo_common::{big_decimal_from_sat_unsigned, UtxoTxBuilder};
+use crate::utxo::{sat_from_big_decimal, BlockchainNetwork, FeePolicy, GetUtxoListOps, UtxoTxGenerationOps};
+use crate::{BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps, MmCoin,
+            NegotiateSwapContractAddrErr, RawTransactionFut, RawTransactionRequest, SearchForSwapTxSpendInput,
+            SignatureError, SignatureResult, SwapOps, TradeFee, TradePreimageFut, TradePreimageResult,
+            TradePreimageValue, TransactionEnum, TransactionFut, UnexpectedDerivationMethod, UtxoStandardCoin,
+            ValidateAddressResult, ValidatePaymentInput, VerificationError, VerificationResult, WithdrawError,
+            WithdrawFut, WithdrawRequest};
+use async_trait::async_trait;
+use bitcoin::hashes::Hash;
+use bitcoin_hashes::sha256::Hash as Sha256;
+use bitcrypto::dhash256;
+use bitcrypto::ChecksumType;
+use chain::TransactionOutput;
+use common::executor::spawn;
+use common::log::{LogOnError, LogState};
+use common::{async_blocking, calc_total_pages, log, now_ms, ten, PagingOptionsEnum};
+use futures::{FutureExt, TryFutureExt};
+use futures01::Future;
+use keys::{hash::H256, AddressHashEnum, CompactSignature, KeyPair, Private, Public};
+use lightning::chain::channelmonitor::Balance;
+use lightning::chain::keysinterface::{KeysInterface, KeysManager, Recipient};
+use lightning::chain::Access;
+use lightning::ln::channelmanager::{ChannelDetails, MIN_FINAL_CLTV_EXPIRY};
+use lightning::ln::{PaymentHash, PaymentPreimage};
+use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
+use lightning::util::config::UserConfig;
+use lightning_background_processor::BackgroundProcessor;
+use lightning_invoice::payment;
+use lightning_invoice::utils::{create_invoice_from_channelmanager, DefaultRouter};
+use lightning_invoice::{Invoice, InvoiceDescription};
+use lightning_persister::storage::{ClosedChannelsFilter, DbStorage, FileSystemStorage, HTLCStatus,
+                                   NodesAddressesMapShared, PaymentInfo, PaymentType, PaymentsFilter, Scorer,
+                                   SqlChannelDetails};
+use lightning_persister::LightningPersister;
+use ln_conf::{ChannelOptions, LightningCoinConf, LightningProtocolConf, PlatformCoinConfirmations};
+use ln_errors::{ClaimableBalancesError, ClaimableBalancesResult, CloseChannelError, CloseChannelResult,
+                ConnectToNodeError, ConnectToNodeResult, EnableLightningError, EnableLightningResult,
+                GenerateInvoiceError, GenerateInvoiceResult, GetChannelDetailsError, GetChannelDetailsResult,
+                GetPaymentDetailsError, GetPaymentDetailsResult, ListChannelsError, ListChannelsResult,
+                ListPaymentsError, ListPaymentsResult, OpenChannelError, OpenChannelResult, SendPaymentError,
+                SendPaymentResult};
+use ln_events::LightningEventHandler;
+use ln_p2p::{connect_to_node, ConnectToNodeRes, PeerManager};
+use ln_platform::{h256_json_from_txid, Platform};
+use ln_serialization::{InvoiceForRPC, NodeAddress, PublicKeyForRPC};
+use ln_utils::{ChainMonitor, ChannelManager};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_net::ip_addr::myipaddr;
+use mm2_number::{BigDecimal, MmNumber};
+use parking_lot::Mutex as PaMutex;
+use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
+use script::{Builder, TransactionInputSigner};
+use secp256k1::PublicKey;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::collections::hash_map::Entry;
+use std::collections::{HashMap, HashSet};
+use std::fmt;
+use std::net::SocketAddr;
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
+
+type Router = DefaultRouter<Arc<NetworkGraph>, Arc<LogState>>;
+type InvoicePayer<E> = payment::InvoicePayer<Arc<ChannelManager>, Router, Arc<Mutex<Scorer>>, Arc<LogState>, E>;
+
+#[derive(Clone)]
+pub struct LightningCoin {
+    pub platform: Arc<Platform>,
+    pub conf: LightningCoinConf,
+    /// The lightning node peer manager that takes care of connecting to peers, etc..
+    pub peer_manager: Arc<PeerManager>,
+    /// The lightning node background processor that takes care of tasks that need to happen periodically
+    pub background_processor: Arc<BackgroundProcessor>,
+    /// The lightning node channel manager which keeps track of the number of open channels and sends messages to the appropriate
+    /// channel, also tracks HTLC preimages and forwards onion packets appropriately.
+    pub channel_manager: Arc<ChannelManager>,
+    /// The lightning node chain monitor that takes care of monitoring the chain for transactions of interest.
+    pub chain_monitor: Arc<ChainMonitor>,
+    /// The lightning node keys manager that takes care of signing invoices.
+    pub keys_manager: Arc<KeysManager>,
+    /// The lightning node invoice payer.
+    pub invoice_payer: Arc<InvoicePayer<Arc<LightningEventHandler>>>,
+    /// The lightning node persister that takes care of writing/reading data from storage.
+    pub persister: Arc<LightningPersister>,
+    /// The mutex storing the addresses of the nodes that the lightning node has open channels with,
+    /// these addresses are used for reconnecting.
+    pub open_channels_nodes: NodesAddressesMapShared,
+}
+
+impl fmt::Debug for LightningCoin {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "LightningCoin {{ conf: {:?} }}", self.conf) }
+}
+
+impl LightningCoin {
+    fn platform_coin(&self) -> &UtxoStandardCoin { &self.platform.coin }
+
+    #[inline]
+    fn my_node_id(&self) -> String { self.channel_manager.get_our_node_id().to_string() }
+
+    fn get_balance_msat(&self) -> (u64, u64) {
+        self.channel_manager
+            .list_channels()
+            .iter()
+            .fold((0, 0), |(spendable, unspendable), chan| {
+                if chan.is_usable {
+                    (
+                        spendable + chan.outbound_capacity_msat,
+                        unspendable + chan.balance_msat - chan.outbound_capacity_msat,
+                    )
+                } else {
+                    (spendable, unspendable + chan.balance_msat)
+                }
+            })
+    }
+
+    fn pay_invoice(&self, invoice: Invoice) -> SendPaymentResult<PaymentInfo> {
+        self.invoice_payer
+            .pay_invoice(&invoice)
+            .map_to_mm(|e| SendPaymentError::PaymentError(format!("{:?}", e)))?;
+        let payment_hash = PaymentHash((*invoice.payment_hash()).into_inner());
+        let payment_type = PaymentType::OutboundPayment {
+            destination: *invoice.payee_pub_key().unwrap_or(&invoice.recover_payee_pub_key()),
+        };
+        let description = match invoice.description() {
+            InvoiceDescription::Direct(d) => d.to_string(),
+            InvoiceDescription::Hash(h) => hex::encode(h.0.into_inner()),
+        };
+        let payment_secret = Some(*invoice.payment_secret());
+        Ok(PaymentInfo {
+            payment_hash,
+            payment_type,
+            description,
+            preimage: None,
+            secret: payment_secret,
+            amt_msat: invoice.amount_milli_satoshis(),
+            fee_paid_msat: None,
+            status: HTLCStatus::Pending,
+            created_at: now_ms() / 1000,
+            last_updated: now_ms() / 1000,
+        })
+    }
+
+    fn keysend(
+        &self,
+        destination: PublicKey,
+        amount_msat: u64,
+        final_cltv_expiry_delta: u32,
+    ) -> SendPaymentResult<PaymentInfo> {
+        if final_cltv_expiry_delta < MIN_FINAL_CLTV_EXPIRY {
+            return MmError::err(SendPaymentError::CLTVExpiryError(
+                final_cltv_expiry_delta,
+                MIN_FINAL_CLTV_EXPIRY,
+            ));
+        }
+        let payment_preimage = PaymentPreimage(self.keys_manager.get_secure_random_bytes());
+        self.invoice_payer
+            .pay_pubkey(destination, payment_preimage, amount_msat, final_cltv_expiry_delta)
+            .map_to_mm(|e| SendPaymentError::PaymentError(format!("{:?}", e)))?;
+        let payment_hash = PaymentHash(Sha256::hash(&payment_preimage.0).into_inner());
+        let payment_type = PaymentType::OutboundPayment { destination };
+
+        Ok(PaymentInfo {
+            payment_hash,
+            payment_type,
+            description: "".into(),
+            preimage: Some(payment_preimage),
+            secret: None,
+            amt_msat: Some(amount_msat),
+            fee_paid_msat: None,
+            status: HTLCStatus::Pending,
+            created_at: now_ms() / 1000,
+            last_updated: now_ms() / 1000,
+        })
+    }
+
+    async fn get_open_channels_by_filter(
+        &self,
+        filter: Option<OpenChannelsFilter>,
+        paging: PagingOptionsEnum<u64>,
+        limit: usize,
+    ) -> ListChannelsResult<GetOpenChannelsResult> {
+        let mut total_open_channels: Vec<ChannelDetailsForRPC> = self
+            .channel_manager
+            .list_channels()
+            .into_iter()
+            .map(From::from)
+            .collect();
+
+        total_open_channels.sort_by(|a, b| a.rpc_channel_id.cmp(&b.rpc_channel_id));
+
+        let open_channels_filtered = if let Some(ref f) = filter {
+            total_open_channels
+                .into_iter()
+                .filter(|chan| apply_open_channel_filter(chan, f))
+                .collect()
+        } else {
+            total_open_channels
+        };
+
+        let offset = match paging {
+            PagingOptionsEnum::PageNumber(page) => (page.get() - 1) * limit,
+            PagingOptionsEnum::FromId(rpc_id) => open_channels_filtered
+                .iter()
+                .position(|x| x.rpc_channel_id == rpc_id)
+                .map(|pos| pos + 1)
+                .unwrap_or_default(),
+        };
+
+        let total = open_channels_filtered.len();
+
+        let channels = if offset + limit <= total {
+            open_channels_filtered[offset..offset + limit].to_vec()
+        } else {
+            open_channels_filtered[offset..].to_vec()
+        };
+
+        Ok(GetOpenChannelsResult {
+            channels,
+            skipped: offset,
+            total,
+        })
+    }
+}
+
+#[async_trait]
+// Todo: Implement this when implementing swaps for lightning as it's is used only for swaps
+impl SwapOps for LightningCoin {
+    fn send_taker_fee(&self, _fee_addr: &[u8], _amount: BigDecimal, _uuid: &[u8]) -> TransactionFut { unimplemented!() }
+
+    fn send_maker_payment(
+        &self,
+        _time_lock: u32,
+        _taker_pub: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_payment(
+        &self,
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_maker_spends_taker_payment(
+        &self,
+        _taker_payment_tx: &[u8],
+        _time_lock: u32,
+        _taker_pub: &[u8],
+        _secret: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_spends_maker_payment(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_refunds_payment(
+        &self,
+        _taker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_maker_refunds_payment(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _taker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn validate_fee(
+        &self,
+        _fee_tx: &TransactionEnum,
+        _expected_sender: &[u8],
+        _fee_addr: &[u8],
+        _amount: &BigDecimal,
+        _min_block_number: u64,
+        _uuid: &[u8],
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn validate_maker_payment(
+        &self,
+        _input: ValidatePaymentInput,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn validate_taker_payment(
+        &self,
+        _input: ValidatePaymentInput,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn check_if_my_payment_sent(
+        &self,
+        _time_lock: u32,
+        _other_pub: &[u8],
+        _secret_hash: &[u8],
+        _search_from_block: u64,
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+        unimplemented!()
+    }
+
+    async fn search_for_swap_tx_spend_my(
+        &self,
+        _: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!()
+    }
+
+    async fn search_for_swap_tx_spend_other(
+        &self,
+        _: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!()
+    }
+
+    fn extract_secret(&self, _secret_hash: &[u8], _spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+
+    fn negotiate_swap_contract_addr(
+        &self,
+        _other_side_address: Option<&[u8]>,
+    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
+        unimplemented!()
+    }
+
+    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { unimplemented!() }
+}
+
+impl MarketCoinOps for LightningCoin {
+    fn ticker(&self) -> &str { &self.conf.ticker }
+
+    fn my_address(&self) -> Result<String, String> { Ok(self.my_node_id()) }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
+
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
+        let mut _message_prefix = self.conf.sign_message_prefix.clone()?;
+        let prefixed_message = format!("{}{}", _message_prefix, message);
+        Some(dhash256(prefixed_message.as_bytes()).take())
+    }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        let message_hash = self.sign_message_hash(message).ok_or(SignatureError::PrefixNotFound)?;
+        let secret_key = self
+            .keys_manager
+            .get_node_secret(Recipient::Node)
+            .map_err(|_| SignatureError::InternalError("Error accessing node keys".to_string()))?;
+        let private = Private {
+            prefix: 239,
+            secret: H256::from(*secret_key.as_ref()),
+            compressed: true,
+            checksum_type: ChecksumType::DSHA256,
+        };
+        let signature = private.sign_compact(&H256::from(message_hash))?;
+        Ok(zbase32::encode_full_bytes(&*signature))
+    }
+
+    fn verify_message(&self, signature: &str, message: &str, pubkey: &str) -> VerificationResult<bool> {
+        let message_hash = self
+            .sign_message_hash(message)
+            .ok_or(VerificationError::PrefixNotFound)?;
+        let signature = CompactSignature::from(
+            zbase32::decode_full_bytes_str(signature)
+                .map_err(|e| VerificationError::SignatureDecodingError(e.to_string()))?,
+        );
+        let recovered_pubkey = Public::recover_compact(&H256::from(message_hash), &signature)?;
+        Ok(recovered_pubkey.to_string() == pubkey)
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> {
+        let decimals = self.decimals();
+        let (spendable_msat, unspendable_msat) = self.get_balance_msat();
+        let my_balance = CoinBalance {
+            spendable: big_decimal_from_sat_unsigned(spendable_msat, decimals),
+            unspendable: big_decimal_from_sat_unsigned(unspendable_msat, decimals),
+        };
+        Box::new(futures01::future::ok(my_balance))
+    }
+
+    fn base_coin_balance(&self) -> BalanceFut<BigDecimal> {
+        Box::new(self.platform_coin().my_balance().map(|res| res.spendable))
+    }
+
+    fn platform_ticker(&self) -> &str { self.platform_coin().ticker() }
+
+    fn send_raw_tx(&self, _tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        Box::new(futures01::future::err(
+            MmError::new(
+                "send_raw_tx is not supported for lightning, please use send_payment method instead.".to_string(),
+            )
+            .to_string(),
+        ))
+    }
+
+    fn send_raw_tx_bytes(&self, _tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        Box::new(futures01::future::err(
+            MmError::new(
+                "send_raw_tx is not supported for lightning, please use send_payment method instead.".to_string(),
+            )
+            .to_string(),
+        ))
+    }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used mainly for swaps
+    fn wait_for_confirmations(
+        &self,
+        _tx: &[u8],
+        _confirmations: u64,
+        _requires_nota: bool,
+        _wait_until: u64,
+        _check_every: u64,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used mainly for swaps
+    fn wait_for_tx_spend(
+        &self,
+        _transaction: &[u8],
+        _wait_until: u64,
+        _from_block: u64,
+        _swap_contract_address: &Option<BytesJson>,
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used mainly for swaps
+    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, String> { unimplemented!() }
+
+    fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { Box::new(futures01::future::ok(0)) }
+
+    fn display_priv_key(&self) -> Result<String, String> {
+        Ok(self
+            .keys_manager
+            .get_node_secret(Recipient::Node)
+            .map_err(|_| "Unsupported recipient".to_string())?
+            .to_string())
+    }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used only for swaps
+    fn min_tx_amount(&self) -> BigDecimal { unimplemented!() }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used only for order matching/swaps
+    fn min_trading_vol(&self) -> MmNumber { unimplemented!() }
+}
+
+#[async_trait]
+impl MmCoin for LightningCoin {
+    fn is_asset_chain(&self) -> bool { false }
+
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(self.platform_coin().get_raw_transaction(req))
+    }
+
+    fn withdraw(&self, _req: WithdrawRequest) -> WithdrawFut {
+        let fut = async move {
+            MmError::err(WithdrawError::InternalError(
+                "withdraw method is not supported for lightning, please use generate_invoice method instead.".into(),
+            ))
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn decimals(&self) -> u8 { self.conf.decimals }
+
+    fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> {
+        Err(MmError::new("Address conversion is not available for LightningCoin".to_string()).to_string())
+    }
+
+    fn validate_address(&self, address: &str) -> ValidateAddressResult {
+        match PublicKey::from_str(address) {
+            Ok(_) => ValidateAddressResult {
+                is_valid: true,
+                reason: None,
+            },
+            Err(e) => ValidateAddressResult {
+                is_valid: false,
+                reason: Some(format!("Error {} on parsing node public key", e)),
+            },
+        }
+    }
+
+    // Todo: Implement this when implementing payments history for lightning
+    fn process_history_loop(&self, _ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> { unimplemented!() }
+
+    // Todo: Implement this when implementing payments history for lightning
+    fn history_sync_status(&self) -> HistorySyncState { unimplemented!() }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used only for swaps
+    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> { unimplemented!() }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used only for swaps
+    async fn get_sender_trade_fee(
+        &self,
+        _value: TradePreimageValue,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        unimplemented!()
+    }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used only for swaps
+    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
+
+    // Todo: Implement this when implementing swaps for lightning as it's is used only for swaps
+    async fn get_fee_to_send_taker_fee(
+        &self,
+        _dex_fee_amount: BigDecimal,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        unimplemented!()
+    }
+
+    // Lightning payments are either pending, successful or failed. Once a payment succeeds there is no need to for confirmations
+    // unlike onchain transactions.
+    fn required_confirmations(&self) -> u64 { 0 }
+
+    fn requires_notarization(&self) -> bool { false }
+
+    fn set_required_confirmations(&self, _confirmations: u64) {}
+
+    fn set_requires_notarization(&self, _requires_nota: bool) {}
+
+    fn swap_contract_address(&self) -> Option<BytesJson> { None }
+
+    fn mature_confirmations(&self) -> Option<u32> { None }
+
+    // Todo: Implement this when implementing order matching for lightning as it's is used only for order matching
+    fn coin_protocol_info(&self) -> Vec<u8> { unimplemented!() }
+
+    // Todo: Implement this when implementing order matching for lightning as it's is used only for order matching
+    fn is_coin_protocol_supported(&self, _info: &Option<Vec<u8>>) -> bool { unimplemented!() }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LightningParams {
+    // The listening port for the p2p LN node
+    pub listening_port: u16,
+    // Printable human-readable string to describe this node to other users.
+    pub node_name: [u8; 32],
+    // Node's RGB color. This is used for showing the node in a network graph with the desired color.
+    pub node_color: [u8; 3],
+    // Invoice Payer is initialized while starting the lightning node, and it requires the number of payment retries that
+    // it should do before considering a payment failed or partially failed. If not provided the number of retries will be 5
+    // as this is a good default value.
+    pub payment_retries: Option<usize>,
+    // Node's backup path for channels and other data that requires backup.
+    pub backup_path: Option<String>,
+}
+
+pub async fn start_lightning(
+    ctx: &MmArc,
+    platform_coin: UtxoStandardCoin,
+    protocol_conf: LightningProtocolConf,
+    conf: LightningCoinConf,
+    params: LightningParams,
+) -> EnableLightningResult<LightningCoin> {
+    // Todo: add support for Hardware wallets for funding transactions and spending spendable outputs (channel closing transactions)
+    if let DerivationMethod::HDWallet(_) = platform_coin.as_ref().derivation_method {
+        return MmError::err(EnableLightningError::UnsupportedMode(
+            "'start_lightning'".into(),
+            "iguana".into(),
+        ));
+    }
+
+    let platform = Arc::new(Platform::new(
+        platform_coin.clone(),
+        protocol_conf.network.clone(),
+        protocol_conf.confirmations,
+    ));
+
+    // Initialize the Logger
+    let logger = ctx.log.0.clone();
+
+    // Initialize Persister
+    let persister = ln_utils::init_persister(ctx, platform.clone(), conf.ticker.clone(), params.backup_path).await?;
+
+    // Initialize the KeysManager
+    let keys_manager = ln_utils::init_keys_manager(ctx)?;
+
+    // Initialize the NetGraphMsgHandler. This is used for providing routes to send payments over
+    let network_graph = Arc::new(persister.get_network_graph(protocol_conf.network.into()).await?);
+    spawn(ln_utils::persist_network_graph_loop(
+        persister.clone(),
+        network_graph.clone(),
+    ));
+    let network_gossip = Arc::new(NetGraphMsgHandler::new(
+        network_graph.clone(),
+        None::<Arc<dyn Access + Send + Sync>>,
+        logger.clone(),
+    ));
+
+    // Initialize the ChannelManager
+    let (chain_monitor, channel_manager) = ln_utils::init_channel_manager(
+        platform.clone(),
+        logger.clone(),
+        persister.clone(),
+        keys_manager.clone(),
+        conf.clone().into(),
+    )
+    .await?;
+
+    // Initialize the PeerManager
+    let peer_manager = ln_p2p::init_peer_manager(
+        ctx.clone(),
+        params.listening_port,
+        channel_manager.clone(),
+        network_gossip.clone(),
+        keys_manager
+            .get_node_secret(Recipient::Node)
+            .map_to_mm(|_| EnableLightningError::UnsupportedMode("'start_lightning'".into(), "local node".into()))?,
+        logger.clone(),
+    )
+    .await?;
+
+    // Initialize the event handler
+    let event_handler = Arc::new(ln_events::LightningEventHandler::new(
+        // It's safe to use unwrap here for now until implementing Native Client for Lightning
+        platform.clone(),
+        channel_manager.clone(),
+        keys_manager.clone(),
+        persister.clone(),
+    ));
+
+    // Initialize routing Scorer
+    let scorer = Arc::new(Mutex::new(persister.get_scorer(network_graph.clone()).await?));
+    spawn(ln_utils::persist_scorer_loop(persister.clone(), scorer.clone()));
+
+    // Create InvoicePayer
+    let router = DefaultRouter::new(network_graph, logger.clone(), keys_manager.get_secure_random_bytes());
+    let invoice_payer = Arc::new(InvoicePayer::new(
+        channel_manager.clone(),
+        router,
+        scorer,
+        logger.clone(),
+        event_handler,
+        payment::RetryAttempts(params.payment_retries.unwrap_or(5)),
+    ));
+
+    // Persist ChannelManager
+    // Note: if the ChannelManager is not persisted properly to disk, there is risk of channels force closing the next time LN starts up
+    let channel_manager_persister = persister.clone();
+    let persist_channel_manager_callback =
+        move |node: &ChannelManager| channel_manager_persister.persist_manager(&*node);
+
+    // Start Background Processing. Runs tasks periodically in the background to keep LN node operational.
+    // InvoicePayer will act as our event handler as it handles some of the payments related events before
+    // delegating it to LightningEventHandler.
+    let background_processor = Arc::new(BackgroundProcessor::start(
+        persist_channel_manager_callback,
+        invoice_payer.clone(),
+        chain_monitor.clone(),
+        channel_manager.clone(),
+        Some(network_gossip),
+        peer_manager.clone(),
+        logger,
+    ));
+
+    // If channel_nodes_data file exists, read channels nodes data from disk and reconnect to channel nodes/peers if possible.
+    let open_channels_nodes = Arc::new(PaMutex::new(
+        ln_utils::get_open_channels_nodes_addresses(persister.clone(), channel_manager.clone()).await?,
+    ));
+    spawn(ln_p2p::connect_to_nodes_loop(
+        open_channels_nodes.clone(),
+        peer_manager.clone(),
+    ));
+
+    // Broadcast Node Announcement
+    spawn(ln_p2p::ln_node_announcement_loop(
+        channel_manager.clone(),
+        params.node_name,
+        params.node_color,
+        params.listening_port,
+    ));
+
+    Ok(LightningCoin {
+        platform,
+        conf,
+        peer_manager,
+        background_processor,
+        channel_manager,
+        chain_monitor,
+        keys_manager,
+        invoice_payer,
+        persister,
+        open_channels_nodes,
+    })
+}
+
+#[derive(Deserialize)]
+pub struct ConnectToNodeRequest {
+    pub coin: String,
+    pub node_address: NodeAddress,
+}
+
+/// Connect to a certain node on the lightning network.
+pub async fn connect_to_lightning_node(ctx: MmArc, req: ConnectToNodeRequest) -> ConnectToNodeResult<String> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(ConnectToNodeError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+
+    let node_pubkey = req.node_address.pubkey;
+    let node_addr = req.node_address.addr;
+    let res = connect_to_node(node_pubkey, node_addr, ln_coin.peer_manager.clone()).await?;
+
+    // If a node that we have an open channel with changed it's address, "connect_to_lightning_node"
+    // can be used to reconnect to the new address while saving this new address for reconnections.
+    if let ConnectToNodeRes::ConnectedSuccessfully { .. } = res {
+        if let Entry::Occupied(mut entry) = ln_coin.open_channels_nodes.lock().entry(node_pubkey) {
+            entry.insert(node_addr);
+        }
+        ln_coin
+            .persister
+            .save_nodes_addresses(ln_coin.open_channels_nodes)
+            .await?;
+    }
+
+    Ok(res.to_string())
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+#[serde(tag = "type", content = "value")]
+pub enum ChannelOpenAmount {
+    Exact(BigDecimal),
+    Max,
+}
+
+#[derive(Deserialize)]
+pub struct OpenChannelRequest {
+    pub coin: String,
+    pub node_address: NodeAddress,
+    pub amount: ChannelOpenAmount,
+    /// The amount to push to the counterparty as part of the open, in milli-satoshi. Creates inbound liquidity for the channel.
+    /// By setting push_msat to a value, opening channel request will be equivalent to opening a channel then sending a payment with
+    /// the push_msat amount.
+    #[serde(default)]
+    pub push_msat: u64,
+    pub channel_options: Option<ChannelOptions>,
+    pub counterparty_locktime: Option<u16>,
+    pub our_htlc_minimum_msat: Option<u64>,
+}
+
+#[derive(Serialize)]
+pub struct OpenChannelResponse {
+    rpc_channel_id: u64,
+    node_address: NodeAddress,
+}
+
+/// Opens a channel on the lightning network.
+pub async fn open_channel(ctx: MmArc, req: OpenChannelRequest) -> OpenChannelResult<OpenChannelResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(OpenChannelError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+
+    // Making sure that the node data is correct and that we can connect to it before doing more operations
+    let node_pubkey = req.node_address.pubkey;
+    let node_addr = req.node_address.addr;
+    connect_to_node(node_pubkey, node_addr, ln_coin.peer_manager.clone()).await?;
+
+    let platform_coin = ln_coin.platform_coin().clone();
+    let decimals = platform_coin.as_ref().decimals;
+    let my_address = platform_coin.as_ref().derivation_method.iguana_or_err()?;
+    let (unspents, _) = platform_coin.get_unspent_ordered_list(my_address).await?;
+    let (value, fee_policy) = match req.amount.clone() {
+        ChannelOpenAmount::Max => (
+            unspents.iter().fold(0, |sum, unspent| sum + unspent.value),
+            FeePolicy::DeductFromOutput(0),
+        ),
+        ChannelOpenAmount::Exact(v) => {
+            let value = sat_from_big_decimal(&v, decimals)?;
+            (value, FeePolicy::SendExact)
+        },
+    };
+
+    // The actual script_pubkey will replace this before signing the transaction after receiving the required
+    // output script from the other node when the channel is accepted
+    let script_pubkey =
+        Builder::build_witness_script(&AddressHashEnum::WitnessScriptHash(Default::default())).to_bytes();
+    let outputs = vec![TransactionOutput { value, script_pubkey }];
+
+    let mut tx_builder = UtxoTxBuilder::new(&platform_coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs)
+        .with_fee_policy(fee_policy);
+
+    let fee = platform_coin
+        .get_tx_fee()
+        .await
+        .map_err(|e| OpenChannelError::RpcError(e.to_string()))?;
+    tx_builder = tx_builder.with_fee(fee);
+
+    let (unsigned, _) = tx_builder.build().await?;
+
+    let amount_in_sat = unsigned.outputs[0].value;
+    let push_msat = req.push_msat;
+    let channel_manager = ln_coin.channel_manager.clone();
+
+    let mut conf = ln_coin.conf.clone();
+    if let Some(options) = req.channel_options {
+        match conf.channel_options.as_mut() {
+            Some(o) => o.update(options),
+            None => conf.channel_options = Some(options),
+        }
+    }
+
+    let mut user_config: UserConfig = conf.into();
+    if let Some(locktime) = req.counterparty_locktime {
+        user_config.own_channel_config.our_to_self_delay = locktime;
+    }
+    if let Some(min) = req.our_htlc_minimum_msat {
+        user_config.own_channel_config.our_htlc_minimum_msat = min;
+    }
+
+    let rpc_channel_id = ln_coin.persister.get_last_channel_rpc_id().await? as u64 + 1;
+
+    let temp_channel_id = async_blocking(move || {
+        channel_manager
+            .create_channel(node_pubkey, amount_in_sat, push_msat, rpc_channel_id, Some(user_config))
+            .map_to_mm(|e| OpenChannelError::FailureToOpenChannel(node_pubkey.to_string(), format!("{:?}", e)))
+    })
+    .await?;
+
+    {
+        let mut unsigned_funding_txs = ln_coin.platform.unsigned_funding_txs.lock();
+        unsigned_funding_txs.insert(rpc_channel_id, unsigned);
+    }
+
+    let pending_channel_details = SqlChannelDetails::new(
+        rpc_channel_id,
+        temp_channel_id,
+        node_pubkey,
+        true,
+        user_config.channel_options.announced_channel,
+    );
+
+    // Saving node data to reconnect to it on restart
+    ln_coin.open_channels_nodes.lock().insert(node_pubkey, node_addr);
+    ln_coin
+        .persister
+        .save_nodes_addresses(ln_coin.open_channels_nodes)
+        .await?;
+
+    ln_coin.persister.add_channel_to_db(pending_channel_details).await?;
+
+    Ok(OpenChannelResponse {
+        rpc_channel_id,
+        node_address: req.node_address,
+    })
+}
+
+#[derive(Deserialize)]
+pub struct OpenChannelsFilter {
+    pub channel_id: Option<H256Json>,
+    pub counterparty_node_id: Option<PublicKeyForRPC>,
+    pub funding_tx: Option<H256Json>,
+    pub from_funding_value_sats: Option<u64>,
+    pub to_funding_value_sats: Option<u64>,
+    pub is_outbound: Option<bool>,
+    pub from_balance_msat: Option<u64>,
+    pub to_balance_msat: Option<u64>,
+    pub from_outbound_capacity_msat: Option<u64>,
+    pub to_outbound_capacity_msat: Option<u64>,
+    pub from_inbound_capacity_msat: Option<u64>,
+    pub to_inbound_capacity_msat: Option<u64>,
+    pub confirmed: Option<bool>,
+    pub is_usable: Option<bool>,
+    pub is_public: Option<bool>,
+}
+
+fn apply_open_channel_filter(channel_details: &ChannelDetailsForRPC, filter: &OpenChannelsFilter) -> bool {
+    let is_channel_id = filter.channel_id.is_none() || Some(&channel_details.channel_id) == filter.channel_id.as_ref();
+
+    let is_counterparty_node_id = filter.counterparty_node_id.is_none()
+        || Some(&channel_details.counterparty_node_id) == filter.counterparty_node_id.as_ref();
+
+    let is_funding_tx = filter.funding_tx.is_none() || channel_details.funding_tx == filter.funding_tx;
+
+    let is_from_funding_value_sats =
+        Some(&channel_details.funding_tx_value_sats) >= filter.from_funding_value_sats.as_ref();
+
+    let is_to_funding_value_sats = filter.to_funding_value_sats.is_none()
+        || Some(&channel_details.funding_tx_value_sats) <= filter.to_funding_value_sats.as_ref();
+
+    let is_outbound = filter.is_outbound.is_none() || Some(&channel_details.is_outbound) == filter.is_outbound.as_ref();
+
+    let is_from_balance_msat = Some(&channel_details.balance_msat) >= filter.from_balance_msat.as_ref();
+
+    let is_to_balance_msat =
+        filter.to_balance_msat.is_none() || Some(&channel_details.balance_msat) <= filter.to_balance_msat.as_ref();
+
+    let is_from_outbound_capacity_msat =
+        Some(&channel_details.outbound_capacity_msat) >= filter.from_outbound_capacity_msat.as_ref();
+
+    let is_to_outbound_capacity_msat = filter.to_outbound_capacity_msat.is_none()
+        || Some(&channel_details.outbound_capacity_msat) <= filter.to_outbound_capacity_msat.as_ref();
+
+    let is_from_inbound_capacity_msat =
+        Some(&channel_details.inbound_capacity_msat) >= filter.from_inbound_capacity_msat.as_ref();
+
+    let is_to_inbound_capacity_msat = filter.to_inbound_capacity_msat.is_none()
+        || Some(&channel_details.inbound_capacity_msat) <= filter.to_inbound_capacity_msat.as_ref();
+
+    let is_confirmed = filter.confirmed.is_none() || Some(&channel_details.confirmed) == filter.confirmed.as_ref();
+
+    let is_usable = filter.is_usable.is_none() || Some(&channel_details.is_usable) == filter.is_usable.as_ref();
+
+    let is_public = filter.is_public.is_none() || Some(&channel_details.is_public) == filter.is_public.as_ref();
+
+    is_channel_id
+        && is_counterparty_node_id
+        && is_funding_tx
+        && is_from_funding_value_sats
+        && is_to_funding_value_sats
+        && is_outbound
+        && is_from_balance_msat
+        && is_to_balance_msat
+        && is_from_outbound_capacity_msat
+        && is_to_outbound_capacity_msat
+        && is_from_inbound_capacity_msat
+        && is_to_inbound_capacity_msat
+        && is_confirmed
+        && is_usable
+        && is_public
+}
+
+#[derive(Deserialize)]
+pub struct ListOpenChannelsRequest {
+    pub coin: String,
+    pub filter: Option<OpenChannelsFilter>,
+    #[serde(default = "ten")]
+    limit: usize,
+    #[serde(default)]
+    paging_options: PagingOptionsEnum<u64>,
+}
+
+#[derive(Clone, Serialize)]
+pub struct ChannelDetailsForRPC {
+    pub rpc_channel_id: u64,
+    pub channel_id: H256Json,
+    pub counterparty_node_id: PublicKeyForRPC,
+    pub funding_tx: Option<H256Json>,
+    pub funding_tx_output_index: Option<u16>,
+    pub funding_tx_value_sats: u64,
+    /// True if the channel was initiated (and thus funded) by us.
+    pub is_outbound: bool,
+    pub balance_msat: u64,
+    pub outbound_capacity_msat: u64,
+    pub inbound_capacity_msat: u64,
+    // Channel is confirmed onchain, this means that funding_locked messages have been exchanged,
+    // the channel is not currently being shut down, and the required confirmation count has been reached.
+    pub confirmed: bool,
+    // Channel is confirmed and funding_locked messages have been exchanged, the peer is connected,
+    // and the channel is not currently negotiating a shutdown.
+    pub is_usable: bool,
+    // A publicly-announced channel.
+    pub is_public: bool,
+}
+
+impl From<ChannelDetails> for ChannelDetailsForRPC {
+    fn from(details: ChannelDetails) -> ChannelDetailsForRPC {
+        ChannelDetailsForRPC {
+            rpc_channel_id: details.user_channel_id,
+            channel_id: details.channel_id.into(),
+            counterparty_node_id: PublicKeyForRPC(details.counterparty.node_id),
+            funding_tx: details.funding_txo.map(|tx| h256_json_from_txid(tx.txid)),
+            funding_tx_output_index: details.funding_txo.map(|tx| tx.index),
+            funding_tx_value_sats: details.channel_value_satoshis,
+            is_outbound: details.is_outbound,
+            balance_msat: details.balance_msat,
+            outbound_capacity_msat: details.outbound_capacity_msat,
+            inbound_capacity_msat: details.inbound_capacity_msat,
+            confirmed: details.is_funding_locked,
+            is_usable: details.is_usable,
+            is_public: details.is_public,
+        }
+    }
+}
+
+struct GetOpenChannelsResult {
+    pub channels: Vec<ChannelDetailsForRPC>,
+    pub skipped: usize,
+    pub total: usize,
+}
+
+#[derive(Serialize)]
+pub struct ListOpenChannelsResponse {
+    open_channels: Vec<ChannelDetailsForRPC>,
+    limit: usize,
+    skipped: usize,
+    total: usize,
+    total_pages: usize,
+    paging_options: PagingOptionsEnum<u64>,
+}
+
+pub async fn list_open_channels_by_filter(
+    ctx: MmArc,
+    req: ListOpenChannelsRequest,
+) -> ListChannelsResult<ListOpenChannelsResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(ListChannelsError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+
+    let result = ln_coin
+        .get_open_channels_by_filter(req.filter, req.paging_options.clone(), req.limit)
+        .await?;
+
+    Ok(ListOpenChannelsResponse {
+        open_channels: result.channels,
+        limit: req.limit,
+        skipped: result.skipped,
+        total: result.total,
+        total_pages: calc_total_pages(result.total, req.limit),
+        paging_options: req.paging_options,
+    })
+}
+
+#[derive(Deserialize)]
+pub struct ListClosedChannelsRequest {
+    pub coin: String,
+    pub filter: Option<ClosedChannelsFilter>,
+    #[serde(default = "ten")]
+    limit: usize,
+    #[serde(default)]
+    paging_options: PagingOptionsEnum<u64>,
+}
+
+#[derive(Serialize)]
+pub struct ListClosedChannelsResponse {
+    closed_channels: Vec<SqlChannelDetails>,
+    limit: usize,
+    skipped: usize,
+    total: usize,
+    total_pages: usize,
+    paging_options: PagingOptionsEnum<u64>,
+}
+
+pub async fn list_closed_channels_by_filter(
+    ctx: MmArc,
+    req: ListClosedChannelsRequest,
+) -> ListChannelsResult<ListClosedChannelsResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(ListChannelsError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+    let closed_channels_res = ln_coin
+        .persister
+        .get_closed_channels_by_filter(req.filter, req.paging_options.clone(), req.limit)
+        .await?;
+
+    Ok(ListClosedChannelsResponse {
+        closed_channels: closed_channels_res.channels,
+        limit: req.limit,
+        skipped: closed_channels_res.skipped,
+        total: closed_channels_res.total,
+        total_pages: calc_total_pages(closed_channels_res.total, req.limit),
+        paging_options: req.paging_options,
+    })
+}
+
+#[derive(Deserialize)]
+pub struct GetChannelDetailsRequest {
+    pub coin: String,
+    pub rpc_channel_id: u64,
+}
+
+#[derive(Serialize)]
+#[serde(tag = "status", content = "details")]
+pub enum GetChannelDetailsResponse {
+    Open(ChannelDetailsForRPC),
+    Closed(SqlChannelDetails),
+}
+
+pub async fn get_channel_details(
+    ctx: MmArc,
+    req: GetChannelDetailsRequest,
+) -> GetChannelDetailsResult<GetChannelDetailsResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(GetChannelDetailsError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+    let channel_details = match ln_coin
+        .channel_manager
+        .list_channels()
+        .into_iter()
+        .find(|chan| chan.user_channel_id == req.rpc_channel_id)
+    {
+        Some(details) => GetChannelDetailsResponse::Open(details.into()),
+        None => GetChannelDetailsResponse::Closed(
+            ln_coin
+                .persister
+                .get_channel_from_db(req.rpc_channel_id)
+                .await?
+                .ok_or(GetChannelDetailsError::NoSuchChannel(req.rpc_channel_id))?,
+        ),
+    };
+
+    Ok(channel_details)
+}
+
+#[derive(Deserialize)]
+pub struct GenerateInvoiceRequest {
+    pub coin: String,
+    pub amount_in_msat: Option<u64>,
+    pub description: String,
+}
+
+#[derive(Serialize)]
+pub struct GenerateInvoiceResponse {
+    payment_hash: H256Json,
+    invoice: InvoiceForRPC,
+}
+
+/// Generates an invoice (request for payment) that can be paid on the lightning network by another node using send_payment.
+pub async fn generate_invoice(
+    ctx: MmArc,
+    req: GenerateInvoiceRequest,
+) -> GenerateInvoiceResult<GenerateInvoiceResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(GenerateInvoiceError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+    let open_channels_nodes = ln_coin.open_channels_nodes.lock().clone();
+    for (node_pubkey, node_addr) in open_channels_nodes {
+        connect_to_node(node_pubkey, node_addr, ln_coin.peer_manager.clone())
+            .await
+            .error_log_with_msg(&format!(
+                "Channel with node: {} can't be used for invoice routing hints due to connection error.",
+                node_pubkey
+            ));
+    }
+    let network = ln_coin.platform.network.clone().into();
+    let invoice = create_invoice_from_channelmanager(
+        &ln_coin.channel_manager,
+        ln_coin.keys_manager,
+        network,
+        req.amount_in_msat,
+        req.description.clone(),
+    )?;
+    let payment_hash = invoice.payment_hash().into_inner();
+    let payment_info = PaymentInfo {
+        payment_hash: PaymentHash(payment_hash),
+        payment_type: PaymentType::InboundPayment,
+        description: req.description,
+        preimage: None,
+        secret: Some(*invoice.payment_secret()),
+        amt_msat: req.amount_in_msat,
+        fee_paid_msat: None,
+        status: HTLCStatus::Pending,
+        created_at: now_ms() / 1000,
+        last_updated: now_ms() / 1000,
+    };
+    ln_coin.persister.add_or_update_payment_in_db(payment_info).await?;
+    Ok(GenerateInvoiceResponse {
+        payment_hash: payment_hash.into(),
+        invoice: invoice.into(),
+    })
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+#[serde(tag = "type")]
+pub enum Payment {
+    #[serde(rename = "invoice")]
+    Invoice { invoice: InvoiceForRPC },
+    #[serde(rename = "keysend")]
+    Keysend {
+        // The recieving node pubkey (node ID)
+        destination: PublicKeyForRPC,
+        // Amount to send in millisatoshis
+        amount_in_msat: u64,
+        // The number of blocks the payment will be locked for if not claimed by the destination,
+        // It's can be assumed that 6 blocks = 1 hour. We can claim the payment amount back after this cltv expires.
+        // Minmum value allowed is MIN_FINAL_CLTV_EXPIRY which is currently 24 for rust-lightning.
+        expiry: u32,
+    },
+}
+
+#[derive(Deserialize)]
+pub struct SendPaymentReq {
+    pub coin: String,
+    pub payment: Payment,
+}
+
+#[derive(Serialize)]
+pub struct SendPaymentResponse {
+    payment_hash: H256Json,
+}
+
+pub async fn send_payment(ctx: MmArc, req: SendPaymentReq) -> SendPaymentResult<SendPaymentResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(SendPaymentError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+    let open_channels_nodes = ln_coin.open_channels_nodes.lock().clone();
+    for (node_pubkey, node_addr) in open_channels_nodes {
+        connect_to_node(node_pubkey, node_addr, ln_coin.peer_manager.clone())
+            .await
+            .error_log_with_msg(&format!(
+                "Channel with node: {} can't be used to route this payment due to connection error.",
+                node_pubkey
+            ));
+    }
+    let payment_info = match req.payment {
+        Payment::Invoice { invoice } => ln_coin.pay_invoice(invoice.into())?,
+        Payment::Keysend {
+            destination,
+            amount_in_msat,
+            expiry,
+        } => ln_coin.keysend(destination.into(), amount_in_msat, expiry)?,
+    };
+    ln_coin
+        .persister
+        .add_or_update_payment_in_db(payment_info.clone())
+        .await?;
+    Ok(SendPaymentResponse {
+        payment_hash: payment_info.payment_hash.0.into(),
+    })
+}
+
+#[derive(Deserialize)]
+pub struct PaymentsFilterForRPC {
+    pub payment_type: Option<PaymentTypeForRPC>,
+    pub description: Option<String>,
+    pub status: Option<HTLCStatus>,
+    pub from_amount_msat: Option<u64>,
+    pub to_amount_msat: Option<u64>,
+    pub from_fee_paid_msat: Option<u64>,
+    pub to_fee_paid_msat: Option<u64>,
+    pub from_timestamp: Option<u64>,
+    pub to_timestamp: Option<u64>,
+}
+
+impl From<PaymentsFilterForRPC> for PaymentsFilter {
+    fn from(filter: PaymentsFilterForRPC) -> Self {
+        PaymentsFilter {
+            payment_type: filter.payment_type.map(From::from),
+            description: filter.description,
+            status: filter.status,
+            from_amount_msat: filter.from_amount_msat,
+            to_amount_msat: filter.to_amount_msat,
+            from_fee_paid_msat: filter.from_fee_paid_msat,
+            to_fee_paid_msat: filter.to_fee_paid_msat,
+            from_timestamp: filter.from_timestamp,
+            to_timestamp: filter.to_timestamp,
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct ListPaymentsReq {
+    pub coin: String,
+    pub filter: Option<PaymentsFilterForRPC>,
+    #[serde(default = "ten")]
+    limit: usize,
+    #[serde(default)]
+    paging_options: PagingOptionsEnum<H256Json>,
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(tag = "type")]
+pub enum PaymentTypeForRPC {
+    #[serde(rename = "Outbound Payment")]
+    OutboundPayment { destination: PublicKeyForRPC },
+    #[serde(rename = "Inbound Payment")]
+    InboundPayment,
+}
+
+impl From<PaymentType> for PaymentTypeForRPC {
+    fn from(payment_type: PaymentType) -> Self {
+        match payment_type {
+            PaymentType::OutboundPayment { destination } => PaymentTypeForRPC::OutboundPayment {
+                destination: PublicKeyForRPC(destination),
+            },
+            PaymentType::InboundPayment => PaymentTypeForRPC::InboundPayment,
+        }
+    }
+}
+
+impl From<PaymentTypeForRPC> for PaymentType {
+    fn from(payment_type: PaymentTypeForRPC) -> Self {
+        match payment_type {
+            PaymentTypeForRPC::OutboundPayment { destination } => PaymentType::OutboundPayment {
+                destination: destination.into(),
+            },
+            PaymentTypeForRPC::InboundPayment => PaymentType::InboundPayment,
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct PaymentInfoForRPC {
+    payment_hash: H256Json,
+    payment_type: PaymentTypeForRPC,
+    description: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    amount_in_msat: Option<u64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    fee_paid_msat: Option<u64>,
+    status: HTLCStatus,
+    created_at: u64,
+    last_updated: u64,
+}
+
+impl From<PaymentInfo> for PaymentInfoForRPC {
+    fn from(info: PaymentInfo) -> Self {
+        PaymentInfoForRPC {
+            payment_hash: info.payment_hash.0.into(),
+            payment_type: info.payment_type.into(),
+            description: info.description,
+            amount_in_msat: info.amt_msat,
+            fee_paid_msat: info.fee_paid_msat,
+            status: info.status,
+            created_at: info.created_at,
+            last_updated: info.last_updated,
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct ListPaymentsResponse {
+    payments: Vec<PaymentInfoForRPC>,
+    limit: usize,
+    skipped: usize,
+    total: usize,
+    total_pages: usize,
+    paging_options: PagingOptionsEnum<H256Json>,
+}
+
+pub async fn list_payments_by_filter(ctx: MmArc, req: ListPaymentsReq) -> ListPaymentsResult<ListPaymentsResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(ListPaymentsError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+    let get_payments_res = ln_coin
+        .persister
+        .get_payments_by_filter(
+            req.filter.map(From::from),
+            req.paging_options.clone().map(|h| PaymentHash(h.0)),
+            req.limit,
+        )
+        .await?;
+
+    Ok(ListPaymentsResponse {
+        payments: get_payments_res.payments.into_iter().map(From::from).collect(),
+        limit: req.limit,
+        skipped: get_payments_res.skipped,
+        total: get_payments_res.total,
+        total_pages: calc_total_pages(get_payments_res.total, req.limit),
+        paging_options: req.paging_options,
+    })
+}
+
+#[derive(Deserialize)]
+pub struct GetPaymentDetailsRequest {
+    pub coin: String,
+    pub payment_hash: H256Json,
+}
+
+#[derive(Serialize)]
+pub struct GetPaymentDetailsResponse {
+    payment_details: PaymentInfoForRPC,
+}
+
+pub async fn get_payment_details(
+    ctx: MmArc,
+    req: GetPaymentDetailsRequest,
+) -> GetPaymentDetailsResult<GetPaymentDetailsResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(GetPaymentDetailsError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+
+    if let Some(payment_info) = ln_coin
+        .persister
+        .get_payment_from_db(PaymentHash(req.payment_hash.0))
+        .await?
+    {
+        return Ok(GetPaymentDetailsResponse {
+            payment_details: payment_info.into(),
+        });
+    }
+
+    MmError::err(GetPaymentDetailsError::NoSuchPayment(req.payment_hash))
+}
+
+#[derive(Deserialize)]
+pub struct CloseChannelReq {
+    pub coin: String,
+    pub channel_id: H256Json,
+    #[serde(default)]
+    pub force_close: bool,
+}
+
+pub async fn close_channel(ctx: MmArc, req: CloseChannelReq) -> CloseChannelResult<String> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(CloseChannelError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+    if req.force_close {
+        ln_coin
+            .channel_manager
+            .force_close_channel(&req.channel_id.0)
+            .map_to_mm(|e| CloseChannelError::CloseChannelError(format!("{:?}", e)))?;
+    } else {
+        ln_coin
+            .channel_manager
+            .close_channel(&req.channel_id.0)
+            .map_to_mm(|e| CloseChannelError::CloseChannelError(format!("{:?}", e)))?;
+    }
+
+    Ok(format!("Initiated closing of channel: {:?}", req.channel_id))
+}
+
+/// Details about the balance(s) available for spending once the channel appears on chain.
+#[derive(Serialize)]
+pub enum ClaimableBalance {
+    /// The channel is not yet closed (or the commitment or closing transaction has not yet
+    /// appeared in a block). The given balance is claimable (less on-chain fees) if the channel is
+    /// force-closed now.
+    ClaimableOnChannelClose {
+        /// The amount available to claim, in satoshis, excluding the on-chain fees which will be
+        /// required to do so.
+        claimable_amount_satoshis: u64,
+    },
+    /// The channel has been closed, and the given balance is ours but awaiting confirmations until
+    /// we consider it spendable.
+    ClaimableAwaitingConfirmations {
+        /// The amount available to claim, in satoshis, possibly excluding the on-chain fees which
+        /// were spent in broadcasting the transaction.
+        claimable_amount_satoshis: u64,
+        /// The height at which an [`Event::SpendableOutputs`] event will be generated for this
+        /// amount.
+        confirmation_height: u32,
+    },
+    /// The channel has been closed, and the given balance should be ours but awaiting spending
+    /// transaction confirmation. If the spending transaction does not confirm in time, it is
+    /// possible our counterparty can take the funds by broadcasting an HTLC timeout on-chain.
+    ///
+    /// Once the spending transaction confirms, before it has reached enough confirmations to be
+    /// considered safe from chain reorganizations, the balance will instead be provided via
+    /// [`Balance::ClaimableAwaitingConfirmations`].
+    ContentiousClaimable {
+        /// The amount available to claim, in satoshis, excluding the on-chain fees which will be
+        /// required to do so.
+        claimable_amount_satoshis: u64,
+        /// The height at which the counterparty may be able to claim the balance if we have not
+        /// done so.
+        timeout_height: u32,
+    },
+    /// HTLCs which we sent to our counterparty which are claimable after a timeout (less on-chain
+    /// fees) if the counterparty does not know the preimage for the HTLCs. These are somewhat
+    /// likely to be claimed by our counterparty before we do.
+    MaybeClaimableHTLCAwaitingTimeout {
+        /// The amount available to claim, in satoshis, excluding the on-chain fees which will be
+        /// required to do so.
+        claimable_amount_satoshis: u64,
+        /// The height at which we will be able to claim the balance if our counterparty has not
+        /// done so.
+        claimable_height: u32,
+    },
+}
+
+impl From<Balance> for ClaimableBalance {
+    fn from(balance: Balance) -> Self {
+        match balance {
+            Balance::ClaimableOnChannelClose {
+                claimable_amount_satoshis,
+            } => ClaimableBalance::ClaimableOnChannelClose {
+                claimable_amount_satoshis,
+            },
+            Balance::ClaimableAwaitingConfirmations {
+                claimable_amount_satoshis,
+                confirmation_height,
+            } => ClaimableBalance::ClaimableAwaitingConfirmations {
+                claimable_amount_satoshis,
+                confirmation_height,
+            },
+            Balance::ContentiousClaimable {
+                claimable_amount_satoshis,
+                timeout_height,
+            } => ClaimableBalance::ContentiousClaimable {
+                claimable_amount_satoshis,
+                timeout_height,
+            },
+            Balance::MaybeClaimableHTLCAwaitingTimeout {
+                claimable_amount_satoshis,
+                claimable_height,
+            } => ClaimableBalance::MaybeClaimableHTLCAwaitingTimeout {
+                claimable_amount_satoshis,
+                claimable_height,
+            },
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct ClaimableBalancesReq {
+    pub coin: String,
+    #[serde(default)]
+    pub include_open_channels_balances: bool,
+}
+
+pub async fn get_claimable_balances(
+    ctx: MmArc,
+    req: ClaimableBalancesReq,
+) -> ClaimableBalancesResult<Vec<ClaimableBalance>> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let ln_coin = match coin {
+        MmCoinEnum::LightningCoin(c) => c,
+        _ => return MmError::err(ClaimableBalancesError::UnsupportedCoin(coin.ticker().to_string())),
+    };
+    let ignored_channels = if req.include_open_channels_balances {
+        Vec::new()
+    } else {
+        ln_coin.channel_manager.list_channels()
+    };
+    let claimable_balances = ln_coin
+        .chain_monitor
+        .get_claimable_balances(&ignored_channels.iter().collect::<Vec<_>>()[..])
+        .into_iter()
+        .map(From::from)
+        .collect();
+
+    Ok(claimable_balances)
+}
diff --git a/mm2src/coins/lightning/ln_conf.rs b/mm2src/coins/lightning/ln_conf.rs
new file mode 100644
index 0000000000..f69a9bca10
--- /dev/null
+++ b/mm2src/coins/lightning/ln_conf.rs
@@ -0,0 +1,250 @@
+use crate::utxo::BlockchainNetwork;
+use lightning::util::config::{ChannelConfig, ChannelHandshakeConfig, ChannelHandshakeLimits, UserConfig};
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct DefaultFeesAndConfirmations {
+    pub default_fee_per_kb: u64,
+    pub n_blocks: u32,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct PlatformCoinConfirmations {
+    pub background: DefaultFeesAndConfirmations,
+    pub normal: DefaultFeesAndConfirmations,
+    pub high_priority: DefaultFeesAndConfirmations,
+}
+
+#[derive(Debug)]
+pub struct LightningProtocolConf {
+    pub platform_coin_ticker: String,
+    pub network: BlockchainNetwork,
+    pub confirmations: PlatformCoinConfirmations,
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+pub struct ChannelOptions {
+    /// Amount (in millionths of a satoshi) charged per satoshi for payments forwarded outbound
+    /// over the channel.
+    pub proportional_fee_in_millionths_sats: Option<u32>,
+    /// Amount (in milli-satoshi) charged for payments forwarded outbound over the channel, in
+    /// excess of proportional_fee_in_millionths_sats.
+    pub base_fee_msat: Option<u32>,
+    pub cltv_expiry_delta: Option<u16>,
+    /// Set to announce the channel publicly and notify all nodes that they can route via this
+    /// channel.
+    pub announced_channel: Option<bool>,
+    /// When set, we commit to an upfront shutdown_pubkey at channel open.
+    pub commit_upfront_shutdown_pubkey: Option<bool>,
+    /// Limit our total exposure to in-flight HTLCs which are burned to fees as they are too
+    /// small to claim on-chain.
+    pub max_dust_htlc_exposure_msat: Option<u64>,
+    /// The additional fee we're willing to pay to avoid waiting for the counterparty's
+    /// locktime to reclaim funds.
+    pub force_close_avoidance_max_fee_sats: Option<u64>,
+}
+
+impl ChannelOptions {
+    pub fn update(&mut self, options: ChannelOptions) {
+        if let Some(fee) = options.proportional_fee_in_millionths_sats {
+            self.proportional_fee_in_millionths_sats = Some(fee);
+        }
+
+        if let Some(fee) = options.base_fee_msat {
+            self.base_fee_msat = Some(fee);
+        }
+
+        if let Some(expiry) = options.cltv_expiry_delta {
+            self.cltv_expiry_delta = Some(expiry);
+        }
+
+        if let Some(announce) = options.announced_channel {
+            self.announced_channel = Some(announce);
+        }
+
+        if let Some(commit) = options.commit_upfront_shutdown_pubkey {
+            self.commit_upfront_shutdown_pubkey = Some(commit);
+        }
+
+        if let Some(dust) = options.max_dust_htlc_exposure_msat {
+            self.max_dust_htlc_exposure_msat = Some(dust);
+        }
+
+        if let Some(fee) = options.force_close_avoidance_max_fee_sats {
+            self.force_close_avoidance_max_fee_sats = Some(fee);
+        }
+    }
+}
+
+impl From<ChannelOptions> for ChannelConfig {
+    fn from(options: ChannelOptions) -> Self {
+        let mut channel_config = ChannelConfig::default();
+
+        if let Some(fee) = options.proportional_fee_in_millionths_sats {
+            channel_config.forwarding_fee_proportional_millionths = fee;
+        }
+
+        if let Some(fee) = options.base_fee_msat {
+            channel_config.forwarding_fee_base_msat = fee;
+        }
+
+        if let Some(expiry) = options.cltv_expiry_delta {
+            channel_config.cltv_expiry_delta = expiry;
+        }
+
+        if let Some(announce) = options.announced_channel {
+            channel_config.announced_channel = announce;
+        }
+
+        if let Some(commit) = options.commit_upfront_shutdown_pubkey {
+            channel_config.commit_upfront_shutdown_pubkey = commit;
+        }
+
+        if let Some(dust) = options.max_dust_htlc_exposure_msat {
+            channel_config.max_dust_htlc_exposure_msat = dust;
+        }
+
+        if let Some(fee) = options.force_close_avoidance_max_fee_sats {
+            channel_config.force_close_avoidance_max_fee_satoshis = fee;
+        }
+
+        channel_config
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct OurChannelsConfig {
+    /// Confirmations we will wait for before considering an inbound channel locked in.
+    pub inbound_channels_confirmations: Option<u32>,
+    /// The number of blocks we require our counterparty to wait to claim their money on chain
+    /// if they broadcast a revoked transaction. We have to be online at least once during this time to
+    /// punish our counterparty for broadcasting a revoked transaction.
+    /// We have to account also for the time to broadcast and confirm our transaction,
+    /// possibly with time in between to RBF (Replace-By-Fee) the spending transaction.
+    pub counterparty_locktime: Option<u16>,
+    /// The smallest value HTLC we will accept to process. The channel gets closed any time
+    /// our counterparty misbehaves by sending us an HTLC with a value smaller than this.
+    pub our_htlc_minimum_msat: Option<u64>,
+}
+
+impl From<OurChannelsConfig> for ChannelHandshakeConfig {
+    fn from(config: OurChannelsConfig) -> Self {
+        let mut channel_handshake_config = ChannelHandshakeConfig::default();
+
+        if let Some(confs) = config.inbound_channels_confirmations {
+            channel_handshake_config.minimum_depth = confs;
+        }
+
+        if let Some(delay) = config.counterparty_locktime {
+            channel_handshake_config.our_to_self_delay = delay;
+        }
+
+        if let Some(min) = config.our_htlc_minimum_msat {
+            channel_handshake_config.our_htlc_minimum_msat = min;
+        }
+
+        channel_handshake_config
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct CounterpartyLimits {
+    /// Minimum allowed satoshis when an inbound channel is funded.
+    pub min_funding_sats: Option<u64>,
+    /// The remote node sets a limit on the minimum size of HTLCs we can send to them. This allows
+    /// us to limit the maximum minimum-size they can require.
+    pub max_htlc_minimum_msat: Option<u64>,
+    /// The remote node sets a limit on the maximum value of pending HTLCs to them at any given
+    /// time to limit their funds exposure to HTLCs. This allows us to set a minimum such value.
+    pub min_max_htlc_value_in_flight_msat: Option<u64>,
+    /// The remote node will require us to keep a certain amount in direct payment to ourselves at all
+    /// time, ensuring that we are able to be punished if we broadcast an old state. This allows us
+    /// to limit the amount which we will have to keep to ourselves (and cannot use for HTLCs).
+    pub max_channel_reserve_sats: Option<u64>,
+    /// The remote node sets a limit on the maximum number of pending HTLCs to them at any given
+    /// time. This allows us to set a minimum such value.
+    pub min_max_accepted_htlcs: Option<u16>,
+    /// This config allows us to set a limit on the maximum confirmations to wait before the outbound channel is usable.
+    pub outbound_channels_confirmations: Option<u32>,
+    /// Set to force an incoming channel to match our announced channel preference in ChannelOptions announced_channel.
+    pub force_announced_channel_preference: Option<bool>,
+    /// Set to the amount of time we're willing to wait to claim money back to us.
+    pub our_locktime_limit: Option<u16>,
+}
+
+impl From<CounterpartyLimits> for ChannelHandshakeLimits {
+    fn from(limits: CounterpartyLimits) -> Self {
+        let mut channel_handshake_limits = ChannelHandshakeLimits::default();
+
+        if let Some(sats) = limits.min_funding_sats {
+            channel_handshake_limits.min_funding_satoshis = sats;
+        }
+
+        if let Some(msat) = limits.max_htlc_minimum_msat {
+            channel_handshake_limits.max_htlc_minimum_msat = msat;
+        }
+
+        if let Some(msat) = limits.min_max_htlc_value_in_flight_msat {
+            channel_handshake_limits.min_max_htlc_value_in_flight_msat = msat;
+        }
+
+        if let Some(sats) = limits.max_channel_reserve_sats {
+            channel_handshake_limits.max_channel_reserve_satoshis = sats;
+        }
+
+        if let Some(min) = limits.min_max_accepted_htlcs {
+            channel_handshake_limits.min_max_accepted_htlcs = min;
+        }
+
+        if let Some(confs) = limits.outbound_channels_confirmations {
+            channel_handshake_limits.max_minimum_depth = confs;
+        }
+
+        if let Some(pref) = limits.force_announced_channel_preference {
+            channel_handshake_limits.force_announced_channel_preference = pref;
+        }
+
+        if let Some(blocks) = limits.our_locktime_limit {
+            channel_handshake_limits.their_to_self_delay = blocks;
+        }
+
+        channel_handshake_limits
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct LightningCoinConf {
+    #[serde(rename = "coin")]
+    pub ticker: String,
+    pub decimals: u8,
+    pub accept_inbound_channels: Option<bool>,
+    pub accept_forwards_to_priv_channels: Option<bool>,
+    pub channel_options: Option<ChannelOptions>,
+    pub our_channels_config: Option<OurChannelsConfig>,
+    pub counterparty_channel_config_limits: Option<CounterpartyLimits>,
+    pub sign_message_prefix: Option<String>,
+}
+
+impl From<LightningCoinConf> for UserConfig {
+    fn from(conf: LightningCoinConf) -> Self {
+        let mut user_config = UserConfig::default();
+        if let Some(config) = conf.our_channels_config {
+            user_config.own_channel_config = config.into();
+        }
+        if let Some(limits) = conf.counterparty_channel_config_limits {
+            user_config.peer_channel_config_limits = limits.into();
+        }
+        if let Some(options) = conf.channel_options {
+            user_config.channel_options = options.into();
+        }
+        if let Some(accept_forwards) = conf.accept_forwards_to_priv_channels {
+            user_config.accept_forwards_to_priv_channels = accept_forwards;
+        }
+        if let Some(accept_inbound) = conf.accept_inbound_channels {
+            user_config.accept_inbound_channels = accept_inbound;
+        }
+        // This allows OpenChannelRequest event to be fired
+        user_config.manually_accept_inbound_channels = true;
+
+        user_config
+    }
+}
diff --git a/mm2src/coins/lightning/ln_errors.rs b/mm2src/coins/lightning/ln_errors.rs
new file mode 100644
index 0000000000..72b581f647
--- /dev/null
+++ b/mm2src/coins/lightning/ln_errors.rs
@@ -0,0 +1,561 @@
+use crate::utxo::rpc_clients::UtxoRpcError;
+use crate::utxo::GenerateTxError;
+use crate::{BalanceError, CoinFindError, NumConversError, PrivKeyNotAllowed, UnexpectedDerivationMethod};
+use bitcoin::consensus::encode;
+use common::jsonrpc_client::JsonRpcError;
+use common::HttpStatusCode;
+use db_common::sqlite::rusqlite::Error as SqlError;
+use derive_more::Display;
+use http::StatusCode;
+use lightning_invoice::SignOrCreationError;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::H256 as H256Json;
+use utxo_signer::with_key_pair::UtxoSignWithKeyPairError;
+
+pub type EnableLightningResult<T> = Result<T, MmError<EnableLightningError>>;
+pub type ConnectToNodeResult<T> = Result<T, MmError<ConnectToNodeError>>;
+pub type OpenChannelResult<T> = Result<T, MmError<OpenChannelError>>;
+pub type ListChannelsResult<T> = Result<T, MmError<ListChannelsError>>;
+pub type GetChannelDetailsResult<T> = Result<T, MmError<GetChannelDetailsError>>;
+pub type GenerateInvoiceResult<T> = Result<T, MmError<GenerateInvoiceError>>;
+pub type SendPaymentResult<T> = Result<T, MmError<SendPaymentError>>;
+pub type ListPaymentsResult<T> = Result<T, MmError<ListPaymentsError>>;
+pub type GetPaymentDetailsResult<T> = Result<T, MmError<GetPaymentDetailsError>>;
+pub type CloseChannelResult<T> = Result<T, MmError<CloseChannelError>>;
+pub type ClaimableBalancesResult<T> = Result<T, MmError<ClaimableBalancesError>>;
+pub type SaveChannelClosingResult<T> = Result<T, MmError<SaveChannelClosingError>>;
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum EnableLightningError {
+    #[display(fmt = "Invalid request: {}", _0)]
+    InvalidRequest(String),
+    #[display(fmt = "Invalid configuration: {}", _0)]
+    InvalidConfiguration(String),
+    #[display(fmt = "{} is only supported in {} mode", _0, _1)]
+    UnsupportedMode(String, String),
+    #[display(fmt = "I/O error {}", _0)]
+    IOError(String),
+    #[display(fmt = "Invalid address: {}", _0)]
+    InvalidAddress(String),
+    #[display(fmt = "Invalid path: {}", _0)]
+    InvalidPath(String),
+    #[display(fmt = "System time error {}", _0)]
+    SystemTimeError(String),
+    #[display(fmt = "Hash error {}", _0)]
+    HashError(String),
+    #[display(fmt = "RPC error {}", _0)]
+    RpcError(String),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+    ConnectToNodeError(String),
+}
+
+impl HttpStatusCode for EnableLightningError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            EnableLightningError::InvalidRequest(_) | EnableLightningError::RpcError(_) => StatusCode::BAD_REQUEST,
+            EnableLightningError::UnsupportedMode(_, _) => StatusCode::NOT_IMPLEMENTED,
+            EnableLightningError::InvalidAddress(_)
+            | EnableLightningError::InvalidPath(_)
+            | EnableLightningError::SystemTimeError(_)
+            | EnableLightningError::IOError(_)
+            | EnableLightningError::HashError(_)
+            | EnableLightningError::ConnectToNodeError(_)
+            | EnableLightningError::InvalidConfiguration(_)
+            | EnableLightningError::DbError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<std::io::Error> for EnableLightningError {
+    fn from(err: std::io::Error) -> EnableLightningError { EnableLightningError::IOError(err.to_string()) }
+}
+
+impl From<SqlError> for EnableLightningError {
+    fn from(err: SqlError) -> EnableLightningError { EnableLightningError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum ConnectToNodeError {
+    #[display(fmt = "Parse error: {}", _0)]
+    ParseError(String),
+    #[display(fmt = "Error connecting to node: {}", _0)]
+    ConnectionError(String),
+    #[display(fmt = "I/O error {}", _0)]
+    IOError(String),
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+}
+
+impl HttpStatusCode for ConnectToNodeError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            ConnectToNodeError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            ConnectToNodeError::ParseError(_)
+            | ConnectToNodeError::IOError(_)
+            | ConnectToNodeError::ConnectionError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            ConnectToNodeError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+        }
+    }
+}
+
+impl From<ConnectToNodeError> for EnableLightningError {
+    fn from(err: ConnectToNodeError) -> EnableLightningError {
+        EnableLightningError::ConnectToNodeError(err.to_string())
+    }
+}
+
+impl From<CoinFindError> for ConnectToNodeError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => ConnectToNodeError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<std::io::Error> for ConnectToNodeError {
+    fn from(err: std::io::Error) -> ConnectToNodeError { ConnectToNodeError::IOError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum OpenChannelError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "Balance Error {}", _0)]
+    BalanceError(String),
+    #[display(fmt = "Invalid path: {}", _0)]
+    InvalidPath(String),
+    #[display(fmt = "Failure to open channel with node {}: {}", _0, _1)]
+    FailureToOpenChannel(String, String),
+    #[display(fmt = "RPC error {}", _0)]
+    RpcError(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+    #[display(fmt = "I/O error {}", _0)]
+    IOError(String),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+    ConnectToNodeError(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "Generate Tx Error {}", _0)]
+    GenerateTxErr(String),
+    #[display(fmt = "Error converting transaction: {}", _0)]
+    ConvertTxErr(String),
+    PrivKeyNotAllowed(String),
+}
+
+impl HttpStatusCode for OpenChannelError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            OpenChannelError::UnsupportedCoin(_)
+            | OpenChannelError::RpcError(_)
+            | OpenChannelError::PrivKeyNotAllowed(_) => StatusCode::BAD_REQUEST,
+            OpenChannelError::FailureToOpenChannel(_, _)
+            | OpenChannelError::ConnectToNodeError(_)
+            | OpenChannelError::InternalError(_)
+            | OpenChannelError::GenerateTxErr(_)
+            | OpenChannelError::IOError(_)
+            | OpenChannelError::DbError(_)
+            | OpenChannelError::InvalidPath(_)
+            | OpenChannelError::ConvertTxErr(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            OpenChannelError::NoSuchCoin(_) | OpenChannelError::BalanceError(_) => StatusCode::PRECONDITION_REQUIRED,
+        }
+    }
+}
+
+impl From<ConnectToNodeError> for OpenChannelError {
+    fn from(err: ConnectToNodeError) -> OpenChannelError { OpenChannelError::ConnectToNodeError(err.to_string()) }
+}
+
+impl From<CoinFindError> for OpenChannelError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => OpenChannelError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<BalanceError> for OpenChannelError {
+    fn from(e: BalanceError) -> Self { OpenChannelError::BalanceError(e.to_string()) }
+}
+
+impl From<NumConversError> for OpenChannelError {
+    fn from(e: NumConversError) -> Self { OpenChannelError::InternalError(e.to_string()) }
+}
+
+impl From<GenerateTxError> for OpenChannelError {
+    fn from(e: GenerateTxError) -> Self { OpenChannelError::GenerateTxErr(e.to_string()) }
+}
+
+impl From<UtxoRpcError> for OpenChannelError {
+    fn from(e: UtxoRpcError) -> Self { OpenChannelError::RpcError(e.to_string()) }
+}
+
+impl From<UnexpectedDerivationMethod> for OpenChannelError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { OpenChannelError::InternalError(e.to_string()) }
+}
+
+impl From<UtxoSignWithKeyPairError> for OpenChannelError {
+    fn from(e: UtxoSignWithKeyPairError) -> Self { OpenChannelError::InternalError(e.to_string()) }
+}
+
+impl From<PrivKeyNotAllowed> for OpenChannelError {
+    fn from(e: PrivKeyNotAllowed) -> Self { OpenChannelError::PrivKeyNotAllowed(e.to_string()) }
+}
+
+impl From<std::io::Error> for OpenChannelError {
+    fn from(err: std::io::Error) -> OpenChannelError { OpenChannelError::IOError(err.to_string()) }
+}
+
+impl From<SqlError> for OpenChannelError {
+    fn from(err: SqlError) -> OpenChannelError { OpenChannelError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum ListChannelsError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl HttpStatusCode for ListChannelsError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            ListChannelsError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            ListChannelsError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+            ListChannelsError::DbError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for ListChannelsError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => ListChannelsError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<SqlError> for ListChannelsError {
+    fn from(err: SqlError) -> ListChannelsError { ListChannelsError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum GetChannelDetailsError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "Channel with rpc id: {} is not found", _0)]
+    NoSuchChannel(u64),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl HttpStatusCode for GetChannelDetailsError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            GetChannelDetailsError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            GetChannelDetailsError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+            GetChannelDetailsError::NoSuchChannel(_) => StatusCode::NOT_FOUND,
+            GetChannelDetailsError::DbError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for GetChannelDetailsError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => GetChannelDetailsError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<SqlError> for GetChannelDetailsError {
+    fn from(err: SqlError) -> GetChannelDetailsError { GetChannelDetailsError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum GenerateInvoiceError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "Invoice signing or creation error: {}", _0)]
+    SignOrCreationError(String),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl HttpStatusCode for GenerateInvoiceError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            GenerateInvoiceError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            GenerateInvoiceError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+            GenerateInvoiceError::SignOrCreationError(_) | GenerateInvoiceError::DbError(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
+
+impl From<CoinFindError> for GenerateInvoiceError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => GenerateInvoiceError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<SignOrCreationError> for GenerateInvoiceError {
+    fn from(e: SignOrCreationError) -> Self { GenerateInvoiceError::SignOrCreationError(e.to_string()) }
+}
+
+impl From<SqlError> for GenerateInvoiceError {
+    fn from(err: SqlError) -> GenerateInvoiceError { GenerateInvoiceError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum SendPaymentError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "Couldn't parse destination pubkey: {}", _0)]
+    NoRouteFound(String),
+    #[display(fmt = "Payment error: {}", _0)]
+    PaymentError(String),
+    #[display(fmt = "Final cltv expiry delta {} is below the required minimum of {}", _0, _1)]
+    CLTVExpiryError(u32, u32),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl HttpStatusCode for SendPaymentError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            SendPaymentError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            SendPaymentError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+            SendPaymentError::PaymentError(_)
+            | SendPaymentError::NoRouteFound(_)
+            | SendPaymentError::CLTVExpiryError(_, _)
+            | SendPaymentError::DbError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for SendPaymentError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => SendPaymentError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<SqlError> for SendPaymentError {
+    fn from(err: SqlError) -> SendPaymentError { SendPaymentError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum ListPaymentsError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl HttpStatusCode for ListPaymentsError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            ListPaymentsError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            ListPaymentsError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+            ListPaymentsError::DbError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for ListPaymentsError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => ListPaymentsError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<SqlError> for ListPaymentsError {
+    fn from(err: SqlError) -> ListPaymentsError { ListPaymentsError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum GetPaymentDetailsError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "Payment with hash: {:?} is not found", _0)]
+    NoSuchPayment(H256Json),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl HttpStatusCode for GetPaymentDetailsError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            GetPaymentDetailsError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            GetPaymentDetailsError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+            GetPaymentDetailsError::NoSuchPayment(_) => StatusCode::NOT_FOUND,
+            GetPaymentDetailsError::DbError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for GetPaymentDetailsError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => GetPaymentDetailsError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<SqlError> for GetPaymentDetailsError {
+    fn from(err: SqlError) -> GetPaymentDetailsError { GetPaymentDetailsError::DbError(err.to_string()) }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum CloseChannelError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "Closing channel error: {}", _0)]
+    CloseChannelError(String),
+}
+
+impl HttpStatusCode for CloseChannelError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            CloseChannelError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            CloseChannelError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+            CloseChannelError::CloseChannelError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for CloseChannelError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => CloseChannelError::NoSuchCoin(coin),
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum ClaimableBalancesError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+}
+
+impl HttpStatusCode for ClaimableBalancesError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            ClaimableBalancesError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            ClaimableBalancesError::NoSuchCoin(_) => StatusCode::PRECONDITION_REQUIRED,
+        }
+    }
+}
+
+impl From<CoinFindError> for ClaimableBalancesError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => ClaimableBalancesError::NoSuchCoin(coin),
+        }
+    }
+}
+
+#[derive(Display)]
+pub enum SaveChannelClosingError {
+    #[display(fmt = "DB error: {}", _0)]
+    DbError(String),
+    #[display(fmt = "Channel with rpc id {} not found in DB", _0)]
+    ChannelNotFound(u64),
+    #[display(fmt = "funding_generated_in_block is Null in DB")]
+    BlockHeightNull,
+    #[display(fmt = "Funding transaction hash is Null in DB")]
+    FundingTxNull,
+    #[display(fmt = "Error parsing funding transaction hash: {}", _0)]
+    FundingTxParseError(String),
+    #[display(fmt = "Error while waiting for the funding transaction to be spent: {}", _0)]
+    WaitForFundingTxSpendError(String),
+}
+
+impl From<SqlError> for SaveChannelClosingError {
+    fn from(err: SqlError) -> SaveChannelClosingError { SaveChannelClosingError::DbError(err.to_string()) }
+}
+
+#[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum GetTxError {
+    Rpc(UtxoRpcError),
+    TxDeserialization(encode::Error),
+}
+
+impl From<UtxoRpcError> for GetTxError {
+    fn from(err: UtxoRpcError) -> GetTxError { GetTxError::Rpc(err) }
+}
+
+impl From<encode::Error> for GetTxError {
+    fn from(err: encode::Error) -> GetTxError { GetTxError::TxDeserialization(err) }
+}
+
+#[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum GetHeaderError {
+    Rpc(JsonRpcError),
+    HeaderDeserialization(encode::Error),
+}
+
+impl From<JsonRpcError> for GetHeaderError {
+    fn from(err: JsonRpcError) -> GetHeaderError { GetHeaderError::Rpc(err) }
+}
+
+impl From<encode::Error> for GetHeaderError {
+    fn from(err: encode::Error) -> GetHeaderError { GetHeaderError::HeaderDeserialization(err) }
+}
+
+#[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum FindWatchedOutputSpendError {
+    HashNotHeight,
+    DeserializationErr(encode::Error),
+    RpcError(String),
+    GetHeaderError(GetHeaderError),
+}
+
+impl From<JsonRpcError> for FindWatchedOutputSpendError {
+    fn from(err: JsonRpcError) -> Self { FindWatchedOutputSpendError::RpcError(err.to_string()) }
+}
+
+impl From<encode::Error> for FindWatchedOutputSpendError {
+    fn from(err: encode::Error) -> Self { FindWatchedOutputSpendError::DeserializationErr(err) }
+}
diff --git a/mm2src/coins/lightning/ln_events.rs b/mm2src/coins/lightning/ln_events.rs
new file mode 100644
index 0000000000..3f898e4fa3
--- /dev/null
+++ b/mm2src/coins/lightning/ln_events.rs
@@ -0,0 +1,481 @@
+use super::*;
+use crate::lightning::ln_errors::{SaveChannelClosingError, SaveChannelClosingResult};
+use bitcoin::blockdata::script::Script;
+use bitcoin::blockdata::transaction::Transaction;
+use common::executor::{spawn, Timer};
+use common::log::{error, info};
+use common::now_ms;
+use core::time::Duration;
+use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
+use lightning::chain::keysinterface::SpendableOutputDescriptor;
+use lightning::util::events::{Event, EventHandler, PaymentPurpose};
+use rand::Rng;
+use script::{Builder, SignatureVersion};
+use secp256k1::Secp256k1;
+use std::convert::TryFrom;
+use std::sync::Arc;
+use utxo_signer::with_key_pair::sign_tx;
+
+const TRY_LOOP_INTERVAL: f64 = 60.;
+
+pub struct LightningEventHandler {
+    platform: Arc<Platform>,
+    channel_manager: Arc<ChannelManager>,
+    keys_manager: Arc<KeysManager>,
+    persister: Arc<LightningPersister>,
+}
+
+impl EventHandler for LightningEventHandler {
+    fn handle_event(&self, event: &Event) {
+        match event {
+            Event::FundingGenerationReady {
+                temporary_channel_id,
+                channel_value_satoshis,
+                output_script,
+                user_channel_id,
+            } => self.handle_funding_generation_ready(
+                *temporary_channel_id,
+                *channel_value_satoshis,
+                output_script,
+                *user_channel_id,
+            ),
+
+            Event::PaymentReceived {
+                payment_hash,
+                amt,
+                purpose,
+            } => self.handle_payment_received(*payment_hash, *amt, purpose),
+
+            Event::PaymentSent {
+                payment_preimage,
+                payment_hash,
+                fee_paid_msat,
+                ..
+            } => self.handle_payment_sent(*payment_preimage, *payment_hash, *fee_paid_msat),
+
+            Event::PaymentFailed { payment_hash, .. } => self.handle_payment_failed(*payment_hash),
+
+            Event::PendingHTLCsForwardable { time_forwardable } => self.handle_pending_htlcs_forwards(*time_forwardable),
+
+            Event::SpendableOutputs { outputs } => self.handle_spendable_outputs(outputs),
+
+            // Todo: an RPC for total amount earned
+            Event::PaymentForwarded { fee_earned_msat, claim_from_onchain_tx } => info!(
+                "Received a fee of {} milli-satoshis for a successfully forwarded payment through our {} lightning node. Was the forwarded HTLC claimed by our counterparty via an on-chain transaction?: {}",
+                fee_earned_msat.unwrap_or_default(),
+                self.platform.coin.ticker(),
+                claim_from_onchain_tx,
+            ),
+
+            Event::ChannelClosed {
+                channel_id,
+                user_channel_id,
+                reason,
+            } => self.handle_channel_closed(*channel_id, *user_channel_id, reason.to_string()),
+
+            // Todo: Add spent UTXOs to RecentlySpentOutPoints if it's not discarded
+            Event::DiscardFunding { channel_id, transaction } => info!(
+                "Discarding funding tx: {} for channel {}",
+                transaction.txid().to_string(),
+                hex::encode(channel_id),
+            ),
+
+            // Handling updating channel penalties after successfully routing a payment along a path is done by the InvoicePayer.
+            Event::PaymentPathSuccessful {
+                payment_id,
+                payment_hash,
+                path,
+            } => info!(
+                "Payment path: {:?}, successful for payment hash: {}, payment id: {}",
+                path.iter().map(|hop| hop.pubkey.to_string()).collect::<Vec<_>>(),
+                payment_hash.map(|h| hex::encode(h.0)).unwrap_or_default(),
+                hex::encode(payment_id.0)
+            ),
+
+            // Handling updating channel penalties after a payment fails to route through a channel is done by the InvoicePayer.
+            // Also abandoning or retrying a payment is handled by the InvoicePayer. 
+            Event::PaymentPathFailed {
+                payment_hash,
+                rejected_by_dest,
+                all_paths_failed,
+                path,
+                ..
+            } => info!(
+                "Payment path: {:?}, failed for payment hash: {}, Was rejected by destination?: {}, All paths failed?: {}",
+                path.iter().map(|hop| hop.pubkey.to_string()).collect::<Vec<_>>(),
+                hex::encode(payment_hash.0),
+                rejected_by_dest,
+                all_paths_failed,
+            ),
+
+            Event::OpenChannelRequest {
+                temporary_channel_id,
+                counterparty_node_id,
+                funding_satoshis,
+                push_msat,
+                channel_type: _,
+            } => {
+                info!(
+                    "Handling OpenChannelRequest from node: {} with funding value: {} and starting balance: {}",
+                    counterparty_node_id,
+                    funding_satoshis,
+                    push_msat,
+                );
+                if self.channel_manager.accept_inbound_channel(temporary_channel_id, 0).is_ok() {
+                    // Todo: once the rust-lightning PR for user_channel_id in accept_inbound_channel is released
+                    // use user_channel_id to get the funding tx here once the funding tx is available.
+                }
+            },
+        }
+    }
+}
+
+// Generates the raw funding transaction with one output equal to the channel value.
+fn sign_funding_transaction(
+    user_channel_id: u64,
+    output_script: &Script,
+    platform: Arc<Platform>,
+) -> OpenChannelResult<Transaction> {
+    let coin = &platform.coin;
+    let mut unsigned = {
+        let unsigned_funding_txs = platform.unsigned_funding_txs.lock();
+        unsigned_funding_txs
+            .get(&user_channel_id)
+            .ok_or_else(|| {
+                OpenChannelError::InternalError(format!(
+                    "Unsigned funding tx not found for internal channel id: {}",
+                    user_channel_id
+                ))
+            })?
+            .clone()
+    };
+    unsigned.outputs[0].script_pubkey = output_script.to_bytes().into();
+
+    let my_address = coin.as_ref().derivation_method.iguana_or_err()?;
+    let key_pair = coin.as_ref().priv_key_policy.key_pair_or_err()?;
+
+    let prev_script = Builder::build_p2pkh(&my_address.hash);
+    let signed = sign_tx(
+        unsigned,
+        key_pair,
+        prev_script,
+        SignatureVersion::WitnessV0,
+        coin.as_ref().conf.fork_id,
+    )?;
+
+    Transaction::try_from(signed).map_to_mm(|e| OpenChannelError::ConvertTxErr(e.to_string()))
+}
+
+async fn save_channel_closing_details(
+    persister: Arc<LightningPersister>,
+    platform: Arc<Platform>,
+    user_channel_id: u64,
+    reason: String,
+) -> SaveChannelClosingResult<()> {
+    persister
+        .update_channel_to_closed(user_channel_id, reason, now_ms() / 1000)
+        .await?;
+
+    let channel_details = persister
+        .get_channel_from_db(user_channel_id)
+        .await?
+        .ok_or_else(|| MmError::new(SaveChannelClosingError::ChannelNotFound(user_channel_id)))?;
+
+    let closing_tx_hash = platform.get_channel_closing_tx(channel_details).await?;
+
+    persister.add_closing_tx_to_db(user_channel_id, closing_tx_hash).await?;
+
+    Ok(())
+}
+
+impl LightningEventHandler {
+    pub fn new(
+        platform: Arc<Platform>,
+        channel_manager: Arc<ChannelManager>,
+        keys_manager: Arc<KeysManager>,
+        persister: Arc<LightningPersister>,
+    ) -> Self {
+        LightningEventHandler {
+            platform,
+            channel_manager,
+            keys_manager,
+            persister,
+        }
+    }
+
+    fn handle_funding_generation_ready(
+        &self,
+        temporary_channel_id: [u8; 32],
+        channel_value_satoshis: u64,
+        output_script: &Script,
+        user_channel_id: u64,
+    ) {
+        info!(
+            "Handling FundingGenerationReady event for internal channel id: {}",
+            user_channel_id
+        );
+        let funding_tx = match sign_funding_transaction(user_channel_id, output_script, self.platform.clone()) {
+            Ok(tx) => tx,
+            Err(e) => {
+                error!(
+                    "Error generating funding transaction for internal channel id {}: {}",
+                    user_channel_id,
+                    e.to_string()
+                );
+                return;
+            },
+        };
+        let funding_txid = funding_tx.txid();
+        // Give the funding transaction back to LDK for opening the channel.
+        if let Err(e) = self
+            .channel_manager
+            .funding_transaction_generated(&temporary_channel_id, funding_tx)
+        {
+            error!("{:?}", e);
+            return;
+        }
+        let platform = self.platform.clone();
+        let persister = self.persister.clone();
+        spawn(async move {
+            let best_block_height = platform.best_block_height();
+            persister
+                .add_funding_tx_to_db(
+                    user_channel_id,
+                    funding_txid.to_string(),
+                    channel_value_satoshis,
+                    best_block_height,
+                )
+                .await
+                .error_log();
+        });
+    }
+
+    fn handle_payment_received(&self, payment_hash: PaymentHash, amt: u64, purpose: &PaymentPurpose) {
+        info!(
+            "Handling PaymentReceived event for payment_hash: {}",
+            hex::encode(payment_hash.0)
+        );
+        let (payment_preimage, payment_secret) = match purpose {
+            PaymentPurpose::InvoicePayment {
+                payment_preimage,
+                payment_secret,
+            } => match payment_preimage {
+                Some(preimage) => (*preimage, Some(*payment_secret)),
+                None => return,
+            },
+            PaymentPurpose::SpontaneousPayment(preimage) => (*preimage, None),
+        };
+        let status = match self.channel_manager.claim_funds(payment_preimage) {
+            true => {
+                info!(
+                    "Received an amount of {} millisatoshis for payment hash {}",
+                    amt,
+                    hex::encode(payment_hash.0)
+                );
+                HTLCStatus::Succeeded
+            },
+            false => HTLCStatus::Failed,
+        };
+        let persister = self.persister.clone();
+        match purpose {
+            PaymentPurpose::InvoicePayment { .. } => spawn(async move {
+                if let Ok(Some(mut payment_info)) = persister
+                    .get_payment_from_db(payment_hash)
+                    .await
+                    .error_log_passthrough()
+                {
+                    payment_info.preimage = Some(payment_preimage);
+                    payment_info.status = HTLCStatus::Succeeded;
+                    payment_info.amt_msat = Some(amt);
+                    payment_info.last_updated = now_ms() / 1000;
+                    if let Err(e) = persister.add_or_update_payment_in_db(payment_info).await {
+                        error!("Unable to update payment information in DB: {}", e);
+                    }
+                }
+            }),
+            PaymentPurpose::SpontaneousPayment(_) => {
+                let payment_info = PaymentInfo {
+                    payment_hash,
+                    payment_type: PaymentType::InboundPayment,
+                    description: "".into(),
+                    preimage: Some(payment_preimage),
+                    secret: payment_secret,
+                    amt_msat: Some(amt),
+                    fee_paid_msat: None,
+                    status,
+                    created_at: now_ms() / 1000,
+                    last_updated: now_ms() / 1000,
+                };
+                spawn(async move {
+                    if let Err(e) = persister.add_or_update_payment_in_db(payment_info).await {
+                        error!("Unable to update payment information in DB: {}", e);
+                    }
+                });
+            },
+        }
+    }
+
+    fn handle_payment_sent(
+        &self,
+        payment_preimage: PaymentPreimage,
+        payment_hash: PaymentHash,
+        fee_paid_msat: Option<u64>,
+    ) {
+        info!(
+            "Handling PaymentSent event for payment_hash: {}",
+            hex::encode(payment_hash.0)
+        );
+        let persister = self.persister.clone();
+        spawn(async move {
+            if let Ok(Some(mut payment_info)) = persister
+                .get_payment_from_db(payment_hash)
+                .await
+                .error_log_passthrough()
+            {
+                payment_info.preimage = Some(payment_preimage);
+                payment_info.status = HTLCStatus::Succeeded;
+                payment_info.fee_paid_msat = fee_paid_msat;
+                payment_info.last_updated = now_ms() / 1000;
+                let amt_msat = payment_info.amt_msat;
+                if let Err(e) = persister.add_or_update_payment_in_db(payment_info).await {
+                    error!("Unable to update payment information in DB: {}", e);
+                }
+                info!(
+                    "Successfully sent payment of {} millisatoshis with payment hash {}",
+                    amt_msat.unwrap_or_default(),
+                    hex::encode(payment_hash.0)
+                );
+            }
+        });
+    }
+
+    fn handle_channel_closed(&self, channel_id: [u8; 32], user_channel_id: u64, reason: String) {
+        info!(
+            "Channel: {} closed for the following reason: {}",
+            hex::encode(channel_id),
+            reason
+        );
+        let persister = self.persister.clone();
+        let platform = self.platform.clone();
+        // Todo: Handle inbound channels closure case after updating to latest version of rust-lightning
+        // as it has a new OpenChannelRequest event where we can give an inbound channel a user_channel_id
+        // other than 0 in sql
+        if user_channel_id != 0 {
+            spawn(async move {
+                if let Err(e) = save_channel_closing_details(persister, platform, user_channel_id, reason).await {
+                    error!(
+                        "Unable to update channel {} closing details in DB: {}",
+                        user_channel_id, e
+                    );
+                }
+            });
+        }
+    }
+
+    fn handle_payment_failed(&self, payment_hash: PaymentHash) {
+        info!(
+            "Handling PaymentFailed event for payment_hash: {}",
+            hex::encode(payment_hash.0)
+        );
+        let persister = self.persister.clone();
+        spawn(async move {
+            if let Ok(Some(mut payment_info)) = persister
+                .get_payment_from_db(payment_hash)
+                .await
+                .error_log_passthrough()
+            {
+                payment_info.status = HTLCStatus::Failed;
+                payment_info.last_updated = now_ms() / 1000;
+                if let Err(e) = persister.add_or_update_payment_in_db(payment_info).await {
+                    error!("Unable to update payment information in DB: {}", e);
+                }
+            }
+        });
+    }
+
+    fn handle_pending_htlcs_forwards(&self, time_forwardable: Duration) {
+        info!("Handling PendingHTLCsForwardable event!");
+        let min_wait_time = time_forwardable.as_millis() as u32;
+        let channel_manager = self.channel_manager.clone();
+        spawn(async move {
+            let millis_to_sleep = rand::thread_rng().gen_range(min_wait_time, min_wait_time * 5);
+            Timer::sleep_ms(millis_to_sleep).await;
+            channel_manager.process_pending_htlc_forwards();
+        });
+    }
+
+    fn handle_spendable_outputs(&self, outputs: &[SpendableOutputDescriptor]) {
+        info!("Handling SpendableOutputs event!");
+        let platform_coin = &self.platform.coin;
+        // Todo: add support for Hardware wallets for funding transactions and spending spendable outputs (channel closing transactions)
+        let my_address = match platform_coin.as_ref().derivation_method.iguana_or_err() {
+            Ok(addr) => addr,
+            Err(e) => {
+                error!("{}", e);
+                return;
+            },
+        };
+        let change_destination_script = Builder::build_witness_script(&my_address.hash).to_bytes().take().into();
+        let feerate_sat_per_1000_weight = self.platform.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
+        let output_descriptors = &outputs.iter().collect::<Vec<_>>();
+        let spending_tx = match self.keys_manager.spend_spendable_outputs(
+            output_descriptors,
+            Vec::new(),
+            change_destination_script,
+            feerate_sat_per_1000_weight,
+            &Secp256k1::new(),
+        ) {
+            Ok(tx) => tx,
+            Err(_) => {
+                error!("Error spending spendable outputs");
+                return;
+            },
+        };
+
+        let claiming_tx_inputs_value = outputs.iter().fold(0, |sum, output| match output {
+            SpendableOutputDescriptor::StaticOutput { output, .. } => sum + output.value,
+            SpendableOutputDescriptor::DelayedPaymentOutput(descriptor) => sum + descriptor.output.value,
+            SpendableOutputDescriptor::StaticPaymentOutput(descriptor) => sum + descriptor.output.value,
+        });
+        let claiming_tx_outputs_value = spending_tx.output.iter().fold(0, |sum, txout| sum + txout.value);
+        if claiming_tx_inputs_value < claiming_tx_outputs_value {
+            error!(
+                "Claiming transaction input value {} can't be less than outputs value {}!",
+                claiming_tx_inputs_value, claiming_tx_outputs_value
+            );
+            return;
+        }
+        let claiming_tx_fee = claiming_tx_inputs_value - claiming_tx_outputs_value;
+        let claiming_tx_fee_per_channel = (claiming_tx_fee as f64) / (outputs.len() as f64);
+
+        for output in outputs {
+            let (closing_txid, claimed_balance) = match output {
+                SpendableOutputDescriptor::StaticOutput { outpoint, output } => {
+                    (outpoint.txid.to_string(), output.value)
+                },
+                SpendableOutputDescriptor::DelayedPaymentOutput(descriptor) => {
+                    (descriptor.outpoint.txid.to_string(), descriptor.output.value)
+                },
+                SpendableOutputDescriptor::StaticPaymentOutput(descriptor) => {
+                    (descriptor.outpoint.txid.to_string(), descriptor.output.value)
+                },
+            };
+            let claiming_txid = spending_tx.txid().to_string();
+            let persister = self.persister.clone();
+            spawn(async move {
+                ok_or_retry_after_sleep!(
+                    persister
+                        .add_claiming_tx_to_db(
+                            closing_txid.clone(),
+                            claiming_txid.clone(),
+                            (claimed_balance as f64) - claiming_tx_fee_per_channel,
+                        )
+                        .await,
+                    TRY_LOOP_INTERVAL
+                );
+            });
+
+            self.platform.broadcast_transaction(&spending_tx);
+        }
+    }
+}
diff --git a/mm2src/coins/lightning/ln_p2p.rs b/mm2src/coins/lightning/ln_p2p.rs
new file mode 100644
index 0000000000..00bd5cdd5b
--- /dev/null
+++ b/mm2src/coins/lightning/ln_p2p.rs
@@ -0,0 +1,200 @@
+use super::*;
+use common::executor::{spawn, Timer};
+use common::log::LogState;
+use derive_more::Display;
+use lightning::chain::Access;
+use lightning::ln::msgs::NetAddress;
+use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler, SimpleArcPeerManager};
+use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
+use lightning_net_tokio::SocketDescriptor;
+use lightning_persister::storage::NodesAddressesMapShared;
+use mm2_net::ip_addr::fetch_external_ip;
+use rand::RngCore;
+use secp256k1::SecretKey;
+use std::net::{IpAddr, Ipv4Addr};
+use tokio::net::TcpListener;
+
+const TRY_RECONNECTING_TO_NODE_INTERVAL: f64 = 60.;
+const BROADCAST_NODE_ANNOUNCEMENT_INTERVAL: u64 = 600;
+
+type NetworkGossip = NetGraphMsgHandler<Arc<NetworkGraph>, Arc<dyn Access + Send + Sync>, Arc<LogState>>;
+
+pub type PeerManager =
+    SimpleArcPeerManager<SocketDescriptor, ChainMonitor, Platform, Platform, dyn Access + Send + Sync, LogState>;
+
+#[derive(Display)]
+pub enum ConnectToNodeRes {
+    #[display(fmt = "Already connected to node: {}@{}", pubkey, node_addr)]
+    AlreadyConnected { pubkey: PublicKey, node_addr: SocketAddr },
+    #[display(fmt = "Connected successfully to node : {}@{}", pubkey, node_addr)]
+    ConnectedSuccessfully { pubkey: PublicKey, node_addr: SocketAddr },
+}
+
+pub async fn connect_to_node(
+    pubkey: PublicKey,
+    node_addr: SocketAddr,
+    peer_manager: Arc<PeerManager>,
+) -> ConnectToNodeResult<ConnectToNodeRes> {
+    if peer_manager.get_peer_node_ids().contains(&pubkey) {
+        return Ok(ConnectToNodeRes::AlreadyConnected { pubkey, node_addr });
+    }
+
+    let mut connection_closed_future =
+        match lightning_net_tokio::connect_outbound(Arc::clone(&peer_manager), pubkey, node_addr).await {
+            Some(fut) => Box::pin(fut),
+            None => {
+                return MmError::err(ConnectToNodeError::ConnectionError(format!(
+                    "Failed to connect to node: {}",
+                    pubkey
+                )))
+            },
+        };
+
+    loop {
+        // Make sure the connection is still established.
+        match futures::poll!(&mut connection_closed_future) {
+            std::task::Poll::Ready(_) => {
+                return MmError::err(ConnectToNodeError::ConnectionError(format!(
+                    "Node {} disconnected before finishing the handshake",
+                    pubkey
+                )));
+            },
+            std::task::Poll::Pending => {},
+        }
+
+        if peer_manager.get_peer_node_ids().contains(&pubkey) {
+            break;
+        }
+
+        // Wait for the handshake to complete
+        Timer::sleep_ms(10).await;
+    }
+
+    Ok(ConnectToNodeRes::ConnectedSuccessfully { pubkey, node_addr })
+}
+
+pub async fn connect_to_nodes_loop(open_channels_nodes: NodesAddressesMapShared, peer_manager: Arc<PeerManager>) {
+    loop {
+        let open_channels_nodes = open_channels_nodes.lock().clone();
+        for (pubkey, node_addr) in open_channels_nodes {
+            let peer_manager = peer_manager.clone();
+            match connect_to_node(pubkey, node_addr, peer_manager.clone()).await {
+                Ok(res) => {
+                    if let ConnectToNodeRes::ConnectedSuccessfully { .. } = res {
+                        log::info!("{}", res.to_string());
+                    }
+                },
+                Err(e) => log::error!("{}", e.to_string()),
+            }
+        }
+
+        Timer::sleep(TRY_RECONNECTING_TO_NODE_INTERVAL).await;
+    }
+}
+
+// TODO: add TOR address option
+fn netaddress_from_ipaddr(addr: IpAddr, port: u16) -> Vec<NetAddress> {
+    if addr == Ipv4Addr::new(0, 0, 0, 0) || addr == Ipv4Addr::new(127, 0, 0, 1) {
+        return Vec::new();
+    }
+    let mut addresses = Vec::new();
+    let address = match addr {
+        IpAddr::V4(addr) => NetAddress::IPv4 {
+            addr: u32::from(addr).to_be_bytes(),
+            port,
+        },
+        IpAddr::V6(addr) => NetAddress::IPv6 {
+            addr: u128::from(addr).to_be_bytes(),
+            port,
+        },
+    };
+    addresses.push(address);
+    addresses
+}
+
+pub async fn ln_node_announcement_loop(
+    channel_manager: Arc<ChannelManager>,
+    node_name: [u8; 32],
+    node_color: [u8; 3],
+    port: u16,
+) {
+    loop {
+        // Right now if the node is behind NAT the external ip is fetched on every loop
+        // If the node does not announce a public IP, it will not be displayed on the network graph,
+        // and other nodes will not be able to open a channel with it. But it can open channels with other nodes.
+        let addresses = match fetch_external_ip().await {
+            Ok(ip) => {
+                log::debug!("Fetch real IP successfully: {}:{}", ip, port);
+                netaddress_from_ipaddr(ip, port)
+            },
+            Err(e) => {
+                log::error!("Error while fetching external ip for node announcement: {}", e);
+                Timer::sleep(BROADCAST_NODE_ANNOUNCEMENT_INTERVAL as f64).await;
+                continue;
+            },
+        };
+        channel_manager.broadcast_node_announcement(node_color, node_name, addresses);
+
+        Timer::sleep(BROADCAST_NODE_ANNOUNCEMENT_INTERVAL as f64).await;
+    }
+}
+
+async fn ln_p2p_loop(peer_manager: Arc<PeerManager>, listener: TcpListener) {
+    loop {
+        let peer_mgr = peer_manager.clone();
+        let tcp_stream = match listener.accept().await {
+            Ok((stream, addr)) => {
+                log::debug!("New incoming lightning connection from node address: {}", addr);
+                stream
+            },
+            Err(e) => {
+                log::error!("Error on accepting lightning connection: {}", e);
+                continue;
+            },
+        };
+        if let Ok(stream) = tcp_stream.into_std() {
+            spawn(async move {
+                lightning_net_tokio::setup_inbound(peer_mgr.clone(), stream).await;
+            });
+        };
+    }
+}
+
+pub async fn init_peer_manager(
+    ctx: MmArc,
+    listening_port: u16,
+    channel_manager: Arc<ChannelManager>,
+    network_gossip: Arc<NetworkGossip>,
+    node_secret: SecretKey,
+    logger: Arc<LogState>,
+) -> EnableLightningResult<Arc<PeerManager>> {
+    // The set (possibly empty) of socket addresses on which this node accepts incoming connections.
+    // If the user wishes to preserve privacy, addresses should likely contain only Tor Onion addresses.
+    let listening_addr = myipaddr(ctx).await.map_to_mm(EnableLightningError::InvalidAddress)?;
+    // If the listening port is used start_lightning should return an error early
+    let listener = TcpListener::bind(format!("{}:{}", listening_addr, listening_port))
+        .await
+        .map_to_mm(|e| EnableLightningError::IOError(e.to_string()))?;
+
+    // ephemeral_random_data is used to derive per-connection ephemeral keys
+    let mut ephemeral_bytes = [0; 32];
+    rand::thread_rng().fill_bytes(&mut ephemeral_bytes);
+    let lightning_msg_handler = MessageHandler {
+        chan_handler: channel_manager,
+        route_handler: network_gossip,
+    };
+
+    // IgnoringMessageHandler is used as custom message types (experimental and application-specific messages) is not needed
+    let peer_manager: Arc<PeerManager> = Arc::new(PeerManager::new(
+        lightning_msg_handler,
+        node_secret,
+        &ephemeral_bytes,
+        logger,
+        Arc::new(IgnoringMessageHandler {}),
+    ));
+
+    // Initialize p2p networking
+    spawn(ln_p2p_loop(peer_manager.clone(), listener));
+
+    Ok(peer_manager)
+}
diff --git a/mm2src/coins/lightning/ln_platform.rs b/mm2src/coins/lightning/ln_platform.rs
new file mode 100644
index 0000000000..dfc3f24554
--- /dev/null
+++ b/mm2src/coins/lightning/ln_platform.rs
@@ -0,0 +1,575 @@
+use super::*;
+use crate::lightning::ln_errors::{FindWatchedOutputSpendError, GetHeaderError, GetTxError, SaveChannelClosingError,
+                                  SaveChannelClosingResult};
+use crate::utxo::rpc_clients::{electrum_script_hash, BestBlock as RpcBestBlock, BlockHashOrHeight,
+                               ElectrumBlockHeader, ElectrumClient, ElectrumNonce, EstimateFeeMethod,
+                               UtxoRpcClientEnum, UtxoRpcError};
+use crate::utxo::utxo_common;
+use crate::utxo::utxo_standard::UtxoStandardCoin;
+use crate::{MarketCoinOps, MmCoin};
+use bitcoin::blockdata::block::BlockHeader;
+use bitcoin::blockdata::script::Script;
+use bitcoin::blockdata::transaction::Transaction;
+use bitcoin::consensus::encode::{deserialize, serialize_hex};
+use bitcoin::hash_types::{BlockHash, TxMerkleNode, Txid};
+use bitcoin_hashes::{sha256d, Hash};
+use common::executor::{spawn, Timer};
+use common::jsonrpc_client::JsonRpcErrorType;
+use common::log::{debug, error, info};
+use futures::compat::Future01CompatExt;
+use keys::hash::H256;
+use lightning::chain::{chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator},
+                       Confirm, Filter, WatchedOutput};
+use rpc::v1::types::H256 as H256Json;
+use std::cmp;
+use std::convert::TryFrom;
+use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering};
+
+const CHECK_FOR_NEW_BEST_BLOCK_INTERVAL: f64 = 60.;
+const MIN_ALLOWED_FEE_PER_1000_WEIGHT: u32 = 253;
+const TRY_LOOP_INTERVAL: f64 = 60.;
+
+#[inline]
+pub fn h256_json_from_txid(txid: Txid) -> H256Json { H256Json::from(txid.as_hash().into_inner()).reversed() }
+
+struct TxWithBlockInfo {
+    tx: Transaction,
+    block_header: BlockHeader,
+    block_height: u64,
+}
+
+async fn get_block_header(electrum_client: &ElectrumClient, height: u64) -> Result<BlockHeader, GetHeaderError> {
+    Ok(deserialize(
+        &electrum_client.blockchain_block_header(height).compat().await?,
+    )?)
+}
+
+async fn find_watched_output_spend_with_header(
+    electrum_client: &ElectrumClient,
+    output: &WatchedOutput,
+) -> Result<Option<TxWithBlockInfo>, FindWatchedOutputSpendError> {
+    // from_block parameter is not used in find_output_spend for electrum clients
+    let utxo_client: UtxoRpcClientEnum = electrum_client.clone().into();
+    let tx_hash = H256::from(output.outpoint.txid.as_hash().into_inner());
+    let output_spend = match utxo_client
+        .find_output_spend(
+            tx_hash,
+            output.script_pubkey.as_ref(),
+            output.outpoint.index.into(),
+            BlockHashOrHeight::Hash(Default::default()),
+        )
+        .compat()
+        .await
+        .map_err(FindWatchedOutputSpendError::RpcError)?
+    {
+        Some(output) => output,
+        None => return Ok(None),
+    };
+
+    let height = match output_spend.spent_in_block {
+        BlockHashOrHeight::Height(h) => h,
+        _ => return Err(FindWatchedOutputSpendError::HashNotHeight),
+    };
+    let block_header = get_block_header(electrum_client, height as u64)
+        .await
+        .map_err(FindWatchedOutputSpendError::GetHeaderError)?;
+    let spending_tx = Transaction::try_from(output_spend.spending_tx)?;
+
+    Ok(Some(TxWithBlockInfo {
+        tx: spending_tx,
+        block_header,
+        block_height: height as u64,
+    }))
+}
+
+pub async fn get_best_header(best_header_listener: &ElectrumClient) -> EnableLightningResult<ElectrumBlockHeader> {
+    best_header_listener
+        .blockchain_headers_subscribe()
+        .compat()
+        .await
+        .map_to_mm(|e| EnableLightningError::RpcError(e.to_string()))
+}
+
+pub async fn update_best_block(
+    chain_monitor: &ChainMonitor,
+    channel_manager: &ChannelManager,
+    best_header: ElectrumBlockHeader,
+) {
+    {
+        let (new_best_header, new_best_height) = match best_header {
+            ElectrumBlockHeader::V12(h) => {
+                let nonce = match h.nonce {
+                    ElectrumNonce::Number(n) => n as u32,
+                    ElectrumNonce::Hash(_) => {
+                        return;
+                    },
+                };
+                let prev_blockhash = match sha256d::Hash::from_slice(&h.prev_block_hash.0) {
+                    Ok(h) => h,
+                    Err(e) => {
+                        error!("Error while parsing previous block hash for lightning node: {}", e);
+                        return;
+                    },
+                };
+                let merkle_root = match sha256d::Hash::from_slice(&h.merkle_root.0) {
+                    Ok(h) => h,
+                    Err(e) => {
+                        error!("Error while parsing merkle root for lightning node: {}", e);
+                        return;
+                    },
+                };
+                (
+                    BlockHeader {
+                        version: h.version as i32,
+                        prev_blockhash: BlockHash::from_hash(prev_blockhash),
+                        merkle_root: TxMerkleNode::from_hash(merkle_root),
+                        time: h.timestamp as u32,
+                        bits: h.bits as u32,
+                        nonce,
+                    },
+                    h.block_height as u32,
+                )
+            },
+            ElectrumBlockHeader::V14(h) => {
+                let block_header = match deserialize(&h.hex.into_vec()) {
+                    Ok(header) => header,
+                    Err(e) => {
+                        error!("Block header deserialization error: {}", e.to_string());
+                        return;
+                    },
+                };
+                (block_header, h.height as u32)
+            },
+        };
+        channel_manager.best_block_updated(&new_best_header, new_best_height);
+        chain_monitor.best_block_updated(&new_best_header, new_best_height);
+    }
+}
+
+pub async fn ln_best_block_update_loop(
+    platform: Arc<Platform>,
+    persister: Arc<LightningPersister>,
+    chain_monitor: Arc<ChainMonitor>,
+    channel_manager: Arc<ChannelManager>,
+    best_header_listener: ElectrumClient,
+    best_block: RpcBestBlock,
+) {
+    let mut current_best_block = best_block;
+    loop {
+        let best_header = ok_or_continue_after_sleep!(get_best_header(&best_header_listener).await, TRY_LOOP_INTERVAL);
+        if current_best_block != best_header.clone().into() {
+            platform.update_best_block_height(best_header.block_height());
+            platform
+                .process_txs_unconfirmations(&chain_monitor, &channel_manager)
+                .await;
+            platform
+                .process_txs_confirmations(&best_header_listener, &persister, &chain_monitor, &channel_manager)
+                .await;
+            current_best_block = best_header.clone().into();
+            update_best_block(&chain_monitor, &channel_manager, best_header).await;
+        }
+        Timer::sleep(CHECK_FOR_NEW_BEST_BLOCK_INTERVAL).await;
+    }
+}
+
+struct ConfirmedTransactionInfo {
+    txid: Txid,
+    header: BlockHeader,
+    index: usize,
+    transaction: Transaction,
+    height: u32,
+}
+
+impl ConfirmedTransactionInfo {
+    fn new(txid: Txid, header: BlockHeader, index: usize, transaction: Transaction, height: u32) -> Self {
+        ConfirmedTransactionInfo {
+            txid,
+            header,
+            index,
+            transaction,
+            height,
+        }
+    }
+}
+
+pub struct Platform {
+    pub coin: UtxoStandardCoin,
+    /// Main/testnet/signet/regtest Needed for lightning node to know which network to connect to
+    pub network: BlockchainNetwork,
+    /// The best block height.
+    pub best_block_height: AtomicU64,
+    /// Default fees to and confirmation targets to be used for FeeEstimator. Default fees are used when the call for
+    /// estimate_fee_sat fails.
+    pub default_fees_and_confirmations: PlatformCoinConfirmations,
+    /// This cache stores the transactions that the LN node has interest in.
+    pub registered_txs: PaMutex<HashMap<Txid, HashSet<Script>>>,
+    /// This cache stores the outputs that the LN node has interest in.
+    pub registered_outputs: PaMutex<Vec<WatchedOutput>>,
+    /// This cache stores transactions to be broadcasted once the other node accepts the channel
+    pub unsigned_funding_txs: PaMutex<HashMap<u64, TransactionInputSigner>>,
+}
+
+impl Platform {
+    #[inline]
+    pub fn new(
+        coin: UtxoStandardCoin,
+        network: BlockchainNetwork,
+        default_fees_and_confirmations: PlatformCoinConfirmations,
+    ) -> Self {
+        Platform {
+            coin,
+            network,
+            best_block_height: AtomicU64::new(0),
+            default_fees_and_confirmations,
+            registered_txs: PaMutex::new(HashMap::new()),
+            registered_outputs: PaMutex::new(Vec::new()),
+            unsigned_funding_txs: PaMutex::new(HashMap::new()),
+        }
+    }
+
+    #[inline]
+    fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.coin.as_ref().rpc_client }
+
+    #[inline]
+    pub fn update_best_block_height(&self, new_height: u64) {
+        self.best_block_height.store(new_height, AtomicOrdering::Relaxed);
+    }
+
+    #[inline]
+    pub fn best_block_height(&self) -> u64 { self.best_block_height.load(AtomicOrdering::Relaxed) }
+
+    pub fn add_tx(&self, txid: Txid, script_pubkey: Script) {
+        let mut registered_txs = self.registered_txs.lock();
+        registered_txs
+            .entry(txid)
+            .or_insert_with(HashSet::new)
+            .insert(script_pubkey);
+    }
+
+    pub fn add_output(&self, output: WatchedOutput) {
+        let mut registered_outputs = self.registered_outputs.lock();
+        registered_outputs.push(output);
+    }
+
+    async fn get_tx_if_onchain(&self, txid: Txid) -> Result<Option<Transaction>, GetTxError> {
+        let txid = h256_json_from_txid(txid);
+        match self
+            .rpc_client()
+            .get_transaction_bytes(&txid)
+            .compat()
+            .await
+            .map_err(|e| e.into_inner())
+        {
+            Ok(bytes) => Ok(Some(deserialize(&bytes.into_vec())?)),
+            Err(err) => {
+                if let UtxoRpcError::ResponseParseError(ref json_err) = err {
+                    if let JsonRpcErrorType::Response(_, json) = &json_err.error {
+                        if let Some(message) = json["message"].as_str() {
+                            if message.contains(utxo_common::NO_TX_ERROR_CODE) {
+                                return Ok(None);
+                            }
+                        }
+                    }
+                }
+                Err(err.into())
+            },
+        }
+    }
+
+    async fn process_tx_for_unconfirmation<T>(&self, txid: Txid, monitor: &T)
+    where
+        T: Confirm,
+    {
+        match self.get_tx_if_onchain(txid).await {
+            Ok(Some(_)) => {},
+            Ok(None) => {
+                info!(
+                    "Transaction {} is not found on chain. The transaction will be re-broadcasted.",
+                    txid,
+                );
+                monitor.transaction_unconfirmed(&txid);
+            },
+            Err(e) => error!(
+                "Error while trying to check if the transaction {} is discarded or not :{:?}",
+                txid, e
+            ),
+        }
+    }
+
+    pub async fn process_txs_unconfirmations(&self, chain_monitor: &ChainMonitor, channel_manager: &ChannelManager) {
+        // Retrieve channel manager transaction IDs to check the chain for un-confirmations
+        let channel_manager_relevant_txids = channel_manager.get_relevant_txids();
+        for txid in channel_manager_relevant_txids {
+            self.process_tx_for_unconfirmation(txid, channel_manager).await;
+        }
+
+        // Retrieve chain monitor transaction IDs to check the chain for un-confirmations
+        let chain_monitor_relevant_txids = chain_monitor.get_relevant_txids();
+        for txid in chain_monitor_relevant_txids {
+            self.process_tx_for_unconfirmation(txid, chain_monitor).await;
+        }
+    }
+
+    async fn get_confirmed_registered_txs(&self, client: &ElectrumClient) -> Vec<ConfirmedTransactionInfo> {
+        let registered_txs = self.registered_txs.lock().clone();
+        let mut confirmed_registered_txs = Vec::new();
+        for (txid, scripts) in registered_txs {
+            if let Some(transaction) =
+                ok_or_continue_after_sleep!(self.get_tx_if_onchain(txid).await, TRY_LOOP_INTERVAL)
+            {
+                for (_, vout) in transaction.output.iter().enumerate() {
+                    if scripts.contains(&vout.script_pubkey) {
+                        let script_hash = hex::encode(electrum_script_hash(vout.script_pubkey.as_ref()));
+                        let history = ok_or_retry_after_sleep!(
+                            client.scripthash_get_history(&script_hash).compat().await,
+                            TRY_LOOP_INTERVAL
+                        );
+                        for item in history {
+                            let rpc_txid = h256_json_from_txid(txid);
+                            if item.tx_hash == rpc_txid && item.height > 0 {
+                                let height = item.height as u64;
+                                let header =
+                                    ok_or_retry_after_sleep!(get_block_header(client, height).await, TRY_LOOP_INTERVAL);
+                                let index = ok_or_retry_after_sleep!(
+                                    client
+                                        .blockchain_transaction_get_merkle(rpc_txid, height)
+                                        .compat()
+                                        .await,
+                                    TRY_LOOP_INTERVAL
+                                )
+                                .pos;
+                                let confirmed_transaction_info = ConfirmedTransactionInfo::new(
+                                    txid,
+                                    header,
+                                    index,
+                                    transaction.clone(),
+                                    height as u32,
+                                );
+                                confirmed_registered_txs.push(confirmed_transaction_info);
+                                self.registered_txs.lock().remove(&txid);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        confirmed_registered_txs
+    }
+
+    async fn append_spent_registered_output_txs(
+        &self,
+        transactions_to_confirm: &mut Vec<ConfirmedTransactionInfo>,
+        client: &ElectrumClient,
+    ) {
+        let mut outputs_to_remove = Vec::new();
+        let registered_outputs = self.registered_outputs.lock().clone();
+        for output in registered_outputs {
+            if let Some(tx_info) = ok_or_continue_after_sleep!(
+                find_watched_output_spend_with_header(client, &output).await,
+                TRY_LOOP_INTERVAL
+            ) {
+                if !transactions_to_confirm
+                    .iter()
+                    .any(|info| info.txid == tx_info.tx.txid())
+                {
+                    let rpc_txid = h256_json_from_txid(tx_info.tx.txid());
+                    let index = ok_or_retry_after_sleep!(
+                        client
+                            .blockchain_transaction_get_merkle(rpc_txid, tx_info.block_height)
+                            .compat()
+                            .await,
+                        TRY_LOOP_INTERVAL
+                    )
+                    .pos;
+                    let confirmed_transaction_info = ConfirmedTransactionInfo::new(
+                        tx_info.tx.txid(),
+                        tx_info.block_header,
+                        index,
+                        tx_info.tx,
+                        tx_info.block_height as u32,
+                    );
+                    transactions_to_confirm.push(confirmed_transaction_info);
+                }
+                outputs_to_remove.push(output);
+            }
+        }
+        self.registered_outputs
+            .lock()
+            .retain(|output| !outputs_to_remove.contains(output));
+    }
+
+    pub async fn process_txs_confirmations(
+        &self,
+        client: &ElectrumClient,
+        persister: &LightningPersister,
+        chain_monitor: &ChainMonitor,
+        channel_manager: &ChannelManager,
+    ) {
+        let mut transactions_to_confirm = self.get_confirmed_registered_txs(client).await;
+        self.append_spent_registered_output_txs(&mut transactions_to_confirm, client)
+            .await;
+
+        transactions_to_confirm.sort_by(|a, b| (a.height, a.index).cmp(&(b.height, b.index)));
+
+        for confirmed_transaction_info in transactions_to_confirm {
+            let best_block_height = self.best_block_height();
+            if let Err(e) = persister
+                .update_funding_tx_block_height(
+                    confirmed_transaction_info.transaction.txid().to_string(),
+                    best_block_height,
+                )
+                .await
+            {
+                error!("Unable to update the funding tx block height in DB: {}", e);
+            }
+            channel_manager.transactions_confirmed(
+                &confirmed_transaction_info.header,
+                &[(
+                    confirmed_transaction_info.index,
+                    &confirmed_transaction_info.transaction,
+                )],
+                confirmed_transaction_info.height,
+            );
+            chain_monitor.transactions_confirmed(
+                &confirmed_transaction_info.header,
+                &[(
+                    confirmed_transaction_info.index,
+                    &confirmed_transaction_info.transaction,
+                )],
+                confirmed_transaction_info.height,
+            );
+        }
+    }
+
+    pub async fn get_channel_closing_tx(&self, channel_details: SqlChannelDetails) -> SaveChannelClosingResult<String> {
+        let from_block = channel_details
+            .funding_generated_in_block
+            .ok_or_else(|| MmError::new(SaveChannelClosingError::BlockHeightNull))?;
+
+        let tx_id = channel_details
+            .funding_tx
+            .ok_or_else(|| MmError::new(SaveChannelClosingError::FundingTxNull))?;
+
+        let tx_hash =
+            H256Json::from_str(&tx_id).map_to_mm(|e| SaveChannelClosingError::FundingTxParseError(e.to_string()))?;
+
+        let funding_tx_bytes = ok_or_retry_after_sleep!(
+            self.rpc_client().get_transaction_bytes(&tx_hash).compat().await,
+            TRY_LOOP_INTERVAL
+        );
+
+        let closing_tx = self
+            .coin
+            .wait_for_tx_spend(
+                &funding_tx_bytes.into_vec(),
+                (now_ms() / 1000) + 3600,
+                from_block,
+                &None,
+            )
+            .compat()
+            .await
+            .map_to_mm(|e| SaveChannelClosingError::WaitForFundingTxSpendError(e.get_plain_text_format()))?;
+
+        let closing_tx_hash = format!("{:02x}", closing_tx.tx_hash());
+
+        Ok(closing_tx_hash)
+    }
+}
+
+impl FeeEstimator for Platform {
+    // Gets estimated satoshis of fee required per 1000 Weight-Units.
+    fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
+        let platform_coin = &self.coin;
+
+        let default_fee = match confirmation_target {
+            ConfirmationTarget::Background => self.default_fees_and_confirmations.background.default_fee_per_kb,
+            ConfirmationTarget::Normal => self.default_fees_and_confirmations.normal.default_fee_per_kb,
+            ConfirmationTarget::HighPriority => self.default_fees_and_confirmations.high_priority.default_fee_per_kb,
+        };
+
+        let conf = &platform_coin.as_ref().conf;
+        let n_blocks = match confirmation_target {
+            ConfirmationTarget::Background => self.default_fees_and_confirmations.background.n_blocks,
+            ConfirmationTarget::Normal => self.default_fees_and_confirmations.normal.n_blocks,
+            ConfirmationTarget::HighPriority => self.default_fees_and_confirmations.high_priority.n_blocks,
+        };
+        let fee_per_kb = tokio::task::block_in_place(move || {
+            self.rpc_client()
+                .estimate_fee_sat(
+                    platform_coin.decimals(),
+                    // Todo: when implementing Native client detect_fee_method should be used for Native and
+                    // EstimateFeeMethod::Standard for Electrum
+                    &EstimateFeeMethod::Standard,
+                    &conf.estimate_fee_mode,
+                    n_blocks,
+                )
+                .wait()
+                .unwrap_or(default_fee)
+        });
+        // Must be no smaller than 253 (ie 1 satoshi-per-byte rounded up to ensure later round-downs don’t put us below 1 satoshi-per-byte).
+        // https://docs.rs/lightning/0.0.101/lightning/chain/chaininterface/trait.FeeEstimator.html#tymethod.get_est_sat_per_1000_weight
+        cmp::max((fee_per_kb as f64 / 4.0).ceil() as u32, MIN_ALLOWED_FEE_PER_1000_WEIGHT)
+    }
+}
+
+impl BroadcasterInterface for Platform {
+    fn broadcast_transaction(&self, tx: &Transaction) {
+        let txid = tx.txid();
+        let tx_hex = serialize_hex(tx);
+        debug!("Trying to broadcast transaction: {}", tx_hex);
+        let fut = self.coin.send_raw_tx(&tx_hex);
+        spawn(async move {
+            match fut.compat().await {
+                Ok(id) => info!("Transaction broadcasted successfully: {:?} ", id),
+                Err(e) => error!("Broadcast transaction {} failed: {}", txid, e),
+            }
+        });
+    }
+}
+
+impl Filter for Platform {
+    // Watches for this transaction on-chain
+    #[inline]
+    fn register_tx(&self, txid: &Txid, script_pubkey: &Script) { self.add_tx(*txid, script_pubkey.clone()); }
+
+    // Watches for any transactions that spend this output on-chain
+    fn register_output(&self, output: WatchedOutput) -> Option<(usize, Transaction)> {
+        self.add_output(output.clone());
+
+        let block_hash = match output.block_hash {
+            Some(h) => H256Json::from(h.as_hash().into_inner()),
+            None => return None,
+        };
+
+        // Although this works for both native and electrum clients as the block hash is available,
+        // the filter interface which includes register_output and register_tx should be used for electrum clients only,
+        // this is the reason for initializing the filter as an option in the start_lightning function as it will be None
+        // when implementing lightning for native clients
+        let output_spend_info = tokio::task::block_in_place(move || {
+            let delay = TRY_LOOP_INTERVAL as u64;
+            ok_or_retry_after_sleep_sync!(
+                self.rpc_client()
+                    .find_output_spend(
+                        H256::from(output.outpoint.txid.as_hash().into_inner()),
+                        output.script_pubkey.as_ref(),
+                        output.outpoint.index.into(),
+                        BlockHashOrHeight::Hash(block_hash),
+                    )
+                    .wait(),
+                delay
+            )
+        });
+
+        if let Some(info) = output_spend_info {
+            match Transaction::try_from(info.spending_tx) {
+                Ok(tx) => Some((info.input_index, tx)),
+                Err(e) => {
+                    error!("Can't convert transaction error: {}", e.to_string());
+                    return None;
+                },
+            };
+        }
+
+        None
+    }
+}
diff --git a/mm2src/coins/lightning/ln_serialization.rs b/mm2src/coins/lightning/ln_serialization.rs
new file mode 100644
index 0000000000..82f0a700c7
--- /dev/null
+++ b/mm2src/coins/lightning/ln_serialization.rs
@@ -0,0 +1,202 @@
+use lightning_invoice::Invoice;
+use secp256k1::PublicKey;
+use serde::{de, Serialize, Serializer};
+use std::fmt;
+use std::net::{SocketAddr, ToSocketAddrs};
+use std::str::FromStr;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct InvoiceForRPC(Invoice);
+
+impl From<Invoice> for InvoiceForRPC {
+    fn from(i: Invoice) -> Self { InvoiceForRPC(i) }
+}
+
+impl From<InvoiceForRPC> for Invoice {
+    fn from(i: InvoiceForRPC) -> Self { i.0 }
+}
+
+impl Serialize for InvoiceForRPC {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(&self.0.to_string())
+    }
+}
+
+impl<'de> de::Deserialize<'de> for InvoiceForRPC {
+    fn deserialize<D: de::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        struct InvoiceForRPCVisitor;
+
+        impl<'de> de::Visitor<'de> for InvoiceForRPCVisitor {
+            type Value = InvoiceForRPC;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                write!(formatter, "a lightning invoice")
+            }
+
+            fn visit_str<E: de::Error>(self, v: &str) -> Result<Self::Value, E> {
+                let invoice = Invoice::from_str(v).map_err(|e| {
+                    let err = format!("Could not parse lightning invoice from str {}, err {}", v, e);
+                    de::Error::custom(err)
+                })?;
+                Ok(InvoiceForRPC(invoice))
+            }
+        }
+
+        deserializer.deserialize_str(InvoiceForRPCVisitor)
+    }
+}
+
+// TODO: support connection to onion addresses
+#[derive(Debug, PartialEq)]
+pub struct NodeAddress {
+    pub pubkey: PublicKey,
+    pub addr: SocketAddr,
+}
+
+impl Serialize for NodeAddress {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(&format!("{}@{}", self.pubkey, self.addr))
+    }
+}
+
+impl<'de> de::Deserialize<'de> for NodeAddress {
+    fn deserialize<D: de::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        struct NodeAddressVisitor;
+
+        impl<'de> de::Visitor<'de> for NodeAddressVisitor {
+            type Value = NodeAddress;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { write!(formatter, "pubkey@host:port") }
+
+            fn visit_str<E: de::Error>(self, v: &str) -> Result<Self::Value, E> {
+                let mut pubkey_and_addr = v.split('@');
+                let pubkey_str = pubkey_and_addr.next().ok_or_else(|| {
+                    let err = format!("Could not parse node address from str {}", v);
+                    de::Error::custom(err)
+                })?;
+                let addr_str = pubkey_and_addr.next().ok_or_else(|| {
+                    let err = format!("Could not parse node address from str {}", v);
+                    de::Error::custom(err)
+                })?;
+                let pubkey = PublicKey::from_str(pubkey_str).map_err(|e| {
+                    let err = format!("Could not parse node pubkey from str {}, err {}", pubkey_str, e);
+                    de::Error::custom(err)
+                })?;
+                let addr = addr_str
+                    .to_socket_addrs()
+                    .map(|mut r| r.next())
+                    .map_err(|e| {
+                        let err = format!("Could not parse socket address from str {}, err {}", addr_str, e);
+                        de::Error::custom(err)
+                    })?
+                    .ok_or_else(|| {
+                        let err = format!("Could not parse socket address from str {}", addr_str);
+                        de::Error::custom(err)
+                    })?;
+                Ok(NodeAddress { pubkey, addr })
+            }
+        }
+
+        deserializer.deserialize_str(NodeAddressVisitor)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct PublicKeyForRPC(pub PublicKey);
+
+impl From<PublicKeyForRPC> for PublicKey {
+    fn from(p: PublicKeyForRPC) -> Self { p.0 }
+}
+
+impl Serialize for PublicKeyForRPC {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(&self.0.to_string())
+    }
+}
+
+impl<'de> de::Deserialize<'de> for PublicKeyForRPC {
+    fn deserialize<D: de::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        struct PublicKeyForRPCVisitor;
+
+        impl<'de> de::Visitor<'de> for PublicKeyForRPCVisitor {
+            type Value = PublicKeyForRPC;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { write!(formatter, "a public key") }
+
+            fn visit_str<E: de::Error>(self, v: &str) -> Result<Self::Value, E> {
+                let pubkey = PublicKey::from_str(v).map_err(|e| {
+                    let err = format!("Could not parse public key from str {}, err {}", v, e);
+                    de::Error::custom(err)
+                })?;
+                Ok(PublicKeyForRPC(pubkey))
+            }
+        }
+
+        deserializer.deserialize_str(PublicKeyForRPCVisitor)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json as json;
+
+    #[test]
+    fn test_invoice_for_rpc_serialize() {
+        let invoice_for_rpc = InvoiceForRPC(str::parse::<Invoice>("lntb20u1p3zqmvrpp52hej7trefx6y633aujj6nltjs8cf7lzyp78tfn5y5wpa3udk5tvqdp8xys9xcmpd3sjqsmgd9czq3njv9c8qatrvd5kumcxqrrsscqp79qy9qsqsp5ccy2qgmptg8dthxsjvw2c43uyvqkg6cqey3jpks4xf0tv7xfrqrq3xfnuffau2h2k8defphv2xsktzn2qj5n2l8d9l9zx64fg6jcmdg9kmpevneyyhfnzrpspqdrky8u7l4c6qdnquh8lnevswwrtcd9ypcq89ga09").unwrap());
+        let expected = r#""lntb20u1p3zqmvrpp52hej7trefx6y633aujj6nltjs8cf7lzyp78tfn5y5wpa3udk5tvqdp8xys9xcmpd3sjqsmgd9czq3njv9c8qatrvd5kumcxqrrsscqp79qy9qsqsp5ccy2qgmptg8dthxsjvw2c43uyvqkg6cqey3jpks4xf0tv7xfrqrq3xfnuffau2h2k8defphv2xsktzn2qj5n2l8d9l9zx64fg6jcmdg9kmpevneyyhfnzrpspqdrky8u7l4c6qdnquh8lnevswwrtcd9ypcq89ga09""#;
+        let actual = json::to_string(&invoice_for_rpc).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_invoice_for_rpc_deserialize() {
+        let invoice_for_rpc = r#""lntb20u1p3zqmvrpp52hej7trefx6y633aujj6nltjs8cf7lzyp78tfn5y5wpa3udk5tvqdp8xys9xcmpd3sjqsmgd9czq3njv9c8qatrvd5kumcxqrrsscqp79qy9qsqsp5ccy2qgmptg8dthxsjvw2c43uyvqkg6cqey3jpks4xf0tv7xfrqrq3xfnuffau2h2k8defphv2xsktzn2qj5n2l8d9l9zx64fg6jcmdg9kmpevneyyhfnzrpspqdrky8u7l4c6qdnquh8lnevswwrtcd9ypcq89ga09""#;
+        let expected = InvoiceForRPC(str::parse::<Invoice>("lntb20u1p3zqmvrpp52hej7trefx6y633aujj6nltjs8cf7lzyp78tfn5y5wpa3udk5tvqdp8xys9xcmpd3sjqsmgd9czq3njv9c8qatrvd5kumcxqrrsscqp79qy9qsqsp5ccy2qgmptg8dthxsjvw2c43uyvqkg6cqey3jpks4xf0tv7xfrqrq3xfnuffau2h2k8defphv2xsktzn2qj5n2l8d9l9zx64fg6jcmdg9kmpevneyyhfnzrpspqdrky8u7l4c6qdnquh8lnevswwrtcd9ypcq89ga09").unwrap());
+        let actual = json::from_str(invoice_for_rpc).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_node_address_serialize() {
+        let node_address = NodeAddress {
+            pubkey: PublicKey::from_str("038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9").unwrap(),
+            addr: SocketAddr::new("203.132.94.196".parse().unwrap(), 9735),
+        };
+        let expected = r#""038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9@203.132.94.196:9735""#;
+        let actual = json::to_string(&node_address).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_node_address_deserialize() {
+        let node_address =
+            r#""038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9@203.132.94.196:9735""#;
+        let expected = NodeAddress {
+            pubkey: PublicKey::from_str("038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9").unwrap(),
+            addr: SocketAddr::new("203.132.94.196".parse().unwrap(), 9735),
+        };
+        let actual: NodeAddress = json::from_str(node_address).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_public_key_for_rpc_serialize() {
+        let public_key_for_rpc = PublicKeyForRPC(
+            PublicKey::from_str("038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9").unwrap(),
+        );
+        let expected = r#""038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9""#;
+        let actual = json::to_string(&public_key_for_rpc).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_public_key_for_rpc_deserialize() {
+        let public_key_for_rpc = r#""038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9""#;
+        let expected = PublicKeyForRPC(
+            PublicKey::from_str("038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9").unwrap(),
+        );
+        let actual = json::from_str(public_key_for_rpc).unwrap();
+        assert_eq!(expected, actual);
+    }
+}
diff --git a/mm2src/coins/lightning/ln_utils.rs b/mm2src/coins/lightning/ln_utils.rs
new file mode 100644
index 0000000000..05e4fd4f63
--- /dev/null
+++ b/mm2src/coins/lightning/ln_utils.rs
@@ -0,0 +1,270 @@
+use super::*;
+use crate::lightning::ln_platform::{get_best_header, ln_best_block_update_loop, update_best_block};
+use crate::utxo::rpc_clients::BestBlock as RpcBestBlock;
+use bitcoin::hash_types::BlockHash;
+use bitcoin_hashes::{sha256d, Hash};
+use common::executor::{spawn, Timer};
+use common::log;
+use common::log::LogState;
+use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
+use lightning::chain::{chainmonitor, BestBlock, Watch};
+use lightning::ln::channelmanager;
+use lightning::ln::channelmanager::{ChainParameters, ChannelManagerReadArgs, SimpleArcChannelManager};
+use lightning::routing::network_graph::NetworkGraph;
+use lightning::util::config::UserConfig;
+use lightning::util::ser::ReadableArgs;
+use lightning_persister::storage::{DbStorage, FileSystemStorage, NodesAddressesMap, Scorer};
+use lightning_persister::LightningPersister;
+use mm2_core::mm_ctx::MmArc;
+use std::fs::File;
+use std::path::PathBuf;
+use std::sync::{Arc, Mutex};
+use std::time::SystemTime;
+
+const NETWORK_GRAPH_PERSIST_INTERVAL: u64 = 600;
+const SCORER_PERSIST_INTERVAL: u64 = 600;
+
+pub type ChainMonitor = chainmonitor::ChainMonitor<
+    InMemorySigner,
+    Arc<Platform>,
+    Arc<Platform>,
+    Arc<Platform>,
+    Arc<LogState>,
+    Arc<LightningPersister>,
+>;
+
+pub type ChannelManager = SimpleArcChannelManager<ChainMonitor, Platform, Platform, LogState>;
+
+#[inline]
+fn ln_data_dir(ctx: &MmArc, ticker: &str) -> PathBuf { ctx.dbdir().join("LIGHTNING").join(ticker) }
+
+#[inline]
+fn ln_data_backup_dir(ctx: &MmArc, path: Option<String>, ticker: &str) -> Option<PathBuf> {
+    path.map(|p| {
+        PathBuf::from(&p)
+            .join(&hex::encode(&**ctx.rmd160()))
+            .join("LIGHTNING")
+            .join(ticker)
+    })
+}
+
+pub async fn init_persister(
+    ctx: &MmArc,
+    platform: Arc<Platform>,
+    ticker: String,
+    backup_path: Option<String>,
+) -> EnableLightningResult<Arc<LightningPersister>> {
+    let ln_data_dir = ln_data_dir(ctx, &ticker);
+    let ln_data_backup_dir = ln_data_backup_dir(ctx, backup_path, &ticker);
+    let persister = Arc::new(LightningPersister::new(
+        ticker.replace('-', "_"),
+        ln_data_dir,
+        ln_data_backup_dir,
+        ctx.sqlite_connection
+            .ok_or(MmError::new(EnableLightningError::DbError(
+                "sqlite_connection is not initialized".into(),
+            )))?
+            .clone(),
+    ));
+    let is_initialized = persister.is_fs_initialized().await?;
+    if !is_initialized {
+        persister.init_fs().await?;
+    }
+    let is_db_initialized = persister.is_db_initialized().await?;
+    if !is_db_initialized {
+        persister.init_db().await?;
+    }
+
+    let closed_channels_without_closing_tx = persister.get_closed_channels_with_no_closing_tx().await?;
+    for channel_details in closed_channels_without_closing_tx {
+        let platform = platform.clone();
+        let persister = persister.clone();
+        let user_channel_id = channel_details.rpc_id;
+        spawn(async move {
+            if let Ok(closing_tx_hash) = platform
+                .get_channel_closing_tx(channel_details)
+                .await
+                .error_log_passthrough()
+            {
+                if let Err(e) = persister.add_closing_tx_to_db(user_channel_id, closing_tx_hash).await {
+                    log::error!(
+                        "Unable to update channel {} closing details in DB: {}",
+                        user_channel_id,
+                        e
+                    );
+                }
+            }
+        });
+    }
+
+    Ok(persister)
+}
+
+pub fn init_keys_manager(ctx: &MmArc) -> EnableLightningResult<Arc<KeysManager>> {
+    // The current time is used to derive random numbers from the seed where required, to ensure all random generation is unique across restarts.
+    let seed: [u8; 32] = ctx.secp256k1_key_pair().private().secret.into();
+    let cur = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .map_to_mm(|e| EnableLightningError::SystemTimeError(e.to_string()))?;
+
+    Ok(Arc::new(KeysManager::new(&seed, cur.as_secs(), cur.subsec_nanos())))
+}
+
+pub async fn init_channel_manager(
+    platform: Arc<Platform>,
+    logger: Arc<LogState>,
+    persister: Arc<LightningPersister>,
+    keys_manager: Arc<KeysManager>,
+    user_config: UserConfig,
+) -> EnableLightningResult<(Arc<ChainMonitor>, Arc<ChannelManager>)> {
+    // Initialize the FeeEstimator. UtxoStandardCoin implements the FeeEstimator trait, so it'll act as our fee estimator.
+    let fee_estimator = platform.clone();
+
+    // Initialize the BroadcasterInterface. UtxoStandardCoin implements the BroadcasterInterface trait, so it'll act as our transaction
+    // broadcaster.
+    let broadcaster = platform.clone();
+
+    // Initialize the ChainMonitor
+    let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
+        Some(platform.clone()),
+        broadcaster.clone(),
+        logger.clone(),
+        fee_estimator.clone(),
+        persister.clone(),
+    ));
+
+    // Read ChannelMonitor state from disk, important for lightning node is restarting and has at least 1 channel
+    let mut channelmonitors = persister
+        .read_channelmonitors(keys_manager.clone())
+        .map_to_mm(|e| EnableLightningError::IOError(e.to_string()))?;
+
+    // This is used for Electrum only to prepare for chain synchronization
+    for (_, chan_mon) in channelmonitors.iter() {
+        chan_mon.load_outputs_to_watch(&platform);
+    }
+
+    let rpc_client = match &platform.coin.as_ref().rpc_client {
+        UtxoRpcClientEnum::Electrum(c) => c.clone(),
+        UtxoRpcClientEnum::Native(_) => {
+            return MmError::err(EnableLightningError::UnsupportedMode(
+                "Lightning network".into(),
+                "electrum".into(),
+            ))
+        },
+    };
+    let best_header = get_best_header(&rpc_client).await?;
+    platform.update_best_block_height(best_header.block_height());
+    let best_block = RpcBestBlock::from(best_header.clone());
+    let best_block_hash = BlockHash::from_hash(
+        sha256d::Hash::from_slice(&best_block.hash.0).map_to_mm(|e| EnableLightningError::HashError(e.to_string()))?,
+    );
+    let (channel_manager_blockhash, channel_manager) = {
+        if let Ok(mut f) = File::open(persister.manager_path()) {
+            let mut channel_monitor_mut_references = Vec::new();
+            for (_, channel_monitor) in channelmonitors.iter_mut() {
+                channel_monitor_mut_references.push(channel_monitor);
+            }
+            // Read ChannelManager data from the file
+            let read_args = ChannelManagerReadArgs::new(
+                keys_manager.clone(),
+                fee_estimator.clone(),
+                chain_monitor.clone(),
+                broadcaster.clone(),
+                logger.clone(),
+                user_config,
+                channel_monitor_mut_references,
+            );
+            <(BlockHash, ChannelManager)>::read(&mut f, read_args)
+                .map_to_mm(|e| EnableLightningError::IOError(e.to_string()))?
+        } else {
+            // Initialize the ChannelManager to starting a new node without history
+            let chain_params = ChainParameters {
+                network: platform.network.clone().into(),
+                best_block: BestBlock::new(best_block_hash, best_block.height as u32),
+            };
+            let new_channel_manager = channelmanager::ChannelManager::new(
+                fee_estimator.clone(),
+                chain_monitor.clone(),
+                broadcaster.clone(),
+                logger.clone(),
+                keys_manager.clone(),
+                user_config,
+                chain_params,
+            );
+            (best_block_hash, new_channel_manager)
+        }
+    };
+
+    let channel_manager: Arc<ChannelManager> = Arc::new(channel_manager);
+
+    // Sync ChannelMonitors and ChannelManager to chain tip if the node is restarting and has open channels
+    if channel_manager_blockhash != best_block_hash {
+        platform
+            .process_txs_unconfirmations(&chain_monitor, &channel_manager)
+            .await;
+        platform
+            .process_txs_confirmations(&rpc_client, &persister, &chain_monitor, &channel_manager)
+            .await;
+        update_best_block(&chain_monitor, &channel_manager, best_header).await;
+    }
+
+    // Give ChannelMonitors to ChainMonitor
+    for (_, channel_monitor) in channelmonitors.drain(..) {
+        let funding_outpoint = channel_monitor.get_funding_txo().0;
+        chain_monitor
+            .watch_channel(funding_outpoint, channel_monitor)
+            .map_to_mm(|e| EnableLightningError::IOError(format!("{:?}", e)))?;
+    }
+
+    // Update best block whenever there's a new chain tip or a block has been newly disconnected
+    spawn(ln_best_block_update_loop(
+        // It's safe to use unwrap here for now until implementing Native Client for Lightning
+        platform,
+        persister.clone(),
+        chain_monitor.clone(),
+        channel_manager.clone(),
+        rpc_client.clone(),
+        best_block,
+    ));
+
+    Ok((chain_monitor, channel_manager))
+}
+
+pub async fn persist_network_graph_loop(persister: Arc<LightningPersister>, network_graph: Arc<NetworkGraph>) {
+    loop {
+        if let Err(e) = persister.save_network_graph(network_graph.clone()).await {
+            log::warn!(
+                "Failed to persist network graph error: {}, please check disk space and permissions",
+                e
+            );
+        }
+        Timer::sleep(NETWORK_GRAPH_PERSIST_INTERVAL as f64).await;
+    }
+}
+
+pub async fn persist_scorer_loop(persister: Arc<LightningPersister>, scorer: Arc<Mutex<Scorer>>) {
+    loop {
+        if let Err(e) = persister.save_scorer(scorer.clone()).await {
+            log::warn!(
+                "Failed to persist scorer error: {}, please check disk space and permissions",
+                e
+            );
+        }
+        Timer::sleep(SCORER_PERSIST_INTERVAL as f64).await;
+    }
+}
+
+pub async fn get_open_channels_nodes_addresses(
+    persister: Arc<LightningPersister>,
+    channel_manager: Arc<ChannelManager>,
+) -> EnableLightningResult<NodesAddressesMap> {
+    let channels = channel_manager.list_channels();
+    let mut nodes_addresses = persister.get_nodes_addresses().await?;
+    nodes_addresses.retain(|pubkey, _node_addr| {
+        channels
+            .iter()
+            .map(|chan| chan.counterparty.node_id)
+            .any(|node_id| node_id == *pubkey)
+    });
+    Ok(nodes_addresses)
+}
diff --git a/mm2src/coins/lightning_background_processor/Cargo.toml b/mm2src/coins/lightning_background_processor/Cargo.toml
new file mode 100644
index 0000000000..5710dcfc2c
--- /dev/null
+++ b/mm2src/coins/lightning_background_processor/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "lightning-background-processor"
+version = "0.0.106"
+authors = ["Valentine Wallace <vwallace@protonmail.com>"]
+license = "MIT OR Apache-2.0"
+repository = "http://github.com/lightningdevkit/rust-lightning"
+description = """
+Utilities to perform required background tasks for Rust Lightning.
+"""
+edition = "2018"
+
+[dependencies]
+bitcoin = "0.27.1"
+lightning = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106", features = ["std"] }
+
+[dev-dependencies]
+db_common = { path = "../../db_common" }
+lightning = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106", features = ["_test_utils"] }
+lightning-invoice = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106" }
+lightning-persister = { version = "0.0.106", path = "../lightning_persister" }
diff --git a/mm2src/coins/lightning_background_processor/src/lib.rs b/mm2src/coins/lightning_background_processor/src/lib.rs
new file mode 100644
index 0000000000..4ca2fe9ad4
--- /dev/null
+++ b/mm2src/coins/lightning_background_processor/src/lib.rs
@@ -0,0 +1,950 @@
+//! Utilities that take care of tasks that (1) need to happen periodically to keep Rust-Lightning
+//! running properly, and (2) either can or should be run in the background. See docs for
+//! [`BackgroundProcessor`] for more details on the nitty-gritty.
+
+#[macro_use] extern crate lightning;
+
+use lightning::chain;
+use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
+use lightning::chain::chainmonitor::{ChainMonitor, Persist};
+use lightning::chain::keysinterface::{KeysInterface, Sign};
+use lightning::ln::channelmanager::ChannelManager;
+use lightning::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
+use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
+use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
+use lightning::util::events::{Event, EventHandler, EventsProvider};
+use lightning::util::logger::Logger;
+use std::ops::Deref;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use std::thread;
+use std::thread::JoinHandle;
+use std::time::{Duration, Instant};
+
+/// `BackgroundProcessor` takes care of tasks that (1) need to happen periodically to keep
+/// Rust-Lightning running properly, and (2) either can or should be run in the background. Its
+/// responsibilities are:
+/// * Processing [`Event`]s with a user-provided [`EventHandler`].
+/// * Monitoring whether the [`ChannelManager`] needs to be re-persisted to disk, and if so,
+///   writing it to disk/backups by invoking the callback given to it at startup.
+///   [`ChannelManager`] persistence should be done in the background.
+/// * Calling [`ChannelManager::timer_tick_occurred`] and [`PeerManager::timer_tick_occurred`]
+///   at the appropriate intervals.
+/// * Calling [`NetworkGraph::remove_stale_channels`] (if a [`NetGraphMsgHandler`] is provided to
+///   [`BackgroundProcessor::start`]).
+///
+/// It will also call [`PeerManager::process_events`] periodically though this shouldn't be relied
+/// upon as doing so may result in high latency.
+///
+/// # Note
+///
+/// If [`ChannelManager`] persistence fails and the persisted manager becomes out-of-date, then
+/// there is a risk of channels force-closing on startup when the manager realizes it's outdated.
+/// However, as long as [`ChannelMonitor`] backups are sound, no funds besides those used for
+/// unilateral chain closure fees are at risk.
+///
+/// [`ChannelMonitor`]: lightning::chain::channelmonitor::ChannelMonitor
+/// [`Event`]: lightning::util::events::Event
+#[must_use = "BackgroundProcessor will immediately stop on drop. It should be stored until shutdown."]
+pub struct BackgroundProcessor {
+    stop_thread: Arc<AtomicBool>,
+    thread_handle: Option<JoinHandle<Result<(), std::io::Error>>>,
+}
+
+#[cfg(not(test))]
+const FRESHNESS_TIMER: u64 = 60;
+#[cfg(test)]
+const FRESHNESS_TIMER: u64 = 1;
+
+#[cfg(all(not(test), not(debug_assertions)))]
+const PING_TIMER: u64 = 10;
+/// Signature operations take a lot longer without compiler optimisations.
+/// Increasing the ping timer allows for this but slower devices will be disconnected if the
+/// timeout is reached.
+#[cfg(all(not(test), debug_assertions))]
+const PING_TIMER: u64 = 30;
+#[cfg(test)]
+const PING_TIMER: u64 = 1;
+
+/// Prune the network graph of stale entries hourly.
+const NETWORK_PRUNE_TIMER: u64 = 60 * 60;
+
+/// Trait which handles persisting a [`ChannelManager`] to disk.
+///
+/// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
+pub trait ChannelManagerPersister<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
+where
+    M::Target: 'static + chain::Watch<Signer>,
+    T::Target: 'static + BroadcasterInterface,
+    K::Target: 'static + KeysInterface<Signer = Signer>,
+    F::Target: 'static + FeeEstimator,
+    L::Target: 'static + Logger,
+{
+    /// Persist the given [`ChannelManager`] to disk, returning an error if persistence failed
+    /// (which will cause the [`BackgroundProcessor`] which called this method to exit.
+    ///
+    /// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
+    fn persist_manager(&self, channel_manager: &ChannelManager<Signer, M, T, K, F, L>) -> Result<(), std::io::Error>;
+}
+
+impl<Fun, Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManagerPersister<Signer, M, T, K, F, L>
+    for Fun
+where
+    M::Target: 'static + chain::Watch<Signer>,
+    T::Target: 'static + BroadcasterInterface,
+    K::Target: 'static + KeysInterface<Signer = Signer>,
+    F::Target: 'static + FeeEstimator,
+    L::Target: 'static + Logger,
+    Fun: Fn(&ChannelManager<Signer, M, T, K, F, L>) -> Result<(), std::io::Error>,
+{
+    fn persist_manager(&self, channel_manager: &ChannelManager<Signer, M, T, K, F, L>) -> Result<(), std::io::Error> {
+        self(channel_manager)
+    }
+}
+
+/// Decorates an [`EventHandler`] with common functionality provided by standard [`EventHandler`]s.
+struct DecoratingEventHandler<
+    E: EventHandler,
+    N: Deref<Target = NetGraphMsgHandler<G, A, L>>,
+    G: Deref<Target = NetworkGraph>,
+    A: Deref,
+    L: Deref,
+> where
+    A::Target: chain::Access,
+    L::Target: Logger,
+{
+    event_handler: E,
+    net_graph_msg_handler: Option<N>,
+}
+
+impl<
+        E: EventHandler,
+        N: Deref<Target = NetGraphMsgHandler<G, A, L>>,
+        G: Deref<Target = NetworkGraph>,
+        A: Deref,
+        L: Deref,
+    > EventHandler for DecoratingEventHandler<E, N, G, A, L>
+where
+    A::Target: chain::Access,
+    L::Target: Logger,
+{
+    fn handle_event(&self, event: &Event) {
+        if let Some(event_handler) = &self.net_graph_msg_handler {
+            event_handler.handle_event(event);
+        }
+        self.event_handler.handle_event(event);
+    }
+}
+
+impl BackgroundProcessor {
+    /// Start a background thread that takes care of responsibilities enumerated in the [top-level
+    /// documentation].
+    ///
+    /// The thread runs indefinitely unless the object is dropped, [`stop`] is called, or
+    /// `persist_manager` returns an error. In case of an error, the error is retrieved by calling
+    /// either [`join`] or [`stop`].
+    ///
+    /// # Data Persistence
+    ///
+    /// `persist_manager` is responsible for writing out the [`ChannelManager`] to disk, and/or
+    /// uploading to one or more backup services. See [`ChannelManager::write`] for writing out a
+    /// [`ChannelManager`]. See [`LightningPersister::persist_manager`] for Rust-Lightning's
+    /// provided implementation.
+    ///
+    /// Typically, users should either implement [`ChannelManagerPersister`] to never return an
+    /// error or call [`join`] and handle any error that may arise. For the latter case,
+    /// `BackgroundProcessor` must be restarted by calling `start` again after handling the error.
+    ///
+    /// # Event Handling
+    ///
+    /// `event_handler` is responsible for handling events that users should be notified of (e.g.,
+    /// payment failed). [`BackgroundProcessor`] may decorate the given [`EventHandler`] with common
+    /// functionality implemented by other handlers.
+    /// * [`NetGraphMsgHandler`] if given will update the [`NetworkGraph`] based on payment failures.
+    ///
+    /// [top-level documentation]: BackgroundProcessor
+    /// [`join`]: Self::join
+    /// [`stop`]: Self::stop
+    /// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
+    /// [`ChannelManager::write`]: lightning::ln::channelmanager::ChannelManager#impl-Writeable
+    /// [`LightningPersister::persist_manager`]: lightning_persister::LightningPersister::persist_manager
+    /// [`NetworkGraph`]: lightning::routing::network_graph::NetworkGraph
+    pub fn start<
+        Signer: 'static + Sign,
+        CA: 'static + Deref + Send + Sync,
+        CF: 'static + Deref + Send + Sync,
+        CW: 'static + Deref + Send + Sync,
+        T: 'static + Deref + Send + Sync,
+        K: 'static + Deref + Send + Sync,
+        F: 'static + Deref + Send + Sync,
+        G: 'static + Deref<Target = NetworkGraph> + Send + Sync,
+        L: 'static + Deref + Send + Sync,
+        P: 'static + Deref + Send + Sync,
+        Descriptor: 'static + SocketDescriptor + Send + Sync,
+        CMH: 'static + Deref + Send + Sync,
+        RMH: 'static + Deref + Send + Sync,
+        EH: 'static + EventHandler + Send,
+        CMP: 'static + Send + ChannelManagerPersister<Signer, CW, T, K, F, L>,
+        M: 'static + Deref<Target = ChainMonitor<Signer, CF, T, F, L, P>> + Send + Sync,
+        CM: 'static + Deref<Target = ChannelManager<Signer, CW, T, K, F, L>> + Send + Sync,
+        NG: 'static + Deref<Target = NetGraphMsgHandler<G, CA, L>> + Send + Sync,
+        UMH: 'static + Deref + Send + Sync,
+        PM: 'static + Deref<Target = PeerManager<Descriptor, CMH, RMH, L, UMH>> + Send + Sync,
+    >(
+        persister: CMP,
+        event_handler: EH,
+        chain_monitor: M,
+        channel_manager: CM,
+        net_graph_msg_handler: Option<NG>,
+        peer_manager: PM,
+        logger: L,
+    ) -> Self
+    where
+        CA::Target: 'static + chain::Access,
+        CF::Target: 'static + chain::Filter,
+        CW::Target: 'static + chain::Watch<Signer>,
+        T::Target: 'static + BroadcasterInterface,
+        K::Target: 'static + KeysInterface<Signer = Signer>,
+        F::Target: 'static + FeeEstimator,
+        L::Target: 'static + Logger,
+        P::Target: 'static + Persist<Signer>,
+        CMH::Target: 'static + ChannelMessageHandler,
+        RMH::Target: 'static + RoutingMessageHandler,
+        UMH::Target: 'static + CustomMessageHandler,
+    {
+        let stop_thread = Arc::new(AtomicBool::new(false));
+        let stop_thread_clone = stop_thread.clone();
+        let handle = thread::spawn(move || -> Result<(), std::io::Error> {
+            let event_handler = DecoratingEventHandler {
+                event_handler,
+                net_graph_msg_handler: net_graph_msg_handler.as_deref(),
+            };
+
+            log_trace!(logger, "Calling ChannelManager's timer_tick_occurred on startup");
+            channel_manager.timer_tick_occurred();
+
+            let mut last_freshness_call = Instant::now();
+            let mut last_ping_call = Instant::now();
+            let mut last_prune_call = Instant::now();
+            let mut have_pruned = false;
+
+            loop {
+                peer_manager.process_events(); // Note that this may block on ChannelManager's locking
+                channel_manager.process_pending_events(&event_handler);
+                chain_monitor.process_pending_events(&event_handler);
+
+                // We wait up to 100ms, but track how long it takes to detect being put to sleep,
+                // see `await_start`'s use below.
+                let await_start = Instant::now();
+                let updates_available = channel_manager.await_persistable_update_timeout(Duration::from_millis(100));
+                let await_time = await_start.elapsed();
+
+                if updates_available {
+                    log_trace!(logger, "Persisting ChannelManager...");
+                    persister.persist_manager(&*channel_manager)?;
+                    log_trace!(logger, "Done persisting ChannelManager.");
+                }
+                // Exit the loop if the background processor was requested to stop.
+                if stop_thread.load(Ordering::Acquire) {
+                    log_trace!(logger, "Terminating background processor.");
+                    break;
+                }
+                if last_freshness_call.elapsed().as_secs() > FRESHNESS_TIMER {
+                    log_trace!(logger, "Calling ChannelManager's timer_tick_occurred");
+                    channel_manager.timer_tick_occurred();
+                    last_freshness_call = Instant::now();
+                }
+                if await_time > Duration::from_secs(1) {
+                    // On various platforms, we may be starved of CPU cycles for several reasons.
+                    // E.g. on iOS, if we've been in the background, we will be entirely paused.
+                    // Similarly, if we're on a desktop platform and the device has been asleep, we
+                    // may not get any cycles.
+                    // We detect this by checking if our max-100ms-sleep, above, ran longer than a
+                    // full second, at which point we assume sockets may have been killed (they
+                    // appear to be at least on some platforms, even if it has only been a second).
+                    // Note that we have to take care to not get here just because user event
+                    // processing was slow at the top of the loop. For example, the sample client
+                    // may call Bitcoin Core RPCs during event handling, which very often takes
+                    // more than a handful of seconds to complete, and shouldn't disconnect all our
+                    // peers.
+                    log_trace!(logger, "100ms sleep took more than a second, disconnecting peers.");
+                    peer_manager.disconnect_all_peers();
+                    last_ping_call = Instant::now();
+                } else if last_ping_call.elapsed().as_secs() > PING_TIMER {
+                    log_trace!(logger, "Calling PeerManager's timer_tick_occurred");
+                    peer_manager.timer_tick_occurred();
+                    last_ping_call = Instant::now();
+                }
+
+                // Note that we want to run a graph prune once not long after startup before
+                // falling back to our usual hourly prunes. This avoids short-lived clients never
+                // pruning their network graph. We run once 60 seconds after startup before
+                // continuing our normal cadence.
+                if last_prune_call.elapsed().as_secs() > if have_pruned { NETWORK_PRUNE_TIMER } else { 60 } {
+                    if let Some(ref handler) = net_graph_msg_handler {
+                        log_trace!(logger, "Pruning network graph of stale entries");
+                        handler.network_graph().remove_stale_channels();
+                        last_prune_call = Instant::now();
+                        have_pruned = true;
+                    }
+                }
+            }
+            // After we exit, ensure we persist the ChannelManager one final time - this avoids
+            // some races where users quit while channel updates were in-flight, with
+            // ChannelMonitor update(s) persisted without a corresponding ChannelManager update.
+            persister.persist_manager(&*channel_manager)
+        });
+        Self {
+            stop_thread: stop_thread_clone,
+            thread_handle: Some(handle),
+        }
+    }
+
+    /// Join `BackgroundProcessor`'s thread, returning any error that occurred while persisting
+    /// [`ChannelManager`].
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the background thread has panicked such as while persisting or
+    /// handling events.
+    ///
+    /// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
+    pub fn join(mut self) -> Result<(), std::io::Error> {
+        assert!(self.thread_handle.is_some());
+        self.join_thread()
+    }
+
+    /// Stop `BackgroundProcessor`'s thread, returning any error that occurred while persisting
+    /// [`ChannelManager`].
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the background thread has panicked such as while persisting or
+    /// handling events.
+    ///
+    /// [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
+    pub fn stop(mut self) -> Result<(), std::io::Error> {
+        assert!(self.thread_handle.is_some());
+        self.stop_and_join_thread()
+    }
+
+    fn stop_and_join_thread(&mut self) -> Result<(), std::io::Error> {
+        self.stop_thread.store(true, Ordering::Release);
+        self.join_thread()
+    }
+
+    fn join_thread(&mut self) -> Result<(), std::io::Error> {
+        match self.thread_handle.take() {
+            Some(handle) => handle.join().unwrap(),
+            None => Ok(()),
+        }
+    }
+}
+
+impl Drop for BackgroundProcessor {
+    fn drop(&mut self) { self.stop_and_join_thread().unwrap(); }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{BackgroundProcessor, FRESHNESS_TIMER};
+    use bitcoin::blockdata::block::BlockHeader;
+    use bitcoin::blockdata::constants::genesis_block;
+    use bitcoin::blockdata::transaction::{Transaction, TxOut};
+    use bitcoin::network::constants::Network;
+    use db_common::sqlite::rusqlite::Connection;
+    use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
+    use lightning::chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient};
+    use lightning::chain::transaction::OutPoint;
+    use lightning::chain::{chainmonitor, BestBlock, Confirm};
+    use lightning::get_event_msg;
+    use lightning::ln::channelmanager::{ChainParameters, ChannelManager, SimpleArcChannelManager, BREAKDOWN_TIMEOUT};
+    use lightning::ln::features::InitFeatures;
+    use lightning::ln::msgs::{ChannelMessageHandler, Init};
+    use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler, PeerManager, SocketDescriptor};
+    use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
+    use lightning::util::config::UserConfig;
+    use lightning::util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
+    use lightning::util::ser::Writeable;
+    use lightning::util::test_utils;
+    use lightning_invoice::payment::{InvoicePayer, RetryAttempts};
+    use lightning_invoice::utils::DefaultRouter;
+    use lightning_persister::LightningPersister;
+    use std::fs;
+    use std::path::PathBuf;
+    use std::sync::{Arc, Mutex};
+    use std::time::Duration;
+
+    const EVENT_DEADLINE: u64 = 5 * FRESHNESS_TIMER;
+
+    #[derive(Clone, Eq, Hash, PartialEq)]
+    struct TestDescriptor {}
+    impl SocketDescriptor for TestDescriptor {
+        fn send_data(&mut self, _data: &[u8], _resume_read: bool) -> usize { 0 }
+
+        fn disconnect_socket(&mut self) {}
+    }
+
+    type ChainMonitor = chainmonitor::ChainMonitor<
+        InMemorySigner,
+        Arc<test_utils::TestChainSource>,
+        Arc<test_utils::TestBroadcaster>,
+        Arc<test_utils::TestFeeEstimator>,
+        Arc<test_utils::TestLogger>,
+        Arc<LightningPersister>,
+    >;
+
+    struct Node {
+        node: Arc<
+            SimpleArcChannelManager<
+                ChainMonitor,
+                test_utils::TestBroadcaster,
+                test_utils::TestFeeEstimator,
+                test_utils::TestLogger,
+            >,
+        >,
+        net_graph_msg_handler: Option<
+            Arc<NetGraphMsgHandler<Arc<NetworkGraph>, Arc<test_utils::TestChainSource>, Arc<test_utils::TestLogger>>>,
+        >,
+        peer_manager: Arc<
+            PeerManager<
+                TestDescriptor,
+                Arc<test_utils::TestChannelMessageHandler>,
+                Arc<test_utils::TestRoutingMessageHandler>,
+                Arc<test_utils::TestLogger>,
+                IgnoringMessageHandler,
+            >,
+        >,
+        chain_monitor: Arc<ChainMonitor>,
+        persister: Arc<LightningPersister>,
+        tx_broadcaster: Arc<test_utils::TestBroadcaster>,
+        network_graph: Arc<NetworkGraph>,
+        logger: Arc<test_utils::TestLogger>,
+        best_block: BestBlock,
+    }
+
+    impl Drop for Node {
+        fn drop(&mut self) {
+            let data_dir = self.persister.main_path();
+            match fs::remove_dir_all(data_dir.clone()) {
+                Err(e) => println!(
+                    "Failed to remove test persister directory {}: {}",
+                    data_dir.to_str().unwrap(),
+                    e
+                ),
+                _ => {},
+            }
+        }
+    }
+
+    fn get_full_filepath(filepath: String, filename: String) -> String {
+        let mut path = PathBuf::from(filepath);
+        path.push(filename);
+        path.to_str().unwrap().to_string()
+    }
+
+    fn create_nodes(num_nodes: usize, persist_dir: String) -> Vec<Node> {
+        let mut nodes = Vec::new();
+        for i in 0..num_nodes {
+            let tx_broadcaster = Arc::new(test_utils::TestBroadcaster {
+                txn_broadcasted: Mutex::new(Vec::new()),
+                blocks: Arc::new(Mutex::new(Vec::new())),
+            });
+            let fee_estimator = Arc::new(test_utils::TestFeeEstimator {
+                sat_per_kw: Mutex::new(253),
+            });
+            let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
+            let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
+            let persister = Arc::new(LightningPersister::new(
+                format!("node_{}_ticker", i),
+                PathBuf::from(format!("{}_persister_{}", persist_dir, i)),
+                None,
+                Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+            ));
+            let seed = [i as u8; 32];
+            let network = Network::Testnet;
+            let genesis_block = genesis_block(network);
+            let now = Duration::from_secs(genesis_block.header.time as u64);
+            let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
+            let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(
+                Some(chain_source.clone()),
+                tx_broadcaster.clone(),
+                logger.clone(),
+                fee_estimator.clone(),
+                persister.clone(),
+            ));
+            let best_block = BestBlock::from_genesis(network);
+            let params = ChainParameters { network, best_block };
+            let manager = Arc::new(ChannelManager::new(
+                fee_estimator.clone(),
+                chain_monitor.clone(),
+                tx_broadcaster.clone(),
+                logger.clone(),
+                keys_manager.clone(),
+                UserConfig::default(),
+                params,
+            ));
+            let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash()));
+            let net_graph_msg_handler = Some(Arc::new(NetGraphMsgHandler::new(
+                network_graph.clone(),
+                Some(chain_source.clone()),
+                logger.clone(),
+            )));
+            let msg_handler = MessageHandler {
+                chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()),
+                route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()),
+            };
+            let peer_manager = Arc::new(PeerManager::new(
+                msg_handler,
+                keys_manager.get_node_secret(Recipient::Node).unwrap(),
+                &seed,
+                logger.clone(),
+                IgnoringMessageHandler {},
+            ));
+            let node = Node {
+                node: manager,
+                net_graph_msg_handler,
+                peer_manager,
+                chain_monitor,
+                persister,
+                tx_broadcaster,
+                network_graph,
+                logger,
+                best_block,
+            };
+            nodes.push(node);
+        }
+
+        for i in 0..num_nodes {
+            for j in (i + 1)..num_nodes {
+                nodes[i].node.peer_connected(&nodes[j].node.get_our_node_id(), &Init {
+                    features: InitFeatures::known(),
+                    remote_network_address: None,
+                });
+                nodes[j].node.peer_connected(&nodes[i].node.get_our_node_id(), &Init {
+                    features: InitFeatures::known(),
+                    remote_network_address: None,
+                });
+            }
+        }
+
+        nodes
+    }
+
+    macro_rules! open_channel {
+        ($node_a: expr, $node_b: expr, $channel_value: expr) => {{
+            begin_open_channel!($node_a, $node_b, $channel_value);
+            let events = $node_a.node.get_and_clear_pending_events();
+            assert_eq!(events.len(), 1);
+            let (temporary_channel_id, tx) = handle_funding_generation_ready!(&events[0], $channel_value);
+            end_open_channel!($node_a, $node_b, temporary_channel_id, tx);
+            tx
+        }};
+    }
+
+    macro_rules! begin_open_channel {
+        ($node_a: expr, $node_b: expr, $channel_value: expr) => {{
+            $node_a
+                .node
+                .create_channel($node_b.node.get_our_node_id(), $channel_value, 100, 42, None)
+                .unwrap();
+            $node_b.node.handle_open_channel(
+                &$node_a.node.get_our_node_id(),
+                InitFeatures::known(),
+                &get_event_msg!(
+                    $node_a,
+                    MessageSendEvent::SendOpenChannel,
+                    $node_b.node.get_our_node_id()
+                ),
+            );
+            $node_a.node.handle_accept_channel(
+                &$node_b.node.get_our_node_id(),
+                InitFeatures::known(),
+                &get_event_msg!(
+                    $node_b,
+                    MessageSendEvent::SendAcceptChannel,
+                    $node_a.node.get_our_node_id()
+                ),
+            );
+        }};
+    }
+
+    macro_rules! handle_funding_generation_ready {
+        ($event: expr, $channel_value: expr) => {{
+            match $event {
+                &Event::FundingGenerationReady {
+                    temporary_channel_id,
+                    channel_value_satoshis,
+                    ref output_script,
+                    user_channel_id,
+                } => {
+                    assert_eq!(channel_value_satoshis, $channel_value);
+                    assert_eq!(user_channel_id, 42);
+
+                    let tx = Transaction {
+                        version: 1 as i32,
+                        lock_time: 0,
+                        input: Vec::new(),
+                        output: vec![TxOut {
+                            value: channel_value_satoshis,
+                            script_pubkey: output_script.clone(),
+                        }],
+                    };
+                    (temporary_channel_id, tx)
+                },
+                _ => panic!("Unexpected event"),
+            }
+        }};
+    }
+
+    macro_rules! end_open_channel {
+        ($node_a: expr, $node_b: expr, $temporary_channel_id: expr, $tx: expr) => {{
+            $node_a
+                .node
+                .funding_transaction_generated(&$temporary_channel_id, $tx.clone())
+                .unwrap();
+            $node_b.node.handle_funding_created(
+                &$node_a.node.get_our_node_id(),
+                &get_event_msg!(
+                    $node_a,
+                    MessageSendEvent::SendFundingCreated,
+                    $node_b.node.get_our_node_id()
+                ),
+            );
+            $node_a.node.handle_funding_signed(
+                &$node_b.node.get_our_node_id(),
+                &get_event_msg!(
+                    $node_b,
+                    MessageSendEvent::SendFundingSigned,
+                    $node_a.node.get_our_node_id()
+                ),
+            );
+        }};
+    }
+
+    fn confirm_transaction_depth(node: &mut Node, tx: &Transaction, depth: u32) {
+        for i in 1..=depth {
+            let prev_blockhash = node.best_block.block_hash();
+            let height = node.best_block.height() + 1;
+            let header = BlockHeader {
+                version: 0x20000000,
+                prev_blockhash,
+                merkle_root: Default::default(),
+                time: height,
+                bits: 42,
+                nonce: 42,
+            };
+            let txdata = vec![(0, tx)];
+            node.best_block = BestBlock::new(header.block_hash(), height);
+            match i {
+                1 => {
+                    node.node.transactions_confirmed(&header, &txdata, height);
+                    node.chain_monitor.transactions_confirmed(&header, &txdata, height);
+                },
+                x if x == depth => {
+                    node.node.best_block_updated(&header, height);
+                    node.chain_monitor.best_block_updated(&header, height);
+                },
+                _ => {},
+            }
+        }
+    }
+    fn confirm_transaction(node: &mut Node, tx: &Transaction) { confirm_transaction_depth(node, tx, ANTI_REORG_DELAY); }
+
+    #[test]
+    fn test_background_processor() {
+        // Test that when a new channel is created, the ChannelManager needs to be re-persisted with
+        // updates. Also test that when new updates are available, the manager signals that it needs
+        // re-persistence and is successfully re-persisted.
+        let nodes = create_nodes(2, "test_background_processor".to_string());
+
+        // Go through the channel creation process so that each node has something to persist. Since
+        // open_channel consumes events, it must complete before starting BackgroundProcessor to
+        // avoid a race with processing events.
+        let tx = open_channel!(nodes[0], nodes[1], 100000);
+
+        // Initiate the background processors to watch each node.
+        let node_0_persister = nodes[0].persister.clone();
+        let persister = move |node: &ChannelManager<
+            InMemorySigner,
+            Arc<ChainMonitor>,
+            Arc<test_utils::TestBroadcaster>,
+            Arc<KeysManager>,
+            Arc<test_utils::TestFeeEstimator>,
+            Arc<test_utils::TestLogger>,
+        >| node_0_persister.persist_manager(node);
+        let event_handler = |_: &_| {};
+        let bg_processor = BackgroundProcessor::start(
+            persister,
+            event_handler,
+            nodes[0].chain_monitor.clone(),
+            nodes[0].node.clone(),
+            nodes[0].net_graph_msg_handler.clone(),
+            nodes[0].peer_manager.clone(),
+            nodes[0].logger.clone(),
+        );
+
+        macro_rules! check_persisted_data {
+            ($node: expr, $filepath: expr, $expected_bytes: expr) => {
+                loop {
+                    $expected_bytes.clear();
+                    match $node.write(&mut $expected_bytes) {
+                        Ok(()) => match std::fs::read($filepath) {
+                            Ok(bytes) => {
+                                if bytes == $expected_bytes {
+                                    break;
+                                } else {
+                                    continue;
+                                }
+                            },
+                            Err(_) => continue,
+                        },
+                        Err(e) => panic!("Unexpected error: {}", e),
+                    }
+                }
+            };
+        }
+
+        // Check that the initial channel manager data is persisted as expected.
+        let filepath = get_full_filepath(
+            "test_background_processor_persister_0".to_string(),
+            "manager".to_string(),
+        );
+        let mut expected_bytes = Vec::new();
+        check_persisted_data!(nodes[0].node, filepath.clone(), expected_bytes);
+        loop {
+            if !nodes[0].node.get_persistence_condvar_value() {
+                break;
+            }
+        }
+
+        // Force-close the channel.
+        nodes[0]
+            .node
+            .force_close_channel(
+                &OutPoint {
+                    txid: tx.txid(),
+                    index: 0,
+                }
+                .to_channel_id(),
+            )
+            .unwrap();
+
+        // Check that the force-close updates are persisted.
+        let mut expected_bytes = Vec::new();
+        check_persisted_data!(nodes[0].node, filepath.clone(), expected_bytes);
+        loop {
+            if !nodes[0].node.get_persistence_condvar_value() {
+                break;
+            }
+        }
+
+        assert!(bg_processor.stop().is_ok());
+    }
+
+    #[test]
+    fn test_timer_tick_called() {
+        // Test that ChannelManager's and PeerManager's `timer_tick_occurred` is called every
+        // `FRESHNESS_TIMER`.
+        let nodes = create_nodes(1, "test_timer_tick_called".to_string());
+        let node_0_persister = nodes[0].persister.clone();
+        let persister = move |node: &ChannelManager<
+            InMemorySigner,
+            Arc<ChainMonitor>,
+            Arc<test_utils::TestBroadcaster>,
+            Arc<KeysManager>,
+            Arc<test_utils::TestFeeEstimator>,
+            Arc<test_utils::TestLogger>,
+        >| node_0_persister.persist_manager(node);
+        let event_handler = |_: &_| {};
+        let bg_processor = BackgroundProcessor::start(
+            persister,
+            event_handler,
+            nodes[0].chain_monitor.clone(),
+            nodes[0].node.clone(),
+            nodes[0].net_graph_msg_handler.clone(),
+            nodes[0].peer_manager.clone(),
+            nodes[0].logger.clone(),
+        );
+        loop {
+            let log_entries = nodes[0].logger.lines.lock().unwrap();
+            let desired_log = "Calling ChannelManager's timer_tick_occurred".to_string();
+            let second_desired_log = "Calling PeerManager's timer_tick_occurred".to_string();
+            if log_entries
+                .get(&("lightning_background_processor".to_string(), desired_log))
+                .is_some()
+                && log_entries
+                    .get(&("lightning_background_processor".to_string(), second_desired_log))
+                    .is_some()
+            {
+                break;
+            }
+        }
+
+        assert!(bg_processor.stop().is_ok());
+    }
+
+    #[test]
+    fn test_persist_error() {
+        // Test that if we encounter an error during manager persistence, the thread panics.
+        let nodes = create_nodes(2, "test_persist_error".to_string());
+        open_channel!(nodes[0], nodes[1], 100000);
+
+        let persister = |_: &_| Err(std::io::Error::new(std::io::ErrorKind::Other, "test"));
+        let event_handler = |_: &_| {};
+        let bg_processor = BackgroundProcessor::start(
+            persister,
+            event_handler,
+            nodes[0].chain_monitor.clone(),
+            nodes[0].node.clone(),
+            nodes[0].net_graph_msg_handler.clone(),
+            nodes[0].peer_manager.clone(),
+            nodes[0].logger.clone(),
+        );
+        match bg_processor.join() {
+            Ok(_) => panic!("Expected error persisting manager"),
+            Err(e) => {
+                assert_eq!(e.kind(), std::io::ErrorKind::Other);
+                assert_eq!(e.get_ref().unwrap().to_string(), "test");
+            },
+        }
+    }
+
+    #[test]
+    fn test_background_event_handling() {
+        let mut nodes = create_nodes(2, "test_background_event_handling".to_string());
+        let channel_value = 100000;
+        let node_0_persister = nodes[0].persister.clone();
+        let persister = move |node: &_| node_0_persister.persist_manager(node);
+
+        // Set up a background event handler for FundingGenerationReady events.
+        let (sender, receiver) = std::sync::mpsc::sync_channel(1);
+        let event_handler = move |event: &Event| {
+            sender
+                .send(handle_funding_generation_ready!(event, channel_value))
+                .unwrap();
+        };
+        let bg_processor = BackgroundProcessor::start(
+            persister.clone(),
+            event_handler,
+            nodes[0].chain_monitor.clone(),
+            nodes[0].node.clone(),
+            nodes[0].net_graph_msg_handler.clone(),
+            nodes[0].peer_manager.clone(),
+            nodes[0].logger.clone(),
+        );
+
+        // Open a channel and check that the FundingGenerationReady event was handled.
+        begin_open_channel!(nodes[0], nodes[1], channel_value);
+        let (temporary_channel_id, funding_tx) = receiver
+            .recv_timeout(Duration::from_secs(EVENT_DEADLINE))
+            .expect("FundingGenerationReady not handled within deadline");
+        end_open_channel!(nodes[0], nodes[1], temporary_channel_id, funding_tx);
+
+        // Confirm the funding transaction.
+        confirm_transaction(&mut nodes[0], &funding_tx);
+        let as_funding = get_event_msg!(
+            nodes[0],
+            MessageSendEvent::SendFundingLocked,
+            nodes[1].node.get_our_node_id()
+        );
+        confirm_transaction(&mut nodes[1], &funding_tx);
+        let bs_funding = get_event_msg!(
+            nodes[1],
+            MessageSendEvent::SendFundingLocked,
+            nodes[0].node.get_our_node_id()
+        );
+        nodes[0]
+            .node
+            .handle_funding_locked(&nodes[1].node.get_our_node_id(), &bs_funding);
+        let _as_channel_update = get_event_msg!(
+            nodes[0],
+            MessageSendEvent::SendChannelUpdate,
+            nodes[1].node.get_our_node_id()
+        );
+        nodes[1]
+            .node
+            .handle_funding_locked(&nodes[0].node.get_our_node_id(), &as_funding);
+        let _bs_channel_update = get_event_msg!(
+            nodes[1],
+            MessageSendEvent::SendChannelUpdate,
+            nodes[0].node.get_our_node_id()
+        );
+
+        assert!(bg_processor.stop().is_ok());
+
+        // Set up a background event handler for SpendableOutputs events.
+        let (sender, receiver) = std::sync::mpsc::sync_channel(1);
+        let event_handler = move |event: &Event| sender.send(event.clone()).unwrap();
+        let bg_processor = BackgroundProcessor::start(
+            persister,
+            event_handler,
+            nodes[0].chain_monitor.clone(),
+            nodes[0].node.clone(),
+            nodes[0].net_graph_msg_handler.clone(),
+            nodes[0].peer_manager.clone(),
+            nodes[0].logger.clone(),
+        );
+
+        // Force close the channel and check that the SpendableOutputs event was handled.
+        nodes[0]
+            .node
+            .force_close_channel(&nodes[0].node.list_channels()[0].channel_id)
+            .unwrap();
+        let commitment_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
+        confirm_transaction_depth(&mut nodes[0], &commitment_tx, BREAKDOWN_TIMEOUT as u32);
+        let event = receiver
+            .recv_timeout(Duration::from_secs(EVENT_DEADLINE))
+            .expect("SpendableOutputs not handled within deadline");
+        match event {
+            Event::SpendableOutputs { .. } => {},
+            Event::ChannelClosed { .. } => {},
+            _ => panic!("Unexpected event: {:?}", event),
+        }
+
+        assert!(bg_processor.stop().is_ok());
+    }
+
+    #[test]
+    fn test_invoice_payer() {
+        let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
+        let random_seed_bytes = keys_manager.get_secure_random_bytes();
+        let nodes = create_nodes(2, "test_invoice_payer".to_string());
+
+        // Initiate the background processors to watch each node.
+        let node_0_persister = nodes[0].persister.clone();
+        let persister = move |node: &ChannelManager<
+            InMemorySigner,
+            Arc<ChainMonitor>,
+            Arc<test_utils::TestBroadcaster>,
+            Arc<KeysManager>,
+            Arc<test_utils::TestFeeEstimator>,
+            Arc<test_utils::TestLogger>,
+        >| node_0_persister.persist_manager(node);
+        let router = DefaultRouter::new(
+            Arc::clone(&nodes[0].network_graph),
+            Arc::clone(&nodes[0].logger),
+            random_seed_bytes,
+        );
+        let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
+        let invoice_payer = Arc::new(InvoicePayer::new(
+            Arc::clone(&nodes[0].node),
+            router,
+            scorer,
+            Arc::clone(&nodes[0].logger),
+            |_: &_| {},
+            RetryAttempts(2),
+        ));
+        let event_handler = Arc::clone(&invoice_payer);
+        let bg_processor = BackgroundProcessor::start(
+            persister,
+            event_handler,
+            nodes[0].chain_monitor.clone(),
+            nodes[0].node.clone(),
+            nodes[0].net_graph_msg_handler.clone(),
+            nodes[0].peer_manager.clone(),
+            nodes[0].logger.clone(),
+        );
+        assert!(bg_processor.stop().is_ok());
+    }
+}
diff --git a/mm2src/coins/lightning_persister/Cargo.toml b/mm2src/coins/lightning_persister/Cargo.toml
new file mode 100644
index 0000000000..32b5d7eb1d
--- /dev/null
+++ b/mm2src/coins/lightning_persister/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "lightning-persister"
+version = "0.0.106"
+edition = "2018"
+authors = ["Valentine Wallace", "Matt Corallo"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/lightningdevkit/rust-lightning/"
+description = """
+Utilities to manage Rust-Lightning channel data persistence and retrieval.
+"""
+
+[dependencies]
+async-trait = "0.1"
+bitcoin = "0.27.1"
+common = { path = "../../common" }
+mm2_io = { path = "../../mm2_io" }
+db_common = { path = "../../db_common" }
+derive_more = "0.99"
+hex = "0.4.2"
+lightning = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106" }
+libc = "0.2"
+parking_lot = { version = "0.12.0", features = ["nightly"] }
+secp256k1 = { version = "0.20" }
+serde = "1.0"
+serde_json = "1.0"
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3", features = ["winbase"] }
+
+[dev-dependencies]
+lightning = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106", features = ["_test_utils"] }
+rand = { version = "0.7", features = ["std", "small_rng"] }
\ No newline at end of file
diff --git a/mm2src/coins/lightning_persister/src/lib.rs b/mm2src/coins/lightning_persister/src/lib.rs
new file mode 100644
index 0000000000..303205c26f
--- /dev/null
+++ b/mm2src/coins/lightning_persister/src/lib.rs
@@ -0,0 +1,2097 @@
+//! Utilities that handle persisting Rust-Lightning data to disk via standard filesystem APIs.
+
+#![feature(io_error_more)]
+
+pub mod storage;
+mod util;
+
+extern crate async_trait;
+extern crate bitcoin;
+extern crate common;
+extern crate libc;
+extern crate lightning;
+extern crate secp256k1;
+extern crate serde_json;
+
+use crate::storage::{ChannelType, ChannelVisibility, ClosedChannelsFilter, DbStorage, FileSystemStorage,
+                     GetClosedChannelsResult, GetPaymentsResult, HTLCStatus, NodesAddressesMap,
+                     NodesAddressesMapShared, PaymentInfo, PaymentType, PaymentsFilter, Scorer, SqlChannelDetails};
+use crate::util::DiskWriteable;
+use async_trait::async_trait;
+use bitcoin::blockdata::constants::genesis_block;
+use bitcoin::hash_types::{BlockHash, Txid};
+use bitcoin::hashes::hex::{FromHex, ToHex};
+use bitcoin::Network;
+use common::{async_blocking, PagingOptionsEnum};
+use db_common::sqlite::rusqlite::{Error as SqlError, Row, ToSql, NO_PARAMS};
+use db_common::sqlite::sql_builder::SqlBuilder;
+use db_common::sqlite::{h256_option_slice_from_row, h256_slice_from_row, offset_by_id, query_single_row,
+                        sql_text_conversion_err, string_from_row, validate_table_name, SqliteConnShared,
+                        CHECK_TABLE_EXISTS_SQL};
+use lightning::chain;
+use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
+use lightning::chain::chainmonitor;
+use lightning::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate};
+use lightning::chain::keysinterface::{KeysInterface, Sign};
+use lightning::chain::transaction::OutPoint;
+use lightning::ln::channelmanager::ChannelManager;
+use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
+use lightning::routing::network_graph::NetworkGraph;
+use lightning::routing::scoring::ProbabilisticScoringParameters;
+use lightning::util::logger::Logger;
+use lightning::util::ser::{Readable, ReadableArgs, Writeable};
+use mm2_io::fs::check_dir_operations;
+use secp256k1::PublicKey;
+use std::collections::HashMap;
+use std::convert::TryInto;
+use std::fs;
+use std::io::{BufReader, BufWriter, Cursor, Error};
+use std::net::SocketAddr;
+use std::ops::Deref;
+use std::path::{Path, PathBuf};
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
+
+/// LightningPersister persists channel data on disk, where each channel's
+/// data is stored in a file named after its funding outpoint.
+/// It is also used to persist payments and channels history to sqlite database.
+///
+/// Warning: this module does the best it can with calls to persist data, but it
+/// can only guarantee that the data is passed to the drive. It is up to the
+/// drive manufacturers to do the actual persistence properly, which they often
+/// don't (especially on consumer-grade hardware). Therefore, it is up to the
+/// user to validate their entire storage stack, to ensure the writes are
+/// persistent.
+/// Corollary: especially when dealing with larger amounts of money, it is best
+/// practice to have multiple channel data backups and not rely only on one
+/// LightningPersister.
+
+pub struct LightningPersister {
+    storage_ticker: String,
+    main_path: PathBuf,
+    backup_path: Option<PathBuf>,
+    sqlite_connection: SqliteConnShared,
+}
+
+impl<Signer: Sign> DiskWriteable for ChannelMonitor<Signer> {
+    fn write_to_file(&self, writer: &mut fs::File) -> Result<(), Error> { self.write(writer) }
+}
+
+impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> DiskWriteable
+    for ChannelManager<Signer, M, T, K, F, L>
+where
+    M::Target: chain::Watch<Signer>,
+    T::Target: BroadcasterInterface,
+    K::Target: KeysInterface<Signer = Signer>,
+    F::Target: FeeEstimator,
+    L::Target: Logger,
+{
+    fn write_to_file(&self, writer: &mut fs::File) -> Result<(), std::io::Error> { self.write(writer) }
+}
+
+fn channels_history_table(ticker: &str) -> String { ticker.to_owned() + "_channels_history" }
+
+fn payments_history_table(ticker: &str) -> String { ticker.to_owned() + "_payments_history" }
+
+fn create_channels_history_table_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "CREATE TABLE IF NOT EXISTS {} (
+            id INTEGER NOT NULL PRIMARY KEY,
+            rpc_id INTEGER NOT NULL UNIQUE,
+            channel_id VARCHAR(255) NOT NULL,
+            counterparty_node_id VARCHAR(255) NOT NULL,
+            funding_tx VARCHAR(255),
+            funding_value INTEGER,
+            funding_generated_in_block Integer,
+            closing_tx VARCHAR(255),
+            closure_reason TEXT,
+            claiming_tx VARCHAR(255),
+            claimed_balance REAL,
+            is_outbound INTEGER NOT NULL,
+            is_public INTEGER NOT NULL,
+            is_closed INTEGER NOT NULL,
+            created_at INTEGER NOT NULL,
+            closed_at INTEGER
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn create_payments_history_table_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "CREATE TABLE IF NOT EXISTS {} (
+            id INTEGER NOT NULL PRIMARY KEY,
+            payment_hash VARCHAR(255) NOT NULL UNIQUE,
+            destination VARCHAR(255),
+            description VARCHAR(641) NOT NULL,
+            preimage VARCHAR(255),
+            secret VARCHAR(255),
+            amount_msat INTEGER,
+            fee_paid_msat INTEGER,
+            is_outbound INTEGER NOT NULL,
+            status VARCHAR(255) NOT NULL,
+            created_at INTEGER NOT NULL,
+            last_updated INTEGER NOT NULL
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn insert_channel_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "INSERT INTO {} (
+            rpc_id,
+            channel_id,
+            counterparty_node_id,
+            is_outbound,
+            is_public,
+            is_closed,
+            created_at
+        ) VALUES (
+            ?1, ?2, ?3, ?4, ?5, ?6, ?7
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn upsert_payment_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "INSERT OR REPLACE INTO {} (
+            payment_hash,
+            destination,
+            description,
+            preimage,
+            secret,
+            amount_msat,
+            fee_paid_msat,
+            is_outbound,
+            status,
+            created_at,
+            last_updated
+        ) VALUES (
+            ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn select_channel_by_rpc_id_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "SELECT 
+            rpc_id,
+            channel_id,
+            counterparty_node_id,
+            funding_tx,
+            funding_value,
+            funding_generated_in_block,
+            closing_tx,
+            closure_reason,
+            claiming_tx,
+            claimed_balance,
+            is_outbound,
+            is_public,
+            is_closed,
+            created_at,
+            closed_at
+        FROM
+            {}
+        WHERE
+            rpc_id=?1",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn select_payment_by_hash_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "SELECT
+            payment_hash,
+            destination,
+            description,
+            preimage,
+            secret,
+            amount_msat,
+            fee_paid_msat,
+            status,
+            is_outbound,
+            created_at,
+            last_updated
+        FROM
+            {}
+        WHERE
+            payment_hash=?1;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn channel_details_from_row(row: &Row<'_>) -> Result<SqlChannelDetails, SqlError> {
+    let channel_details = SqlChannelDetails {
+        rpc_id: row.get::<_, u32>(0)? as u64,
+        channel_id: row.get(1)?,
+        counterparty_node_id: row.get(2)?,
+        funding_tx: row.get(3)?,
+        funding_value: row.get::<_, Option<u32>>(4)?.map(|v| v as u64),
+        funding_generated_in_block: row.get::<_, Option<u32>>(5)?.map(|v| v as u64),
+        closing_tx: row.get(6)?,
+        closure_reason: row.get(7)?,
+        claiming_tx: row.get(8)?,
+        claimed_balance: row.get::<_, Option<f64>>(9)?,
+        is_outbound: row.get(10)?,
+        is_public: row.get(11)?,
+        is_closed: row.get(12)?,
+        created_at: row.get::<_, u32>(13)? as u64,
+        closed_at: row.get::<_, Option<u32>>(14)?.map(|t| t as u64),
+    };
+    Ok(channel_details)
+}
+
+fn payment_info_from_row(row: &Row<'_>) -> Result<PaymentInfo, SqlError> {
+    let is_outbound = row.get::<_, bool>(8)?;
+    let payment_type = if is_outbound {
+        PaymentType::OutboundPayment {
+            destination: PublicKey::from_str(&row.get::<_, String>(1)?).map_err(|e| sql_text_conversion_err(1, e))?,
+        }
+    } else {
+        PaymentType::InboundPayment
+    };
+
+    let payment_info = PaymentInfo {
+        payment_hash: PaymentHash(h256_slice_from_row::<String>(row, 0)?),
+        payment_type,
+        description: row.get(2)?,
+        preimage: h256_option_slice_from_row::<String>(row, 3)?.map(PaymentPreimage),
+        secret: h256_option_slice_from_row::<String>(row, 4)?.map(PaymentSecret),
+        amt_msat: row.get::<_, Option<u32>>(5)?.map(|v| v as u64),
+        fee_paid_msat: row.get::<_, Option<u32>>(6)?.map(|v| v as u64),
+        status: HTLCStatus::from_str(&row.get::<_, String>(7)?)?,
+        created_at: row.get::<_, u32>(9)? as u64,
+        last_updated: row.get::<_, u32>(10)? as u64,
+    };
+    Ok(payment_info)
+}
+
+fn get_last_channel_rpc_id_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!("SELECT IFNULL(MAX(rpc_id), 0) FROM {};", table_name);
+
+    Ok(sql)
+}
+
+fn update_funding_tx_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET
+            funding_tx = ?1,
+            funding_value = ?2,
+            funding_generated_in_block = ?3
+        WHERE
+            rpc_id = ?4;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn update_funding_tx_block_height_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET funding_generated_in_block = ?1 WHERE funding_tx = ?2;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn update_channel_to_closed_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET closure_reason = ?1, is_closed = ?2, closed_at = ?3 WHERE rpc_id = ?4;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn update_closing_tx_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!("UPDATE {} SET closing_tx = ?1 WHERE rpc_id = ?2;", table_name);
+
+    Ok(sql)
+}
+
+fn get_channels_builder_preimage(for_coin: &str) -> Result<SqlBuilder, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let mut sql_builder = SqlBuilder::select_from(table_name);
+    sql_builder.and_where("is_closed = 1");
+    Ok(sql_builder)
+}
+
+fn add_fields_to_get_channels_sql_builder(sql_builder: &mut SqlBuilder) {
+    sql_builder
+        .field("rpc_id")
+        .field("channel_id")
+        .field("counterparty_node_id")
+        .field("funding_tx")
+        .field("funding_value")
+        .field("funding_generated_in_block")
+        .field("closing_tx")
+        .field("closure_reason")
+        .field("claiming_tx")
+        .field("claimed_balance")
+        .field("is_outbound")
+        .field("is_public")
+        .field("is_closed")
+        .field("created_at")
+        .field("closed_at");
+}
+
+fn finalize_get_channels_sql_builder(sql_builder: &mut SqlBuilder, offset: usize, limit: usize) {
+    sql_builder.offset(offset);
+    sql_builder.limit(limit);
+    sql_builder.order_desc("closed_at");
+}
+
+fn apply_get_channels_filter(builder: &mut SqlBuilder, params: &mut Vec<(&str, String)>, filter: ClosedChannelsFilter) {
+    if let Some(channel_id) = filter.channel_id {
+        builder.and_where("channel_id = :channel_id");
+        params.push((":channel_id", channel_id));
+    }
+
+    if let Some(counterparty_node_id) = filter.counterparty_node_id {
+        builder.and_where("counterparty_node_id = :counterparty_node_id");
+        params.push((":counterparty_node_id", counterparty_node_id));
+    }
+
+    if let Some(funding_tx) = filter.funding_tx {
+        builder.and_where("funding_tx = :funding_tx");
+        params.push((":funding_tx", funding_tx));
+    }
+
+    if let Some(from_funding_value) = filter.from_funding_value {
+        builder.and_where("funding_value >= :from_funding_value");
+        params.push((":from_funding_value", from_funding_value.to_string()));
+    }
+
+    if let Some(to_funding_value) = filter.to_funding_value {
+        builder.and_where("funding_value <= :to_funding_value");
+        params.push((":to_funding_value", to_funding_value.to_string()));
+    }
+
+    if let Some(closing_tx) = filter.closing_tx {
+        builder.and_where("closing_tx = :closing_tx");
+        params.push((":closing_tx", closing_tx));
+    }
+
+    if let Some(closure_reason) = filter.closure_reason {
+        builder.and_where(format!("closure_reason LIKE '%{}%'", closure_reason));
+    }
+
+    if let Some(claiming_tx) = filter.claiming_tx {
+        builder.and_where("claiming_tx = :claiming_tx");
+        params.push((":claiming_tx", claiming_tx));
+    }
+
+    if let Some(from_claimed_balance) = filter.from_claimed_balance {
+        builder.and_where("claimed_balance >= :from_claimed_balance");
+        params.push((":from_claimed_balance", from_claimed_balance.to_string()));
+    }
+
+    if let Some(to_claimed_balance) = filter.to_claimed_balance {
+        builder.and_where("claimed_balance <= :to_claimed_balance");
+        params.push((":to_claimed_balance", to_claimed_balance.to_string()));
+    }
+
+    if let Some(channel_type) = filter.channel_type {
+        let is_outbound = match channel_type {
+            ChannelType::Outbound => true as i32,
+            ChannelType::Inbound => false as i32,
+        };
+
+        builder.and_where("is_outbound = :is_outbound");
+        params.push((":is_outbound", is_outbound.to_string()));
+    }
+
+    if let Some(channel_visibility) = filter.channel_visibility {
+        let is_public = match channel_visibility {
+            ChannelVisibility::Public => true as i32,
+            ChannelVisibility::Private => false as i32,
+        };
+
+        builder.and_where("is_public = :is_public");
+        params.push((":is_public", is_public.to_string()));
+    }
+}
+
+fn get_payments_builder_preimage(for_coin: &str) -> Result<SqlBuilder, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    Ok(SqlBuilder::select_from(table_name))
+}
+
+fn finalize_get_payments_sql_builder(sql_builder: &mut SqlBuilder, offset: usize, limit: usize) {
+    sql_builder
+        .field("payment_hash")
+        .field("destination")
+        .field("description")
+        .field("preimage")
+        .field("secret")
+        .field("amount_msat")
+        .field("fee_paid_msat")
+        .field("status")
+        .field("is_outbound")
+        .field("created_at")
+        .field("last_updated");
+    sql_builder.offset(offset);
+    sql_builder.limit(limit);
+    sql_builder.order_desc("last_updated");
+}
+
+fn apply_get_payments_filter(builder: &mut SqlBuilder, params: &mut Vec<(&str, String)>, filter: PaymentsFilter) {
+    if let Some(payment_type) = filter.payment_type {
+        let (is_outbound, destination) = match payment_type {
+            PaymentType::OutboundPayment { destination } => (true as i32, Some(destination.to_string())),
+            PaymentType::InboundPayment => (false as i32, None),
+        };
+        if let Some(dest) = destination {
+            builder.and_where("destination = :dest");
+            params.push((":dest", dest));
+        }
+
+        builder.and_where("is_outbound = :is_outbound");
+        params.push((":is_outbound", is_outbound.to_string()));
+    }
+
+    if let Some(description) = filter.description {
+        builder.and_where(format!("description LIKE '%{}%'", description));
+    }
+
+    if let Some(status) = filter.status {
+        builder.and_where("status = :status");
+        params.push((":status", status.to_string()));
+    }
+
+    if let Some(from_amount) = filter.from_amount_msat {
+        builder.and_where("amount_msat >= :from_amount");
+        params.push((":from_amount", from_amount.to_string()));
+    }
+
+    if let Some(to_amount) = filter.to_amount_msat {
+        builder.and_where("amount_msat <= :to_amount");
+        params.push((":to_amount", to_amount.to_string()));
+    }
+
+    if let Some(from_fee) = filter.from_fee_paid_msat {
+        builder.and_where("fee_paid_msat >= :from_fee");
+        params.push((":from_fee", from_fee.to_string()));
+    }
+
+    if let Some(to_fee) = filter.to_fee_paid_msat {
+        builder.and_where("fee_paid_msat <= :to_fee");
+        params.push((":to_fee", to_fee.to_string()));
+    }
+
+    if let Some(from_time) = filter.from_timestamp {
+        builder.and_where("created_at >= :from_time");
+        params.push((":from_time", from_time.to_string()));
+    }
+
+    if let Some(to_time) = filter.to_timestamp {
+        builder.and_where("created_at <= :to_time");
+        params.push((":to_time", to_time.to_string()));
+    }
+}
+
+fn update_claiming_tx_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET claiming_tx = ?1, claimed_balance = ?2 WHERE closing_tx = ?3;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+impl LightningPersister {
+    /// Initialize a new LightningPersister and set the path to the individual channels'
+    /// files.
+    pub fn new(
+        storage_ticker: String,
+        main_path: PathBuf,
+        backup_path: Option<PathBuf>,
+        sqlite_connection: SqliteConnShared,
+    ) -> Self {
+        Self {
+            storage_ticker,
+            main_path,
+            backup_path,
+            sqlite_connection,
+        }
+    }
+
+    /// Get the directory which was provided when this persister was initialized.
+    pub fn main_path(&self) -> PathBuf { self.main_path.clone() }
+
+    /// Get the backup directory which was provided when this persister was initialized.
+    pub fn backup_path(&self) -> Option<PathBuf> { self.backup_path.clone() }
+
+    pub(crate) fn monitor_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("monitors");
+        path
+    }
+
+    pub(crate) fn monitor_backup_path(&self) -> Option<PathBuf> {
+        if let Some(mut backup_path) = self.backup_path() {
+            backup_path.push("monitors");
+            return Some(backup_path);
+        }
+        None
+    }
+
+    pub(crate) fn nodes_addresses_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("channel_nodes_data");
+        path
+    }
+
+    pub(crate) fn nodes_addresses_backup_path(&self) -> Option<PathBuf> {
+        if let Some(mut backup_path) = self.backup_path() {
+            backup_path.push("channel_nodes_data");
+            return Some(backup_path);
+        }
+        None
+    }
+
+    pub(crate) fn network_graph_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("network_graph");
+        path
+    }
+
+    pub(crate) fn scorer_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("scorer");
+        path
+    }
+
+    pub fn manager_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("manager");
+        path
+    }
+
+    /// Writes the provided `ChannelManager` to the path provided at `LightningPersister`
+    /// initialization, within a file called "manager".
+    pub fn persist_manager<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>(
+        &self,
+        manager: &ChannelManager<Signer, M, T, K, F, L>,
+    ) -> Result<(), std::io::Error>
+    where
+        M::Target: chain::Watch<Signer>,
+        T::Target: BroadcasterInterface,
+        K::Target: KeysInterface<Signer = Signer>,
+        F::Target: FeeEstimator,
+        L::Target: Logger,
+    {
+        let path = self.main_path();
+        util::write_to_file(path, "manager".to_string(), manager)?;
+        if let Some(backup_path) = self.backup_path() {
+            util::write_to_file(backup_path, "manager".to_string(), manager)?;
+        }
+        Ok(())
+    }
+
+    /// Read `ChannelMonitor`s from disk.
+    pub fn read_channelmonitors<Signer: Sign, K: Deref>(
+        &self,
+        keys_manager: K,
+    ) -> Result<Vec<(BlockHash, ChannelMonitor<Signer>)>, std::io::Error>
+    where
+        K::Target: KeysInterface<Signer = Signer> + Sized,
+    {
+        let path = self.monitor_path();
+        if !Path::new(&path).exists() {
+            return Ok(Vec::new());
+        }
+        let mut res = Vec::new();
+        for file_option in fs::read_dir(path).unwrap() {
+            let file = file_option.unwrap();
+            let owned_file_name = file.file_name();
+            let filename = owned_file_name.to_str();
+            if filename.is_none() || !filename.unwrap().is_ascii() || filename.unwrap().len() < 65 {
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::InvalidData,
+                    "Invalid ChannelMonitor file name",
+                ));
+            }
+            if filename.unwrap().ends_with(".tmp") {
+                // If we were in the middle of committing an new update and crashed, it should be
+                // safe to ignore the update - we should never have returned to the caller and
+                // irrevocably committed to the new state in any way.
+                continue;
+            }
+
+            let txid = Txid::from_hex(filename.unwrap().split_at(64).0);
+            if txid.is_err() {
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::InvalidData,
+                    "Invalid tx ID in filename",
+                ));
+            }
+
+            let index = filename.unwrap().split_at(65).1.parse::<u16>();
+            if index.is_err() {
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::InvalidData,
+                    "Invalid tx index in filename",
+                ));
+            }
+
+            let contents = fs::read(&file.path())?;
+            let mut buffer = Cursor::new(&contents);
+            match <(BlockHash, ChannelMonitor<Signer>)>::read(&mut buffer, &*keys_manager) {
+                Ok((blockhash, channel_monitor)) => {
+                    if channel_monitor.get_funding_txo().0.txid != txid.unwrap()
+                        || channel_monitor.get_funding_txo().0.index != index.unwrap()
+                    {
+                        return Err(std::io::Error::new(
+                            std::io::ErrorKind::InvalidData,
+                            "ChannelMonitor was stored in the wrong file",
+                        ));
+                    }
+                    res.push((blockhash, channel_monitor));
+                },
+                Err(e) => {
+                    return Err(std::io::Error::new(
+                        std::io::ErrorKind::InvalidData,
+                        format!("Failed to deserialize ChannelMonitor: {}", e),
+                    ))
+                },
+            }
+        }
+        Ok(res)
+    }
+}
+
+impl<ChannelSigner: Sign> chainmonitor::Persist<ChannelSigner> for LightningPersister {
+    // TODO: We really need a way for the persister to inform the user that its time to crash/shut
+    // down once these start returning failure.
+    // A PermanentFailure implies we need to shut down since we're force-closing channels without
+    // even broadcasting!
+
+    fn persist_new_channel(
+        &self,
+        funding_txo: OutPoint,
+        monitor: &ChannelMonitor<ChannelSigner>,
+        _update_id: chainmonitor::MonitorUpdateId,
+    ) -> Result<(), chain::ChannelMonitorUpdateErr> {
+        let filename = format!("{}_{}", funding_txo.txid.to_hex(), funding_txo.index);
+        util::write_to_file(self.monitor_path(), filename.clone(), monitor)
+            .map_err(|_| chain::ChannelMonitorUpdateErr::PermanentFailure)?;
+        if let Some(backup_path) = self.monitor_backup_path() {
+            util::write_to_file(backup_path, filename, monitor)
+                .map_err(|_| chain::ChannelMonitorUpdateErr::PermanentFailure)?;
+        }
+        Ok(())
+    }
+
+    fn update_persisted_channel(
+        &self,
+        funding_txo: OutPoint,
+        _update: &Option<ChannelMonitorUpdate>,
+        monitor: &ChannelMonitor<ChannelSigner>,
+        _update_id: chainmonitor::MonitorUpdateId,
+    ) -> Result<(), chain::ChannelMonitorUpdateErr> {
+        let filename = format!("{}_{}", funding_txo.txid.to_hex(), funding_txo.index);
+        util::write_to_file(self.monitor_path(), filename.clone(), monitor)
+            .map_err(|_| chain::ChannelMonitorUpdateErr::PermanentFailure)?;
+        if let Some(backup_path) = self.monitor_backup_path() {
+            util::write_to_file(backup_path, filename, monitor)
+                .map_err(|_| chain::ChannelMonitorUpdateErr::PermanentFailure)?;
+        }
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl FileSystemStorage for LightningPersister {
+    type Error = std::io::Error;
+
+    async fn init_fs(&self) -> Result<(), Self::Error> {
+        let path = self.main_path();
+        let backup_path = self.backup_path();
+        async_blocking(move || {
+            fs::create_dir_all(path.clone())?;
+            if let Some(path) = backup_path {
+                fs::create_dir_all(path.clone())?;
+                check_dir_operations(&path)?;
+            }
+            check_dir_operations(&path)
+        })
+        .await
+    }
+
+    async fn is_fs_initialized(&self) -> Result<bool, Self::Error> {
+        let dir_path = self.main_path();
+        let backup_dir_path = self.backup_path();
+        async_blocking(move || {
+            if !dir_path.exists() || backup_dir_path.as_ref().map(|path| !path.exists()).unwrap_or(false) {
+                Ok(false)
+            } else if !dir_path.is_dir() {
+                Err(std::io::Error::new(
+                    std::io::ErrorKind::NotADirectory,
+                    format!("{} is not a directory", dir_path.display()),
+                ))
+            } else if backup_dir_path.as_ref().map(|path| !path.is_dir()).unwrap_or(false) {
+                Err(std::io::Error::new(
+                    std::io::ErrorKind::NotADirectory,
+                    "Backup path is not a directory",
+                ))
+            } else {
+                let check_backup_ops = if let Some(backup_path) = backup_dir_path {
+                    check_dir_operations(&backup_path).is_ok()
+                } else {
+                    true
+                };
+                check_dir_operations(&dir_path).map(|_| check_backup_ops)
+            }
+        })
+        .await
+    }
+
+    async fn get_nodes_addresses(&self) -> Result<NodesAddressesMap, Self::Error> {
+        let path = self.nodes_addresses_path();
+        if !path.exists() {
+            return Ok(HashMap::new());
+        }
+        async_blocking(move || {
+            let file = fs::File::open(path)?;
+            let reader = BufReader::new(file);
+            let nodes_addresses: HashMap<String, SocketAddr> =
+                serde_json::from_reader(reader).map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
+            nodes_addresses
+                .iter()
+                .map(|(pubkey_str, addr)| {
+                    let pubkey = PublicKey::from_str(pubkey_str)
+                        .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
+                    Ok((pubkey, *addr))
+                })
+                .collect()
+        })
+        .await
+    }
+
+    async fn save_nodes_addresses(&self, nodes_addresses: NodesAddressesMapShared) -> Result<(), Self::Error> {
+        let path = self.nodes_addresses_path();
+        let backup_path = self.nodes_addresses_backup_path();
+        async_blocking(move || {
+            let nodes_addresses: HashMap<String, SocketAddr> = nodes_addresses
+                .lock()
+                .iter()
+                .map(|(pubkey, addr)| (pubkey.to_string(), *addr))
+                .collect();
+
+            let file = fs::OpenOptions::new()
+                .create(true)
+                .write(true)
+                .truncate(true)
+                .open(path)?;
+            serde_json::to_writer(file, &nodes_addresses)
+                .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
+
+            if let Some(path) = backup_path {
+                let file = fs::OpenOptions::new()
+                    .create(true)
+                    .write(true)
+                    .truncate(true)
+                    .open(path)?;
+                serde_json::to_writer(file, &nodes_addresses)
+                    .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
+            }
+
+            Ok(())
+        })
+        .await
+    }
+
+    async fn get_network_graph(&self, network: Network) -> Result<NetworkGraph, Self::Error> {
+        let path = self.network_graph_path();
+        if !path.exists() {
+            return Ok(NetworkGraph::new(genesis_block(network).header.block_hash()));
+        }
+        async_blocking(move || {
+            let file = fs::File::open(path)?;
+            common::log::info!("Reading the saved lightning network graph from file, this can take some time!");
+            NetworkGraph::read(&mut BufReader::new(file))
+                .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string()))
+        })
+        .await
+    }
+
+    async fn save_network_graph(&self, network_graph: Arc<NetworkGraph>) -> Result<(), Self::Error> {
+        let path = self.network_graph_path();
+        async_blocking(move || {
+            let file = fs::OpenOptions::new()
+                .create(true)
+                .write(true)
+                .truncate(true)
+                .open(path)?;
+            network_graph.write(&mut BufWriter::new(file))
+        })
+        .await
+    }
+
+    async fn get_scorer(&self, network_graph: Arc<NetworkGraph>) -> Result<Scorer, Self::Error> {
+        let path = self.scorer_path();
+        if !path.exists() {
+            return Ok(Scorer::new(ProbabilisticScoringParameters::default(), network_graph));
+        }
+        async_blocking(move || {
+            let file = fs::File::open(path)?;
+            Scorer::read(
+                &mut BufReader::new(file),
+                (ProbabilisticScoringParameters::default(), network_graph),
+            )
+            .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string()))
+        })
+        .await
+    }
+
+    async fn save_scorer(&self, scorer: Arc<Mutex<Scorer>>) -> Result<(), Self::Error> {
+        let path = self.scorer_path();
+        async_blocking(move || {
+            let scorer = scorer.lock().unwrap();
+            let file = fs::OpenOptions::new()
+                .create(true)
+                .write(true)
+                .truncate(true)
+                .open(path)?;
+            scorer.write(&mut BufWriter::new(file))
+        })
+        .await
+    }
+}
+
+#[async_trait]
+impl DbStorage for LightningPersister {
+    type Error = SqlError;
+
+    async fn init_db(&self) -> Result<(), Self::Error> {
+        let sqlite_connection = self.sqlite_connection.clone();
+        let sql_channels_history = create_channels_history_table_sql(self.storage_ticker.as_str())?;
+        let sql_payments_history = create_payments_history_table_sql(self.storage_ticker.as_str())?;
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+            conn.execute(&sql_channels_history, NO_PARAMS).map(|_| ())?;
+            conn.execute(&sql_payments_history, NO_PARAMS).map(|_| ())?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn is_db_initialized(&self) -> Result<bool, Self::Error> {
+        let channels_history_table = channels_history_table(self.storage_ticker.as_str());
+        validate_table_name(&channels_history_table)?;
+        let payments_history_table = payments_history_table(self.storage_ticker.as_str());
+        validate_table_name(&payments_history_table)?;
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+            let channels_history_initialized =
+                query_single_row(&conn, CHECK_TABLE_EXISTS_SQL, [channels_history_table], string_from_row)?;
+            let payments_history_initialized =
+                query_single_row(&conn, CHECK_TABLE_EXISTS_SQL, [payments_history_table], string_from_row)?;
+            Ok(channels_history_initialized.is_some() && payments_history_initialized.is_some())
+        })
+        .await
+    }
+
+    async fn get_last_channel_rpc_id(&self) -> Result<u32, Self::Error> {
+        let sql = get_last_channel_rpc_id_sql(self.storage_ticker.as_str())?;
+        let sqlite_connection = self.sqlite_connection.clone();
+
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+            let count: u32 = conn.query_row(&sql, NO_PARAMS, |r| r.get(0))?;
+            Ok(count)
+        })
+        .await
+    }
+
+    async fn add_channel_to_db(&self, details: SqlChannelDetails) -> Result<(), Self::Error> {
+        let for_coin = self.storage_ticker.clone();
+        let rpc_id = details.rpc_id.to_string();
+        let channel_id = details.channel_id;
+        let counterparty_node_id = details.counterparty_node_id;
+        let is_outbound = (details.is_outbound as i32).to_string();
+        let is_public = (details.is_public as i32).to_string();
+        let is_closed = (details.is_closed as i32).to_string();
+        let created_at = (details.created_at as u32).to_string();
+
+        let params = [
+            rpc_id,
+            channel_id,
+            counterparty_node_id,
+            is_outbound,
+            is_public,
+            is_closed,
+            created_at,
+        ];
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            sql_transaction.execute(&insert_channel_sql(&for_coin)?, &params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn add_funding_tx_to_db(
+        &self,
+        rpc_id: u64,
+        funding_tx: String,
+        funding_value: u64,
+        funding_generated_in_block: u64,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.storage_ticker.clone();
+        let funding_value = funding_value.to_string();
+        let funding_generated_in_block = funding_generated_in_block.to_string();
+        let rpc_id = rpc_id.to_string();
+
+        let params = [funding_tx, funding_value, funding_generated_in_block, rpc_id];
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            sql_transaction.execute(&update_funding_tx_sql(&for_coin)?, &params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn update_funding_tx_block_height(&self, funding_tx: String, block_height: u64) -> Result<(), Self::Error> {
+        let for_coin = self.storage_ticker.clone();
+        let generated_in_block = block_height as u32;
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = [&generated_in_block as &dyn ToSql, &funding_tx as &dyn ToSql];
+            sql_transaction.execute(&update_funding_tx_block_height_sql(&for_coin)?, &params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn update_channel_to_closed(
+        &self,
+        rpc_id: u64,
+        closure_reason: String,
+        closed_at: u64,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.storage_ticker.clone();
+        let is_closed = "1".to_string();
+        let rpc_id = rpc_id.to_string();
+
+        let params = [closure_reason, is_closed, closed_at.to_string(), rpc_id];
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            sql_transaction.execute(&update_channel_to_closed_sql(&for_coin)?, &params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn get_closed_channels_with_no_closing_tx(&self) -> Result<Vec<SqlChannelDetails>, Self::Error> {
+        let mut builder = get_channels_builder_preimage(self.storage_ticker.as_str())?;
+        builder.and_where("closing_tx IS NULL");
+        add_fields_to_get_channels_sql_builder(&mut builder);
+        let sql = builder.sql().expect("valid sql");
+        let sqlite_connection = self.sqlite_connection.clone();
+
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+
+            let mut stmt = conn.prepare(&sql)?;
+            let result = stmt
+                .query_map_named(&[], channel_details_from_row)?
+                .collect::<Result<_, _>>()?;
+            Ok(result)
+        })
+        .await
+    }
+
+    async fn add_closing_tx_to_db(&self, rpc_id: u64, closing_tx: String) -> Result<(), Self::Error> {
+        let for_coin = self.storage_ticker.clone();
+        let rpc_id = rpc_id.to_string();
+
+        let params = [closing_tx, rpc_id];
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            sql_transaction.execute(&update_closing_tx_sql(&for_coin)?, &params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn add_claiming_tx_to_db(
+        &self,
+        closing_tx: String,
+        claiming_tx: String,
+        claimed_balance: f64,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.storage_ticker.clone();
+        let claimed_balance = claimed_balance.to_string();
+
+        let params = [claiming_tx, claimed_balance, closing_tx];
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            sql_transaction.execute(&update_claiming_tx_sql(&for_coin)?, &params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn get_channel_from_db(&self, rpc_id: u64) -> Result<Option<SqlChannelDetails>, Self::Error> {
+        let params = [rpc_id.to_string()];
+        let sql = select_channel_by_rpc_id_sql(self.storage_ticker.as_str())?;
+        let sqlite_connection = self.sqlite_connection.clone();
+
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+            query_single_row(&conn, &sql, params, channel_details_from_row)
+        })
+        .await
+    }
+
+    async fn get_closed_channels_by_filter(
+        &self,
+        filter: Option<ClosedChannelsFilter>,
+        paging: PagingOptionsEnum<u64>,
+        limit: usize,
+    ) -> Result<GetClosedChannelsResult, Self::Error> {
+        let mut sql_builder = get_channels_builder_preimage(self.storage_ticker.as_str())?;
+        let sqlite_connection = self.sqlite_connection.clone();
+
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+
+            let mut total_builder = sql_builder.clone();
+            total_builder.count("id");
+            let total_sql = total_builder.sql().expect("valid sql");
+            let total: isize = conn.query_row(&total_sql, NO_PARAMS, |row| row.get(0))?;
+            let total = total.try_into().expect("count should be always above zero");
+
+            let offset = match paging {
+                PagingOptionsEnum::PageNumber(page) => (page.get() - 1) * limit,
+                PagingOptionsEnum::FromId(rpc_id) => {
+                    let params = [rpc_id as u32];
+                    let maybe_offset =
+                        offset_by_id(&conn, &sql_builder, params, "rpc_id", "closed_at DESC", "rpc_id = ?1")?;
+                    match maybe_offset {
+                        Some(offset) => offset,
+                        None => {
+                            return Ok(GetClosedChannelsResult {
+                                channels: vec![],
+                                skipped: 0,
+                                total,
+                            })
+                        },
+                    }
+                },
+            };
+
+            let mut params = vec![];
+            if let Some(f) = filter {
+                apply_get_channels_filter(&mut sql_builder, &mut params, f);
+            }
+            let params_as_trait: Vec<_> = params.iter().map(|(key, value)| (*key, value as &dyn ToSql)).collect();
+            add_fields_to_get_channels_sql_builder(&mut sql_builder);
+            finalize_get_channels_sql_builder(&mut sql_builder, offset, limit);
+
+            let sql = sql_builder.sql().expect("valid sql");
+            let mut stmt = conn.prepare(&sql)?;
+            let channels = stmt
+                .query_map_named(params_as_trait.as_slice(), channel_details_from_row)?
+                .collect::<Result<_, _>>()?;
+            let result = GetClosedChannelsResult {
+                channels,
+                skipped: offset,
+                total,
+            };
+            Ok(result)
+        })
+        .await
+    }
+
+    async fn add_or_update_payment_in_db(&self, info: PaymentInfo) -> Result<(), Self::Error> {
+        let for_coin = self.storage_ticker.clone();
+        let payment_hash = hex::encode(info.payment_hash.0);
+        let (is_outbound, destination) = match info.payment_type {
+            PaymentType::OutboundPayment { destination } => (true as i32, Some(destination.to_string())),
+            PaymentType::InboundPayment => (false as i32, None),
+        };
+        let description = info.description;
+        let preimage = info.preimage.map(|p| hex::encode(p.0));
+        let secret = info.secret.map(|s| hex::encode(s.0));
+        let amount_msat = info.amt_msat.map(|a| a as u32);
+        let fee_paid_msat = info.fee_paid_msat.map(|f| f as u32);
+        let status = info.status.to_string();
+        let created_at = info.created_at as u32;
+        let last_updated = info.last_updated as u32;
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let params = [
+                &payment_hash as &dyn ToSql,
+                &destination as &dyn ToSql,
+                &description as &dyn ToSql,
+                &preimage as &dyn ToSql,
+                &secret as &dyn ToSql,
+                &amount_msat as &dyn ToSql,
+                &fee_paid_msat as &dyn ToSql,
+                &is_outbound as &dyn ToSql,
+                &status as &dyn ToSql,
+                &created_at as &dyn ToSql,
+                &last_updated as &dyn ToSql,
+            ];
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            sql_transaction.execute(&upsert_payment_sql(&for_coin)?, &params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn get_payment_from_db(&self, hash: PaymentHash) -> Result<Option<PaymentInfo>, Self::Error> {
+        let params = [hex::encode(hash.0)];
+        let sql = select_payment_by_hash_sql(self.storage_ticker.as_str())?;
+        let sqlite_connection = self.sqlite_connection.clone();
+
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+            query_single_row(&conn, &sql, params, payment_info_from_row)
+        })
+        .await
+    }
+
+    async fn get_payments_by_filter(
+        &self,
+        filter: Option<PaymentsFilter>,
+        paging: PagingOptionsEnum<PaymentHash>,
+        limit: usize,
+    ) -> Result<GetPaymentsResult, Self::Error> {
+        let mut sql_builder = get_payments_builder_preimage(self.storage_ticker.as_str())?;
+        let sqlite_connection = self.sqlite_connection.clone();
+
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+
+            let mut total_builder = sql_builder.clone();
+            total_builder.count("id");
+            let total_sql = total_builder.sql().expect("valid sql");
+            let total: isize = conn.query_row(&total_sql, NO_PARAMS, |row| row.get(0))?;
+            let total = total.try_into().expect("count should be always above zero");
+
+            let offset = match paging {
+                PagingOptionsEnum::PageNumber(page) => (page.get() - 1) * limit,
+                PagingOptionsEnum::FromId(hash) => {
+                    let hash_str = hex::encode(hash.0);
+                    let params = [&hash_str];
+                    let maybe_offset = offset_by_id(
+                        &conn,
+                        &sql_builder,
+                        params,
+                        "payment_hash",
+                        "last_updated DESC",
+                        "payment_hash = ?1",
+                    )?;
+                    match maybe_offset {
+                        Some(offset) => offset,
+                        None => {
+                            return Ok(GetPaymentsResult {
+                                payments: vec![],
+                                skipped: 0,
+                                total,
+                            })
+                        },
+                    }
+                },
+            };
+
+            let mut params = vec![];
+            if let Some(f) = filter {
+                apply_get_payments_filter(&mut sql_builder, &mut params, f);
+            }
+            let params_as_trait: Vec<_> = params.iter().map(|(key, value)| (*key, value as &dyn ToSql)).collect();
+            finalize_get_payments_sql_builder(&mut sql_builder, offset, limit);
+
+            let sql = sql_builder.sql().expect("valid sql");
+            let mut stmt = conn.prepare(&sql)?;
+            let payments = stmt
+                .query_map_named(params_as_trait.as_slice(), payment_info_from_row)?
+                .collect::<Result<_, _>>()?;
+            let result = GetPaymentsResult {
+                payments,
+                skipped: offset,
+                total,
+            };
+            Ok(result)
+        })
+        .await
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    extern crate bitcoin;
+    extern crate lightning;
+    use bitcoin::blockdata::block::{Block, BlockHeader};
+    use bitcoin::hashes::hex::FromHex;
+    use bitcoin::Txid;
+    use common::{block_on, now_ms};
+    use db_common::sqlite::rusqlite::Connection;
+    use lightning::chain::chainmonitor::Persist;
+    use lightning::chain::transaction::OutPoint;
+    use lightning::chain::ChannelMonitorUpdateErr;
+    use lightning::ln::features::InitFeatures;
+    use lightning::ln::functional_test_utils::*;
+    use lightning::util::events::{ClosureReason, MessageSendEventsProvider};
+    use lightning::util::test_utils;
+    use lightning::{check_added_monitors, check_closed_broadcast, check_closed_event};
+    use rand::distributions::Alphanumeric;
+    use rand::{Rng, RngCore};
+    use secp256k1::{Secp256k1, SecretKey};
+    use std::fs;
+    use std::num::NonZeroUsize;
+    use std::path::PathBuf;
+    use std::sync::{Arc, Mutex};
+
+    impl Drop for LightningPersister {
+        fn drop(&mut self) {
+            // We test for invalid directory names, so it's OK if directory removal
+            // fails.
+            match fs::remove_dir_all(&self.main_path) {
+                Err(e) => println!("Failed to remove test persister directory: {}", e),
+                _ => {},
+            }
+        }
+    }
+
+    fn generate_random_channels(num: u64) -> Vec<SqlChannelDetails> {
+        let mut rng = rand::thread_rng();
+        let mut channels = vec![];
+        let s = Secp256k1::new();
+        let mut bytes = [0; 32];
+        for i in 0..num {
+            let details = SqlChannelDetails {
+                rpc_id: i + 1,
+                channel_id: {
+                    rng.fill_bytes(&mut bytes);
+                    hex::encode(bytes)
+                },
+                counterparty_node_id: {
+                    rng.fill_bytes(&mut bytes);
+                    let secret = SecretKey::from_slice(&bytes).unwrap();
+                    let pubkey = PublicKey::from_secret_key(&s, &secret);
+                    pubkey.to_string()
+                },
+                funding_tx: {
+                    rng.fill_bytes(&mut bytes);
+                    Some(hex::encode(bytes))
+                },
+                funding_value: Some(rng.gen::<u32>() as u64),
+                closing_tx: {
+                    rng.fill_bytes(&mut bytes);
+                    Some(hex::encode(bytes))
+                },
+                closure_reason: {
+                    Some(
+                        rng.sample_iter(&Alphanumeric)
+                            .take(30)
+                            .map(char::from)
+                            .collect::<String>(),
+                    )
+                },
+                claiming_tx: {
+                    rng.fill_bytes(&mut bytes);
+                    Some(hex::encode(bytes))
+                },
+                claimed_balance: Some(rng.gen::<f64>()),
+                funding_generated_in_block: Some(rng.gen::<u32>() as u64),
+                is_outbound: rand::random(),
+                is_public: rand::random(),
+                is_closed: rand::random(),
+                created_at: rng.gen::<u32>() as u64,
+                closed_at: Some(rng.gen::<u32>() as u64),
+            };
+            channels.push(details);
+        }
+        channels
+    }
+
+    fn generate_random_payments(num: u64) -> Vec<PaymentInfo> {
+        let mut rng = rand::thread_rng();
+        let mut payments = vec![];
+        let s = Secp256k1::new();
+        let mut bytes = [0; 32];
+        for _ in 0..num {
+            let payment_type = if let 0 = rng.gen::<u8>() % 2 {
+                PaymentType::InboundPayment
+            } else {
+                rng.fill_bytes(&mut bytes);
+                let secret = SecretKey::from_slice(&bytes).unwrap();
+                PaymentType::OutboundPayment {
+                    destination: PublicKey::from_secret_key(&s, &secret),
+                }
+            };
+            let status_rng: u8 = rng.gen();
+            let status = if status_rng % 3 == 0 {
+                HTLCStatus::Succeeded
+            } else if status_rng % 3 == 1 {
+                HTLCStatus::Pending
+            } else {
+                HTLCStatus::Failed
+            };
+            let description: String = rng.sample_iter(&Alphanumeric).take(30).map(char::from).collect();
+            let info = PaymentInfo {
+                payment_hash: {
+                    rng.fill_bytes(&mut bytes);
+                    PaymentHash(bytes)
+                },
+                payment_type,
+                description,
+                preimage: {
+                    rng.fill_bytes(&mut bytes);
+                    Some(PaymentPreimage(bytes))
+                },
+                secret: {
+                    rng.fill_bytes(&mut bytes);
+                    Some(PaymentSecret(bytes))
+                },
+                amt_msat: Some(rng.gen::<u32>() as u64),
+                fee_paid_msat: Some(rng.gen::<u32>() as u64),
+                status,
+                created_at: rng.gen::<u32>() as u64,
+                last_updated: rng.gen::<u32>() as u64,
+            };
+            payments.push(info);
+        }
+        payments
+    }
+
+    // Integration-test the LightningPersister. Test relaying a few payments
+    // and check that the persisted data is updated the appropriate number of
+    // times.
+    #[test]
+    fn test_filesystem_persister() {
+        // Create the nodes, giving them LightningPersisters for data persisters.
+        let persister_0 = LightningPersister::new(
+            "test_filesystem_persister_0".into(),
+            PathBuf::from("test_filesystem_persister_0"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+        let persister_1 = LightningPersister::new(
+            "test_filesystem_persister_1".into(),
+            PathBuf::from("test_filesystem_persister_1"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+        let chanmon_cfgs = create_chanmon_cfgs(2);
+        let mut node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+        let chain_mon_0 = test_utils::TestChainMonitor::new(
+            Some(&chanmon_cfgs[0].chain_source),
+            &chanmon_cfgs[0].tx_broadcaster,
+            &chanmon_cfgs[0].logger,
+            &chanmon_cfgs[0].fee_estimator,
+            &persister_0,
+            &node_cfgs[0].keys_manager,
+        );
+        let chain_mon_1 = test_utils::TestChainMonitor::new(
+            Some(&chanmon_cfgs[1].chain_source),
+            &chanmon_cfgs[1].tx_broadcaster,
+            &chanmon_cfgs[1].logger,
+            &chanmon_cfgs[1].fee_estimator,
+            &persister_1,
+            &node_cfgs[1].keys_manager,
+        );
+        node_cfgs[0].chain_monitor = chain_mon_0;
+        node_cfgs[1].chain_monitor = chain_mon_1;
+        let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+        let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+
+        // Check that the persisted channel data is empty before any channels are
+        // open.
+        let mut persisted_chan_data_0 = persister_0.read_channelmonitors(nodes[0].keys_manager).unwrap();
+        assert_eq!(persisted_chan_data_0.len(), 0);
+        let mut persisted_chan_data_1 = persister_1.read_channelmonitors(nodes[1].keys_manager).unwrap();
+        assert_eq!(persisted_chan_data_1.len(), 0);
+
+        // Helper to make sure the channel is on the expected update ID.
+        macro_rules! check_persisted_data {
+            ($expected_update_id: expr) => {
+                persisted_chan_data_0 = persister_0.read_channelmonitors(nodes[0].keys_manager).unwrap();
+                assert_eq!(persisted_chan_data_0.len(), 1);
+                for (_, mon) in persisted_chan_data_0.iter() {
+                    assert_eq!(mon.get_latest_update_id(), $expected_update_id);
+                }
+                persisted_chan_data_1 = persister_1.read_channelmonitors(nodes[1].keys_manager).unwrap();
+                assert_eq!(persisted_chan_data_1.len(), 1);
+                for (_, mon) in persisted_chan_data_1.iter() {
+                    assert_eq!(mon.get_latest_update_id(), $expected_update_id);
+                }
+            };
+        }
+
+        // Create some initial channel and check that a channel was persisted.
+        let _ = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
+        check_persisted_data!(0);
+
+        // Send a few payments and make sure the monitors are updated to the latest.
+        send_payment(&nodes[0], &vec![&nodes[1]][..], 8000000);
+        check_persisted_data!(5);
+        send_payment(&nodes[1], &vec![&nodes[0]][..], 4000000);
+        check_persisted_data!(10);
+
+        // Force close because cooperative close doesn't result in any persisted
+        // updates.
+        nodes[0]
+            .node
+            .force_close_channel(&nodes[0].node.list_channels()[0].channel_id)
+            .unwrap();
+        check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
+        check_closed_broadcast!(nodes[0], true);
+        check_added_monitors!(nodes[0], 1);
+
+        let node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
+        assert_eq!(node_txn.len(), 1);
+
+        let header = BlockHeader {
+            version: 0x20000000,
+            prev_blockhash: nodes[0].best_block_hash(),
+            merkle_root: Default::default(),
+            time: 42,
+            bits: 42,
+            nonce: 42,
+        };
+        connect_block(&nodes[1], &Block {
+            header,
+            txdata: vec![node_txn[0].clone(), node_txn[0].clone()],
+        });
+        check_closed_broadcast!(nodes[1], true);
+        check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed);
+        check_added_monitors!(nodes[1], 1);
+
+        // Make sure everything is persisted as expected after close.
+        check_persisted_data!(11);
+    }
+
+    // Test that if the persister's path to channel data is read-only, writing a
+    // monitor to it results in the persister returning a PermanentFailure.
+    // Windows ignores the read-only flag for folders, so this test is Unix-only.
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn test_readonly_dir_perm_failure() {
+        let persister = LightningPersister::new(
+            "test_readonly_dir_perm_failure".into(),
+            PathBuf::from("test_readonly_dir_perm_failure"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+        fs::create_dir_all(&persister.main_path).unwrap();
+
+        // Set up a dummy channel and force close. This will produce a monitor
+        // that we can then use to test persistence.
+        let chanmon_cfgs = create_chanmon_cfgs(2);
+        let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+        let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+        let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+        let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
+        nodes[1].node.force_close_channel(&chan.2).unwrap();
+        check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
+        let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
+        let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
+        let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
+
+        // Set the persister's directory to read-only, which should result in
+        // returning a permanent failure when we then attempt to persist a
+        // channel update.
+        let path = &persister.main_path;
+        let mut perms = fs::metadata(path).unwrap().permissions();
+        perms.set_readonly(true);
+        fs::set_permissions(path, perms).unwrap();
+
+        let test_txo = OutPoint {
+            txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
+            index: 0,
+        };
+        match persister.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {
+            Err(ChannelMonitorUpdateErr::PermanentFailure) => {},
+            _ => panic!("unexpected result from persisting new channel"),
+        }
+
+        nodes[1].node.get_and_clear_pending_msg_events();
+        added_monitors.clear();
+    }
+
+    // Test that if a persister's directory name is invalid, monitor persistence
+    // will fail.
+    #[cfg(target_os = "windows")]
+    #[test]
+    fn test_fail_on_open() {
+        // Set up a dummy channel and force close. This will produce a monitor
+        // that we can then use to test persistence.
+        let chanmon_cfgs = create_chanmon_cfgs(2);
+        let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+        let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+        let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+        let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
+        nodes[1].node.force_close_channel(&chan.2).unwrap();
+        check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
+        let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
+        let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
+        let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
+
+        // Create the persister with an invalid directory name and test that the
+        // channel fails to open because the directories fail to be created. There
+        // don't seem to be invalid filename characters on Unix that Rust doesn't
+        // handle, hence why the test is Windows-only.
+        let persister = LightningPersister::new(
+            "test_fail_on_open".into(),
+            PathBuf::from(":<>/"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        let test_txo = OutPoint {
+            txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
+            index: 0,
+        };
+        match persister.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {
+            Err(ChannelMonitorUpdateErr::PermanentFailure) => {},
+            _ => panic!("unexpected result from persisting new channel"),
+        }
+
+        nodes[1].node.get_and_clear_pending_msg_events();
+        added_monitors.clear();
+    }
+
+    #[test]
+    fn test_init_sql_collection() {
+        let persister = LightningPersister::new(
+            "init_sql_collection".into(),
+            PathBuf::from("test_filesystem_persister"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+        let initialized = block_on(persister.is_db_initialized()).unwrap();
+        assert!(!initialized);
+
+        block_on(persister.init_db()).unwrap();
+        // repetitive init must not fail
+        block_on(persister.init_db()).unwrap();
+
+        let initialized = block_on(persister.is_db_initialized()).unwrap();
+        assert!(initialized);
+    }
+
+    #[test]
+    fn test_add_get_channel_sql() {
+        let persister = LightningPersister::new(
+            "add_get_channel".into(),
+            PathBuf::from("test_filesystem_persister"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(persister.init_db()).unwrap();
+
+        let last_channel_rpc_id = block_on(persister.get_last_channel_rpc_id()).unwrap();
+        assert_eq!(last_channel_rpc_id, 0);
+
+        let channel = block_on(persister.get_channel_from_db(1)).unwrap();
+        assert!(channel.is_none());
+
+        let mut expected_channel_details = SqlChannelDetails::new(
+            1,
+            [0; 32],
+            PublicKey::from_str("038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9").unwrap(),
+            true,
+            true,
+        );
+        block_on(persister.add_channel_to_db(expected_channel_details.clone())).unwrap();
+        let last_channel_rpc_id = block_on(persister.get_last_channel_rpc_id()).unwrap();
+        assert_eq!(last_channel_rpc_id, 1);
+
+        let actual_channel_details = block_on(persister.get_channel_from_db(1)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        // must fail because we are adding channel with the same rpc_id
+        block_on(persister.add_channel_to_db(expected_channel_details.clone())).unwrap_err();
+        assert_eq!(last_channel_rpc_id, 1);
+
+        expected_channel_details.rpc_id = 2;
+        block_on(persister.add_channel_to_db(expected_channel_details.clone())).unwrap();
+        let last_channel_rpc_id = block_on(persister.get_last_channel_rpc_id()).unwrap();
+        assert_eq!(last_channel_rpc_id, 2);
+
+        block_on(persister.add_funding_tx_to_db(
+            2,
+            "9cdafd6d42dcbdc06b0b5bce1866deb82630581285bbfb56870577300c0a8c6e".into(),
+            3000,
+            50000,
+        ))
+        .unwrap();
+        expected_channel_details.funding_tx =
+            Some("9cdafd6d42dcbdc06b0b5bce1866deb82630581285bbfb56870577300c0a8c6e".into());
+        expected_channel_details.funding_value = Some(3000);
+        expected_channel_details.funding_generated_in_block = Some(50000);
+
+        let actual_channel_details = block_on(persister.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        block_on(persister.update_funding_tx_block_height(
+            "9cdafd6d42dcbdc06b0b5bce1866deb82630581285bbfb56870577300c0a8c6e".into(),
+            50001,
+        ))
+        .unwrap();
+        expected_channel_details.funding_generated_in_block = Some(50001);
+
+        let actual_channel_details = block_on(persister.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        let current_time = now_ms() / 1000;
+        block_on(persister.update_channel_to_closed(2, "the channel was cooperatively closed".into(), current_time))
+            .unwrap();
+        expected_channel_details.closure_reason = Some("the channel was cooperatively closed".into());
+        expected_channel_details.is_closed = true;
+        expected_channel_details.closed_at = Some(current_time);
+
+        let actual_channel_details = block_on(persister.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        let actual_channels = block_on(persister.get_closed_channels_with_no_closing_tx()).unwrap();
+        assert_eq!(actual_channels.len(), 1);
+
+        let closed_channels =
+            block_on(persister.get_closed_channels_by_filter(None, PagingOptionsEnum::default(), 10)).unwrap();
+        assert_eq!(closed_channels.channels.len(), 1);
+        assert_eq!(expected_channel_details, closed_channels.channels[0]);
+
+        block_on(persister.update_channel_to_closed(1, "the channel was cooperatively closed".into(), now_ms() / 1000))
+            .unwrap();
+        let closed_channels =
+            block_on(persister.get_closed_channels_by_filter(None, PagingOptionsEnum::default(), 10)).unwrap();
+        assert_eq!(closed_channels.channels.len(), 2);
+
+        let actual_channels = block_on(persister.get_closed_channels_with_no_closing_tx()).unwrap();
+        assert_eq!(actual_channels.len(), 2);
+
+        block_on(persister.add_closing_tx_to_db(
+            2,
+            "5557df9ad2c9b3c57a4df8b4a7da0b7a6f4e923b4a01daa98bf9e5a3b33e9c8f".into(),
+        ))
+        .unwrap();
+        expected_channel_details.closing_tx =
+            Some("5557df9ad2c9b3c57a4df8b4a7da0b7a6f4e923b4a01daa98bf9e5a3b33e9c8f".into());
+
+        let actual_channels = block_on(persister.get_closed_channels_with_no_closing_tx()).unwrap();
+        assert_eq!(actual_channels.len(), 1);
+
+        let actual_channel_details = block_on(persister.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        block_on(persister.add_claiming_tx_to_db(
+            "5557df9ad2c9b3c57a4df8b4a7da0b7a6f4e923b4a01daa98bf9e5a3b33e9c8f".into(),
+            "97f061634a4a7b0b0c2b95648f86b1c39b95e0cf5073f07725b7143c095b612a".into(),
+            2000.333333,
+        ))
+        .unwrap();
+        expected_channel_details.claiming_tx =
+            Some("97f061634a4a7b0b0c2b95648f86b1c39b95e0cf5073f07725b7143c095b612a".into());
+        expected_channel_details.claimed_balance = Some(2000.333333);
+
+        let actual_channel_details = block_on(persister.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+    }
+
+    #[test]
+    fn test_add_get_payment_sql() {
+        let persister = LightningPersister::new(
+            "add_get_payment".into(),
+            PathBuf::from("test_filesystem_persister"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(persister.init_db()).unwrap();
+
+        let payment = block_on(persister.get_payment_from_db(PaymentHash([0; 32]))).unwrap();
+        assert!(payment.is_none());
+
+        let mut expected_payment_info = PaymentInfo {
+            payment_hash: PaymentHash([0; 32]),
+            payment_type: PaymentType::InboundPayment,
+            description: "test payment".into(),
+            preimage: Some(PaymentPreimage([2; 32])),
+            secret: Some(PaymentSecret([3; 32])),
+            amt_msat: Some(2000),
+            fee_paid_msat: Some(100),
+            status: HTLCStatus::Failed,
+            created_at: now_ms() / 1000,
+            last_updated: now_ms() / 1000,
+        };
+        block_on(persister.add_or_update_payment_in_db(expected_payment_info.clone())).unwrap();
+
+        let actual_payment_info = block_on(persister.get_payment_from_db(PaymentHash([0; 32])))
+            .unwrap()
+            .unwrap();
+        assert_eq!(expected_payment_info, actual_payment_info);
+
+        expected_payment_info.payment_hash = PaymentHash([1; 32]);
+        expected_payment_info.payment_type = PaymentType::OutboundPayment {
+            destination: PublicKey::from_str("038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9")
+                .unwrap(),
+        };
+        expected_payment_info.secret = None;
+        expected_payment_info.amt_msat = None;
+        expected_payment_info.status = HTLCStatus::Succeeded;
+        expected_payment_info.last_updated = now_ms() / 1000;
+        block_on(persister.add_or_update_payment_in_db(expected_payment_info.clone())).unwrap();
+
+        let actual_payment_info = block_on(persister.get_payment_from_db(PaymentHash([1; 32])))
+            .unwrap()
+            .unwrap();
+        assert_eq!(expected_payment_info, actual_payment_info);
+    }
+
+    #[test]
+    fn test_get_payments_by_filter() {
+        let persister = LightningPersister::new(
+            "test_get_payments_by_filter".into(),
+            PathBuf::from("test_filesystem_persister"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(persister.init_db()).unwrap();
+
+        let mut payments = generate_random_payments(100);
+
+        for payment in payments.clone() {
+            block_on(persister.add_or_update_payment_in_db(payment)).unwrap();
+        }
+
+        let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+        let limit = 4;
+
+        let result = block_on(persister.get_payments_by_filter(None, paging, limit)).unwrap();
+
+        payments.sort_by(|a, b| b.last_updated.cmp(&a.last_updated));
+        let expected_payments = &payments[..4].to_vec();
+        let actual_payments = &result.payments;
+
+        assert_eq!(0, result.skipped);
+        assert_eq!(100, result.total);
+        assert_eq!(expected_payments, actual_payments);
+
+        let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap());
+        let limit = 5;
+
+        let result = block_on(persister.get_payments_by_filter(None, paging, limit)).unwrap();
+
+        let expected_payments = &payments[5..10].to_vec();
+        let actual_payments = &result.payments;
+
+        assert_eq!(5, result.skipped);
+        assert_eq!(100, result.total);
+        assert_eq!(expected_payments, actual_payments);
+
+        let from_payment_hash = payments[20].payment_hash;
+        let paging = PagingOptionsEnum::FromId(from_payment_hash);
+        let limit = 3;
+
+        let result = block_on(persister.get_payments_by_filter(None, paging, limit)).unwrap();
+
+        let expected_payments = &payments[21..24].to_vec();
+        let actual_payments = &result.payments;
+
+        assert_eq!(expected_payments, actual_payments);
+
+        let mut filter = PaymentsFilter {
+            payment_type: Some(PaymentType::InboundPayment),
+            description: None,
+            status: None,
+            from_amount_msat: None,
+            to_amount_msat: None,
+            from_fee_paid_msat: None,
+            to_fee_paid_msat: None,
+            from_timestamp: None,
+            to_timestamp: None,
+        };
+        let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+        let limit = 10;
+
+        let result = block_on(persister.get_payments_by_filter(Some(filter.clone()), paging.clone(), limit)).unwrap();
+        let expected_payments_vec: Vec<PaymentInfo> = payments
+            .iter()
+            .map(|p| p.clone())
+            .filter(|p| p.payment_type == PaymentType::InboundPayment)
+            .collect();
+        let expected_payments = if expected_payments_vec.len() > 10 {
+            expected_payments_vec[..10].to_vec()
+        } else {
+            expected_payments_vec.clone()
+        };
+        let actual_payments = result.payments;
+
+        assert_eq!(expected_payments, actual_payments);
+
+        filter.status = Some(HTLCStatus::Succeeded);
+        let result = block_on(persister.get_payments_by_filter(Some(filter.clone()), paging.clone(), limit)).unwrap();
+        let expected_payments_vec: Vec<PaymentInfo> = expected_payments_vec
+            .iter()
+            .map(|p| p.clone())
+            .filter(|p| p.status == HTLCStatus::Succeeded)
+            .collect();
+        let expected_payments = if expected_payments_vec.len() > 10 {
+            expected_payments_vec[..10].to_vec()
+        } else {
+            expected_payments_vec
+        };
+        let actual_payments = result.payments;
+
+        assert_eq!(expected_payments, actual_payments);
+
+        let description = &payments[42].description;
+        let substr = &description[5..10];
+        filter.payment_type = None;
+        filter.status = None;
+        filter.description = Some(substr.to_string());
+        let result = block_on(persister.get_payments_by_filter(Some(filter), paging, limit)).unwrap();
+        let expected_payments_vec: Vec<PaymentInfo> = payments
+            .iter()
+            .map(|p| p.clone())
+            .filter(|p| p.description.contains(&substr))
+            .collect();
+        let expected_payments = if expected_payments_vec.len() > 10 {
+            expected_payments_vec[..10].to_vec()
+        } else {
+            expected_payments_vec.clone()
+        };
+        let actual_payments = result.payments;
+
+        assert_eq!(expected_payments, actual_payments);
+    }
+
+    #[test]
+    fn test_get_channels_by_filter() {
+        let persister = LightningPersister::new(
+            "test_get_channels_by_filter".into(),
+            PathBuf::from("test_filesystem_persister"),
+            None,
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(persister.init_db()).unwrap();
+
+        let channels = generate_random_channels(100);
+
+        for channel in channels {
+            block_on(persister.add_channel_to_db(channel.clone())).unwrap();
+            block_on(persister.add_funding_tx_to_db(
+                channel.rpc_id,
+                channel.funding_tx.unwrap(),
+                channel.funding_value.unwrap(),
+                channel.funding_generated_in_block.unwrap(),
+            ))
+            .unwrap();
+            block_on(persister.update_channel_to_closed(channel.rpc_id, channel.closure_reason.unwrap(), 1655806080))
+                .unwrap();
+            block_on(persister.add_closing_tx_to_db(channel.rpc_id, channel.closing_tx.clone().unwrap())).unwrap();
+            block_on(persister.add_claiming_tx_to_db(
+                channel.closing_tx.unwrap(),
+                channel.claiming_tx.unwrap(),
+                channel.claimed_balance.unwrap(),
+            ))
+            .unwrap();
+        }
+
+        // get all channels from SQL since updated_at changed from channels generated by generate_random_channels
+        let channels = block_on(persister.get_closed_channels_by_filter(None, PagingOptionsEnum::default(), 100))
+            .unwrap()
+            .channels;
+        assert_eq!(100, channels.len());
+
+        let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+        let limit = 4;
+
+        let result = block_on(persister.get_closed_channels_by_filter(None, paging, limit)).unwrap();
+
+        let expected_channels = &channels[..4].to_vec();
+        let actual_channels = &result.channels;
+
+        assert_eq!(0, result.skipped);
+        assert_eq!(100, result.total);
+        assert_eq!(expected_channels, actual_channels);
+
+        let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap());
+        let limit = 5;
+
+        let result = block_on(persister.get_closed_channels_by_filter(None, paging, limit)).unwrap();
+
+        let expected_channels = &channels[5..10].to_vec();
+        let actual_channels = &result.channels;
+
+        assert_eq!(5, result.skipped);
+        assert_eq!(100, result.total);
+        assert_eq!(expected_channels, actual_channels);
+
+        let from_rpc_id = 20;
+        let paging = PagingOptionsEnum::FromId(from_rpc_id);
+        let limit = 3;
+
+        let result = block_on(persister.get_closed_channels_by_filter(None, paging, limit)).unwrap();
+
+        let expected_channels = channels[20..23].to_vec();
+        let actual_channels = result.channels;
+
+        assert_eq!(expected_channels, actual_channels);
+
+        let mut filter = ClosedChannelsFilter {
+            channel_id: None,
+            counterparty_node_id: None,
+            funding_tx: None,
+            from_funding_value: None,
+            to_funding_value: None,
+            closing_tx: None,
+            closure_reason: None,
+            claiming_tx: None,
+            from_claimed_balance: None,
+            to_claimed_balance: None,
+            channel_type: Some(ChannelType::Outbound),
+            channel_visibility: None,
+        };
+        let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+        let limit = 10;
+
+        let result =
+            block_on(persister.get_closed_channels_by_filter(Some(filter.clone()), paging.clone(), limit)).unwrap();
+        let expected_channels_vec: Vec<SqlChannelDetails> = channels
+            .iter()
+            .map(|chan| chan.clone())
+            .filter(|chan| chan.is_outbound)
+            .collect();
+        let expected_channels = if expected_channels_vec.len() > 10 {
+            expected_channels_vec[..10].to_vec()
+        } else {
+            expected_channels_vec.clone()
+        };
+        let actual_channels = result.channels;
+
+        assert_eq!(expected_channels, actual_channels);
+
+        filter.channel_visibility = Some(ChannelVisibility::Public);
+        let result =
+            block_on(persister.get_closed_channels_by_filter(Some(filter.clone()), paging.clone(), limit)).unwrap();
+        let expected_channels_vec: Vec<SqlChannelDetails> = expected_channels_vec
+            .iter()
+            .map(|chan| chan.clone())
+            .filter(|chan| chan.is_public)
+            .collect();
+        let expected_channels = if expected_channels_vec.len() > 10 {
+            expected_channels_vec[..10].to_vec()
+        } else {
+            expected_channels_vec
+        };
+        let actual_channels = result.channels;
+
+        assert_eq!(expected_channels, actual_channels);
+
+        let channel_id = channels[42].channel_id.clone();
+        filter.channel_type = None;
+        filter.channel_visibility = None;
+        filter.channel_id = Some(channel_id.clone());
+        let result = block_on(persister.get_closed_channels_by_filter(Some(filter), paging, limit)).unwrap();
+        let expected_channels_vec: Vec<SqlChannelDetails> = channels
+            .iter()
+            .map(|chan| chan.clone())
+            .filter(|chan| chan.channel_id == channel_id)
+            .collect();
+        let expected_channels = if expected_channels_vec.len() > 10 {
+            expected_channels_vec[..10].to_vec()
+        } else {
+            expected_channels_vec.clone()
+        };
+        let actual_channels = result.channels;
+
+        assert_eq!(expected_channels, actual_channels);
+    }
+}
diff --git a/mm2src/coins/lightning_persister/src/storage.rs b/mm2src/coins/lightning_persister/src/storage.rs
new file mode 100644
index 0000000000..c0b9ac7e9d
--- /dev/null
+++ b/mm2src/coins/lightning_persister/src/storage.rs
@@ -0,0 +1,274 @@
+use async_trait::async_trait;
+use bitcoin::Network;
+use common::{now_ms, PagingOptionsEnum};
+use db_common::sqlite::rusqlite::types::FromSqlError;
+use derive_more::Display;
+use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
+use lightning::routing::network_graph::NetworkGraph;
+use lightning::routing::scoring::ProbabilisticScorer;
+use parking_lot::Mutex as PaMutex;
+use secp256k1::PublicKey;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::net::SocketAddr;
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
+
+pub type NodesAddressesMap = HashMap<PublicKey, SocketAddr>;
+pub type NodesAddressesMapShared = Arc<PaMutex<NodesAddressesMap>>;
+pub type Scorer = ProbabilisticScorer<Arc<NetworkGraph>>;
+#[async_trait]
+pub trait FileSystemStorage {
+    type Error;
+
+    /// Initializes dirs/collection/tables in storage for a specified coin
+    async fn init_fs(&self) -> Result<(), Self::Error>;
+
+    async fn is_fs_initialized(&self) -> Result<bool, Self::Error>;
+
+    async fn get_nodes_addresses(&self) -> Result<HashMap<PublicKey, SocketAddr>, Self::Error>;
+
+    async fn save_nodes_addresses(&self, nodes_addresses: NodesAddressesMapShared) -> Result<(), Self::Error>;
+
+    async fn get_network_graph(&self, network: Network) -> Result<NetworkGraph, Self::Error>;
+
+    async fn save_network_graph(&self, network_graph: Arc<NetworkGraph>) -> Result<(), Self::Error>;
+
+    async fn get_scorer(&self, network_graph: Arc<NetworkGraph>) -> Result<Scorer, Self::Error>;
+
+    async fn save_scorer(&self, scorer: Arc<Mutex<Scorer>>) -> Result<(), Self::Error>;
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct SqlChannelDetails {
+    pub rpc_id: u64,
+    pub channel_id: String,
+    pub counterparty_node_id: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub funding_tx: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub funding_value: Option<u64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub closing_tx: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub closure_reason: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub claiming_tx: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub claimed_balance: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub funding_generated_in_block: Option<u64>,
+    pub is_outbound: bool,
+    pub is_public: bool,
+    pub is_closed: bool,
+    pub created_at: u64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub closed_at: Option<u64>,
+}
+
+impl SqlChannelDetails {
+    #[inline]
+    pub fn new(
+        rpc_id: u64,
+        channel_id: [u8; 32],
+        counterparty_node_id: PublicKey,
+        is_outbound: bool,
+        is_public: bool,
+    ) -> Self {
+        SqlChannelDetails {
+            rpc_id,
+            channel_id: hex::encode(channel_id),
+            counterparty_node_id: counterparty_node_id.to_string(),
+            funding_tx: None,
+            funding_value: None,
+            funding_generated_in_block: None,
+            closing_tx: None,
+            closure_reason: None,
+            claiming_tx: None,
+            claimed_balance: None,
+            is_outbound,
+            is_public,
+            is_closed: false,
+            created_at: now_ms() / 1000,
+            closed_at: None,
+        }
+    }
+}
+
+#[derive(Clone, Deserialize)]
+pub enum ChannelType {
+    Outbound,
+    Inbound,
+}
+
+#[derive(Clone, Deserialize)]
+pub enum ChannelVisibility {
+    Public,
+    Private,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct ClosedChannelsFilter {
+    pub channel_id: Option<String>,
+    pub counterparty_node_id: Option<String>,
+    pub funding_tx: Option<String>,
+    pub from_funding_value: Option<u64>,
+    pub to_funding_value: Option<u64>,
+    pub closing_tx: Option<String>,
+    pub closure_reason: Option<String>,
+    pub claiming_tx: Option<String>,
+    pub from_claimed_balance: Option<f64>,
+    pub to_claimed_balance: Option<f64>,
+    pub channel_type: Option<ChannelType>,
+    pub channel_visibility: Option<ChannelVisibility>,
+}
+
+pub struct GetClosedChannelsResult {
+    pub channels: Vec<SqlChannelDetails>,
+    pub skipped: usize,
+    pub total: usize,
+}
+
+#[derive(Clone, Debug, Deserialize, Display, PartialEq, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum HTLCStatus {
+    Pending,
+    Succeeded,
+    Failed,
+}
+
+impl FromStr for HTLCStatus {
+    type Err = FromSqlError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "Pending" => Ok(HTLCStatus::Pending),
+            "Succeeded" => Ok(HTLCStatus::Succeeded),
+            "Failed" => Ok(HTLCStatus::Failed),
+            _ => Err(FromSqlError::InvalidType),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum PaymentType {
+    OutboundPayment { destination: PublicKey },
+    InboundPayment,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct PaymentInfo {
+    pub payment_hash: PaymentHash,
+    pub payment_type: PaymentType,
+    pub description: String,
+    pub preimage: Option<PaymentPreimage>,
+    pub secret: Option<PaymentSecret>,
+    pub amt_msat: Option<u64>,
+    pub fee_paid_msat: Option<u64>,
+    pub status: HTLCStatus,
+    pub created_at: u64,
+    pub last_updated: u64,
+}
+
+#[derive(Clone)]
+pub struct PaymentsFilter {
+    pub payment_type: Option<PaymentType>,
+    pub description: Option<String>,
+    pub status: Option<HTLCStatus>,
+    pub from_amount_msat: Option<u64>,
+    pub to_amount_msat: Option<u64>,
+    pub from_fee_paid_msat: Option<u64>,
+    pub to_fee_paid_msat: Option<u64>,
+    pub from_timestamp: Option<u64>,
+    pub to_timestamp: Option<u64>,
+}
+
+pub struct GetPaymentsResult {
+    pub payments: Vec<PaymentInfo>,
+    pub skipped: usize,
+    pub total: usize,
+}
+
+#[async_trait]
+pub trait DbStorage {
+    type Error;
+
+    /// Initializes tables in DB.
+    async fn init_db(&self) -> Result<(), Self::Error>;
+
+    /// Checks if tables have been initialized or not in DB.
+    async fn is_db_initialized(&self) -> Result<bool, Self::Error>;
+
+    /// Gets the last added channel rpc_id. Can be used to deduce the rpc_id for a new channel to be added to DB.
+    async fn get_last_channel_rpc_id(&self) -> Result<u32, Self::Error>;
+
+    /// Inserts a new channel record in the DB. The record's data is completed using add_funding_tx_to_db,
+    /// add_closing_tx_to_db, add_claiming_tx_to_db when this information is available.
+    async fn add_channel_to_db(&self, details: SqlChannelDetails) -> Result<(), Self::Error>;
+
+    /// Updates a channel's DB record with the channel's funding transaction information.
+    async fn add_funding_tx_to_db(
+        &self,
+        rpc_id: u64,
+        funding_tx: String,
+        funding_value: u64,
+        funding_generated_in_block: u64,
+    ) -> Result<(), Self::Error>;
+
+    /// Updates funding_tx_block_height value for a channel in the DB. Should be used to update the block height of
+    /// the funding tx when the transaction is confirmed on-chain.
+    async fn update_funding_tx_block_height(&self, funding_tx: String, block_height: u64) -> Result<(), Self::Error>;
+
+    /// Updates the is_closed value for a channel in the DB to 1.
+    async fn update_channel_to_closed(
+        &self,
+        rpc_id: u64,
+        closure_reason: String,
+        close_at: u64,
+    ) -> Result<(), Self::Error>;
+
+    /// Gets the list of closed channels records in the DB with no closing tx hashs saved yet. Can be used to check if
+    /// the closing tx hash needs to be fetched from the chain and saved to DB when initializing the persister.
+    async fn get_closed_channels_with_no_closing_tx(&self) -> Result<Vec<SqlChannelDetails>, Self::Error>;
+
+    /// Updates a channel's DB record with the channel's closing transaction hash.
+    async fn add_closing_tx_to_db(&self, rpc_id: u64, closing_tx: String) -> Result<(), Self::Error>;
+
+    /// Updates a channel's DB record with information about the transaction responsible for claiming the channel's
+    /// closing balance back to the user's address.
+    async fn add_claiming_tx_to_db(
+        &self,
+        closing_tx: String,
+        claiming_tx: String,
+        claimed_balance: f64,
+    ) -> Result<(), Self::Error>;
+
+    /// Gets a channel record from DB by the channel's rpc_id.
+    async fn get_channel_from_db(&self, rpc_id: u64) -> Result<Option<SqlChannelDetails>, Self::Error>;
+
+    /// Gets the list of closed channels that match the provided filter criteria. The number of requested records is
+    /// specified by the limit parameter, the starting record to list from is specified by the paging parameter. The
+    /// total number of matched records along with the number of skipped records are also returned in the result.
+    async fn get_closed_channels_by_filter(
+        &self,
+        filter: Option<ClosedChannelsFilter>,
+        paging: PagingOptionsEnum<u64>,
+        limit: usize,
+    ) -> Result<GetClosedChannelsResult, Self::Error>;
+
+    /// Inserts or updates a new payment record in the DB.
+    async fn add_or_update_payment_in_db(&self, info: PaymentInfo) -> Result<(), Self::Error>;
+
+    /// Gets a payment's record from DB by the payment's hash.
+    async fn get_payment_from_db(&self, hash: PaymentHash) -> Result<Option<PaymentInfo>, Self::Error>;
+
+    /// Gets the list of payments that match the provided filter criteria. The number of requested records is specified
+    /// by the limit parameter, the starting record to list from is specified by the paging parameter. The total number
+    /// of matched records along with the number of skipped records are also returned in the result.
+    async fn get_payments_by_filter(
+        &self,
+        filter: Option<PaymentsFilter>,
+        paging: PagingOptionsEnum<PaymentHash>,
+        limit: usize,
+    ) -> Result<GetPaymentsResult, Self::Error>;
+}
diff --git a/mm2src/coins/lightning_persister/src/util.rs b/mm2src/coins/lightning_persister/src/util.rs
new file mode 100644
index 0000000000..ac5bc99de5
--- /dev/null
+++ b/mm2src/coins/lightning_persister/src/util.rs
@@ -0,0 +1,196 @@
+#[cfg(target_os = "windows")] extern crate winapi;
+
+use std::fs;
+use std::path::{Path, PathBuf};
+
+#[cfg(not(target_os = "windows"))]
+use std::os::unix::io::AsRawFd;
+
+#[cfg(target_os = "windows")]
+use {std::ffi::OsStr, std::os::windows::ffi::OsStrExt};
+
+pub(crate) trait DiskWriteable {
+    fn write_to_file(&self, writer: &mut fs::File) -> Result<(), std::io::Error>;
+}
+
+pub(crate) fn get_full_filepath(mut filepath: PathBuf, filename: String) -> String {
+    filepath.push(filename);
+    filepath.to_str().unwrap().to_string()
+}
+
+#[cfg(target_os = "windows")]
+macro_rules! call {
+    ($e: expr) => {
+        if $e != 0 {
+            return Ok(());
+        } else {
+            return Err(std::io::Error::last_os_error());
+        }
+    };
+}
+
+#[cfg(target_os = "windows")]
+fn path_to_windows_str<T: AsRef<OsStr>>(path: T) -> Vec<winapi::shared::ntdef::WCHAR> {
+    path.as_ref().encode_wide().chain(Some(0)).collect()
+}
+
+#[allow(bare_trait_objects)]
+pub(crate) fn write_to_file<D: DiskWriteable>(path: PathBuf, filename: String, data: &D) -> std::io::Result<()> {
+    fs::create_dir_all(path.clone())?;
+    // Do a crazy dance with lots of fsync()s to be overly cautious here...
+    // We never want to end up in a state where we've lost the old data, or end up using the
+    // old data on power loss after we've returned.
+    // The way to atomically write a file on Unix platforms is:
+    // open(tmpname), write(tmpfile), fsync(tmpfile), close(tmpfile), rename(), fsync(dir)
+    let filename_with_path = get_full_filepath(path, filename);
+    let tmp_filename = format!("{}.tmp", filename_with_path);
+
+    {
+        // Note that going by rust-lang/rust@d602a6b, on MacOS it is only safe to use
+        // rust stdlib 1.36 or higher.
+        let mut f = fs::File::create(&tmp_filename)?;
+        data.write_to_file(&mut f)?;
+        f.sync_all()?;
+    }
+    // Fsync the parent directory on Unix.
+    #[cfg(not(target_os = "windows"))]
+    {
+        fs::rename(&tmp_filename, &filename_with_path)?;
+        let path = Path::new(&filename_with_path).parent().unwrap();
+        let dir_file = fs::OpenOptions::new().read(true).open(path)?;
+        unsafe {
+            libc::fsync(dir_file.as_raw_fd());
+        }
+    }
+    #[cfg(target_os = "windows")]
+    {
+        let src = PathBuf::from(tmp_filename);
+        let dst = PathBuf::from(filename_with_path.clone());
+        if Path::new(&filename_with_path).exists() {
+            unsafe {
+                winapi::um::winbase::ReplaceFileW(
+                    path_to_windows_str(dst).as_ptr(),
+                    path_to_windows_str(src).as_ptr(),
+                    std::ptr::null(),
+                    winapi::um::winbase::REPLACEFILE_IGNORE_MERGE_ERRORS,
+                    std::ptr::null_mut() as *mut winapi::ctypes::c_void,
+                    std::ptr::null_mut() as *mut winapi::ctypes::c_void,
+                )
+            };
+        } else {
+            call!(unsafe {
+                winapi::um::winbase::MoveFileExW(
+                    path_to_windows_str(src).as_ptr(),
+                    path_to_windows_str(dst).as_ptr(),
+                    winapi::um::winbase::MOVEFILE_WRITE_THROUGH | winapi::um::winbase::MOVEFILE_REPLACE_EXISTING,
+                )
+            });
+        }
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{get_full_filepath, write_to_file, DiskWriteable};
+    use std::fs;
+    use std::io;
+    use std::io::Write;
+    use std::path::PathBuf;
+
+    struct TestWriteable {}
+    impl DiskWriteable for TestWriteable {
+        fn write_to_file(&self, writer: &mut fs::File) -> Result<(), io::Error> { writer.write_all(&[42; 1]) }
+    }
+
+    // Test that if the persister's path to channel data is read-only, writing
+    // data to it fails. Windows ignores the read-only flag for folders, so this
+    // test is Unix-only.
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn test_readonly_dir() {
+        let test_writeable = TestWriteable {};
+        let filename = "test_readonly_dir_persister_filename".to_string();
+        let path = "test_readonly_dir_persister_dir";
+        fs::create_dir_all(path.to_string()).unwrap();
+        let mut perms = fs::metadata(path.to_string()).unwrap().permissions();
+        perms.set_readonly(true);
+        fs::set_permissions(path.to_string(), perms).unwrap();
+        match write_to_file(PathBuf::from(path.to_string()), filename, &test_writeable) {
+            Err(e) => assert_eq!(e.kind(), io::ErrorKind::PermissionDenied),
+            _ => panic!("Unexpected error message"),
+        }
+        let mut perms = fs::metadata(path.to_string()).unwrap().permissions();
+        perms.set_readonly(false);
+        fs::set_permissions(path.to_string(), perms).unwrap();
+        fs::remove_dir_all(path).unwrap();
+    }
+
+    // Test failure to rename in the process of atomically creating a channel
+    // monitor's file. We induce this failure by making the `tmp` file a
+    // directory.
+    // Explanation: given "from" = the file being renamed, "to" = the destination
+    // file that already exists: Unix should fail because if "from" is a file,
+    // then "to" is also required to be a file.
+    // TODO: ideally try to make this work on Windows again
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn test_rename_failure() {
+        let test_writeable = TestWriteable {};
+        let filename = "test_rename_failure_filename";
+        let path = PathBuf::from("test_rename_failure_dir");
+        // Create the channel data file and make it a directory.
+        fs::create_dir_all(get_full_filepath(path.clone(), filename.to_string())).unwrap();
+        match write_to_file(path.clone(), filename.to_string(), &test_writeable) {
+            Err(e) => assert_eq!(e.raw_os_error(), Some(libc::EISDIR)),
+            _ => panic!("Unexpected Ok(())"),
+        }
+        fs::remove_dir_all(path).unwrap();
+    }
+
+    #[test]
+    fn test_diskwriteable_failure() {
+        struct FailingWriteable {}
+        impl DiskWriteable for FailingWriteable {
+            fn write_to_file(&self, _writer: &mut fs::File) -> Result<(), std::io::Error> {
+                Err(std::io::Error::new(std::io::ErrorKind::Other, "expected failure"))
+            }
+        }
+
+        let filename = "test_diskwriteable_failure";
+        let path = PathBuf::from("test_diskwriteable_failure_dir");
+        let test_writeable = FailingWriteable {};
+        match write_to_file(path.clone(), filename.to_string(), &test_writeable) {
+            Err(e) => {
+                assert_eq!(e.kind(), std::io::ErrorKind::Other);
+                assert_eq!(e.get_ref().unwrap().to_string(), "expected failure");
+            },
+            _ => panic!("unexpected result"),
+        }
+        fs::remove_dir_all(path).unwrap();
+    }
+
+    // Test failure to create the temporary file in the persistence process.
+    // We induce this failure by having the temp file already exist and be a
+    // directory.
+    #[test]
+    fn test_tmp_file_creation_failure() {
+        let test_writeable = TestWriteable {};
+        let filename = "test_tmp_file_creation_failure_filename".to_string();
+        let path = PathBuf::from("test_tmp_file_creation_failure_dir");
+
+        // Create the tmp file and make it a directory.
+        let tmp_path = get_full_filepath(path.clone(), format!("{}.tmp", filename.clone()));
+        fs::create_dir_all(tmp_path).unwrap();
+        match write_to_file(path.clone(), filename, &test_writeable) {
+            Err(e) => {
+                #[cfg(not(target_os = "windows"))]
+                assert_eq!(e.raw_os_error(), Some(libc::EISDIR));
+                #[cfg(target_os = "windows")]
+                assert_eq!(e.kind(), io::ErrorKind::PermissionDenied);
+            },
+            _ => panic!("Unexpected error message"),
+        }
+        fs::remove_dir_all(path).unwrap();
+    }
+}
diff --git a/mm2src/coins/lp_coins.rs b/mm2src/coins/lp_coins.rs
index db9d799cc5..4fed0635b9 100644
--- a/mm2src/coins/lp_coins.rs
+++ b/mm2src/coins/lp_coins.rs
@@ -1,13 +1,15 @@
 /******************************************************************************
- * Copyright © 2014-2018 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -21,9 +23,9 @@
 #![feature(integer_atomics)]
 #![feature(async_closure)]
 #![feature(hash_raw_entry)]
+#![feature(stmt_expr_attributes)]
 
 #[macro_use] extern crate common;
-#[macro_use] extern crate fomat_macros;
 #[macro_use] extern crate gstuff;
 #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate serde_derive;
@@ -31,29 +33,52 @@
 #[macro_use] extern crate ser_error_derive;
 
 use async_trait::async_trait;
-use bigdecimal::{BigDecimal, ParseBigDecimalError};
-use common::executor::{spawn, Timer};
-use common::mm_ctx::{from_ctx, MmArc, MmWeak};
-use common::mm_error::prelude::*;
+use base58::FromBase58Error;
 use common::mm_metrics::MetricsWeak;
-use common::mm_number::MmNumber;
-use common::{calc_total_pages, now_ms, HttpStatusCode};
+use common::{calc_total_pages, now_ms, ten, HttpStatusCode};
+use crypto::{Bip32Error, CryptoCtx, DerivationPath};
 use derive_more::Display;
 use futures::compat::Future01CompatExt;
-use futures::lock::{MappedMutexGuard as AsyncMappedMutexGuard, Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
+use futures::lock::Mutex as AsyncMutex;
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
 use http::{Response, StatusCode};
-use keys::AddressFormat as UtxoAddressFormat;
-use rpc::v1::types::Bytes as BytesJson;
-use serde::{Deserialize, Deserializer};
+use keys::{AddressFormat as UtxoAddressFormat, KeyPair, NetworkPrefix as CashAddrPrefix};
+use mm2_core::mm_ctx::{from_ctx, MmArc};
+use mm2_err_handle::prelude::*;
+use mm2_number::bigdecimal::{BigDecimal, ParseBigDecimalError, Zero};
+use mm2_number::MmNumber;
+use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
+use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::{self as json, Value as Json};
+use std::cmp::Ordering;
 use std::collections::hash_map::{HashMap, RawEntryMut};
 use std::fmt;
 use std::num::NonZeroUsize;
-use std::ops::Deref;
+use std::ops::{Add, Deref};
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::sync::Arc;
+use std::time::Duration;
+use utxo_signer::with_key_pair::UtxoSignWithKeyPairError;
+
+cfg_native! {
+    use crate::lightning::LightningCoin;
+    use crate::lightning::ln_conf::PlatformCoinConfirmations;
+    use async_std::fs;
+    use futures::AsyncWriteExt;
+    use std::io;
+    use zcash_primitives::transaction::Transaction as ZTransaction;
+    use z_coin::ZcoinConsensusParams;
+}
+
+cfg_wasm32! {
+    use mm2_db::indexed_db::{ConstructibleDb, DbLocked, SharedDb};
+    use hd_wallet_storage::HDWalletDb;
+    use tx_history_storage::wasm::{clear_tx_history, load_tx_history, save_tx_history, TxHistoryDb};
+
+    pub type TxHistoryDbLocked<'a> = DbLocked<'a, TxHistoryDb>;
+}
 
 // using custom copy of try_fus as futures crate was renamed to futures01
 macro_rules! try_fus {
@@ -74,46 +99,266 @@ macro_rules! try_f {
     };
 }
 
+/// `TransactionErr` compatible `try_fus` macro.
+macro_rules! try_tx_fus {
+    ($e: expr) => {
+        match $e {
+            Ok(ok) => ok,
+            Err(err) => return Box::new(futures01::future::err(crate::TransactionErr::Plain(ERRL!("{:?}", err)))),
+        }
+    };
+    ($e: expr, $tx: expr) => {
+        match $e {
+            Ok(ok) => ok,
+            Err(err) => {
+                return Box::new(futures01::future::err(crate::TransactionErr::TxRecoverable(
+                    TransactionEnum::from($tx),
+                    ERRL!("{:?}", err),
+                )))
+            },
+        }
+    };
+}
+
+/// `TransactionErr` compatible `try_s` macro.
+macro_rules! try_tx_s {
+    ($e: expr) => {
+        match $e {
+            Ok(ok) => ok,
+            Err(err) => {
+                return Err(crate::TransactionErr::Plain(format!(
+                    "{}:{}] {:?}",
+                    file!(),
+                    line!(),
+                    err
+                )))
+            },
+        }
+    };
+    ($e: expr, $tx: expr) => {
+        match $e {
+            Ok(ok) => ok,
+            Err(err) => {
+                return Err(crate::TransactionErr::TxRecoverable(
+                    TransactionEnum::from($tx),
+                    format!("{}:{}] {:?}", file!(), line!(), err),
+                ))
+            },
+        }
+    };
+}
+
+/// `TransactionErr:Plain` compatible `ERR` macro.
+macro_rules! TX_PLAIN_ERR {
+    ($format: expr, $($args: tt)+) => { Err(crate::TransactionErr::Plain((ERRL!($format, $($args)+)))) };
+    ($format: expr) => { Err(crate::TransactionErr::Plain(ERRL!($format))) }
+}
+
+/// `TransactionErr:TxRecoverable` compatible `ERR` macro.
+#[allow(unused_macros)]
+macro_rules! TX_RECOVERABLE_ERR {
+    ($tx: expr, $format: expr, $($args: tt)+) => {
+        Err(crate::TransactionErr::TxRecoverable(TransactionEnum::from($tx), ERRL!($format, $($args)+)))
+    };
+    ($tx: expr, $format: expr) => {
+        Err(crate::TransactionErr::TxRecoverable(TransactionEnum::from($tx), ERRL!($format)))
+    };
+}
+
+macro_rules! ok_or_continue_after_sleep {
+    ($e:expr, $delay: ident) => {
+        match $e {
+            Ok(res) => res,
+            Err(e) => {
+                error!("error {:?}", e);
+                Timer::sleep($delay).await;
+                continue;
+            },
+        }
+    };
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+macro_rules! ok_or_retry_after_sleep {
+    ($e:expr, $delay: ident) => {
+        loop {
+            match $e {
+                Ok(res) => break res,
+                Err(e) => {
+                    error!("error {:?}", e);
+                    Timer::sleep($delay).await;
+                    continue;
+                },
+            }
+        }
+    };
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+macro_rules! ok_or_retry_after_sleep_sync {
+    ($e:expr, $delay: ident) => {
+        loop {
+            match $e {
+                Ok(res) => break res,
+                Err(e) => {
+                    error!("error {:?}", e);
+                    std::thread::sleep(core::time::Duration::from_secs($delay));
+                    continue;
+                },
+            }
+        }
+    };
+}
+
+pub mod coin_balance;
 #[doc(hidden)]
 #[cfg(test)]
 pub mod coins_tests;
-
 pub mod eth;
-use eth::{eth_coin_from_conf_and_request, EthCoin, EthTxFeeDetails, SignedEthTx};
-
-pub mod utxo;
-use utxo::qtum::{self, qtum_coin_from_conf_and_request, QtumCoin};
-use utxo::utxo_common::big_decimal_from_sat_unsigned;
-use utxo::utxo_standard::{utxo_standard_coin_from_conf_and_request, UtxoStandardCoin};
-use utxo::{GenerateTxError, UtxoFeeDetails, UtxoTx};
-
+pub mod hd_pubkey;
+pub mod hd_wallet;
+pub mod hd_wallet_storage;
+#[cfg(not(target_arch = "wasm32"))] pub mod lightning;
+#[cfg_attr(target_arch = "wasm32", allow(dead_code, unused_imports))]
+pub mod my_tx_history_v2;
 pub mod qrc20;
-use qrc20::{qrc20_coin_from_conf_and_request, Qrc20Coin, Qrc20FeeDetails};
-
+pub mod rpc_command;
 #[doc(hidden)]
 #[allow(unused_variables)]
 pub mod test_coin;
+pub mod tx_history_storage;
 pub use test_coin::TestCoin;
 
-pub mod tx_history_db;
-use tx_history_db::{TxHistoryDb, TxHistoryError, TxHistoryOps, TxHistoryResult};
+#[doc(hidden)]
+#[allow(unused_variables)]
+#[cfg(not(target_arch = "wasm32"))]
+pub mod solana;
+#[cfg(not(target_arch = "wasm32"))]
+pub use solana::spl::SplToken;
+#[cfg(not(target_arch = "wasm32"))]
+pub use solana::{solana_coin_from_conf_and_params, SolanaActivationParams, SolanaCoin, SolanaFeeDetails};
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
-pub mod z_coin;
-use crate::utxo::UnsupportedAddr;
-#[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
-use z_coin::{z_coin_from_conf_and_request, ZCoin};
+pub mod utxo;
+#[cfg(not(target_arch = "wasm32"))] pub mod z_coin;
+
+use eth::{eth_coin_from_conf_and_request, EthCoin, EthTxFeeDetails, SignedEthTx};
+use hd_wallet::{HDAddress, HDAddressId};
+use qrc20::Qrc20ActivationParams;
+use qrc20::{qrc20_coin_from_conf_and_params, Qrc20Coin, Qrc20FeeDetails};
+use qtum::{Qrc20AddressError, ScriptHashTypeNotSupported};
+use rpc_command::init_create_account::{CreateAccountTaskManager, CreateAccountTaskManagerShared};
+use rpc_command::init_scan_for_new_addresses::{ScanAddressesTaskManager, ScanAddressesTaskManagerShared};
+use rpc_command::init_withdraw::{WithdrawTaskManager, WithdrawTaskManagerShared};
+use utxo::bch::{bch_coin_from_conf_and_params, BchActivationRequest, BchCoin};
+use utxo::qtum::{self, qtum_coin_with_priv_key, QtumCoin};
+use utxo::qtum::{QtumDelegationOps, QtumDelegationRequest, QtumStakingInfosDetails};
+use utxo::rpc_clients::UtxoRpcError;
+use utxo::slp::SlpToken;
+use utxo::slp::{slp_addr_from_pubkey_str, SlpFeeDetails};
+use utxo::utxo_common::big_decimal_from_sat_unsigned;
+use utxo::utxo_standard::{utxo_standard_coin_with_priv_key, UtxoStandardCoin};
+use utxo::UtxoActivationParams;
+use utxo::{BlockchainNetwork, GenerateTxError, UtxoFeeDetails, UtxoTx};
+#[cfg(not(target_arch = "wasm32"))] use z_coin::ZCoin;
 
 pub type BalanceResult<T> = Result<T, MmError<BalanceError>>;
 pub type BalanceFut<T> = Box<dyn Future<Item = T, Error = MmError<BalanceError>> + Send>;
+pub type NonZeroBalanceFut<T> = Box<dyn Future<Item = T, Error = MmError<GetNonZeroBalance>> + Send>;
 pub type NumConversResult<T> = Result<T, MmError<NumConversError>>;
+pub type StakingInfosResult = Result<StakingInfos, MmError<StakingInfosError>>;
+pub type StakingInfosFut = Box<dyn Future<Item = StakingInfos, Error = MmError<StakingInfosError>> + Send>;
+pub type DelegationResult = Result<TransactionDetails, MmError<DelegationError>>;
+pub type DelegationFut = Box<dyn Future<Item = TransactionDetails, Error = MmError<DelegationError>> + Send>;
 pub type WithdrawResult = Result<TransactionDetails, MmError<WithdrawError>>;
 pub type WithdrawFut = Box<dyn Future<Item = TransactionDetails, Error = MmError<WithdrawError>> + Send>;
 pub type TradePreimageResult<T> = Result<T, MmError<TradePreimageError>>;
 pub type TradePreimageFut<T> = Box<dyn Future<Item = T, Error = MmError<TradePreimageError>> + Send>;
 pub type CoinFindResult<T> = Result<T, MmError<CoinFindError>>;
 pub type TxHistoryFut<T> = Box<dyn Future<Item = T, Error = MmError<TxHistoryError>> + Send>;
-pub type TxHistoryDbLocked<'a> = AsyncMappedMutexGuard<'a, Option<TxHistoryDb>, TxHistoryDb>;
+pub type TxHistoryResult<T> = Result<T, MmError<TxHistoryError>>;
+pub type RawTransactionResult = Result<RawTransactionRes, MmError<RawTransactionError>>;
+pub type RawTransactionFut<'a> =
+    Box<dyn Future<Item = RawTransactionRes, Error = MmError<RawTransactionError>> + Send + 'a>;
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum RawTransactionError {
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "Invalid  hash: {}", _0)]
+    InvalidHashError(String),
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Hash does not exist: {}", _0)]
+    HashNotExist(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+impl HttpStatusCode for RawTransactionError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            RawTransactionError::NoSuchCoin { .. }
+            | RawTransactionError::InvalidHashError(_)
+            | RawTransactionError::HashNotExist(_) => StatusCode::BAD_REQUEST,
+            RawTransactionError::Transport(_) | RawTransactionError::InternalError(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
+
+impl From<CoinFindError> for RawTransactionError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => RawTransactionError::NoSuchCoin { coin },
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct RawTransactionRequest {
+    pub coin: String,
+    pub tx_hash: String,
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct RawTransactionRes {
+    /// Raw bytes of signed transaction in hexadecimal string, this should be return hexadecimal encoded signed transaction for get_raw_transaction
+    pub tx_hex: BytesJson,
+}
+
+pub type SignatureResult<T> = Result<T, MmError<SignatureError>>;
+pub type VerificationResult<T> = Result<T, MmError<VerificationError>>;
+
+#[derive(Debug, Display)]
+pub enum TxHistoryError {
+    ErrorSerializing(String),
+    ErrorDeserializing(String),
+    ErrorSaving(String),
+    ErrorLoading(String),
+    ErrorClearing(String),
+    #[display(fmt = "'internal_id' not found: {:?}", internal_id)]
+    FromIdNotFound {
+        internal_id: BytesJson,
+    },
+    NotSupported(String),
+    InternalError(String),
+}
+
+#[derive(Debug, Display)]
+pub enum PrivKeyNotAllowed {
+    #[display(fmt = "Hardware Wallet is not supported")]
+    HardwareWalletNotSupported,
+}
+
+#[derive(Debug, Display, PartialEq, Serialize)]
+pub enum UnexpectedDerivationMethod {
+    #[display(fmt = "Iguana private key is unavailable")]
+    IguanaPrivKeyUnavailable,
+    #[display(fmt = "HD wallet is unavailable")]
+    HDWalletUnavailable,
+}
 
 pub trait Transaction: fmt::Debug + 'static {
     /// Raw transaction bytes of the transaction
@@ -126,9 +371,13 @@ pub trait Transaction: fmt::Debug + 'static {
 pub enum TransactionEnum {
     UtxoTx(UtxoTx),
     SignedEthTx(SignedEthTx),
+    #[cfg(not(target_arch = "wasm32"))]
+    ZTransaction(ZTransaction),
 }
 ifrom!(TransactionEnum, UtxoTx);
 ifrom!(TransactionEnum, SignedEthTx);
+#[cfg(not(target_arch = "wasm32"))]
+ifrom!(TransactionEnum, ZTransaction);
 
 // NB: When stable and groked by IDEs, `enum_dispatch` can be used instead of `Deref` to speed things up.
 impl Deref for TransactionEnum {
@@ -137,11 +386,42 @@ impl Deref for TransactionEnum {
         match self {
             TransactionEnum::UtxoTx(ref t) => t,
             TransactionEnum::SignedEthTx(ref t) => t,
+            #[cfg(not(target_arch = "wasm32"))]
+            TransactionEnum::ZTransaction(ref t) => t,
         }
     }
 }
 
-pub type TransactionFut = Box<dyn Future<Item = TransactionEnum, Error = String> + Send>;
+#[derive(Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum TransactionErr {
+    /// Keeps transactions while throwing errors.
+    TxRecoverable(TransactionEnum, String),
+    /// Simply for plain error messages.
+    Plain(String),
+}
+
+impl TransactionErr {
+    /// Returns transaction if the error includes it.
+    #[inline]
+    pub fn get_tx(&self) -> Option<TransactionEnum> {
+        match self {
+            TransactionErr::TxRecoverable(tx, _) => Some(tx.clone()),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    /// Returns plain text part of error.
+    pub fn get_plain_text_format(&self) -> String {
+        match self {
+            TransactionErr::TxRecoverable(_, err) => err.to_string(),
+            TransactionErr::Plain(err) => err.to_string(),
+        }
+    }
+}
+
+pub type TransactionFut = Box<dyn Future<Item = TransactionEnum, Error = TransactionErr> + Send>;
 
 #[derive(Debug, PartialEq)]
 pub enum FoundSwapTxSpend {
@@ -164,9 +444,33 @@ pub enum NegotiateSwapContractAddrErr {
     NoOtherAddrAndNoFallback,
 }
 
+#[derive(Clone, Debug)]
+pub struct ValidatePaymentInput {
+    pub payment_tx: Vec<u8>,
+    pub time_lock: u32,
+    pub other_pub: Vec<u8>,
+    pub secret_hash: Vec<u8>,
+    pub amount: BigDecimal,
+    pub swap_contract_address: Option<BytesJson>,
+    pub try_spv_proof_until: u64,
+    pub confirmations: u64,
+    pub unique_swap_data: Vec<u8>,
+}
+
+pub struct SearchForSwapTxSpendInput<'a> {
+    pub time_lock: u32,
+    pub other_pub: &'a [u8],
+    pub secret_hash: &'a [u8],
+    pub tx: &'a [u8],
+    pub search_from_block: u64,
+    pub swap_contract_address: &'a Option<BytesJson>,
+    pub swap_unique_data: &'a [u8],
+}
+
 /// Swap operations (mostly based on the Hash/Time locked transactions implemented by coin wallets).
+#[async_trait]
 pub trait SwapOps {
-    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal) -> TransactionFut;
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, uuid: &[u8]) -> TransactionFut;
 
     fn send_maker_payment(
         &self,
@@ -175,6 +479,7 @@ pub trait SwapOps {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut;
 
     fn send_taker_payment(
@@ -184,6 +489,7 @@ pub trait SwapOps {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut;
 
     fn send_maker_spends_taker_payment(
@@ -193,6 +499,7 @@ pub trait SwapOps {
         taker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut;
 
     fn send_taker_spends_maker_payment(
@@ -202,6 +509,7 @@ pub trait SwapOps {
         maker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut;
 
     fn send_taker_refunds_payment(
@@ -211,6 +519,7 @@ pub trait SwapOps {
         maker_pub: &[u8],
         secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut;
 
     fn send_maker_refunds_payment(
@@ -220,6 +529,7 @@ pub trait SwapOps {
         taker_pub: &[u8],
         secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut;
 
     fn validate_fee(
@@ -229,27 +539,12 @@ pub trait SwapOps {
         fee_addr: &[u8],
         amount: &BigDecimal,
         min_block_number: u64,
+        uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send>;
 
-    fn validate_maker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send>;
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send>;
 
-    fn validate_taker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send>;
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send>;
 
     fn check_if_my_payment_sent(
         &self,
@@ -258,26 +553,17 @@ pub trait SwapOps {
         secret_hash: &[u8],
         search_from_block: u64,
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send>;
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String>;
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String>;
 
     fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String>;
@@ -299,6 +585,8 @@ pub trait SwapOps {
         &self,
         other_side_address: Option<&[u8]>,
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>>;
+
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair;
 }
 
 /// Operations that coins have independently from the MarketMaker.
@@ -308,6 +596,24 @@ pub trait MarketCoinOps {
 
     fn my_address(&self) -> Result<String, String>;
 
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>>;
+
+    fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]>;
+
+    fn sign_message(&self, _message: &str) -> SignatureResult<String>;
+
+    fn verify_message(&self, _signature: &str, _message: &str, _address: &str) -> VerificationResult<bool>;
+
+    fn get_non_zero_balance(&self) -> NonZeroBalanceFut<MmNumber> {
+        let closure = |spendable: BigDecimal| {
+            if spendable.is_zero() {
+                return MmError::err(GetNonZeroBalance::BalanceIsZero);
+            }
+            Ok(MmNumber::from(spendable))
+        };
+        Box::new(self.my_spendable_balance().map_err(From::from).and_then(closure))
+    }
+
     fn my_balance(&self) -> BalanceFut<CoinBalance>;
 
     fn my_spendable_balance(&self) -> BalanceFut<BigDecimal> {
@@ -316,10 +622,14 @@ pub trait MarketCoinOps {
 
     /// Base coin balance for tokens, e.g. ETH balance in ERC20 case
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal>;
+    fn platform_ticker(&self) -> &str;
 
     /// Receives raw transaction bytes in hexadecimal format as input and returns tx hash in hexadecimal format
     fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send>;
 
+    /// Receives raw transaction bytes as input and returns tx hash in hexadecimal format
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send>;
+
     fn wait_for_confirmations(
         &self,
         tx: &[u8],
@@ -341,16 +651,18 @@ pub trait MarketCoinOps {
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send>;
 
-    fn display_priv_key(&self) -> String;
+    fn display_priv_key(&self) -> Result<String, String>;
 
     /// Get the minimum amount to send.
     fn min_tx_amount(&self) -> BigDecimal;
 
     /// Get the minimum amount to trade.
     fn min_trading_vol(&self) -> MmNumber;
+
+    fn is_privacy(&self) -> bool { false }
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, PartialEq)]
 #[serde(tag = "type")]
 pub enum WithdrawFee {
     UtxoFixed {
@@ -371,10 +683,51 @@ pub enum WithdrawFee {
     },
 }
 
-#[allow(dead_code)]
+pub struct WithdrawSenderAddress<Address, Pubkey> {
+    address: Address,
+    pubkey: Pubkey,
+    derivation_path: Option<DerivationPath>,
+}
+
+impl<Address, Pubkey> From<HDAddress<Address, Pubkey>> for WithdrawSenderAddress<Address, Pubkey> {
+    fn from(addr: HDAddress<Address, Pubkey>) -> Self {
+        WithdrawSenderAddress {
+            address: addr.address,
+            pubkey: addr.pubkey,
+            derivation_path: Some(addr.derivation_path),
+        }
+    }
+}
+
+/// Rename to `GetWithdrawSenderAddresses` when withdraw supports multiple `from` addresses.
+#[async_trait]
+pub trait GetWithdrawSenderAddress {
+    type Address;
+    type Pubkey;
+
+    async fn get_withdraw_sender_address(
+        &self,
+        req: &WithdrawRequest,
+    ) -> MmResult<WithdrawSenderAddress<Self::Address, Self::Pubkey>, WithdrawError>;
+}
+
+#[derive(Clone, Deserialize)]
+#[serde(untagged)]
+pub enum WithdrawFrom {
+    // AccountId { account_id: u32 },
+    AddressId(HDAddressId),
+    /// Don't use `Bip44DerivationPath` or `RpcDerivationPath` because if there is an error in the path,
+    /// `serde::Deserialize` returns "data did not match any variant of untagged enum WithdrawFrom".
+    /// It's better to show the user an informative error.
+    DerivationPath {
+        derivation_path: String,
+    },
+}
+
 #[derive(Deserialize)]
 pub struct WithdrawRequest {
     coin: String,
+    from: Option<WithdrawFrom>,
     to: String,
     #[serde(default)]
     amount: BigDecimal,
@@ -383,10 +736,67 @@ pub struct WithdrawRequest {
     fee: Option<WithdrawFee>,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(tag = "type")]
+pub enum StakingDetails {
+    Qtum(QtumDelegationRequest),
+}
+
+#[allow(dead_code)]
+#[derive(Deserialize)]
+pub struct AddDelegateRequest {
+    pub coin: String,
+    pub staking_details: StakingDetails,
+}
+
+#[allow(dead_code)]
+#[derive(Deserialize)]
+pub struct RemoveDelegateRequest {
+    pub coin: String,
+}
+
+#[derive(Deserialize)]
+pub struct GetStakingInfosRequest {
+    pub coin: String,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct SignatureRequest {
+    coin: String,
+    message: String,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct VerificationRequest {
+    coin: String,
+    message: String,
+    signature: String,
+    address: String,
+}
+
 impl WithdrawRequest {
+    pub fn new(
+        coin: String,
+        from: Option<WithdrawFrom>,
+        to: String,
+        amount: BigDecimal,
+        max: bool,
+        fee: Option<WithdrawFee>,
+    ) -> WithdrawRequest {
+        WithdrawRequest {
+            coin,
+            from,
+            to,
+            amount,
+            max,
+            fee,
+        }
+    }
+
     pub fn new_max(coin: String, to: String) -> WithdrawRequest {
         WithdrawRequest {
             coin,
+            from: None,
             to,
             amount: 0.into(),
             max: true,
@@ -395,6 +805,31 @@ impl WithdrawRequest {
     }
 }
 
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum StakingInfosDetails {
+    Qtum(QtumStakingInfosDetails),
+}
+
+impl From<QtumStakingInfosDetails> for StakingInfosDetails {
+    fn from(qtum_staking_infos: QtumStakingInfosDetails) -> Self { StakingInfosDetails::Qtum(qtum_staking_infos) }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct StakingInfos {
+    pub staking_infos_details: StakingInfosDetails,
+}
+
+#[derive(Serialize)]
+pub struct SignatureResponse {
+    signature: String,
+}
+
+#[derive(Serialize)]
+pub struct VerificationResponse {
+    is_valid: bool,
+}
+
 /// Please note that no type should have the same structure as another type,
 /// because this enum has the `untagged` deserialization.
 #[derive(Clone, Debug, PartialEq, Serialize)]
@@ -403,6 +838,9 @@ pub enum TxFeeDetails {
     Utxo(UtxoFeeDetails),
     Eth(EthTxFeeDetails),
     Qrc20(Qrc20FeeDetails),
+    Slp(SlpFeeDetails),
+    #[cfg(not(target_arch = "wasm32"))]
+    Solana(SolanaFeeDetails),
 }
 
 /// Deserialize the TxFeeDetails as an untagged enum.
@@ -417,12 +855,16 @@ impl<'de> Deserialize<'de> for TxFeeDetails {
             Utxo(UtxoFeeDetails),
             Eth(EthTxFeeDetails),
             Qrc20(Qrc20FeeDetails),
+            #[cfg(not(target_arch = "wasm32"))]
+            Solana(SolanaFeeDetails),
         }
 
         match Deserialize::deserialize(deserializer)? {
             TxFeeDetailsUnTagged::Utxo(f) => Ok(TxFeeDetails::Utxo(f)),
             TxFeeDetailsUnTagged::Eth(f) => Ok(TxFeeDetails::Eth(f)),
             TxFeeDetailsUnTagged::Qrc20(f) => Ok(TxFeeDetails::Qrc20(f)),
+            #[cfg(not(target_arch = "wasm32"))]
+            TxFeeDetailsUnTagged::Solana(f) => Ok(TxFeeDetails::Solana(f)),
         }
     }
 }
@@ -439,6 +881,11 @@ impl From<Qrc20FeeDetails> for TxFeeDetails {
     fn from(qrc20_details: Qrc20FeeDetails) -> Self { TxFeeDetails::Qrc20(qrc20_details) }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+impl From<SolanaFeeDetails> for TxFeeDetails {
+    fn from(solana_details: SolanaFeeDetails) -> Self { TxFeeDetails::Solana(solana_details) }
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct KmdRewardsDetails {
     amount: BigDecimal,
@@ -454,13 +901,25 @@ impl KmdRewardsDetails {
     }
 }
 
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub enum TransactionType {
+    StakingDelegation,
+    RemoveDelegation,
+    StandardTransfer,
+    TokenTransfer(BytesJson),
+}
+
+impl Default for TransactionType {
+    fn default() -> Self { TransactionType::StandardTransfer }
+}
+
 /// Transaction details
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct TransactionDetails {
-    /// Raw bytes of signed transaction in hexadecimal string, this should be sent as is to send_raw_transaction RPC to broadcast the transaction
+    /// Raw bytes of signed transaction, this should be sent as is to `send_raw_transaction_bytes` RPC to broadcast the transaction
     pub tx_hex: BytesJson,
     /// Transaction hash in hexadecimal format
-    tx_hash: BytesJson,
+    tx_hash: String,
     /// Coins are sent from these addresses
     from: Vec<String>,
     /// Coins are sent to these addresses
@@ -488,6 +947,15 @@ pub struct TransactionDetails {
     /// Amount of accrued rewards.
     #[serde(skip_serializing_if = "Option::is_none")]
     kmd_rewards: Option<KmdRewardsDetails>,
+    /// Type of transactions, default is StandardTransfer
+    #[serde(default)]
+    transaction_type: TransactionType,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct BlockHeightAndTime {
+    height: u64,
+    timestamp: u64,
 }
 
 impl TransactionDetails {
@@ -529,12 +997,36 @@ pub struct TradeFee {
     pub paid_from_trading_vol: bool,
 }
 
-#[derive(Clone, Debug, PartialEq, PartialOrd)]
+#[derive(Clone, Debug, Default, PartialEq, PartialOrd, Serialize)]
 pub struct CoinBalance {
     pub spendable: BigDecimal,
     pub unspendable: BigDecimal,
 }
 
+impl CoinBalance {
+    pub fn new(spendable: BigDecimal) -> CoinBalance {
+        CoinBalance {
+            spendable,
+            unspendable: BigDecimal::from(0),
+        }
+    }
+
+    pub fn into_total(self) -> BigDecimal { self.spendable + self.unspendable }
+
+    pub fn get_total(&self) -> BigDecimal { &self.spendable + &self.unspendable }
+}
+
+impl Add for CoinBalance {
+    type Output = CoinBalance;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        CoinBalance {
+            spendable: self.spendable + rhs.spendable,
+            unspendable: self.unspendable + rhs.unspendable,
+        }
+    }
+}
+
 /// The approximation is needed to cover the dynamic miner fee changing during a swap.
 #[derive(Clone, Debug)]
 pub enum FeeApproxStage {
@@ -554,7 +1046,7 @@ pub enum TradePreimageValue {
     UpperBound(BigDecimal),
 }
 
-#[derive(Debug, Display)]
+#[derive(Debug, Display, PartialEq)]
 pub enum TradePreimageError {
     #[display(
         fmt = "Not enough {} to preimage the trade: available {}, required at least {}",
@@ -579,6 +1071,10 @@ impl From<NumConversError> for TradePreimageError {
     fn from(e: NumConversError) -> Self { TradePreimageError::InternalError(e.to_string()) }
 }
 
+impl From<UnexpectedDerivationMethod> for TradePreimageError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { TradePreimageError::InternalError(e.to_string()) }
+}
+
 impl TradePreimageError {
     /// Construct [`TradePreimageError`] from [`GenerateTxError`] using additional `coin` and `decimals`.
     pub fn from_generate_tx_error(
@@ -666,17 +1162,276 @@ pub enum BalanceError {
     Transport(String),
     #[display(fmt = "Invalid response: {}", _0)]
     InvalidResponse(String),
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+    #[display(fmt = "Wallet storage error: {}", _0)]
+    WalletStorageError(String),
     #[display(fmt = "Internal: {}", _0)]
     Internal(String),
 }
 
+#[derive(Debug, PartialEq, Display)]
+pub enum GetNonZeroBalance {
+    #[display(fmt = "Internal error when retrieving balance")]
+    MyBalanceError(BalanceError),
+    #[display(fmt = "Balance is zero")]
+    BalanceIsZero,
+}
+
+impl From<BalanceError> for GetNonZeroBalance {
+    fn from(e: BalanceError) -> Self { GetNonZeroBalance::MyBalanceError(e) }
+}
+
 impl From<NumConversError> for BalanceError {
     fn from(e: NumConversError) -> Self { BalanceError::Internal(e.to_string()) }
 }
 
+impl From<UnexpectedDerivationMethod> for BalanceError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { BalanceError::UnexpectedDerivationMethod(e) }
+}
+
+impl From<Bip32Error> for BalanceError {
+    fn from(e: Bip32Error) -> Self { BalanceError::Internal(e.to_string()) }
+}
+
 #[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
+pub enum StakingInfosError {
+    #[display(fmt = "Staking infos not available for: {}", coin)]
+    CoinDoesntSupportStakingInfos { coin: String },
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "Derivation method is not supported: {}", _0)]
+    UnexpectedDerivationMethod(String),
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<UtxoRpcError> for StakingInfosError {
+    fn from(e: UtxoRpcError) -> Self {
+        match e {
+            UtxoRpcError::Transport(rpc) | UtxoRpcError::ResponseParseError(rpc) => {
+                StakingInfosError::Transport(rpc.to_string())
+            },
+            UtxoRpcError::InvalidResponse(error) => StakingInfosError::Transport(error),
+            UtxoRpcError::Internal(error) => StakingInfosError::Internal(error),
+        }
+    }
+}
+
+impl From<UnexpectedDerivationMethod> for StakingInfosError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { StakingInfosError::UnexpectedDerivationMethod(e.to_string()) }
+}
+
+impl From<Qrc20AddressError> for StakingInfosError {
+    fn from(e: Qrc20AddressError) -> Self {
+        match e {
+            Qrc20AddressError::UnexpectedDerivationMethod(e) => StakingInfosError::UnexpectedDerivationMethod(e),
+            Qrc20AddressError::ScriptHashTypeNotSupported { script_hash_type } => {
+                StakingInfosError::Internal(format!("Script hash type '{}' is not supported", script_hash_type))
+            },
+        }
+    }
+}
+
+impl HttpStatusCode for StakingInfosError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            StakingInfosError::NoSuchCoin { .. }
+            | StakingInfosError::CoinDoesntSupportStakingInfos { .. }
+            | StakingInfosError::UnexpectedDerivationMethod(_) => StatusCode::BAD_REQUEST,
+            StakingInfosError::Transport(_) | StakingInfosError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for StakingInfosError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => StakingInfosError::NoSuchCoin { coin },
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum DelegationError {
+    #[display(
+        fmt = "Not enough {} to delegate: available {}, required at least {}",
+        coin,
+        available,
+        required
+    )]
+    NotSufficientBalance {
+        coin: String,
+        available: BigDecimal,
+        required: BigDecimal,
+    },
+    #[display(fmt = "The amount {} is too small, required at least {}", amount, threshold)]
+    AmountTooLow { amount: BigDecimal, threshold: BigDecimal },
+    #[display(fmt = "Delegation not available for: {}", coin)]
+    CoinDoesntSupportDelegation { coin: String },
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "{}", _0)]
+    CannotInteractWithSmartContract(String),
+    #[display(fmt = "{}", _0)]
+    AddressError(String),
+    #[display(fmt = "Already delegating to: {}", _0)]
+    AlreadyDelegating(String),
+    #[display(fmt = "Delegation is not supported, reason: {}", reason)]
+    DelegationOpsNotSupported { reason: String },
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+impl From<UtxoRpcError> for DelegationError {
+    fn from(e: UtxoRpcError) -> Self {
+        match e {
+            UtxoRpcError::Transport(transport) | UtxoRpcError::ResponseParseError(transport) => {
+                DelegationError::Transport(transport.to_string())
+            },
+            UtxoRpcError::InvalidResponse(resp) => DelegationError::Transport(resp),
+            UtxoRpcError::Internal(internal) => DelegationError::InternalError(internal),
+        }
+    }
+}
+
+impl From<StakingInfosError> for DelegationError {
+    fn from(e: StakingInfosError) -> Self {
+        match e {
+            StakingInfosError::CoinDoesntSupportStakingInfos { coin } => {
+                DelegationError::CoinDoesntSupportDelegation { coin }
+            },
+            StakingInfosError::NoSuchCoin { coin } => DelegationError::NoSuchCoin { coin },
+            StakingInfosError::Transport(e) => DelegationError::Transport(e),
+            StakingInfosError::UnexpectedDerivationMethod(reason) => {
+                DelegationError::DelegationOpsNotSupported { reason }
+            },
+            StakingInfosError::Internal(e) => DelegationError::InternalError(e),
+        }
+    }
+}
+
+impl From<CoinFindError> for DelegationError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => DelegationError::NoSuchCoin { coin },
+        }
+    }
+}
+
+impl From<BalanceError> for DelegationError {
+    fn from(e: BalanceError) -> Self {
+        match e {
+            BalanceError::Transport(error) | BalanceError::InvalidResponse(error) => DelegationError::Transport(error),
+            BalanceError::UnexpectedDerivationMethod(e) => {
+                DelegationError::DelegationOpsNotSupported { reason: e.to_string() }
+            },
+            e @ BalanceError::WalletStorageError(_) => DelegationError::InternalError(e.to_string()),
+            BalanceError::Internal(internal) => DelegationError::InternalError(internal),
+        }
+    }
+}
+
+impl From<UtxoSignWithKeyPairError> for DelegationError {
+    fn from(e: UtxoSignWithKeyPairError) -> Self {
+        let error = format!("Error signing: {}", e);
+        DelegationError::InternalError(error)
+    }
+}
+
+impl From<PrivKeyNotAllowed> for DelegationError {
+    fn from(e: PrivKeyNotAllowed) -> Self { DelegationError::DelegationOpsNotSupported { reason: e.to_string() } }
+}
+
+impl From<UnexpectedDerivationMethod> for DelegationError {
+    fn from(e: UnexpectedDerivationMethod) -> Self {
+        DelegationError::DelegationOpsNotSupported { reason: e.to_string() }
+    }
+}
+
+impl From<ScriptHashTypeNotSupported> for DelegationError {
+    fn from(e: ScriptHashTypeNotSupported) -> Self { DelegationError::AddressError(e.to_string()) }
+}
+
+impl HttpStatusCode for DelegationError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            DelegationError::Transport(_) | DelegationError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            _ => StatusCode::BAD_REQUEST,
+        }
+    }
+}
+
+impl DelegationError {
+    pub fn from_generate_tx_error(gen_tx_err: GenerateTxError, coin: String, decimals: u8) -> DelegationError {
+        match gen_tx_err {
+            GenerateTxError::EmptyUtxoSet { required } => {
+                let required = big_decimal_from_sat_unsigned(required, decimals);
+                DelegationError::NotSufficientBalance {
+                    coin,
+                    available: BigDecimal::from(0),
+                    required,
+                }
+            },
+            GenerateTxError::EmptyOutputs => DelegationError::InternalError(gen_tx_err.to_string()),
+            GenerateTxError::OutputValueLessThanDust { value, dust } => {
+                let amount = big_decimal_from_sat_unsigned(value, decimals);
+                let threshold = big_decimal_from_sat_unsigned(dust, decimals);
+                DelegationError::AmountTooLow { amount, threshold }
+            },
+            GenerateTxError::DeductFeeFromOutputFailed {
+                output_value, required, ..
+            } => {
+                let available = big_decimal_from_sat_unsigned(output_value, decimals);
+                let required = big_decimal_from_sat_unsigned(required, decimals);
+                DelegationError::NotSufficientBalance {
+                    coin,
+                    available,
+                    required,
+                }
+            },
+            GenerateTxError::NotEnoughUtxos { sum_utxos, required } => {
+                let available = big_decimal_from_sat_unsigned(sum_utxos, decimals);
+                let required = big_decimal_from_sat_unsigned(required, decimals);
+                DelegationError::NotSufficientBalance {
+                    coin,
+                    available,
+                    required,
+                }
+            },
+            GenerateTxError::Transport(e) => DelegationError::Transport(e),
+            GenerateTxError::Internal(e) => DelegationError::InternalError(e),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Display, Serialize, SerializeErrorType, PartialEq)]
+#[serde(tag = "error_type", content = "error_data")]
 pub enum WithdrawError {
+    /*                                              */
+    /*------------ Trezor device errors ------------*/
+    /*                                             */
+    #[display(fmt = "Trezor device disconnected")]
+    TrezorDisconnected,
+    #[display(fmt = "Trezor internal error: {}", _0)]
+    HardwareWalletInternal(String),
+    #[display(fmt = "No Trezor device available")]
+    NoTrezorDeviceAvailable,
+    #[display(fmt = "Unexpected Hardware Wallet device: {}", _0)]
+    FoundUnexpectedDevice(String),
+    /*                                         */
+    /*------------- WithdrawError -------------*/
+    /*                                         */
+    #[display(
+        fmt = "'{}' coin doesn't support 'init_withdraw' yet. Consider using 'withdraw' request instead",
+        coin
+    )]
+    CoinDoesntSupportInitWithdraw { coin: String },
     #[display(
         fmt = "Not enough {} to withdraw: available {}, required at least {}",
         coin,
@@ -698,6 +1453,16 @@ pub enum WithdrawError {
     InvalidFeePolicy(String),
     #[display(fmt = "No such coin {}", coin)]
     NoSuchCoin { coin: String },
+    #[display(fmt = "Withdraw timed out {:?}", _0)]
+    Timeout(Duration),
+    #[display(fmt = "Unexpected user action. Expected '{}'", expected)]
+    UnexpectedUserAction { expected: String },
+    #[display(fmt = "Request should contain a 'from' address/account")]
+    FromAddressNotFound,
+    #[display(fmt = "Unexpected 'from' address: {}", _0)]
+    UnexpectedFromAddress(String),
+    #[display(fmt = "Unknown '{}' account", account_id)]
+    UnknownAccount { account_id: u32 },
     #[display(fmt = "Transport error: {}", _0)]
     Transport(String),
     #[display(fmt = "Internal error: {}", _0)]
@@ -707,13 +1472,24 @@ pub enum WithdrawError {
 impl HttpStatusCode for WithdrawError {
     fn status_code(&self) -> StatusCode {
         match self {
-            WithdrawError::NotSufficientBalance { .. }
+            WithdrawError::NoSuchCoin { .. } => StatusCode::NOT_FOUND,
+            WithdrawError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
+            WithdrawError::CoinDoesntSupportInitWithdraw { .. }
+            | WithdrawError::UnexpectedUserAction { .. }
+            | WithdrawError::NotSufficientBalance { .. }
             | WithdrawError::ZeroBalanceToWithdrawMax
             | WithdrawError::AmountTooLow { .. }
             | WithdrawError::InvalidAddress(_)
             | WithdrawError::InvalidFeePolicy(_)
-            | WithdrawError::NoSuchCoin { .. } => StatusCode::BAD_REQUEST,
-            WithdrawError::Transport(_) | WithdrawError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            | WithdrawError::FromAddressNotFound
+            | WithdrawError::UnexpectedFromAddress(_)
+            | WithdrawError::UnknownAccount { .. } => StatusCode::BAD_REQUEST,
+            WithdrawError::NoTrezorDeviceAvailable
+            | WithdrawError::TrezorDisconnected
+            | WithdrawError::FoundUnexpectedDevice(_) => StatusCode::GONE,
+            WithdrawError::HardwareWalletInternal(_)
+            | WithdrawError::Transport(_)
+            | WithdrawError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
 }
@@ -726,6 +1502,8 @@ impl From<BalanceError> for WithdrawError {
     fn from(e: BalanceError) -> Self {
         match e {
             BalanceError::Transport(error) | BalanceError::InvalidResponse(error) => WithdrawError::Transport(error),
+            BalanceError::UnexpectedDerivationMethod(e) => WithdrawError::from(e),
+            e @ BalanceError::WalletStorageError(_) => WithdrawError::InternalError(e.to_string()),
             BalanceError::Internal(internal) => WithdrawError::InternalError(internal),
         }
     }
@@ -739,8 +1517,19 @@ impl From<CoinFindError> for WithdrawError {
     }
 }
 
-impl From<UnsupportedAddr> for WithdrawError {
-    fn from(e: UnsupportedAddr) -> Self { WithdrawError::InvalidAddress(e.to_string()) }
+impl From<UtxoSignWithKeyPairError> for WithdrawError {
+    fn from(e: UtxoSignWithKeyPairError) -> Self {
+        let error = format!("Error signing: {}", e);
+        WithdrawError::InternalError(error)
+    }
+}
+
+impl From<UnexpectedDerivationMethod> for WithdrawError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { WithdrawError::InternalError(e.to_string()) }
+}
+
+impl From<PrivKeyNotAllowed> for WithdrawError {
+    fn from(e: PrivKeyNotAllowed) -> Self { WithdrawError::InternalError(e.to_string()) }
 }
 
 impl WithdrawError {
@@ -772,22 +1561,126 @@ impl WithdrawError {
                     required,
                 }
             },
-            GenerateTxError::NotEnoughUtxos { sum_utxos, required } => {
-                let available = big_decimal_from_sat_unsigned(sum_utxos, decimals);
-                let required = big_decimal_from_sat_unsigned(required, decimals);
-                WithdrawError::NotSufficientBalance {
-                    coin,
-                    available,
-                    required,
-                }
+            GenerateTxError::NotEnoughUtxos { sum_utxos, required } => {
+                let available = big_decimal_from_sat_unsigned(sum_utxos, decimals);
+                let required = big_decimal_from_sat_unsigned(required, decimals);
+                WithdrawError::NotSufficientBalance {
+                    coin,
+                    available,
+                    required,
+                }
+            },
+            GenerateTxError::Transport(e) => WithdrawError::Transport(e),
+            GenerateTxError::Internal(e) => WithdrawError::InternalError(e),
+        }
+    }
+}
+
+#[derive(Serialize, Display, Debug, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum SignatureError {
+    #[display(fmt = "Invalid request: {}", _0)]
+    InvalidRequest(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+    #[display(fmt = "Coin is not found: {}", _0)]
+    CoinIsNotFound(String),
+    #[display(fmt = "sign_message_prefix is not set in coin config")]
+    PrefixNotFound,
+}
+
+impl HttpStatusCode for SignatureError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            SignatureError::InvalidRequest(_) => StatusCode::BAD_REQUEST,
+            SignatureError::CoinIsNotFound(_) => StatusCode::BAD_REQUEST,
+            SignatureError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            SignatureError::PrefixNotFound => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<keys::Error> for SignatureError {
+    fn from(e: keys::Error) -> Self { SignatureError::InternalError(e.to_string()) }
+}
+
+impl From<ethkey::Error> for SignatureError {
+    fn from(e: ethkey::Error) -> Self { SignatureError::InternalError(e.to_string()) }
+}
+
+impl From<PrivKeyNotAllowed> for SignatureError {
+    fn from(e: PrivKeyNotAllowed) -> Self { SignatureError::InternalError(e.to_string()) }
+}
+
+impl From<CoinFindError> for SignatureError {
+    fn from(e: CoinFindError) -> Self { SignatureError::CoinIsNotFound(e.to_string()) }
+}
+
+#[derive(Serialize, Display, Debug, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum VerificationError {
+    #[display(fmt = "Invalid request: {}", _0)]
+    InvalidRequest(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+    #[display(fmt = "Signature decoding error: {}", _0)]
+    SignatureDecodingError(String),
+    #[display(fmt = "Address decoding error: {}", _0)]
+    AddressDecodingError(String),
+    #[display(fmt = "Coin is not found: {}", _0)]
+    CoinIsNotFound(String),
+    #[display(fmt = "sign_message_prefix is not set in coin config")]
+    PrefixNotFound,
+}
+
+impl HttpStatusCode for VerificationError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            VerificationError::InvalidRequest(_) => StatusCode::BAD_REQUEST,
+            VerificationError::SignatureDecodingError(_) => StatusCode::BAD_REQUEST,
+            VerificationError::AddressDecodingError(_) => StatusCode::BAD_REQUEST,
+            VerificationError::CoinIsNotFound(_) => StatusCode::BAD_REQUEST,
+            VerificationError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            VerificationError::PrefixNotFound => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<base64::DecodeError> for VerificationError {
+    fn from(e: base64::DecodeError) -> Self { VerificationError::SignatureDecodingError(e.to_string()) }
+}
+
+impl From<hex::FromHexError> for VerificationError {
+    fn from(e: hex::FromHexError) -> Self { VerificationError::AddressDecodingError(e.to_string()) }
+}
+
+impl From<FromBase58Error> for VerificationError {
+    fn from(e: FromBase58Error) -> Self {
+        match e {
+            FromBase58Error::InvalidBase58Character(c, _) => {
+                VerificationError::AddressDecodingError(format!("Invalid Base58 Character: {}", c))
+            },
+            FromBase58Error::InvalidBase58Length => {
+                VerificationError::AddressDecodingError(String::from("Invalid Base58 Length"))
             },
-            GenerateTxError::Transport(e) => WithdrawError::Transport(e),
-            GenerateTxError::Internal(e) => WithdrawError::InternalError(e),
         }
     }
 }
 
+impl From<keys::Error> for VerificationError {
+    fn from(e: keys::Error) -> Self { VerificationError::InternalError(e.to_string()) }
+}
+
+impl From<ethkey::Error> for VerificationError {
+    fn from(e: ethkey::Error) -> Self { VerificationError::InternalError(e.to_string()) }
+}
+
+impl From<CoinFindError> for VerificationError {
+    fn from(e: CoinFindError) -> Self { VerificationError::CoinIsNotFound(e.to_string()) }
+}
+
 /// NB: Implementations are expected to follow the pImpl idiom, providing cheap reference-counted cloning and garbage collection.
+#[async_trait]
 pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
     // `MmCoin` is an extension fulcrum for something that doesn't fit the `MarketCoinOps`. Practical examples:
     // name (might be required for some APIs, CoinMarketCap for instance);
@@ -805,6 +1698,8 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
 
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut;
 
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut;
+
     /// Maximum number of digits after decimal point used to denominate integer coin units (satoshis, wei, etc.)
     fn decimals(&self) -> u8;
 
@@ -816,46 +1711,25 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
     /// Loop collecting coin transaction history and saving it to local DB
     fn process_history_loop(&self, ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send>;
 
+    /// Path to tx history file
+    fn tx_history_path(&self, ctx: &MmArc) -> PathBuf {
+        let my_address = self.my_address().unwrap_or_default();
+        // BCH cash address format has colon after prefix, e.g. bitcoincash:
+        // Colon can't be used in file names on Windows so it should be escaped
+        let my_address = my_address.replace(':', "_");
+        ctx.dbdir()
+            .join("TRANSACTIONS")
+            .join(format!("{}_{}.json", self.ticker(), my_address))
+    }
+
     /// Loads existing tx history from file, returns empty vector if file is not found
     /// Cleans the existing file if deserialization fails
     fn load_history_from_file(&self, ctx: &MmArc) -> TxHistoryFut<Vec<TransactionDetails>> {
-        let ctx = ctx.clone();
-        let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
-        let ticker = self.ticker().to_owned();
-        let my_address = self.my_address().unwrap_or_default();
-
-        let fut = async move {
-            let mut db = coins_ctx.tx_history_db().await?;
-            let err = match db.load_history(&ticker, &my_address).await {
-                Ok(history) => return Ok(history),
-                Err(e) => e,
-            };
-
-            if let TxHistoryError::ErrorDeserializing(e) = err.get_inner() {
-                ctx.log.log(
-                    "🌋",
-                    &[&"tx_history", &ticker.to_owned()],
-                    &ERRL!("Error {} on history deserialization, resetting the cache.", e),
-                );
-                db.clear(&ticker, &my_address).await?;
-                return Ok(Vec::new());
-            }
-
-            Err(err)
-        };
-        Box::new(fut.boxed().compat())
+        load_history_from_file_impl(self, ctx)
     }
 
     fn save_history_to_file(&self, ctx: &MmArc, history: Vec<TransactionDetails>) -> TxHistoryFut<()> {
-        let coins_ctx = CoinsContext::from_ctx(ctx).unwrap();
-        let ticker = self.ticker().to_owned();
-        let my_address = self.my_address().unwrap_or_default();
-
-        let fut = async move {
-            let mut db = coins_ctx.tx_history_db().await?;
-            db.save_history(&ticker, &my_address, history).await
-        };
-        Box::new(fut.boxed().compat())
+        save_history_to_file_impl(self, ctx, history)
     }
 
     /// Transaction history background sync status
@@ -865,17 +1739,21 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
     fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send>;
 
     /// Get fee to be paid by sender per whole swap using the sending value and check if the wallet has sufficient balance to pay the fee.
-    fn get_sender_trade_fee(&self, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee>;
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee>;
 
     /// Get fee to be paid by receiver per whole swap and check if the wallet has sufficient balance to pay the fee.
     fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut<TradeFee>;
 
     /// Get transaction fee the Taker has to pay to send a `TakerFee` transaction and check if the wallet has sufficient balance to pay the fee.
-    fn get_fee_to_send_taker_fee(
+    async fn get_fee_to_send_taker_fee(
         &self,
         dex_fee_amount: BigDecimal,
         stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee>;
+    ) -> TradePreimageResult<TradeFee>;
 
     /// required transaction confirmations number to ensure double-spend safety
     fn required_confirmations(&self) -> u64;
@@ -903,13 +1781,22 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
 }
 
 #[derive(Clone, Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum MmCoinEnum {
     UtxoCoin(UtxoStandardCoin),
     QtumCoin(QtumCoin),
     Qrc20Coin(Qrc20Coin),
     EthCoin(EthCoin),
-    #[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
+    #[cfg(not(target_arch = "wasm32"))]
     ZCoin(ZCoin),
+    Bch(BchCoin),
+    SlpToken(SlpToken),
+    #[cfg(not(target_arch = "wasm32"))]
+    SolanaCoin(SolanaCoin),
+    #[cfg(not(target_arch = "wasm32"))]
+    SplToken(SplToken),
+    #[cfg(not(target_arch = "wasm32"))]
+    LightningCoin(LightningCoin),
     Test(TestCoin),
 }
 
@@ -925,6 +1812,16 @@ impl From<TestCoin> for MmCoinEnum {
     fn from(c: TestCoin) -> MmCoinEnum { MmCoinEnum::Test(c) }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+impl From<SolanaCoin> for MmCoinEnum {
+    fn from(c: SolanaCoin) -> MmCoinEnum { MmCoinEnum::SolanaCoin(c) }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl From<SplToken> for MmCoinEnum {
+    fn from(c: SplToken) -> MmCoinEnum { MmCoinEnum::SplToken(c) }
+}
+
 impl From<QtumCoin> for MmCoinEnum {
     fn from(coin: QtumCoin) -> Self { MmCoinEnum::QtumCoin(coin) }
 }
@@ -933,7 +1830,20 @@ impl From<Qrc20Coin> for MmCoinEnum {
     fn from(c: Qrc20Coin) -> MmCoinEnum { MmCoinEnum::Qrc20Coin(c) }
 }
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
+impl From<BchCoin> for MmCoinEnum {
+    fn from(c: BchCoin) -> MmCoinEnum { MmCoinEnum::Bch(c) }
+}
+
+impl From<SlpToken> for MmCoinEnum {
+    fn from(c: SlpToken) -> MmCoinEnum { MmCoinEnum::SlpToken(c) }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl From<LightningCoin> for MmCoinEnum {
+    fn from(c: LightningCoin) -> MmCoinEnum { MmCoinEnum::LightningCoin(c) }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
 impl From<ZCoin> for MmCoinEnum {
     fn from(c: ZCoin) -> MmCoinEnum { MmCoinEnum::ZCoin(c) }
 }
@@ -947,9 +1857,32 @@ impl Deref for MmCoinEnum {
             MmCoinEnum::QtumCoin(ref c) => c,
             MmCoinEnum::Qrc20Coin(ref c) => c,
             MmCoinEnum::EthCoin(ref c) => c,
-            #[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
+            MmCoinEnum::Bch(ref c) => c,
+            MmCoinEnum::SlpToken(ref c) => c,
+            #[cfg(not(target_arch = "wasm32"))]
+            MmCoinEnum::LightningCoin(ref c) => c,
+            #[cfg(not(target_arch = "wasm32"))]
             MmCoinEnum::ZCoin(ref c) => c,
             MmCoinEnum::Test(ref c) => c,
+            #[cfg(not(target_arch = "wasm32"))]
+            MmCoinEnum::SolanaCoin(ref c) => c,
+            #[cfg(not(target_arch = "wasm32"))]
+            MmCoinEnum::SplToken(ref c) => c,
+        }
+    }
+}
+
+impl MmCoinEnum {
+    pub fn is_utxo_in_native_mode(&self) -> bool {
+        match self {
+            MmCoinEnum::UtxoCoin(ref c) => c.as_ref().rpc_client.is_native(),
+            MmCoinEnum::QtumCoin(ref c) => c.as_ref().rpc_client.is_native(),
+            MmCoinEnum::Qrc20Coin(ref c) => c.as_ref().rpc_client.is_native(),
+            MmCoinEnum::Bch(ref c) => c.as_ref().rpc_client.is_native(),
+            MmCoinEnum::SlpToken(ref c) => c.as_ref().rpc_client.is_native(),
+            #[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
+            MmCoinEnum::ZCoin(ref c) => c.as_ref().rpc_client.is_native(),
+            _ => false,
         }
     }
 }
@@ -959,55 +1892,187 @@ pub trait BalanceTradeFeeUpdatedHandler {
     async fn balance_updated(&self, coin: &MmCoinEnum, new_balance: &BigDecimal);
 }
 
-struct CoinsContext {
+pub struct CoinsContext {
     /// A map from a currency ticker symbol to the corresponding coin.
     /// Similar to `LP_coins`.
     coins: AsyncMutex<HashMap<String, MmCoinEnum>>,
     balance_update_handlers: AsyncMutex<Vec<Box<dyn BalanceTradeFeeUpdatedHandler + Send + Sync>>>,
-    tx_history_path: PathBuf,
-    /// The database has to be initialized only once!
-    /// It's better to use something like [`Constructible`], but it doesn't provide a method to get the inner value by the mutable reference.
-    tx_history_db: AsyncMutex<Option<TxHistoryDb>>,
+    withdraw_task_manager: WithdrawTaskManagerShared,
+    create_account_manager: CreateAccountTaskManagerShared,
+    scan_addresses_manager: ScanAddressesTaskManagerShared,
+    #[cfg(target_arch = "wasm32")]
+    tx_history_db: SharedDb<TxHistoryDb>,
+    #[cfg(target_arch = "wasm32")]
+    hd_wallet_db: SharedDb<HDWalletDb>,
+}
+
+#[derive(Debug)]
+pub struct CoinIsAlreadyActivatedErr {
+    pub ticker: String,
+}
+
+#[derive(Debug)]
+pub struct PlatformIsAlreadyActivatedErr {
+    pub ticker: String,
 }
+
 impl CoinsContext {
     /// Obtains a reference to this crate context, creating it if necessary.
-    fn from_ctx(ctx: &MmArc) -> Result<Arc<CoinsContext>, String> {
-        let tx_history_path = ctx.dbdir().join("TRANSACTIONS");
+    pub fn from_ctx(ctx: &MmArc) -> Result<Arc<CoinsContext>, String> {
         Ok(try_s!(from_ctx(&ctx.coins_ctx, move || {
             Ok(CoinsContext {
                 coins: AsyncMutex::new(HashMap::new()),
                 balance_update_handlers: AsyncMutex::new(vec![]),
-                tx_history_path,
-                tx_history_db: AsyncMutex::new(None),
+                withdraw_task_manager: WithdrawTaskManager::new_shared(),
+                create_account_manager: CreateAccountTaskManager::new_shared(),
+                scan_addresses_manager: ScanAddressesTaskManager::new_shared(),
+                #[cfg(target_arch = "wasm32")]
+                tx_history_db: ConstructibleDb::new_shared(ctx),
+                #[cfg(target_arch = "wasm32")]
+                hd_wallet_db: ConstructibleDb::new_shared(ctx),
             })
         })))
     }
 
+    pub async fn add_coin(&self, coin: MmCoinEnum) -> Result<(), MmError<CoinIsAlreadyActivatedErr>> {
+        let mut coins = self.coins.lock().await;
+        if coins.contains_key(coin.ticker()) {
+            return MmError::err(CoinIsAlreadyActivatedErr {
+                ticker: coin.ticker().into(),
+            });
+        }
+
+        coins.insert(coin.ticker().into(), coin);
+        Ok(())
+    }
+
+    pub async fn add_platform_with_tokens(
+        &self,
+        platform: MmCoinEnum,
+        tokens: Vec<MmCoinEnum>,
+    ) -> Result<(), MmError<PlatformIsAlreadyActivatedErr>> {
+        let mut coins = self.coins.lock().await;
+        if coins.contains_key(platform.ticker()) {
+            return MmError::err(PlatformIsAlreadyActivatedErr {
+                ticker: platform.ticker().into(),
+            });
+        }
+
+        coins.insert(platform.ticker().into(), platform);
+
+        // Tokens can't be activated without platform coin so we can safely insert them without checking prior existence
+        for token in tokens {
+            coins.insert(token.ticker().into(), token);
+        }
+        Ok(())
+    }
+
+    #[cfg(target_arch = "wasm32")]
     async fn tx_history_db(&self) -> TxHistoryResult<TxHistoryDbLocked<'_>> {
-        /// # Panics
-        ///
-        /// This function will `panic!()` if the inner value of the `guard` is `None`.
-        fn unwrap_tx_history_db(guard: AsyncMutexGuard<'_, Option<TxHistoryDb>>) -> TxHistoryDbLocked<'_> {
-            AsyncMutexGuard::map(guard, |wrapped_db| {
-                wrapped_db
-                    .as_mut()
-                    .expect("'CoinsContext::tx_history_db' must contain a value")
-            })
+        Ok(self.tx_history_db.get_or_initialize().await?)
+    }
+}
+
+/// This enum is used in coin activation requests.
+#[derive(Copy, Clone, Debug, Deserialize, Serialize)]
+pub enum PrivKeyActivationPolicy {
+    IguanaPrivKey,
+    Trezor,
+}
+
+impl PrivKeyActivationPolicy {
+    /// The function can be used as a default deserialization constructor:
+    /// `#[serde(default = "PrivKeyActivationPolicy::iguana_priv_key")]`
+    pub fn iguana_priv_key() -> PrivKeyActivationPolicy { PrivKeyActivationPolicy::IguanaPrivKey }
+
+    /// The function can be used as a default deserialization constructor:
+    /// `#[serde(default = "PrivKeyActivationPolicy::trezor")]`
+    pub fn trezor() -> PrivKeyActivationPolicy { PrivKeyActivationPolicy::Trezor }
+}
+
+#[derive(Debug)]
+pub enum PrivKeyPolicy<T> {
+    KeyPair(T),
+    Trezor,
+}
+
+impl<T> PrivKeyPolicy<T> {
+    pub fn key_pair(&self) -> Option<&T> {
+        match self {
+            PrivKeyPolicy::KeyPair(key_pair) => Some(key_pair),
+            PrivKeyPolicy::Trezor => None,
+        }
+    }
+
+    pub fn key_pair_or_err(&self) -> Result<&T, MmError<PrivKeyNotAllowed>> {
+        self.key_pair()
+            .or_mm_err(|| PrivKeyNotAllowed::HardwareWalletNotSupported)
+    }
+}
+
+#[derive(Clone)]
+pub enum PrivKeyBuildPolicy<'a> {
+    IguanaPrivKey(&'a [u8]),
+    Trezor,
+}
+
+impl<'a> PrivKeyBuildPolicy<'a> {
+    pub fn iguana_priv_key(crypto_ctx: &'a CryptoCtx) -> Self {
+        PrivKeyBuildPolicy::IguanaPrivKey(crypto_ctx.iguana_ctx().secp256k1_privkey_bytes())
+    }
+}
+
+#[derive(Debug)]
+pub enum DerivationMethod<Address, HDWallet> {
+    Iguana(Address),
+    HDWallet(HDWallet),
+}
+
+impl<Address, HDWallet> DerivationMethod<Address, HDWallet> {
+    pub fn iguana(&self) -> Option<&Address> {
+        match self {
+            DerivationMethod::Iguana(my_address) => Some(my_address),
+            DerivationMethod::HDWallet(_) => None,
         }
+    }
+
+    pub fn iguana_or_err(&self) -> MmResult<&Address, UnexpectedDerivationMethod> {
+        self.iguana()
+            .or_mm_err(|| UnexpectedDerivationMethod::IguanaPrivKeyUnavailable)
+    }
 
-        let mut tx_history_db = self.tx_history_db.lock().await;
-        if tx_history_db.is_some() {
-            return Ok(unwrap_tx_history_db(tx_history_db));
+    pub fn hd_wallet(&self) -> Option<&HDWallet> {
+        match self {
+            DerivationMethod::Iguana(_) => None,
+            DerivationMethod::HDWallet(hd_wallet) => Some(hd_wallet),
         }
+    }
+
+    pub fn hd_wallet_or_err(&self) -> MmResult<&HDWallet, UnexpectedDerivationMethod> {
+        self.hd_wallet()
+            .or_mm_err(|| UnexpectedDerivationMethod::HDWalletUnavailable)
+    }
+
+    /// # Panic
+    ///
+    /// Panic if the address mode is [`DerivationMethod::HDWallet`].
+    pub fn unwrap_iguana(&self) -> &Address { self.iguana_or_err().unwrap() }
+}
+
+#[async_trait]
+pub trait CoinWithDerivationMethod {
+    type Address;
+    type HDWallet;
 
-        let db = TxHistoryDb::init_with_fs_path(self.tx_history_path.clone()).await?;
-        *tx_history_db = Some(db);
-        Ok(unwrap_tx_history_db(tx_history_db))
+    fn derivation_method(&self) -> &DerivationMethod<Self::Address, Self::HDWallet>;
+
+    fn has_hd_wallet_derivation_method(&self) -> bool {
+        matches!(self.derivation_method(), DerivationMethod::HDWallet(_))
     }
 }
 
 #[allow(clippy::upper_case_acronyms)]
-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(tag = "type", content = "protocol_data")]
 pub enum CoinProtocol {
     UTXO,
@@ -1021,8 +2086,33 @@ pub enum CoinProtocol {
         platform: String,
         contract_address: String,
     },
-    #[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
-    ZHTLC,
+    SLPTOKEN {
+        platform: String,
+        token_id: H256Json,
+        decimals: u8,
+        required_confirmations: Option<u64>,
+    },
+    BCH {
+        slp_prefix: String,
+    },
+    #[cfg(not(target_arch = "wasm32"))]
+    LIGHTNING {
+        platform: String,
+        network: BlockchainNetwork,
+        confirmations: PlatformCoinConfirmations,
+    },
+    #[cfg(not(target_arch = "wasm32"))]
+    SOLANA,
+    #[cfg(not(target_arch = "wasm32"))]
+    SPLTOKEN {
+        platform: String,
+        token_contract_address: String,
+        decimals: u8,
+    },
+    #[cfg(not(target_arch = "wasm32"))]
+    ZHTLC {
+        consensus_params: ZcoinConsensusParams,
+    },
 }
 
 pub type RpcTransportEventHandlerShared = Arc<dyn RpcTransportEventHandler + Send + Sync + 'static>;
@@ -1186,11 +2276,15 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
     let coins_en = coin_conf(ctx, ticker);
 
     if coins_en.is_null() {
+        let warning = format!(
+            "Warning, coin {} is used without a corresponding configuration.",
+            ticker
+        );
         ctx.log.log(
             "😅",
             #[allow(clippy::unnecessary_cast)]
             &[&("coin" as &str), &ticker, &("no-conf" as &str)],
-            &fomat! ("Warning, coin " (ticker) " is used without a corresponding configuration."),
+            &warning,
         );
     }
 
@@ -1200,7 +2294,10 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
             "assuming that coin is not supported"
         ));
     }
-    let secret = &*ctx.secp256k1_key_pair().private().secret;
+    let secret = try_s!(CryptoCtx::from_ctx(ctx))
+        .iguana_ctx()
+        .secp256k1_privkey_bytes()
+        .to_vec();
 
     if coins_en["protocol"].is_null() {
         return ERR!(
@@ -1211,46 +2308,112 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
 
     let coin: MmCoinEnum = match &protocol {
         CoinProtocol::UTXO => {
-            try_s!(utxo_standard_coin_from_conf_and_request(ctx, ticker, &coins_en, req, secret).await).into()
+            let params = try_s!(UtxoActivationParams::from_legacy_req(req));
+            try_s!(utxo_standard_coin_with_priv_key(ctx, ticker, &coins_en, &params, &secret).await).into()
+        },
+        CoinProtocol::QTUM => {
+            let params = try_s!(UtxoActivationParams::from_legacy_req(req));
+            try_s!(qtum_coin_with_priv_key(ctx, ticker, &coins_en, &params, &secret).await).into()
         },
-        CoinProtocol::QTUM => try_s!(qtum_coin_from_conf_and_request(ctx, ticker, &coins_en, req, secret).await).into(),
         CoinProtocol::ETH | CoinProtocol::ERC20 { .. } => {
-            try_s!(eth_coin_from_conf_and_request(ctx, ticker, &coins_en, req, secret, protocol).await).into()
+            try_s!(eth_coin_from_conf_and_request(ctx, ticker, &coins_en, req, &secret, protocol).await).into()
         },
         CoinProtocol::QRC20 {
             platform,
             contract_address,
         } => {
+            let params = try_s!(Qrc20ActivationParams::from_legacy_req(req));
             let contract_address = try_s!(qtum::contract_addr_from_str(contract_address));
+
             try_s!(
-                qrc20_coin_from_conf_and_request(ctx, ticker, platform, &coins_en, req, secret, contract_address).await
+                qrc20_coin_from_conf_and_params(ctx, ticker, platform, &coins_en, &params, &secret, contract_address)
+                    .await
             )
             .into()
         },
-        #[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
-        CoinProtocol::ZHTLC => try_s!(z_coin_from_conf_and_request(ctx, ticker, &coins_en, req, secret).await).into(),
+        CoinProtocol::BCH { slp_prefix } => {
+            let prefix = try_s!(CashAddrPrefix::from_str(slp_prefix));
+            let params = try_s!(BchActivationRequest::from_legacy_req(req));
+
+            let bch = try_s!(bch_coin_from_conf_and_params(ctx, ticker, &coins_en, params, prefix, &secret).await);
+            bch.into()
+        },
+        CoinProtocol::SLPTOKEN {
+            platform,
+            token_id,
+            decimals,
+            required_confirmations,
+        } => {
+            let platform_coin = try_s!(lp_coinfind(ctx, platform).await);
+            let platform_coin = match platform_coin {
+                Some(MmCoinEnum::Bch(coin)) => coin,
+                Some(_) => return ERR!("Platform coin {} is not BCH", platform),
+                None => return ERR!("Platform coin {} is not activated", platform),
+            };
+
+            let confs = required_confirmations.unwrap_or(platform_coin.required_confirmations());
+            let token = SlpToken::new(*decimals, ticker.into(), (*token_id).into(), platform_coin, confs);
+            token.into()
+        },
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::ZHTLC { .. } => return ERR!("ZHTLC protocol is not supported by lp_coininit"),
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::LIGHTNING { .. } => return ERR!("Lightning protocol is not supported by lp_coininit"),
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::SOLANA => {
+            return ERR!("Solana protocol is not supported by lp_coininit - use enable_solana_with_tokens instead")
+        },
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::SPLTOKEN { .. } => {
+            return ERR!("SplToken protocol is not supported by lp_coininit - use enable_spl instead")
+        },
     };
 
-    let block_count = try_s!(coin.current_block().compat().await);
-    // TODO, #156: Warn the user when we know that the wallet is under-initialized.
-    log! ([=ticker] if !coins_en["etomic"].is_null() {", etomic"} ", " [=block_count]);
+    let register_params = RegisterCoinParams {
+        ticker: ticker.to_owned(),
+        tx_history: req["tx_history"].as_bool().unwrap_or(false),
+    };
+    try_s!(lp_register_coin(ctx, coin.clone(), register_params).await);
+    Ok(coin)
+}
+
+#[derive(Debug, Display)]
+pub enum RegisterCoinError {
+    #[display(fmt = "Coin '{}' is initialized already", coin)]
+    CoinIsInitializedAlready {
+        coin: String,
+    },
+    Internal(String),
+}
+
+pub struct RegisterCoinParams {
+    pub ticker: String,
+    pub tx_history: bool,
+}
+
+pub async fn lp_register_coin(
+    ctx: &MmArc,
+    coin: MmCoinEnum,
+    params: RegisterCoinParams,
+) -> Result<(), MmError<RegisterCoinError>> {
+    let RegisterCoinParams { ticker, tx_history } = params;
+    let cctx = CoinsContext::from_ctx(ctx).map_to_mm(RegisterCoinError::Internal)?;
+
     // TODO AP: locking the coins list during the entire initialization prevents different coins from being
     // activated concurrently which results in long activation time: https://github.com/KomodoPlatform/atomicDEX/issues/24
     // So I'm leaving the possibility of race condition intentionally in favor of faster concurrent activation.
     // Should consider refactoring: maybe extract the RPC client initialization part from coin init functions.
     let mut coins = cctx.coins.lock().await;
-    match coins.raw_entry_mut().from_key(ticker) {
-        RawEntryMut::Occupied(_oe) => return ERR!("Coin {} already initialized", ticker),
-        RawEntryMut::Vacant(ve) => ve.insert(ticker.to_string(), coin.clone()),
+    match coins.raw_entry_mut().from_key(&ticker) {
+        RawEntryMut::Occupied(_oe) => {
+            return MmError::err(RegisterCoinError::CoinIsInitializedAlready { coin: ticker.clone() })
+        },
+        RawEntryMut::Vacant(ve) => ve.insert(ticker.clone(), coin.clone()),
     };
-    let history = req["tx_history"].as_bool().unwrap_or(false);
-    if history {
-        try_s!(lp_spawn_tx_history(ctx.clone(), coin.clone()));
+    if tx_history {
+        lp_spawn_tx_history(ctx.clone(), coin).map_to_mm(RegisterCoinError::Internal)?;
     }
-    let ticker = ticker.to_owned();
-    let ctx_weak = ctx.weak();
-    spawn(async move { check_balance_update_loop(ctx_weak, ticker).await });
-    Ok(coin)
+    Ok(())
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -1287,7 +2450,7 @@ pub async fn find_pair(ctx: &MmArc, base: &str, rel: &str) -> Result<Option<(MmC
         .await
 }
 
-#[derive(Display)]
+#[derive(Debug, Display)]
 pub enum CoinFindError {
     #[display(fmt = "No such coin: {}", coin)]
     NoSuchCoin { coin: String },
@@ -1350,9 +2513,9 @@ struct ValidateAddressReq {
 
 #[derive(Serialize)]
 pub struct ValidateAddressResult {
-    is_valid: bool,
+    pub is_valid: bool,
     #[serde(skip_serializing_if = "Option::is_none")]
-    reason: Option<String>,
+    pub reason: Option<String>,
 }
 
 pub async fn validate_address(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
@@ -1373,6 +2536,72 @@ pub async fn withdraw(ctx: MmArc, req: WithdrawRequest) -> WithdrawResult {
     coin.withdraw(req).compat().await
 }
 
+pub async fn get_raw_transaction(ctx: MmArc, req: RawTransactionRequest) -> RawTransactionResult {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    coin.get_raw_transaction(req).compat().await
+}
+
+pub async fn sign_message(ctx: MmArc, req: SignatureRequest) -> SignatureResult<SignatureResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let signature = coin.sign_message(&req.message)?;
+    Ok(SignatureResponse { signature })
+}
+
+pub async fn verify_message(ctx: MmArc, req: VerificationRequest) -> VerificationResult<VerificationResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+
+    let validate_address_result = coin.validate_address(&req.address);
+    if !validate_address_result.is_valid {
+        return MmError::err(VerificationError::InvalidRequest(
+            validate_address_result.reason.unwrap_or_else(|| "Unknown".to_string()),
+        ));
+    }
+
+    let is_valid = coin.verify_message(&req.signature, &req.message, &req.address)?;
+
+    Ok(VerificationResponse { is_valid })
+}
+
+pub async fn remove_delegation(ctx: MmArc, req: RemoveDelegateRequest) -> DelegationResult {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    match coin {
+        MmCoinEnum::QtumCoin(qtum) => qtum.remove_delegation().compat().await,
+        _ => {
+            return MmError::err(DelegationError::CoinDoesntSupportDelegation {
+                coin: coin.ticker().to_string(),
+            })
+        },
+    }
+}
+
+pub async fn get_staking_infos(ctx: MmArc, req: GetStakingInfosRequest) -> StakingInfosResult {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    match coin {
+        MmCoinEnum::QtumCoin(qtum) => qtum.get_delegation_infos().compat().await,
+        _ => {
+            return MmError::err(StakingInfosError::CoinDoesntSupportStakingInfos {
+                coin: coin.ticker().to_string(),
+            })
+        },
+    }
+}
+
+pub async fn add_delegation(ctx: MmArc, req: AddDelegateRequest) -> DelegationResult {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    // Need to find a way to do a proper dispatch
+    let coin_concrete = match coin {
+        MmCoinEnum::QtumCoin(qtum) => qtum,
+        _ => {
+            return MmError::err(DelegationError::CoinDoesntSupportDelegation {
+                coin: coin.ticker().to_string(),
+            })
+        },
+    };
+    match req.staking_details {
+        StakingDetails::Qtum(qtum_staking) => coin_concrete.add_delegation(qtum_staking).compat().await,
+    }
+}
+
 pub async fn send_raw_transaction(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
     let ticker = try_s!(req["coin"].as_str().ok_or("No 'coin' field")).to_owned();
     let coin = match lp_coinfind(&ctx, &ticker).await {
@@ -1396,8 +2625,6 @@ pub enum HistorySyncState {
     Finished,
 }
 
-fn ten() -> usize { 10 }
-
 #[derive(Deserialize)]
 struct MyTxHistoryRequest {
     coin: String,
@@ -1580,40 +2807,12 @@ pub async fn show_priv_key(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, S
     let res = try_s!(json::to_vec(&json!({
         "result": {
             "coin": ticker,
-            "priv_key": coin.display_priv_key(),
+            "priv_key": try_s!(coin.display_priv_key()),
         }
     })));
     Ok(try_s!(Response::builder().body(res)))
 }
 
-// TODO: Refactor this, it's actually not required to check balance and trade fee when there no orders using the coin
-pub async fn check_balance_update_loop(ctx: MmWeak, ticker: String) {
-    let mut current_balance = None;
-    loop {
-        Timer::sleep(10.).await;
-        let ctx = match MmArc::from_weak(&ctx) {
-            Some(ctx) => ctx,
-            None => return,
-        };
-
-        match lp_coinfind(&ctx, &ticker).await {
-            Ok(Some(coin)) => {
-                let balance = match coin.my_spendable_balance().compat().await {
-                    Ok(balance) => balance,
-                    Err(_) => continue,
-                };
-                if Some(&balance) != current_balance.as_ref() {
-                    let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
-                    coins_ctx.balance_updated(&coin, &balance).await;
-                    current_balance = Some(balance);
-                }
-            },
-            Ok(None) => break,
-            Err(_) => continue,
-        }
-    }
-}
-
 pub async fn register_balance_update_handler(
     ctx: MmArc,
     handler: Box<dyn BalanceTradeFeeUpdatedHandler + Send + Sync>,
@@ -1680,9 +2879,9 @@ pub async fn convert_utxo_address(ctx: MmArc, req: Json) -> Result<Response<Vec<
         MmCoinEnum::UtxoCoin(utxo) => utxo,
         _ => return ERR!("Coin {} is not utxo", req.to_coin),
     };
-    addr.prefix = coin.as_ref().my_address.prefix;
-    addr.t_addr_prefix = coin.as_ref().my_address.t_addr_prefix;
-    addr.checksum_type = coin.as_ref().my_address.checksum_type;
+    addr.prefix = coin.as_ref().conf.pub_addr_prefix;
+    addr.t_addr_prefix = coin.as_ref().conf.pub_t_addr_prefix;
+    addr.checksum_type = coin.as_ref().conf.checksum_type;
 
     let response = try_s!(json::to_vec(&json!({
         "result": addr.to_string(),
@@ -1691,6 +2890,7 @@ pub async fn convert_utxo_address(ctx: MmArc, req: Json) -> Result<Response<Vec<
 }
 
 pub fn address_by_coin_conf_and_pubkey_str(
+    ctx: &MmArc,
     coin: &str,
     conf: &Json,
     pubkey: &str,
@@ -1699,10 +2899,170 @@ pub fn address_by_coin_conf_and_pubkey_str(
     let protocol: CoinProtocol = try_s!(json::from_value(conf["protocol"].clone()));
     match protocol {
         CoinProtocol::ERC20 { .. } | CoinProtocol::ETH => eth::addr_from_pubkey_str(pubkey),
-        CoinProtocol::UTXO | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } => {
+        CoinProtocol::UTXO | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
             utxo::address_by_conf_and_pubkey_str(coin, conf, pubkey, addr_format)
         },
-        #[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc"))]
-        CoinProtocol::ZHTLC => utxo::address_by_conf_and_pubkey_str(coin, conf, pubkey, addr_format),
+        CoinProtocol::SLPTOKEN { platform, .. } => {
+            let platform_conf = coin_conf(ctx, &platform);
+            if platform_conf.is_null() {
+                return ERR!("platform {} conf is null", platform);
+            }
+            // TODO is there any way to make it better without duplicating the prefix in the SLP conf?
+            let platform_protocol: CoinProtocol = try_s!(json::from_value(platform_conf["protocol"].clone()));
+            match platform_protocol {
+                CoinProtocol::BCH { slp_prefix } => {
+                    slp_addr_from_pubkey_str(pubkey, &slp_prefix).map_err(|e| ERRL!("{}", e))
+                },
+                _ => ERR!("Platform protocol {:?} is not BCH", platform_protocol),
+            }
+        },
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::LIGHTNING { .. } => {
+            ERR!("address_by_coin_conf_and_pubkey_str is not implemented for lightning protocol yet!")
+        },
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::SOLANA | CoinProtocol::SPLTOKEN { .. } => {
+            ERR!("Solana pubkey is the public address - you do not need to use this rpc call.")
+        },
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::ZHTLC { .. } => ERR!("address_by_coin_conf_and_pubkey_str is not supported for ZHTLC protocol!"),
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+fn load_history_from_file_impl<T>(coin: &T, ctx: &MmArc) -> TxHistoryFut<Vec<TransactionDetails>>
+where
+    T: MmCoin + ?Sized,
+{
+    let ctx = ctx.clone();
+    let ticker = coin.ticker().to_owned();
+    let my_address = try_f!(coin.my_address().map_to_mm(TxHistoryError::InternalError));
+
+    let fut = async move {
+        let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+        let db = coins_ctx.tx_history_db().await?;
+        let err = match load_tx_history(&db, &ticker, &my_address).await {
+            Ok(history) => return Ok(history),
+            Err(e) => e,
+        };
+
+        if let TxHistoryError::ErrorDeserializing(e) = err.get_inner() {
+            ctx.log.log(
+                "🌋",
+                &[&"tx_history", &ticker.to_owned()],
+                &ERRL!("Error {} on history deserialization, resetting the cache.", e),
+            );
+            clear_tx_history(&db, &ticker, &my_address).await?;
+            return Ok(Vec::new());
+        }
+
+        Err(err)
+    };
+    Box::new(fut.boxed().compat())
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn load_history_from_file_impl<T>(coin: &T, ctx: &MmArc) -> TxHistoryFut<Vec<TransactionDetails>>
+where
+    T: MmCoin + ?Sized,
+{
+    let ticker = coin.ticker().to_owned();
+    let history_path = coin.tx_history_path(ctx);
+    let ctx = ctx.clone();
+
+    let fut = async move {
+        let content = match fs::read(&history_path).await {
+            Ok(content) => content,
+            Err(err) if err.kind() == io::ErrorKind::NotFound => {
+                return Ok(Vec::new());
+            },
+            Err(err) => {
+                let error = format!(
+                    "Error '{}' reading from the history file {}",
+                    err,
+                    history_path.display()
+                );
+                return MmError::err(TxHistoryError::ErrorLoading(error));
+            },
+        };
+        let serde_err = match json::from_slice(&content) {
+            Ok(txs) => return Ok(txs),
+            Err(e) => e,
+        };
+
+        ctx.log.log(
+            "🌋",
+            &[&"tx_history", &ticker],
+            &ERRL!("Error {} on history deserialization, resetting the cache.", serde_err),
+        );
+        fs::remove_file(&history_path)
+            .await
+            .map_to_mm(|e| TxHistoryError::ErrorClearing(e.to_string()))?;
+        Ok(Vec::new())
+    };
+    Box::new(fut.boxed().compat())
+}
+
+#[cfg(target_arch = "wasm32")]
+fn save_history_to_file_impl<T>(coin: &T, ctx: &MmArc, mut history: Vec<TransactionDetails>) -> TxHistoryFut<()>
+where
+    T: MmCoin + MarketCoinOps + ?Sized,
+{
+    let ctx = ctx.clone();
+    let ticker = coin.ticker().to_owned();
+    let my_address = try_f!(coin.my_address().map_to_mm(TxHistoryError::InternalError));
+
+    history.sort_unstable_by(compare_transactions);
+
+    let fut = async move {
+        let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+        let db = coins_ctx.tx_history_db().await?;
+        save_tx_history(&db, &ticker, &my_address, history).await?;
+        Ok(())
+    };
+    Box::new(fut.boxed().compat())
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn save_history_to_file_impl<T>(coin: &T, ctx: &MmArc, mut history: Vec<TransactionDetails>) -> TxHistoryFut<()>
+where
+    T: MmCoin + MarketCoinOps + ?Sized,
+{
+    let history_path = coin.tx_history_path(ctx);
+    let tmp_file = format!("{}.tmp", history_path.display());
+
+    history.sort_unstable_by(compare_transactions);
+
+    let fut = async move {
+        let content = json::to_vec(&history).map_to_mm(|e| TxHistoryError::ErrorSerializing(e.to_string()))?;
+
+        let fs_fut = async {
+            let mut file = fs::File::create(&tmp_file).await?;
+            file.write_all(&content).await?;
+            file.flush().await?;
+            fs::rename(&tmp_file, &history_path).await?;
+            Ok(())
+        };
+
+        let res: io::Result<_> = fs_fut.await;
+        if let Err(e) = res {
+            let error = format!("Error '{}' creating/writing/renaming the tmp file {}", e, tmp_file);
+            return MmError::err(TxHistoryError::ErrorSaving(error));
+        }
+        Ok(())
+    };
+    Box::new(fut.boxed().compat())
+}
+
+fn compare_transactions(a: &TransactionDetails, b: &TransactionDetails) -> Ordering {
+    // the transactions with block_height == 0 are the most recent so we need to separately handle them while sorting
+    if a.block_height == b.block_height {
+        a.internal_id.cmp(&b.internal_id)
+    } else if a.block_height == 0 {
+        Ordering::Less
+    } else if b.block_height == 0 {
+        Ordering::Greater
+    } else {
+        b.block_height.cmp(&a.block_height)
     }
 }
diff --git a/mm2src/coins/my_tx_history_v2.rs b/mm2src/coins/my_tx_history_v2.rs
new file mode 100644
index 0000000000..c297264ab2
--- /dev/null
+++ b/mm2src/coins/my_tx_history_v2.rs
@@ -0,0 +1,392 @@
+use crate::tx_history_storage::{CreateTxHistoryStorageError, GetTxHistoryFilters, TxHistoryStorageBuilder, WalletId};
+use crate::{lp_coinfind_or_err, BlockHeightAndTime, CoinFindError, HistorySyncState, MmCoin, MmCoinEnum, Transaction,
+            TransactionDetails, TransactionType, TxFeeDetails, UtxoRpcError};
+use async_trait::async_trait;
+use bitcrypto::sha256;
+use common::{calc_total_pages, ten, HttpStatusCode, PagingOptionsEnum, StatusCode};
+use derive_more::Display;
+use futures::compat::Future01CompatExt;
+use keys::{Address, CashAddress};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use rpc::v1::types::{Bytes as BytesJson, ToTxHash};
+use std::collections::HashSet;
+
+#[derive(Debug)]
+pub enum RemoveTxResult {
+    TxRemoved,
+    TxDidNotExist,
+}
+
+impl RemoveTxResult {
+    pub fn tx_existed(&self) -> bool { matches!(self, RemoveTxResult::TxRemoved) }
+}
+
+pub struct GetHistoryResult {
+    pub transactions: Vec<TransactionDetails>,
+    pub skipped: usize,
+    pub total: usize,
+}
+
+pub trait TxHistoryStorageError: std::fmt::Debug + NotMmError + NotEqual + Send {}
+
+#[async_trait]
+pub trait TxHistoryStorage: Send + Sync + 'static {
+    type Error: TxHistoryStorageError;
+
+    /// Initializes collection/tables in storage for the specified wallet.
+    async fn init(&self, wallet_id: &WalletId) -> Result<(), MmError<Self::Error>>;
+
+    /// Whether collections/tables are initialized for the specified wallet.
+    async fn is_initialized_for(&self, wallet_id: &WalletId) -> Result<bool, MmError<Self::Error>>;
+
+    /// Adds multiple transactions to the selected wallet's history.
+    /// Also consider adding tx_hex to the cache during this operation.
+    async fn add_transactions_to_history<I>(
+        &self,
+        wallet_id: &WalletId,
+        transactions: I,
+    ) -> Result<(), MmError<Self::Error>>
+    where
+        I: IntoIterator<Item = TransactionDetails> + Send + 'static,
+        I::IntoIter: Send;
+
+    /// Removes the transaction by internal_id from the selected wallet's history.
+    async fn remove_tx_from_history(
+        &self,
+        wallet_id: &WalletId,
+        internal_id: &BytesJson,
+    ) -> Result<RemoveTxResult, MmError<Self::Error>>;
+
+    /// Gets the transaction by internal_id from the selected wallet's history
+    async fn get_tx_from_history(
+        &self,
+        wallet_id: &WalletId,
+        internal_id: &BytesJson,
+    ) -> Result<Option<TransactionDetails>, MmError<Self::Error>>;
+
+    /// Returns whether the history contains unconfirmed transactions.
+    async fn history_contains_unconfirmed_txes(&self, wallet_id: &WalletId) -> Result<bool, MmError<Self::Error>>;
+
+    /// Gets the unconfirmed transactions from the wallet's history.
+    async fn get_unconfirmed_txes_from_history(
+        &self,
+        wallet_id: &WalletId,
+    ) -> Result<Vec<TransactionDetails>, MmError<Self::Error>>;
+
+    /// Updates transaction in the selected wallet's history
+    async fn update_tx_in_history(
+        &self,
+        wallet_id: &WalletId,
+        tx: &TransactionDetails,
+    ) -> Result<(), MmError<Self::Error>>;
+
+    /// Whether the selected wallet's history contains a transaction with the given `tx_hash`.
+    async fn history_has_tx_hash(&self, wallet_id: &WalletId, tx_hash: &str) -> Result<bool, MmError<Self::Error>>;
+
+    /// Returns the number of unique transaction hashes.
+    async fn unique_tx_hashes_num_in_history(&self, wallet_id: &WalletId) -> Result<usize, MmError<Self::Error>>;
+
+    /// Adds the given `tx_hex` transaction to the selected wallet's cache.
+    async fn add_tx_to_cache(
+        &self,
+        wallet_id: &WalletId,
+        tx_hash: &str,
+        tx_hex: &BytesJson,
+    ) -> Result<(), MmError<Self::Error>>;
+
+    /// Gets transaction hexes from the wallet's cache.
+    async fn tx_bytes_from_cache(
+        &self,
+        wallet_id: &WalletId,
+        tx_hash: &str,
+    ) -> Result<Option<BytesJson>, MmError<Self::Error>>;
+
+    /// Gets transaction history for the selected wallet according to the specified `filters`.
+    async fn get_history(
+        &self,
+        wallet_id: &WalletId,
+        filters: GetTxHistoryFilters,
+        paging: PagingOptionsEnum<BytesJson>,
+        limit: usize,
+    ) -> Result<GetHistoryResult, MmError<Self::Error>>;
+}
+
+pub trait DisplayAddress {
+    fn display_address(&self) -> String;
+}
+
+impl DisplayAddress for Address {
+    fn display_address(&self) -> String { self.to_string() }
+}
+
+impl DisplayAddress for CashAddress {
+    fn display_address(&self) -> String { self.encode().expect("A valid cash address") }
+}
+
+pub struct TxDetailsBuilder<'a, Addr: DisplayAddress, Tx: Transaction> {
+    coin: String,
+    tx: &'a Tx,
+    my_addresses: HashSet<Addr>,
+    total_amount: BigDecimal,
+    received_by_me: BigDecimal,
+    spent_by_me: BigDecimal,
+    from_addresses: HashSet<Addr>,
+    to_addresses: HashSet<Addr>,
+    transaction_type: TransactionType,
+    block_height_and_time: Option<BlockHeightAndTime>,
+    tx_fee: Option<TxFeeDetails>,
+}
+
+impl<'a, Addr: Clone + DisplayAddress + Eq + std::hash::Hash, Tx: Transaction> TxDetailsBuilder<'a, Addr, Tx> {
+    pub fn new(
+        coin: String,
+        tx: &'a Tx,
+        block_height_and_time: Option<BlockHeightAndTime>,
+        my_addresses: impl IntoIterator<Item = Addr>,
+    ) -> Self {
+        TxDetailsBuilder {
+            coin,
+            tx,
+            my_addresses: my_addresses.into_iter().collect(),
+            total_amount: Default::default(),
+            received_by_me: Default::default(),
+            spent_by_me: Default::default(),
+            from_addresses: Default::default(),
+            to_addresses: Default::default(),
+            block_height_and_time,
+            transaction_type: TransactionType::StandardTransfer,
+            tx_fee: None,
+        }
+    }
+
+    pub fn set_tx_fee(&mut self, tx_fee: Option<TxFeeDetails>) { self.tx_fee = tx_fee; }
+
+    pub fn set_transaction_type(&mut self, tx_type: TransactionType) { self.transaction_type = tx_type; }
+
+    pub fn transferred_to(&mut self, address: Addr, amount: &BigDecimal) {
+        if self.my_addresses.contains(&address) {
+            self.received_by_me += amount;
+        }
+        self.to_addresses.insert(address);
+    }
+
+    pub fn transferred_from(&mut self, address: Addr, amount: &BigDecimal) {
+        if self.my_addresses.contains(&address) {
+            self.spent_by_me += amount;
+        }
+        self.total_amount += amount;
+        self.from_addresses.insert(address);
+    }
+
+    pub fn build(self) -> TransactionDetails {
+        let (block_height, timestamp) = match self.block_height_and_time {
+            Some(height_with_time) => (height_with_time.height, height_with_time.timestamp),
+            None => (0, 0),
+        };
+
+        let mut from: Vec<_> = self
+            .from_addresses
+            .iter()
+            .map(DisplayAddress::display_address)
+            .collect();
+        from.sort();
+
+        let mut to: Vec<_> = self.to_addresses.iter().map(DisplayAddress::display_address).collect();
+        to.sort();
+
+        let tx_hash = self.tx.tx_hash();
+        let internal_id = match &self.transaction_type {
+            TransactionType::TokenTransfer(token_id) => {
+                let mut bytes_for_hash = tx_hash.0.clone();
+                bytes_for_hash.extend_from_slice(&token_id.0);
+                sha256(&bytes_for_hash).to_vec().into()
+            },
+            TransactionType::StakingDelegation
+            | TransactionType::RemoveDelegation
+            | TransactionType::StandardTransfer => tx_hash.clone(),
+        };
+
+        TransactionDetails {
+            coin: self.coin,
+            tx_hex: self.tx.tx_hex().into(),
+            tx_hash: tx_hash.to_tx_hash(),
+            from,
+            to,
+            total_amount: self.total_amount,
+            my_balance_change: &self.received_by_me - &self.spent_by_me,
+            spent_by_me: self.spent_by_me,
+            received_by_me: self.received_by_me,
+            block_height,
+            timestamp,
+            fee_details: self.tx_fee,
+            internal_id,
+            kmd_rewards: None,
+            transaction_type: self.transaction_type,
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct MyTxHistoryRequestV2<T> {
+    coin: String,
+    #[serde(default = "ten")]
+    pub(crate) limit: usize,
+    #[serde(default)]
+    pub(crate) paging_options: PagingOptionsEnum<T>,
+}
+
+#[derive(Serialize)]
+pub struct MyTxHistoryDetails {
+    #[serde(flatten)]
+    pub(crate) details: TransactionDetails,
+    pub(crate) confirmations: u64,
+}
+
+#[derive(Serialize)]
+pub struct MyTxHistoryResponseV2<Tx, Id> {
+    pub(crate) coin: String,
+    pub(crate) current_block: u64,
+    pub(crate) transactions: Vec<Tx>,
+    pub(crate) sync_status: HistorySyncState,
+    pub(crate) limit: usize,
+    pub(crate) skipped: usize,
+    pub(crate) total: usize,
+    pub(crate) total_pages: usize,
+    pub(crate) paging_options: PagingOptionsEnum<Id>,
+}
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum MyTxHistoryErrorV2 {
+    CoinIsNotActive(String),
+    StorageIsNotInitialized(String),
+    StorageError(String),
+    RpcError(String),
+    NotSupportedFor(String),
+    Internal(String),
+}
+
+impl HttpStatusCode for MyTxHistoryErrorV2 {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            MyTxHistoryErrorV2::CoinIsNotActive(_) => StatusCode::PRECONDITION_REQUIRED,
+            MyTxHistoryErrorV2::StorageIsNotInitialized(_)
+            | MyTxHistoryErrorV2::StorageError(_)
+            | MyTxHistoryErrorV2::RpcError(_)
+            | MyTxHistoryErrorV2::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            MyTxHistoryErrorV2::NotSupportedFor(_) => StatusCode::BAD_REQUEST,
+        }
+    }
+}
+
+impl From<CoinFindError> for MyTxHistoryErrorV2 {
+    fn from(err: CoinFindError) -> Self {
+        match err {
+            CoinFindError::NoSuchCoin { coin } => MyTxHistoryErrorV2::CoinIsNotActive(coin),
+        }
+    }
+}
+
+impl<T: TxHistoryStorageError> From<T> for MyTxHistoryErrorV2 {
+    fn from(err: T) -> Self {
+        let msg = format!("{:?}", err);
+        MyTxHistoryErrorV2::StorageError(msg)
+    }
+}
+
+impl From<CreateTxHistoryStorageError> for MyTxHistoryErrorV2 {
+    fn from(e: CreateTxHistoryStorageError) -> Self { MyTxHistoryErrorV2::StorageError(e.to_string()) }
+}
+
+impl From<UtxoRpcError> for MyTxHistoryErrorV2 {
+    fn from(err: UtxoRpcError) -> Self { MyTxHistoryErrorV2::RpcError(err.to_string()) }
+}
+
+pub trait CoinWithTxHistoryV2 {
+    fn history_wallet_id(&self) -> WalletId;
+
+    fn get_tx_history_filters(&self) -> GetTxHistoryFilters;
+}
+
+/// According to the [comment](https://github.com/KomodoPlatform/atomicDEX-API/pull/1285#discussion_r888410390),
+/// it's worth to add [`MmCoin::my_tx_history_v2`] when most coins support transaction history V2.
+pub async fn my_tx_history_v2_rpc(
+    ctx: MmArc,
+    request: MyTxHistoryRequestV2<BytesJson>,
+) -> Result<MyTxHistoryResponseV2<MyTxHistoryDetails, BytesJson>, MmError<MyTxHistoryErrorV2>> {
+    match lp_coinfind_or_err(&ctx, &request.coin).await? {
+        MmCoinEnum::Bch(bch) => my_tx_history_v2_impl(ctx, &bch, request).await,
+        MmCoinEnum::SlpToken(slp_token) => my_tx_history_v2_impl(ctx, &slp_token, request).await,
+        other => MmError::err(MyTxHistoryErrorV2::NotSupportedFor(other.ticker().to_owned())),
+    }
+}
+
+pub(crate) async fn my_tx_history_v2_impl<Coin>(
+    ctx: MmArc,
+    coin: &Coin,
+    request: MyTxHistoryRequestV2<BytesJson>,
+) -> Result<MyTxHistoryResponseV2<MyTxHistoryDetails, BytesJson>, MmError<MyTxHistoryErrorV2>>
+where
+    Coin: CoinWithTxHistoryV2 + MmCoin,
+{
+    let tx_history_storage = TxHistoryStorageBuilder::new(&ctx).build()?;
+
+    let wallet_id = coin.history_wallet_id();
+    let is_storage_init = tx_history_storage.is_initialized_for(&wallet_id).await?;
+    if !is_storage_init {
+        let msg = format!("Storage is not initialized for {:?}", wallet_id);
+        return MmError::err(MyTxHistoryErrorV2::StorageIsNotInitialized(msg));
+    }
+    let current_block = coin
+        .current_block()
+        .compat()
+        .await
+        .map_to_mm(MyTxHistoryErrorV2::RpcError)?;
+
+    let filters = coin.get_tx_history_filters();
+    let history = tx_history_storage
+        .get_history(&wallet_id, filters, request.paging_options.clone(), request.limit)
+        .await?;
+
+    let transactions = history
+        .transactions
+        .into_iter()
+        .map(|mut details| {
+            // it can be the platform ticker instead of the token ticker for a pre-saved record
+            if details.coin != request.coin {
+                details.coin = request.coin.clone();
+            }
+            let confirmations = if details.block_height == 0 || details.block_height > current_block {
+                0
+            } else {
+                current_block + 1 - details.block_height
+            };
+            MyTxHistoryDetails { confirmations, details }
+        })
+        .collect();
+
+    Ok(MyTxHistoryResponseV2 {
+        coin: request.coin,
+        current_block,
+        transactions,
+        sync_status: coin.history_sync_status(),
+        limit: request.limit,
+        skipped: history.skipped,
+        total: history.total,
+        total_pages: calc_total_pages(history.total, request.limit),
+        paging_options: request.paging_options,
+    })
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn z_coin_tx_history_rpc(
+    ctx: MmArc,
+    request: MyTxHistoryRequestV2<i64>,
+) -> Result<MyTxHistoryResponseV2<crate::z_coin::ZcoinTxDetails, i64>, MmError<MyTxHistoryErrorV2>> {
+    match lp_coinfind_or_err(&ctx, &request.coin).await? {
+        MmCoinEnum::ZCoin(z_coin) => z_coin.tx_history(request).await,
+        other => MmError::err(MyTxHistoryErrorV2::NotSupportedFor(other.ticker().to_owned())),
+    }
+}
diff --git a/mm2src/coins/qrc20.rs b/mm2src/coins/qrc20.rs
index 49ec025d4c..4378cf44f4 100644
--- a/mm2src/coins/qrc20.rs
+++ b/mm2src/coins/qrc20.rs
@@ -3,60 +3,66 @@ use crate::qrc20::rpc_clients::{LogEntry, Qrc20ElectrumOps, Qrc20NativeOps, Qrc2
                                 ViewContractCallType};
 use crate::utxo::qtum::QtumBasedCoin;
 use crate::utxo::rpc_clients::{ElectrumClient, NativeClient, UnspentInfo, UtxoRpcClientEnum, UtxoRpcClientOps,
-                               UtxoRpcError, UtxoRpcResult};
-use crate::utxo::utxo_common::{self, big_decimal_from_sat, check_all_inputs_signed_by_pub};
-use crate::utxo::{qtum, sign_tx, ActualTxFee, AdditionalTxData, FeePolicy, GenerateTxError, GenerateTxResult,
-                  HistoryUtxoTx, HistoryUtxoTxMap, RecentlySpentOutPoints, UtxoAddressFormat, UtxoCoinBuilder,
-                  UtxoCoinFields, UtxoCommonOps, UtxoTx, VerboseTransactionFrom, UTXO_LOCK};
+                               UtxoRpcError, UtxoRpcFut, UtxoRpcResult};
+#[cfg(not(target_arch = "wasm32"))]
+use crate::utxo::tx_cache::{UtxoVerboseCacheOps, UtxoVerboseCacheShared};
+use crate::utxo::utxo_builder::{UtxoCoinBuildError, UtxoCoinBuildResult, UtxoCoinBuilderCommonOps,
+                                UtxoCoinWithIguanaPrivKeyBuilder, UtxoFieldsWithIguanaPrivKeyBuilder};
+use crate::utxo::utxo_common::{self, big_decimal_from_sat, check_all_inputs_signed_by_pub, UtxoTxBuilder};
+use crate::utxo::{qtum, ActualTxFee, AdditionalTxData, BroadcastTxErr, FeePolicy, GenerateTxError, GetUtxoListOps,
+                  HistoryUtxoTx, HistoryUtxoTxMap, MatureUnspentList, RecentlySpentOutPointsGuard,
+                  UtxoActivationParams, UtxoAddressFormat, UtxoCoinFields, UtxoCommonOps, UtxoFromLegacyReqErr,
+                  UtxoTx, UtxoTxBroadcastOps, UtxoTxGenerationOps, VerboseTransactionFrom, UTXO_LOCK};
 use crate::{BalanceError, BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps,
-            MmCoin, NegotiateSwapContractAddrErr, SwapOps, TradeFee, TradePreimageError, TradePreimageFut,
-            TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum, TransactionFut,
-            ValidateAddressResult, WithdrawError, WithdrawFee, WithdrawFut, WithdrawRequest, WithdrawResult};
+            MmCoin, NegotiateSwapContractAddrErr, PrivKeyNotAllowed, RawTransactionFut, RawTransactionRequest,
+            SearchForSwapTxSpendInput, SignatureResult, SwapOps, TradeFee, TradePreimageError, TradePreimageFut,
+            TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum, TransactionErr,
+            TransactionFut, TransactionType, UnexpectedDerivationMethod, ValidateAddressResult, ValidatePaymentInput,
+            VerificationResult, WithdrawError, WithdrawFee, WithdrawFut, WithdrawRequest, WithdrawResult};
 use async_trait::async_trait;
-use bigdecimal::BigDecimal;
 use bitcrypto::{dhash160, sha256};
 use chain::TransactionOutput;
-use common::block_on;
 use common::executor::Timer;
-use common::jsonrpc_client::{JsonRpcClient, JsonRpcError, JsonRpcRequest, RpcRes};
+use common::jsonrpc_client::{JsonRpcClient, JsonRpcRequest, RpcRes};
 use common::log::{error, warn};
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
-use common::mm_number::MmNumber;
 use common::now_ms;
 use derive_more::Display;
 use ethabi::{Function, Token};
 use ethereum_types::{H160, U256};
 use futures::compat::Future01CompatExt;
-use futures::lock::MutexGuard as AsyncMutexGuard;
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
 use keys::bytes::Bytes as ScriptBytes;
-use keys::{Address as UtxoAddress, Address, Public};
+use keys::{Address as UtxoAddress, Address, KeyPair, Public};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
 #[cfg(test)] use mocktopus::macros::*;
-use rpc::v1::types::{Bytes as BytesJson, Transaction as RpcTransaction, H160 as H160Json, H256 as H256Json};
+use rpc::v1::types::{Bytes as BytesJson, ToTxHash, Transaction as RpcTransaction, H160 as H160Json, H256 as H256Json};
 use script::{Builder as ScriptBuilder, Opcode, Script, TransactionInputSigner};
 use script_pubkey::generate_contract_call_script_pubkey;
 use serde_json::{self as json, Value as Json};
 use serialization::{deserialize, serialize, CoinVariant};
+use std::collections::{HashMap, HashSet};
 use std::ops::{Deref, Neg};
 #[cfg(not(target_arch = "wasm32"))] use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
+use utxo_signer::with_key_pair::{sign_tx, UtxoSignWithKeyPairError};
 
 mod history;
 #[cfg(test)] mod qrc20_tests;
 pub mod rpc_clients;
-mod script_pubkey;
+pub mod script_pubkey;
 mod swap;
 
 /// Qtum amount is always 0 for the QRC20 UTXO outputs,
 /// because we should pay only a fee in Qtum to send the QRC20 transaction.
-const OUTPUT_QTUM_AMOUNT: u64 = 0;
-const QRC20_GAS_LIMIT_DEFAULT: u64 = 100_000;
+pub const OUTPUT_QTUM_AMOUNT: u64 = 0;
+pub const QRC20_GAS_LIMIT_DEFAULT: u64 = 100_000;
 const QRC20_PAYMENT_GAS_LIMIT: u64 = 200_000;
-const QRC20_GAS_PRICE_DEFAULT: u64 = 40;
-const QRC20_DUST: u64 = 0;
+pub const QRC20_GAS_PRICE_DEFAULT: u64 = 40;
+pub const QRC20_DUST: u64 = 0;
 // Keccak-256 hash of `Transfer` event
 const QRC20_TRANSFER_TOPIC: &str = "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";
 const QRC20_PAYMENT_SENT_TOPIC: &str = "ccc9c05183599bd3135da606eaaf535daffe256e9de33c048014cffcccd4ad57";
@@ -65,14 +71,89 @@ const QRC20_SENDER_REFUNDED_TOPIC: &str = "1797d500133f8e427eb9da9523aa4a25cb40f
 
 pub type Qrc20AbiResult<T> = Result<T, MmError<Qrc20AbiError>>;
 
+#[derive(Display)]
+pub enum Qrc20GenTxError {
+    ErrorGeneratingUtxoTx(GenerateTxError),
+    ErrorSigningTx(UtxoSignWithKeyPairError),
+    PrivKeyNotAllowed(PrivKeyNotAllowed),
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+}
+
+impl From<GenerateTxError> for Qrc20GenTxError {
+    fn from(e: GenerateTxError) -> Self { Qrc20GenTxError::ErrorGeneratingUtxoTx(e) }
+}
+
+impl From<UtxoSignWithKeyPairError> for Qrc20GenTxError {
+    fn from(e: UtxoSignWithKeyPairError) -> Self { Qrc20GenTxError::ErrorSigningTx(e) }
+}
+
+impl From<PrivKeyNotAllowed> for Qrc20GenTxError {
+    fn from(e: PrivKeyNotAllowed) -> Self { Qrc20GenTxError::PrivKeyNotAllowed(e) }
+}
+
+impl From<UnexpectedDerivationMethod> for Qrc20GenTxError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { Qrc20GenTxError::UnexpectedDerivationMethod(e) }
+}
+
+impl From<UtxoRpcError> for Qrc20GenTxError {
+    fn from(e: UtxoRpcError) -> Self { Qrc20GenTxError::ErrorGeneratingUtxoTx(GenerateTxError::from(e)) }
+}
+
+impl Qrc20GenTxError {
+    fn into_withdraw_error(self, coin: String, decimals: u8) -> WithdrawError {
+        match self {
+            Qrc20GenTxError::ErrorGeneratingUtxoTx(gen_err) => {
+                WithdrawError::from_generate_tx_error(gen_err, coin, decimals)
+            },
+            Qrc20GenTxError::ErrorSigningTx(sign_err) => WithdrawError::InternalError(sign_err.to_string()),
+            Qrc20GenTxError::PrivKeyNotAllowed(priv_err) => WithdrawError::InternalError(priv_err.to_string()),
+            Qrc20GenTxError::UnexpectedDerivationMethod(addr_err) => WithdrawError::InternalError(addr_err.to_string()),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Qrc20ActivationParams {
+    swap_contract_address: H160,
+    fallback_swap_contract: Option<H160>,
+    #[serde(flatten)]
+    utxo_params: UtxoActivationParams,
+}
+
+#[derive(Debug, Display)]
+pub enum Qrc20FromLegacyReqErr {
+    InvalidSwapContractAddr(json::Error),
+    InvalidFallbackSwapContract(json::Error),
+    InvalidUtxoParams(UtxoFromLegacyReqErr),
+}
+
+impl From<UtxoFromLegacyReqErr> for Qrc20FromLegacyReqErr {
+    fn from(err: UtxoFromLegacyReqErr) -> Self { Qrc20FromLegacyReqErr::InvalidUtxoParams(err) }
+}
+
+impl Qrc20ActivationParams {
+    pub fn from_legacy_req(req: &Json) -> Result<Self, MmError<Qrc20FromLegacyReqErr>> {
+        let swap_contract_address = json::from_value(req["swap_contract_address"].clone())
+            .map_to_mm(Qrc20FromLegacyReqErr::InvalidSwapContractAddr)?;
+        let fallback_swap_contract = json::from_value(req["fallback_swap_contract"].clone())
+            .map_to_mm(Qrc20FromLegacyReqErr::InvalidFallbackSwapContract)?;
+        let utxo_params = UtxoActivationParams::from_legacy_req(req)?;
+        Ok(Qrc20ActivationParams {
+            swap_contract_address,
+            fallback_swap_contract,
+            utxo_params,
+        })
+    }
+}
+
 struct Qrc20CoinBuilder<'a> {
     ctx: &'a MmArc,
     ticker: &'a str,
     conf: &'a Json,
-    req: &'a Json,
+    activation_params: &'a Qrc20ActivationParams,
     priv_key: &'a [u8],
     platform: String,
-    contract_address: H160,
+    token_contract_address: H160,
 }
 
 impl<'a> Qrc20CoinBuilder<'a> {
@@ -80,85 +161,49 @@ impl<'a> Qrc20CoinBuilder<'a> {
         ctx: &'a MmArc,
         ticker: &'a str,
         conf: &'a Json,
-        req: &'a Json,
+        activation_params: &'a Qrc20ActivationParams,
         priv_key: &'a [u8],
         platform: String,
-        contract_address: H160,
+        token_contract_address: H160,
     ) -> Qrc20CoinBuilder<'a> {
         Qrc20CoinBuilder {
             ctx,
             ticker,
             conf,
-            req,
+            activation_params,
             priv_key,
             platform,
-            contract_address,
-        }
-    }
-}
-
-impl Qrc20CoinBuilder<'_> {
-    fn swap_contract_address(&self) -> Result<H160, String> {
-        match self.req()["swap_contract_address"].as_str() {
-            Some(address) => qtum::contract_addr_from_str(address).map_err(|e| ERRL!("{}", e)),
-            None => return ERR!("\"swap_contract_address\" field is expected"),
-        }
-    }
-
-    fn fallback_swap_contract(&self) -> Result<Option<H160>, String> {
-        match self.req()["fallback_swap_contract"].as_str() {
-            Some(address) => qtum::contract_addr_from_str(address)
-                .map_err(|e| ERRL!("{}", e))
-                .map(Some),
-            None => Ok(None),
+            token_contract_address,
         }
     }
 }
 
 #[async_trait]
-impl UtxoCoinBuilder for Qrc20CoinBuilder<'_> {
-    type ResultCoin = Qrc20Coin;
-
-    async fn build(self) -> Result<Self::ResultCoin, String> {
-        let swap_contract_address = try_s!(self.swap_contract_address());
-        let fallback_swap_contract = try_s!(self.fallback_swap_contract());
-        let utxo = try_s!(self.build_utxo_fields().await);
-        let inner = Qrc20CoinFields {
-            utxo,
-            platform: self.platform,
-            contract_address: self.contract_address,
-            swap_contract_address,
-            fallback_swap_contract,
-        };
-        Ok(Qrc20Coin(Arc::new(inner)))
-    }
-
+impl<'a> UtxoCoinBuilderCommonOps for Qrc20CoinBuilder<'a> {
     fn ctx(&self) -> &MmArc { self.ctx }
 
     fn conf(&self) -> &Json { self.conf }
 
-    fn req(&self) -> &Json { self.req }
+    fn activation_params(&self) -> &UtxoActivationParams { &self.activation_params.utxo_params }
 
     fn ticker(&self) -> &str { self.ticker }
 
-    fn priv_key(&self) -> &[u8] { self.priv_key }
-
-    async fn decimals(&self, rpc_client: &UtxoRpcClientEnum) -> Result<u8, String> {
+    async fn decimals(&self, rpc_client: &UtxoRpcClientEnum) -> UtxoCoinBuildResult<u8> {
         if let Some(d) = self.conf()["decimals"].as_u64() {
             return Ok(d as u8);
         }
 
         rpc_client
-            .token_decimals(&self.contract_address)
+            .token_decimals(&self.token_contract_address)
             .compat()
             .await
-            .map_err(|e| ERRL!("{}", e))
+            .map_to_mm(UtxoCoinBuildError::ErrorDetectingDecimals)
     }
 
     fn dust_amount(&self) -> u64 { QRC20_DUST }
 
     #[cfg(not(target_arch = "wasm32"))]
-    fn confpath(&self) -> Result<PathBuf, String> {
+    fn confpath(&self) -> UtxoCoinBuildResult<PathBuf> {
         use crate::utxo::coin_daemon_data_dir;
 
         // Documented at https://github.com/jl777/coins#bitcoin-protocol-specific-json
@@ -184,25 +229,72 @@ impl UtxoCoinBuilder for Qrc20CoinBuilder<'_> {
         };
 
         if rel_to_home {
-            let home = try_s!(dirs::home_dir().ok_or("Can not detect the user home directory"));
+            let home = dirs::home_dir().or_mm_err(|| UtxoCoinBuildError::CantDetectUserHome)?;
             Ok(home.join(confpath))
         } else {
             Ok(confpath.into())
         }
     }
+
+    fn check_utxo_maturity(&self) -> bool {
+        if let Some(false) = self.activation_params.utxo_params.check_utxo_maturity {
+            warn!("'check_utxo_maturity' is ignored because QRC20 gas refund is returned as a coinbase transaction");
+        }
+        true
+    }
+
+    /// Override [`UtxoCoinBuilderCommonOps::tx_cache`] to initialize TX cache with the platform ticker.
+    /// Please note the method is overridden for Native mode only.
+    #[inline]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn tx_cache(&self) -> UtxoVerboseCacheShared {
+        crate::utxo::tx_cache::fs_tx_cache::FsVerboseCache::new(self.platform.clone(), self.tx_cache_path())
+            .into_shared()
+    }
 }
 
-pub async fn qrc20_coin_from_conf_and_request(
+#[async_trait]
+impl<'a> UtxoFieldsWithIguanaPrivKeyBuilder for Qrc20CoinBuilder<'a> {}
+
+#[async_trait]
+impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for Qrc20CoinBuilder<'a> {
+    type ResultCoin = Qrc20Coin;
+    type Error = UtxoCoinBuildError;
+
+    fn priv_key(&self) -> &[u8] { self.priv_key }
+
+    async fn build(self) -> MmResult<Self::ResultCoin, Self::Error> {
+        let utxo = self.build_utxo_fields_with_iguana_priv_key(self.priv_key()).await?;
+        let inner = Qrc20CoinFields {
+            utxo,
+            platform: self.platform,
+            contract_address: self.token_contract_address,
+            swap_contract_address: self.activation_params.swap_contract_address,
+            fallback_swap_contract: self.activation_params.fallback_swap_contract,
+        };
+        Ok(Qrc20Coin(Arc::new(inner)))
+    }
+}
+
+pub async fn qrc20_coin_from_conf_and_params(
     ctx: &MmArc,
     ticker: &str,
     platform: &str,
     conf: &Json,
-    req: &Json,
+    params: &Qrc20ActivationParams,
     priv_key: &[u8],
     contract_address: H160,
 ) -> Result<Qrc20Coin, String> {
-    let builder = Qrc20CoinBuilder::new(ctx, ticker, conf, req, priv_key, platform.to_owned(), contract_address);
-    builder.build().await
+    let builder = Qrc20CoinBuilder::new(
+        ctx,
+        ticker,
+        conf,
+        params,
+        priv_key,
+        platform.to_owned(),
+        contract_address,
+    );
+    Ok(try_s!(builder.build().await))
 }
 
 #[derive(Debug)]
@@ -308,10 +400,10 @@ impl MutContractCallType {
     fn short_signature(&self) -> [u8; 4] { self.as_function().short_signature() }
 }
 
-struct GenerateQrc20TxResult {
-    signed: UtxoTx,
-    miner_fee: u64,
-    gas_fee: u64,
+pub struct GenerateQrc20TxResult {
+    pub signed: UtxoTx,
+    pub miner_fee: u64,
+    pub gas_fee: u64,
 }
 
 #[derive(Debug, Display)]
@@ -326,6 +418,10 @@ impl From<ethabi::Error> for Qrc20AbiError {
     fn from(e: ethabi::Error) -> Qrc20AbiError { Qrc20AbiError::AbiError(e.to_string()) }
 }
 
+impl From<Qrc20AbiError> for GenerateTxError {
+    fn from(e: Qrc20AbiError) -> Self { GenerateTxError::Internal(e.to_string()) }
+}
+
 impl From<Qrc20AbiError> for TradePreimageError {
     fn from(e: Qrc20AbiError) -> Self {
         // `Qrc20ABIError` is always an internal error
@@ -358,19 +454,19 @@ impl Qrc20Coin {
 
     /// Generate and send a transaction with the specified UTXO outputs.
     /// Note this function locks the `UTXO_LOCK`.
-    pub async fn send_contract_calls(&self, outputs: Vec<ContractCallOutput>) -> Result<TransactionEnum, String> {
+    pub async fn send_contract_calls(
+        &self,
+        outputs: Vec<ContractCallOutput>,
+    ) -> Result<TransactionEnum, TransactionErr> {
         // TODO: we need to somehow refactor it using RecentlySpentOutpoints cache
         // Move over all QRC20 tokens should share the same cache with each other and base QTUM coin
         let _utxo_lock = UTXO_LOCK.lock().await;
 
-        let platform = self.platform.clone();
-        let decimals = self.utxo.decimals;
         let GenerateQrc20TxResult { signed, .. } = self
             .generate_qrc20_transaction(outputs)
             .await
-            .mm_err(|e| WithdrawError::from_generate_tx_error(e, platform, decimals))
-            .map_err(|e| ERRL!("{}", e))?;
-        let _tx = try_s!(self.utxo.rpc_client.send_transaction(&signed).compat().await);
+            .map_err(|e| TransactionErr::Plain(ERRL!("{}", e)))?;
+        try_tx_s!(self.utxo.rpc_client.send_transaction(&signed).compat().await, signed);
         Ok(signed.into())
     }
 
@@ -379,8 +475,9 @@ impl Qrc20Coin {
     async fn generate_qrc20_transaction(
         &self,
         contract_outputs: Vec<ContractCallOutput>,
-    ) -> Result<GenerateQrc20TxResult, MmError<GenerateTxError>> {
-        let (unspents, _) = self.ordered_mature_unspents(&self.utxo.my_address).await?;
+    ) -> Result<GenerateQrc20TxResult, MmError<Qrc20GenTxError>> {
+        let my_address = self.utxo.derivation_method.iguana_or_err()?;
+        let (unspents, _) = self.get_unspent_ordered_list(my_address).await?;
 
         let mut gas_fee = 0;
         let mut outputs = Vec::with_capacity(contract_outputs.len());
@@ -388,21 +485,25 @@ impl Qrc20Coin {
             gas_fee += output.gas_limit * output.gas_price;
             outputs.push(TransactionOutput::from(output));
         }
-        let fee_policy = FeePolicy::SendExact;
-        let tx_fee = None;
 
-        let (unsigned, data) = self
-            .generate_transaction(unspents, outputs, fee_policy, tx_fee, Some(gas_fee))
+        let (unsigned, data) = UtxoTxBuilder::new(self)
+            .add_available_inputs(unspents)
+            .add_outputs(outputs)
+            .with_gas_fee(gas_fee)
+            .build()
             .await?;
-        let prev_script = ScriptBuilder::build_p2pkh(&self.utxo.my_address.hash);
+
+        let my_address = self.utxo.derivation_method.iguana_or_err()?;
+        let key_pair = self.utxo.priv_key_policy.key_pair_or_err()?;
+
+        let prev_script = ScriptBuilder::build_p2pkh(&my_address.hash);
         let signed = sign_tx(
             unsigned,
-            &self.utxo.key_pair,
+            key_pair,
             prev_script,
             self.utxo.conf.signature_version,
             self.utxo.conf.fork_id,
-        )
-        .map_to_mm(GenerateTxError::Internal)?;
+        )?;
 
         let miner_fee = data.fee_amount + data.unused_change.unwrap_or_default();
         Ok(GenerateQrc20TxResult {
@@ -454,13 +555,62 @@ impl Qrc20Coin {
     }
 }
 
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
 #[async_trait]
 #[cfg_attr(test, mockable)]
-impl UtxoCommonOps for Qrc20Coin {
+impl UtxoTxBroadcastOps for Qrc20Coin {
+    async fn broadcast_tx(&self, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>> {
+        utxo_common::broadcast_tx(self, tx).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoTxGenerationOps for Qrc20Coin {
     /// Get only QTUM transaction fee.
-    async fn get_tx_fee(&self) -> Result<ActualTxFee, JsonRpcError> { utxo_common::get_tx_fee(&self.utxo).await }
+    async fn get_tx_fee(&self) -> UtxoRpcResult<ActualTxFee> { utxo_common::get_tx_fee(&self.utxo).await }
+
+    async fn calc_interest_if_required(
+        &self,
+        unsigned: TransactionInputSigner,
+        data: AdditionalTxData,
+        my_script_pub: ScriptBytes,
+    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
+        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl GetUtxoListOps for Qrc20Coin {
+    async fn get_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_unspent_ordered_list(self, address).await
+    }
 
-    async fn get_htlc_spend_fee(&self) -> UtxoRpcResult<u64> { utxo_common::get_htlc_spend_fee(self).await }
+    async fn get_all_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_all_unspent_ordered_list(self, address).await
+    }
+
+    async fn get_mature_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(MatureUnspentList, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_mature_unspent_ordered_list(self, address).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoCommonOps for Qrc20Coin {
+    async fn get_htlc_spend_fee(&self, tx_size: u64) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size).await
+    }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<UtxoAddress>, String> {
         utxo_common::addresses_from_script(self, script)
@@ -468,10 +618,12 @@ impl UtxoCommonOps for Qrc20Coin {
 
     fn denominate_satoshis(&self, satoshi: i64) -> f64 { utxo_common::denominate_satoshis(&self.utxo, satoshi) }
 
-    fn my_public_key(&self) -> &Public { self.utxo.key_pair.public() }
+    fn my_public_key(&self) -> Result<&Public, MmError<UnexpectedDerivationMethod>> {
+        utxo_common::my_public_key(self.as_ref())
+    }
 
     fn address_from_str(&self, address: &str) -> Result<UtxoAddress, String> {
-        utxo_common::checked_address_from_str(&self.utxo, address)
+        utxo_common::checked_address_from_str(self, address)
     }
 
     async fn get_current_mtp(&self) -> UtxoRpcResult<u32> {
@@ -480,27 +632,6 @@ impl UtxoCommonOps for Qrc20Coin {
 
     fn is_unspent_mature(&self, output: &RpcTransaction) -> bool { self.is_qtum_unspent_mature(output) }
 
-    /// Generate UTXO transaction with specified unspent inputs and specified outputs.
-    async fn generate_transaction(
-        &self,
-        utxos: Vec<UnspentInfo>,
-        outputs: Vec<TransactionOutput>,
-        fee_policy: FeePolicy,
-        fee: Option<ActualTxFee>,
-        gas_fee: Option<u64>,
-    ) -> GenerateTxResult {
-        utxo_common::generate_transaction(self, utxos, outputs, fee_policy, fee, gas_fee).await
-    }
-
-    async fn calc_interest_if_required(
-        &self,
-        unsigned: TransactionInputSigner,
-        data: AdditionalTxData,
-        my_script_pub: ScriptBytes,
-    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
-        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
-    }
-
     async fn calc_interest_of_tx(
         &self,
         _tx: &UtxoTx,
@@ -519,54 +650,19 @@ impl UtxoCommonOps for Qrc20Coin {
         utxo_common::get_mut_verbose_transaction_from_map_or_rpc(self, tx_hash, utxo_tx_map).await
     }
 
-    async fn p2sh_spending_tx(
-        &self,
-        prev_transaction: UtxoTx,
-        redeem_script: ScriptBytes,
-        outputs: Vec<TransactionOutput>,
-        script_data: Script,
-        sequence: u32,
-        lock_time: u32,
-    ) -> Result<UtxoTx, String> {
-        utxo_common::p2sh_spending_tx(
-            self,
-            prev_transaction,
-            redeem_script,
-            outputs,
-            script_data,
-            sequence,
-            lock_time,
-        )
-        .await
+    async fn p2sh_spending_tx(&self, input: utxo_common::P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String> {
+        utxo_common::p2sh_spending_tx(self, input).await
     }
 
-    async fn ordered_mature_unspents<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::ordered_mature_unspents(self, address).await
-    }
-
-    fn get_verbose_transaction_from_cache_or_rpc(
+    fn get_verbose_transactions_from_cache_or_rpc(
         &self,
-        txid: H256Json,
-    ) -> Box<dyn Future<Item = VerboseTransactionFrom, Error = String> + Send> {
+        tx_ids: HashSet<H256Json>,
+    ) -> UtxoRpcFut<HashMap<H256Json, VerboseTransactionFrom>> {
         let selfi = self.clone();
-        let fut = async move { utxo_common::get_verbose_transaction_from_cache_or_rpc(&selfi.utxo, txid).await };
+        let fut = async move { utxo_common::get_verbose_transactions_from_cache_or_rpc(&selfi.utxo, tx_ids).await };
         Box::new(fut.boxed().compat())
     }
 
-    async fn cache_transaction_if_possible(&self, tx: &RpcTransaction) -> Result<(), String> {
-        utxo_common::cache_transaction_if_possible(&self.utxo, tx).await
-    }
-
-    async fn list_unspent_ordered<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::ordered_mature_unspents(self, address).await
-    }
-
     async fn preimage_trade_fee_required_to_send_outputs(
         &self,
         outputs: Vec<TransactionOutput>,
@@ -574,7 +670,15 @@ impl UtxoCommonOps for Qrc20Coin {
         gas_fee: Option<u64>,
         stage: &FeeApproxStage,
     ) -> TradePreimageResult<BigDecimal> {
-        utxo_common::preimage_trade_fee_required_to_send_outputs(self, outputs, fee_policy, gas_fee, stage).await
+        utxo_common::preimage_trade_fee_required_to_send_outputs(
+            self,
+            self.platform_ticker(),
+            outputs,
+            fee_policy,
+            gas_fee,
+            stage,
+        )
+        .await
     }
 
     fn increase_dynamic_fee_by_stage(&self, dynamic_fee: u64, stage: &FeeApproxStage) -> u64 {
@@ -585,17 +689,32 @@ impl UtxoCommonOps for Qrc20Coin {
         utxo_common::p2sh_tx_locktime(self, &self.utxo.conf.ticker, htlc_locktime).await
     }
 
+    fn addr_format(&self) -> &UtxoAddressFormat { utxo_common::addr_format(self) }
+
     fn addr_format_for_standard_scripts(&self) -> UtxoAddressFormat {
         utxo_common::addr_format_for_standard_scripts(self)
     }
+
+    fn address_from_pubkey(&self, pubkey: &Public) -> Address {
+        let conf = &self.utxo.conf;
+        utxo_common::address_from_pubkey(
+            pubkey,
+            conf.pub_addr_prefix,
+            conf.pub_t_addr_prefix,
+            conf.checksum_type,
+            conf.bech32_hrp.clone(),
+            self.addr_format().clone(),
+        )
+    }
 }
 
+#[async_trait]
 impl SwapOps for Qrc20Coin {
-    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal) -> TransactionFut {
-        let to_address = try_fus!(self.contract_address_from_raw_pubkey(fee_addr));
-        let amount = try_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
+        let to_address = try_tx_fus!(self.contract_address_from_raw_pubkey(fee_addr));
+        let amount = try_tx_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
         let transfer_output =
-            try_fus!(self.transfer_output(to_address, amount, QRC20_GAS_LIMIT_DEFAULT, QRC20_GAS_PRICE_DEFAULT));
+            try_tx_fus!(self.transfer_output(to_address, amount, QRC20_GAS_LIMIT_DEFAULT, QRC20_GAS_PRICE_DEFAULT));
         let outputs = vec![transfer_output];
 
         let selfi = self.clone();
@@ -611,12 +730,13 @@ impl SwapOps for Qrc20Coin {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let taker_addr = try_fus!(self.contract_address_from_raw_pubkey(taker_pub));
+        let taker_addr = try_tx_fus!(self.contract_address_from_raw_pubkey(taker_pub));
         let id = qrc20_swap_id(time_lock, secret_hash);
-        let value = try_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
+        let value = try_tx_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
         let secret_hash = Vec::from(secret_hash);
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -634,12 +754,13 @@ impl SwapOps for Qrc20Coin {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let maker_addr = try_fus!(self.contract_address_from_raw_pubkey(maker_pub));
+        let maker_addr = try_tx_fus!(self.contract_address_from_raw_pubkey(maker_pub));
         let id = qrc20_swap_id(time_lock, secret_hash);
-        let value = try_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
+        let value = try_tx_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
         let secret_hash = Vec::from(secret_hash);
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -657,9 +778,10 @@ impl SwapOps for Qrc20Coin {
         _taker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let payment_tx: UtxoTx = try_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let payment_tx: UtxoTx = try_tx_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
         let secret = secret.to_vec();
 
         let selfi = self.clone();
@@ -678,10 +800,11 @@ impl SwapOps for Qrc20Coin {
         _maker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let payment_tx: UtxoTx = try_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let payment_tx: UtxoTx = try_tx_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
         let secret = secret.to_vec();
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -699,9 +822,10 @@ impl SwapOps for Qrc20Coin {
         _maker_pub: &[u8],
         _secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let payment_tx: UtxoTx = try_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let payment_tx: UtxoTx = try_tx_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -719,9 +843,10 @@ impl SwapOps for Qrc20Coin {
         _taker_pub: &[u8],
         _secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let payment_tx: UtxoTx = try_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+        let payment_tx: UtxoTx = try_tx_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -739,6 +864,7 @@ impl SwapOps for Qrc20Coin {
         fee_addr: &[u8],
         amount: &BigDecimal,
         min_block_number: u64,
+        _uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let fee_tx = match fee_tx {
             TransactionEnum::UtxoTx(tx) => tx,
@@ -760,29 +886,20 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_maker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        secret_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let payment_tx: UtxoTx = try_fus!(deserialize(payment_tx).map_err(|e| ERRL!("{:?}", e)));
-        let sender = try_fus!(self.contract_address_from_raw_pubkey(maker_pub));
-        let secret_hash = secret_hash.to_vec();
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let payment_tx: UtxoTx = try_fus!(deserialize(input.payment_tx.as_slice()).map_err(|e| ERRL!("{:?}", e)));
+        let sender = try_fus!(self.contract_address_from_raw_pubkey(&input.other_pub));
+        let swap_contract_address = try_fus!(input.swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
             selfi
                 .validate_payment(
                     payment_tx,
-                    time_lock,
+                    input.time_lock,
                     sender,
-                    secret_hash,
-                    amount,
+                    input.secret_hash,
+                    input.amount,
                     swap_contract_address,
                 )
                 .await
@@ -790,29 +907,20 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_taker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        secret_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
-        let payment_tx: UtxoTx = try_fus!(deserialize(payment_tx).map_err(|e| ERRL!("{:?}", e)));
-        let sender = try_fus!(self.contract_address_from_raw_pubkey(taker_pub));
-        let secret_hash = secret_hash.to_vec();
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let swap_contract_address = try_fus!(input.swap_contract_address.try_to_address());
+        let payment_tx: UtxoTx = try_fus!(deserialize(input.payment_tx.as_slice()).map_err(|e| ERRL!("{:?}", e)));
+        let sender = try_fus!(self.contract_address_from_raw_pubkey(&input.other_pub));
 
         let selfi = self.clone();
         let fut = async move {
             selfi
                 .validate_payment(
                     payment_tx,
-                    time_lock,
+                    input.time_lock,
                     sender,
-                    secret_hash,
-                    amount,
+                    input.secret_hash,
+                    input.amount,
                     swap_contract_address,
                 )
                 .await
@@ -827,6 +935,7 @@ impl SwapOps for Qrc20Coin {
         secret_hash: &[u8],
         search_from_block: u64,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
         let swap_id = qrc20_swap_id(time_lock, secret_hash);
         let swap_contract_address = try_fus!(swap_contract_address.try_to_address());
@@ -840,36 +949,24 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        time_lock: u32,
-        _other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        let tx: UtxoTx = try_s!(deserialize(tx).map_err(|e| ERRL!("{:?}", e)));
+        let tx: UtxoTx = try_s!(deserialize(input.tx).map_err(|e| ERRL!("{:?}", e)));
 
-        let selfi = self.clone();
-        let fut = selfi.search_for_swap_tx_spend(time_lock, secret_hash.to_vec(), tx, search_from_block);
-        block_on(fut)
+        self.search_for_swap_tx_spend(input.time_lock, input.secret_hash, tx, input.search_from_block)
+            .await
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
-        time_lock: u32,
-        _other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        let tx: UtxoTx = try_s!(deserialize(tx).map_err(|e| ERRL!("{:?}", e)));
+        let tx: UtxoTx = try_s!(deserialize(input.tx).map_err(|e| ERRL!("{:?}", e)));
 
-        let selfi = self.clone();
-        let fut = selfi.search_for_swap_tx_spend(time_lock, secret_hash.to_vec(), tx, search_from_block);
-        block_on(fut)
+        self.search_for_swap_tx_spend(input.time_lock, input.secret_hash, tx, input.search_from_block)
+            .await
     }
 
     fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
@@ -901,6 +998,10 @@ impl SwapOps for Qrc20Coin {
                 .ok_or_else(|| MmError::new(NegotiateSwapContractAddrErr::NoOtherAddrAndNoFallback)),
         }
     }
+
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
+    }
 }
 
 impl MarketCoinOps for Qrc20Coin {
@@ -908,14 +1009,33 @@ impl MarketCoinOps for Qrc20Coin {
 
     fn my_address(&self) -> Result<String, String> { utxo_common::my_address(self) }
 
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        let pubkey = utxo_common::my_public_key(self.as_ref())?;
+        Ok(pubkey.to_string())
+    }
+
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
+        utxo_common::sign_message_hash(self.as_ref(), message)
+    }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        utxo_common::sign_message(self.as_ref(), message)
+    }
+
+    fn verify_message(&self, signature_base64: &str, message: &str, address: &str) -> VerificationResult<bool> {
+        utxo_common::verify_message(self, signature_base64, message, address)
+    }
+
     fn my_balance(&self) -> BalanceFut<CoinBalance> {
-        let my_address = self.my_addr_as_contract_addr();
-        let params = [Token::Address(my_address)];
-        let contract_address = self.contract_address;
         let decimals = self.utxo.decimals;
 
         let coin = self.clone();
         let fut = async move {
+            let my_address = coin
+                .my_addr_as_contract_addr()
+                .mm_err(|e| BalanceError::Internal(e.to_string()))?;
+            let params = [Token::Address(my_address)];
+            let contract_address = coin.contract_address;
             let tokens = coin
                 .utxo
                 .rpc_client
@@ -938,18 +1058,22 @@ impl MarketCoinOps for Qrc20Coin {
     }
 
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> {
-        let selfi = self.clone();
-        let fut = async move {
-            let CoinBalance { spendable, .. } = selfi.qtum_balance().await?;
-            Ok(spendable)
-        };
-        Box::new(fut.boxed().compat())
+        // use standard UTXO my_balance implementation that returns Qtum balance instead of QRC20
+        Box::new(utxo_common::my_balance(self.clone()).map(|CoinBalance { spendable, .. }| spendable))
     }
 
+    fn platform_ticker(&self) -> &str { &self.0.platform }
+
+    #[inline(always)]
     fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
         utxo_common::send_raw_tx(&self.utxo, tx)
     }
 
+    #[inline(always)]
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        utxo_common::send_raw_tx_bytes(&self.utxo, tx)
+    }
+
     fn wait_for_confirmations(
         &self,
         tx: &[u8],
@@ -975,10 +1099,15 @@ impl MarketCoinOps for Qrc20Coin {
         from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
     ) -> TransactionFut {
-        let tx: UtxoTx = try_fus!(deserialize(transaction).map_err(|e| ERRL!("{:?}", e)));
+        let tx: UtxoTx = try_tx_fus!(deserialize(transaction).map_err(|e| ERRL!("{:?}", e)));
 
         let selfi = self.clone();
-        let fut = async move { selfi.wait_for_tx_spend_impl(tx, wait_until, from_block).await };
+        let fut = async move {
+            selfi
+                .wait_for_tx_spend_impl(tx, wait_until, from_block)
+                .map_err(TransactionErr::Plain)
+                .await
+        };
         Box::new(fut.boxed().compat())
     }
 
@@ -990,7 +1119,7 @@ impl MarketCoinOps for Qrc20Coin {
         utxo_common::current_block(&self.utxo)
     }
 
-    fn display_priv_key(&self) -> String { utxo_common::display_priv_key(&self.utxo) }
+    fn display_priv_key(&self) -> Result<String, String> { utxo_common::display_priv_key(&self.utxo) }
 
     fn min_tx_amount(&self) -> BigDecimal { BigDecimal::from(0) }
 
@@ -1000,6 +1129,7 @@ impl MarketCoinOps for Qrc20Coin {
     }
 }
 
+#[async_trait]
 impl MmCoin for Qrc20Coin {
     fn is_asset_chain(&self) -> bool { utxo_common::is_asset_chain(&self.utxo) }
 
@@ -1007,6 +1137,10 @@ impl MmCoin for Qrc20Coin {
         Box::new(qrc20_withdraw(self.clone(), req).boxed().compat())
     }
 
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(utxo_common::get_raw_transaction(&self.utxo, req).boxed().compat())
+    }
+
     fn decimals(&self) -> u8 { utxo_common::decimals(&self.utxo) }
 
     fn convert_to_address(&self, from: &str, to_address_format: Json) -> Result<String, String> {
@@ -1038,61 +1172,54 @@ impl MmCoin for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    fn get_sender_trade_fee(&self, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
-        let selfi = self.clone();
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
         let decimals = self.utxo.decimals;
-        let fut = async move {
-            // pass the dummy params
-            let timelock = (now_ms() / 1000) as u32;
-            let secret_hash = vec![0; 20];
-            let swap_id = qrc20_swap_id(timelock, &secret_hash);
-            let receiver_addr = H160::default();
-            // we can avoid the requesting balance, because it doesn't affect the total fee
-            let my_balance = U256::max_value();
-            let value = match value {
-                TradePreimageValue::Exact(value) | TradePreimageValue::UpperBound(value) => {
-                    wei_from_big_decimal(&value, decimals)?
-                },
-            };
-
-            let erc20_payment_fee = {
-                let erc20_payment_outputs = selfi
-                    .generate_swap_payment_outputs(
-                        my_balance,
-                        swap_id.clone(),
-                        value,
-                        timelock,
-                        secret_hash.clone(),
-                        receiver_addr,
-                        selfi.swap_contract_address,
-                    )
-                    .await?;
-                selfi
-                    .preimage_trade_fee_required_to_send_outputs(erc20_payment_outputs, &stage)
-                    .await?
-            };
+        // pass the dummy params
+        let timelock = (now_ms() / 1000) as u32;
+        let secret_hash = vec![0; 20];
+        let swap_id = qrc20_swap_id(timelock, &secret_hash);
+        let receiver_addr = H160::default();
+        // we can avoid the requesting balance, because it doesn't affect the total fee
+        let my_balance = U256::max_value();
+        let value = match value {
+            TradePreimageValue::Exact(value) | TradePreimageValue::UpperBound(value) => {
+                wei_from_big_decimal(&value, decimals)?
+            },
+        };
 
-            let sender_refund_fee = {
-                let sender_refund_output = selfi.sender_refund_output(
-                    &selfi.swap_contract_address,
-                    swap_id,
+        let erc20_payment_fee = {
+            let erc20_payment_outputs = self
+                .generate_swap_payment_outputs(
+                    my_balance,
+                    swap_id.clone(),
                     value,
-                    secret_hash,
+                    timelock,
+                    secret_hash.clone(),
                     receiver_addr,
-                )?;
-                selfi
-                    .preimage_trade_fee_required_to_send_outputs(vec![sender_refund_output], &stage)
-                    .await?
-            };
+                    self.swap_contract_address,
+                )
+                .await?;
+            self.preimage_trade_fee_required_to_send_outputs(erc20_payment_outputs, &stage)
+                .await?
+        };
 
-            let total_fee = erc20_payment_fee + sender_refund_fee;
-            Ok(TradeFee {
-                coin: selfi.platform.clone(),
-                amount: total_fee.into(),
-                paid_from_trading_vol: false,
-            })
+        let sender_refund_fee = {
+            let sender_refund_output =
+                self.sender_refund_output(&self.swap_contract_address, swap_id, value, secret_hash, receiver_addr)?;
+            self.preimage_trade_fee_required_to_send_outputs(vec![sender_refund_output], &stage)
+                .await?
         };
-        Box::new(fut.boxed().compat())
+
+        let total_fee = erc20_payment_fee + sender_refund_fee;
+        Ok(TradeFee {
+            coin: self.platform.clone(),
+            amount: total_fee.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
     fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
@@ -1105,7 +1232,7 @@ impl MmCoin for Qrc20Coin {
             let sender_addr = H160::default();
             // get the max available value that we can pass into the contract call params
             // see `generate_contract_call_script_pubkey`
-            let value = u64::max_value().into();
+            let value = u64::MAX.into();
             let output =
                 selfi.receiver_spend_output(&selfi.swap_contract_address, swap_id, value, secret, sender_addr)?;
 
@@ -1121,30 +1248,27 @@ impl MmCoin for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    fn get_fee_to_send_taker_fee(
+    async fn get_fee_to_send_taker_fee(
         &self,
         dex_fee_amount: BigDecimal,
         stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee> {
-        let selfi = self.clone();
-        let fut = async move {
-            let amount = wei_from_big_decimal(&dex_fee_amount, selfi.utxo.decimals)?;
+    ) -> TradePreimageResult<TradeFee> {
+        let amount = wei_from_big_decimal(&dex_fee_amount, self.utxo.decimals)?;
 
-            // pass the dummy params
-            let to_addr = H160::default();
-            let transfer_output =
-                selfi.transfer_output(to_addr, amount, QRC20_GAS_LIMIT_DEFAULT, QRC20_GAS_PRICE_DEFAULT)?;
+        // pass the dummy params
+        let to_addr = H160::default();
+        let transfer_output =
+            self.transfer_output(to_addr, amount, QRC20_GAS_LIMIT_DEFAULT, QRC20_GAS_PRICE_DEFAULT)?;
 
-            let total_fee = selfi
-                .preimage_trade_fee_required_to_send_outputs(vec![transfer_output], &stage)
-                .await?;
-            Ok(TradeFee {
-                coin: selfi.platform.clone(),
-                amount: total_fee.into(),
-                paid_from_trading_vol: false,
-            })
-        };
-        Box::new(fut.boxed().compat())
+        let total_fee = self
+            .preimage_trade_fee_required_to_send_outputs(vec![transfer_output], &stage)
+            .await?;
+
+        Ok(TradeFee {
+            coin: self.platform.clone(),
+            amount: total_fee.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
     fn required_confirmations(&self) -> u64 { utxo_common::required_confirmations(&self.utxo) }
@@ -1165,10 +1289,10 @@ impl MmCoin for Qrc20Coin {
 
     fn mature_confirmations(&self) -> Option<u32> { Some(self.utxo.conf.mature_confirmations) }
 
-    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(&self.utxo) }
+    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(self) }
 
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
-        utxo_common::is_coin_protocol_supported(&self.utxo, info)
+        utxo_common::is_coin_protocol_supported(self, info)
     }
 }
 
@@ -1179,20 +1303,20 @@ pub fn qrc20_swap_id(time_lock: u32, secret_hash: &[u8]) -> Vec<u8> {
     sha256(&input).to_vec()
 }
 
-fn contract_addr_into_rpc_format(address: &H160) -> H160Json { H160Json::from(address.0) }
+pub fn contract_addr_into_rpc_format(address: &H160) -> H160Json { H160Json::from(address.0) }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct Qrc20FeeDetails {
     /// Coin name
-    coin: String,
+    pub coin: String,
     /// Standard UTXO miner fee based on transaction size
-    miner_fee: BigDecimal,
+    pub miner_fee: BigDecimal,
     /// Gas limit in satoshi.
-    gas_limit: u64,
+    pub gas_limit: u64,
     /// Gas price in satoshi.
-    gas_price: u64,
+    pub gas_price: u64,
     /// Total used gas.
-    total_gas_fee: BigDecimal,
+    pub total_gas_fee: BigDecimal,
 }
 
 async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult {
@@ -1201,10 +1325,8 @@ async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult
         .map_to_mm(WithdrawError::InvalidAddress)?;
     let conf = &coin.utxo.conf;
     let is_p2pkh = to_addr.prefix == conf.pub_addr_prefix && to_addr.t_addr_prefix == conf.pub_t_addr_prefix;
-    let is_p2sh =
-        to_addr.prefix == conf.p2sh_addr_prefix && to_addr.t_addr_prefix == conf.p2sh_t_addr_prefix && conf.segwit;
-    if !is_p2pkh && !is_p2sh {
-        let error = "Expected either P2PKH or P2SH".to_owned();
+    if !is_p2pkh {
+        let error = "QRC20 can be sent to P2PKH addresses only".to_owned();
         return MmError::err(WithdrawError::InvalidAddress(error));
     }
 
@@ -1241,23 +1363,21 @@ async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult
     };
 
     // [`Qrc20Coin::transfer_output`] shouldn't fail if the arguments are correct
-    let transfer_output = coin.transfer_output(
-        qtum::contract_addr_from_utxo_addr(to_addr.clone()),
-        qrc20_amount_sat,
-        gas_limit,
-        gas_price,
-    )?;
+    let contract_addr = qtum::contract_addr_from_utxo_addr(to_addr.clone())?;
+    let transfer_output = coin.transfer_output(contract_addr, qrc20_amount_sat, gas_limit, gas_price)?;
     let outputs = vec![transfer_output];
 
     let GenerateQrc20TxResult {
         signed,
         miner_fee,
         gas_fee,
-    } = coin.generate_qrc20_transaction(outputs).await.mm_err(|gen_tx_error| {
-        WithdrawError::from_generate_tx_error(gen_tx_error, coin.platform.clone(), coin.utxo.decimals)
-    })?;
+    } = coin
+        .generate_qrc20_transaction(outputs)
+        .await
+        .mm_err(|gen_tx_error| gen_tx_error.into_withdraw_error(coin.platform.clone(), coin.utxo.decimals))?;
 
-    let received_by_me = if to_addr == coin.utxo.my_address {
+    let my_address = coin.utxo.derivation_method.iguana_or_err()?;
+    let received_by_me = if to_addr == *my_address {
         qrc20_amount.clone()
     } else {
         0.into()
@@ -1265,7 +1385,7 @@ async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult
     let my_balance_change = &received_by_me - &qrc20_amount;
 
     // [`MarketCoinOps::my_address`] and [`UtxoCommonOps::display_address`] shouldn't fail
-    let my_address = coin.my_address().map_to_mm(WithdrawError::InternalError)?;
+    let my_address_string = coin.my_address().map_to_mm(WithdrawError::InternalError)?;
     let to_address = to_addr.display_address().map_to_mm(WithdrawError::InternalError)?;
 
     let fee_details = Qrc20FeeDetails {
@@ -1277,13 +1397,13 @@ async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult
         total_gas_fee: utxo_common::big_decimal_from_sat(gas_fee as i64, coin.utxo.decimals),
     };
     Ok(TransactionDetails {
-        from: vec![my_address],
+        from: vec![my_address_string],
         to: vec![to_address],
         total_amount: qrc20_amount.clone(),
         spent_by_me: qrc20_amount,
         received_by_me,
         my_balance_change,
-        tx_hash: signed.hash().reversed().to_vec().into(),
+        tx_hash: signed.hash().reversed().to_vec().to_tx_hash(),
         tx_hex: serialize(&signed).into(),
         fee_details: Some(fee_details.into()),
         block_height: 0,
@@ -1291,6 +1411,7 @@ async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult
         internal_id: vec![].into(),
         timestamp: now_ms() / 1000,
         kmd_rewards: None,
+        transaction_type: TransactionType::StandardTransfer,
     })
 }
 
diff --git a/mm2src/coins/qrc20/history.rs b/mm2src/coins/qrc20/history.rs
index 091d61ada9..967ba82ba4 100644
--- a/mm2src/coins/qrc20/history.rs
+++ b/mm2src/coins/qrc20/history.rs
@@ -1,14 +1,11 @@
 use super::*;
-use crate::tx_history_db::TxHistoryResult;
 use crate::utxo::{RequestTxHistoryResult, UtxoFeeDetails};
-use crate::CoinsContext;
-use crate::TxFeeDetails;
+use crate::{CoinsContext, TxFeeDetails, TxHistoryResult};
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use common::jsonrpc_client::JsonRpcErrorType;
 use common::mm_metrics::MetricsArc;
 use itertools::Itertools;
 use script_pubkey::{extract_contract_call_from_script, extract_gas_from_script, ExtractGasEnum};
-use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::io::Cursor;
 use utxo_common::{HISTORY_TOO_LARGE_ERROR, HISTORY_TOO_LARGE_ERR_CODE};
@@ -148,7 +145,7 @@ impl Qrc20Coin {
                     }));
                     break;
                 },
-                RequestTxHistoryResult::UnknownError(e) => {
+                RequestTxHistoryResult::CriticalError(e) => {
                     ctx.log.log(
                         "😟",
                         &[&"tx_history", &self.utxo.conf.ticker],
@@ -175,19 +172,11 @@ impl Qrc20Coin {
             }
 
             // `history_map` has been updated.
-            let mut to_write: Vec<TransactionDetails> = history_map
+            let to_write: Vec<TransactionDetails> = history_map
                 .iter()
-                .map(|(_, value)| value)
-                .flatten()
+                .flat_map(|(_, value)| value)
                 .map(|(_tx_id, tx)| tx.clone())
                 .collect();
-            to_write.sort_unstable_by(|a, b| {
-                match sort_newest_to_oldest(a.block_height, b.block_height) {
-                    // do not reverse `transfer` events in one transaction
-                    Ordering::Equal => a.internal_id.cmp(&b.internal_id),
-                    ord => ord,
-                }
-            });
             if let Err(e) = self.save_history_to_file(&ctx, to_write).compat().await {
                 ctx.log.log(
                     "",
@@ -209,7 +198,7 @@ impl Qrc20Coin {
 
         let miner_fee = {
             let total_qtum_fee = match qtum_details.fee_details {
-                Some(TxFeeDetails::Utxo(UtxoFeeDetails { ref amount })) => amount.clone(),
+                Some(TxFeeDetails::Utxo(UtxoFeeDetails { ref amount, .. })) => amount.clone(),
                 Some(ref fee) => return ERR!("Unexpected fee details {:?}", fee),
                 None => return ERR!("No Qtum fee details"),
             };
@@ -235,7 +224,8 @@ impl Qrc20Coin {
         receipt: TxReceipt,
         miner_fee: BigDecimal,
     ) -> Result<TxTransferMap, String> {
-        let tx_hash: H256Json = qtum_details.tx_hash.as_slice().into();
+        let my_address = try_s!(self.utxo.derivation_method.iguana_or_err());
+        let tx_hash: H256Json = try_s!(H256Json::from_str(&qtum_details.tx_hash));
         if qtum_tx.outputs.len() <= (receipt.output_index as usize) {
             return ERR!(
                 "Length of the transaction {:?} outputs less than output_index {}",
@@ -290,17 +280,17 @@ impl Qrc20Coin {
             };
 
             // https://github.com/qtumproject/qtum-electrum/blob/v4.0.2/electrum/wallet.py#L2102
-            if from != self.utxo.my_address && to != self.utxo.my_address {
+            if from != *my_address && to != *my_address {
                 // address mismatch
                 continue;
             }
 
-            let spent_by_me = if from == self.utxo.my_address {
+            let spent_by_me = if from == *my_address {
                 total_amount.clone()
             } else {
                 0.into()
             };
-            let received_by_me = if to == self.utxo.my_address {
+            let received_by_me = if to == *my_address {
                 total_amount.clone()
             } else {
                 0.into()
@@ -309,16 +299,16 @@ impl Qrc20Coin {
             // do not inherit the block_height from qtum_tx (usually it is None)
             let block_height = receipt.block_number;
             let my_balance_change = &received_by_me - &spent_by_me;
-            let internal_id = TxInternalId::new(tx_hash.clone(), receipt.output_index, log_index as u64);
+            let internal_id = TxInternalId::new(tx_hash, receipt.output_index, log_index as u64);
 
             let from = if is_transferred_from_contract(&script_pubkey) {
-                qtum::display_as_contract_address(from)
+                try_s!(qtum::display_as_contract_address(from))
             } else {
                 try_s!(from.display_address())
             };
 
             let to = if is_transferred_to_contract(&script_pubkey) {
-                qtum::display_as_contract_address(to)
+                try_s!(qtum::display_as_contract_address(to))
             } else {
                 try_s!(to.display_address())
             };
@@ -360,7 +350,9 @@ impl Qrc20Coin {
                                 }
                             }
                         },
-                        JsonRpcErrorType::Transport(err) | JsonRpcErrorType::Parse(_, err) => {
+                        JsonRpcErrorType::InvalidRequest(err)
+                        | JsonRpcErrorType::Transport(err)
+                        | JsonRpcErrorType::Parse(_, err) => {
                             return RequestTxHistoryResult::Retry {
                                 error: ERRL!("Error {} on blockchain_contract_event_get_history", err),
                             };
@@ -391,8 +383,7 @@ impl Qrc20Coin {
     ) -> bool {
         let need_update = history
             .iter()
-            .map(|(_, txs)| txs)
-            .flatten()
+            .flat_map(|(_, txs)| txs)
             .any(|(_, tx)| tx.should_update_timestamp() || tx.should_update_block_height());
         match last_balance {
             Some(last_balance) if last_balance == actual_balance && !need_update => {
@@ -413,13 +404,7 @@ impl Qrc20Coin {
     ) -> ProcessCachedTransferMapResult {
         async fn get_verbose_transaction(coin: &Qrc20Coin, ctx: &MmArc, tx_hash: H256Json) -> Option<RpcTransaction> {
             mm_counter!(ctx.metrics, "tx.history.request.count", 1, "coin" => coin.utxo.conf.ticker.clone(), "method" => "get_verbose_transaction");
-            match coin
-                .utxo
-                .rpc_client
-                .get_verbose_transaction(tx_hash.clone())
-                .compat()
-                .await
-            {
+            match coin.utxo.rpc_client.get_verbose_transaction(&tx_hash).compat().await {
                 Ok(d) => {
                     mm_counter!(ctx.metrics, "tx.history.response.count", 1, "coin" => coin.utxo.conf.ticker.clone(), "method" => "get_verbose_transaction");
                     Some(d)
@@ -460,7 +445,7 @@ impl Qrc20Coin {
             }
             if tx.should_update_timestamp() {
                 if qtum_verbose.is_none() {
-                    qtum_verbose = get_verbose_transaction(self, ctx, tx_hash.clone()).await;
+                    qtum_verbose = get_verbose_transaction(self, ctx, *tx_hash).await;
                 }
                 if let Some(ref qtum_verbose) = qtum_verbose {
                     tx.timestamp = qtum_verbose.time as u64;
@@ -478,6 +463,10 @@ impl Qrc20Coin {
 
     /// Returns true if the `history_map` has been updated.
     async fn process_tx_ids(&self, ctx: &MmArc, history_map: &mut HistoryMapByHash, tx_ids: TxIds) -> bool {
+        // Remove transactions in the history_map that are not in the requested transaction list anymore
+        let requested_ids: HashSet<H256Json> = tx_ids.iter().map(|x| x.0).collect();
+        history_map.retain(|hash, _| requested_ids.contains(hash));
+
         let mut transactions_left = if history_map.len() < tx_ids.len() {
             tx_ids.len() - history_map.len()
         } else {
@@ -507,7 +496,7 @@ impl Qrc20Coin {
             // `transfer` details are not initialized for the `tx_hash`
             // or there is an error in cached `tx_hash_history`
             mm_counter!(ctx.metrics, "tx.history.request.count", 1, "coin" => self.utxo.conf.ticker.clone(), "method" => "transfer_details_by_hash");
-            let tx_hash_history = match self.transfer_details_by_hash(tx_hash.clone()).await {
+            let tx_hash_history = match self.transfer_details_by_hash(tx_hash).await {
                 Ok(d) => d,
                 Err(e) => {
                     ctx.log.log(
@@ -519,7 +508,7 @@ impl Qrc20Coin {
                 },
             };
 
-            if history_map.insert(tx_hash.clone(), tx_hash_history).is_some() {
+            if history_map.insert(tx_hash, tx_hash_history).is_some() {
                 ctx.log.log(
                     "😟",
                     &[&"tx_history", &self.utxo.conf.ticker],
@@ -557,7 +546,7 @@ impl Qrc20Coin {
                     return Ok(HistoryMapByHash::default());
                 },
             };
-            let tx_hash_history = history_map.entry(id.tx_hash.clone()).or_insert_with(HashMap::default);
+            let tx_hash_history = history_map.entry(id.tx_hash).or_insert_with(HashMap::default);
             if tx_hash_history.insert(id, tx).is_some() {
                 ctx.log.log(
                     "😟",
@@ -574,7 +563,9 @@ impl Qrc20Coin {
 
 pub struct TransferHistoryBuilder {
     coin: Qrc20Coin,
-    params: TransferHistoryParams,
+    from_block: u64,
+    address: Option<H160>,
+    token_address: H160,
 }
 
 struct TransferHistoryParams {
@@ -585,39 +576,62 @@ struct TransferHistoryParams {
 
 impl TransferHistoryBuilder {
     pub fn new(coin: Qrc20Coin) -> TransferHistoryBuilder {
-        let address = qtum::contract_addr_from_utxo_addr(coin.utxo.my_address.clone());
         let token_address = coin.contract_address;
-        let params = TransferHistoryParams {
+        TransferHistoryBuilder {
+            coin,
             from_block: 0,
-            address,
+            address: None,
             token_address,
-        };
-        TransferHistoryBuilder { coin, params }
+        }
     }
 
     #[allow(clippy::wrong_self_convention)]
     pub fn from_block(mut self, from_block: u64) -> TransferHistoryBuilder {
-        self.params.from_block = from_block;
+        self.from_block = from_block;
         self
     }
 
     pub fn address(mut self, address: H160) -> TransferHistoryBuilder {
-        self.params.address = address;
+        self.address = Some(address);
         self
     }
 
     #[allow(dead_code)]
     pub fn token_address(mut self, token_address: H160) -> TransferHistoryBuilder {
-        self.params.token_address = token_address;
+        self.token_address = token_address;
         self
     }
 
     pub async fn build(self) -> Result<Vec<TxReceipt>, MmError<UtxoRpcError>> {
-        self.coin.utxo.rpc_client.build(self.params).await
+        let params = self.build_params()?;
+        self.coin.utxo.rpc_client.build(params).await
     }
 
     pub async fn build_tx_idents(self) -> Result<Vec<(H256Json, u64)>, MmError<UtxoRpcError>> {
-        self.coin.utxo.rpc_client.build_tx_idents(self.params).await
+        let params = self.build_params()?;
+        self.coin.utxo.rpc_client.build_tx_idents(params).await
+    }
+
+    fn build_params(&self) -> Result<TransferHistoryParams, MmError<UtxoRpcError>> {
+        let address = match self.address {
+            Some(addr) => addr,
+            None => {
+                let my_address = self
+                    .coin
+                    .utxo
+                    .derivation_method
+                    .iguana_or_err()
+                    .mm_err(|e| UtxoRpcError::Internal(e.to_string()))?;
+                qtum::contract_addr_from_utxo_addr(my_address.clone())
+                    .mm_err(|e| UtxoRpcError::Internal(e.to_string()))?
+            },
+        };
+
+        Ok(TransferHistoryParams {
+            from_block: self.from_block,
+            address,
+            token_address: self.token_address,
+        })
     }
 }
 
@@ -658,7 +672,7 @@ impl BuildTransferHistory for ElectrumClient {
 
         let mut receipts = Vec::new();
         for (tx_hash, _height) in tx_idents {
-            let mut tx_receipts = self.blochchain_transaction_get_receipt(&tx_hash).compat().await?;
+            let mut tx_receipts = self.blockchain_transaction_get_receipt(&tx_hash).compat().await?;
             // remove receipts of contract calls didn't emit at least one `Transfer` event
             tx_receipts.retain(|receipt| receipt.log.iter().any(is_transfer_event_log));
             receipts.extend(tx_receipts.into_iter());
@@ -714,7 +728,7 @@ impl BuildTransferHistory for NativeClient {
         while from_block <= block_count {
             let to_block = from_block + SEARCH_LOGS_STEP - 1;
             let mut receipts = self
-                .search_logs(from_block, Some(to_block), vec![token_address.clone()], topics.clone())
+                .search_logs(from_block, Some(to_block), vec![token_address], topics.clone())
                 .compat()
                 .await?;
 
@@ -788,17 +802,6 @@ fn is_transferred_to_contract(script_pubkey: &Script) -> bool {
     }
 }
 
-fn sort_newest_to_oldest(x_height: u64, y_height: u64) -> Ordering {
-    // the transactions with block_height == 0 are the most recent
-    if x_height == 0 {
-        Ordering::Less
-    } else if y_height == 0 {
-        Ordering::Greater
-    } else {
-        y_height.cmp(&x_height)
-    }
-}
-
 fn is_transfer_event_log(log: &LogEntry) -> bool {
     match log.topics.first() {
         Some(first_topic) => first_topic == QRC20_TRANSFER_TOPIC,
@@ -809,8 +812,9 @@ fn is_transfer_event_log(log: &LogEntry) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use common::for_tests::find_metrics_in_json;
+    use common::block_on;
     use common::mm_metrics::{MetricType, MetricsJson, MetricsOps};
+    use mm2_test_helpers::for_tests::find_metrics_in_json;
     use qrc20_tests::qrc20_coin_for_test;
 
     #[test]
diff --git a/mm2src/coins/qrc20/qrc20_tests.rs b/mm2src/coins/qrc20/qrc20_tests.rs
index e53bb98b6f..f5848056da 100644
--- a/mm2src/coins/qrc20/qrc20_tests.rs
+++ b/mm2src/coins/qrc20/qrc20_tests.rs
@@ -1,11 +1,15 @@
 use super::*;
+use crate::utxo::rpc_clients::UnspentInfo;
 use crate::TxFeeDetails;
-use bigdecimal::Zero;
 use chain::OutPoint;
-use common::mm_ctx::MmCtxBuilder;
-use common::DEX_FEE_ADDR_RAW_PUBKEY;
+use common::{block_on, DEX_FEE_ADDR_RAW_PUBKEY};
 use itertools::Itertools;
+use mm2_core::mm_ctx::MmCtxBuilder;
+use mm2_number::bigdecimal::Zero;
 use mocktopus::mocking::{MockResult, Mockable};
+use rpc::v1::types::ToTxHash;
+use std::convert::TryFrom;
+use std::mem::discriminant;
 
 const EXPECTED_TX_FEE: i64 = 1000;
 const CONTRACT_CALL_GAS_FEE: i64 = (QRC20_GAS_LIMIT_DEFAULT * QRC20_GAS_PRICE_DEFAULT) as i64;
@@ -19,25 +23,26 @@ pub fn qrc20_coin_for_test(priv_key: &[u8], fallback_swap: Option<&str>) -> (MmA
         "pubtype":120,
         "p2shtype":110,
         "wiftype":128,
-        "segwit":true,
         "mm2":1,
         "mature_confirmations":2000,
         "dust":72800,
     });
     let req = json!({
         "method": "electrum",
-        "servers": [{"url":"95.217.83.126:10001"}],
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
         "swap_contract_address": "0xba8b71f3544b93e2f681f996da519a98ace0107a",
         "fallback_swap_contract": fallback_swap,
     });
     let contract_address = "0xd362e096e873eb7907e205fadc6175c6fec7bc44".into();
     let ctx = MmCtxBuilder::new().into_mm_arc();
-    let coin = block_on(qrc20_coin_from_conf_and_request(
+    let params = Qrc20ActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(qrc20_coin_from_conf_and_params(
         &ctx,
         "QRC20",
         "QTUM",
         &conf,
-        &req,
+        &params,
         priv_key,
         contract_address,
     ))
@@ -50,9 +55,39 @@ fn check_tx_fee(coin: &Qrc20Coin, expected_tx_fee: ActualTxFee) {
     assert_eq!(actual_tx_fee, expected_tx_fee);
 }
 
+#[test]
+fn test_withdraw_to_p2sh_address_should_fail() {
+    let priv_key = [
+        3, 98, 177, 3, 108, 39, 234, 144, 131, 178, 103, 103, 127, 80, 230, 166, 53, 68, 147, 215, 42, 216, 144, 72,
+        172, 110, 180, 13, 123, 179, 10, 49,
+    ];
+    let (_, coin) = qrc20_coin_for_test(&priv_key, None);
+
+    let p2sh_address = Address {
+        prefix: coin.as_ref().conf.p2sh_addr_prefix,
+        hash: coin.as_ref().derivation_method.unwrap_iguana().hash.clone(),
+        t_addr_prefix: coin.as_ref().conf.p2sh_t_addr_prefix,
+        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
+        hrp: coin.as_ref().conf.bech32_hrp.clone(),
+        addr_format: UtxoAddressFormat::Standard,
+    };
+
+    let req = WithdrawRequest {
+        amount: 10.into(),
+        from: None,
+        to: p2sh_address.to_string(),
+        coin: "QRC20".into(),
+        max: false,
+        fee: None,
+    };
+    let err = coin.withdraw(req).wait().unwrap_err().into_inner();
+    let expect = WithdrawError::InvalidAddress("QRC20 can be sent to P2PKH addresses only".to_owned());
+    assert_eq!(err, expect);
+}
+
 #[test]
 fn test_withdraw_impl_fee_details() {
-    Qrc20Coin::ordered_mature_unspents.mock_safe(|coin, _| {
+    Qrc20Coin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -74,6 +109,7 @@ fn test_withdraw_impl_fee_details() {
 
     let withdraw_req = WithdrawRequest {
         amount: 10.into(),
+        from: None,
         to: "qHmJ3KA6ZAjR9wGjpFASn4gtUSeFAqdZgs".into(),
         coin: "QRC20".into(),
         max: false,
@@ -108,87 +144,54 @@ fn test_validate_maker_payment() {
     ];
     let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
 
-    assert_eq!(coin.utxo.my_address, "qUX9FGHubczidVjWPCUWuwCUJWpkAtGCgf".into());
+    assert_eq!(
+        *coin.utxo.derivation_method.unwrap_iguana(),
+        "qUX9FGHubczidVjWPCUWuwCUJWpkAtGCgf".into()
+    );
 
     // tx_hash: 016a59dd2b181b3906b0f0333d5c7561dacb332dc99ac39679a591e523f2c49a
     let payment_tx = hex::decode("010000000194448324c14fc6b78c7a52c59debe3240fc392019dbd6f1457422e3308ce1e75010000006b483045022100800a4956a30a36708536d98e8ea55a3d0983b963af6c924f60241616e2ff056d0220239e622f8ec8f1a0f5ef0fc93ff094a8e6b5aab964a62bed680b17bf6a848aac012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff020000000000000000e35403a0860101284cc49b415b2a0c692f2ec8ebab181a79e31b7baab30fef0902e57f901c47a342643eeafa6b510000000000000000000000000000000000000000000000000000000001312d00000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc44000000000000000000000000783cf0be521101942da509846ea476e683aad8320101010101010101010101010101010101010101000000000000000000000000000000000000000000000000000000000000000000000000000000005f72ec7514ba8b71f3544b93e2f681f996da519a98ace0107ac201319302000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88ac40ed725f").unwrap();
-    let time_lock = 1601367157;
     // pubkey of "cMhHM3PMpMrChygR4bLF7QsTdenhWpFrrmf2UezBG3eeFsz41rtL" passphrase
-    let maker_pub = hex::decode("03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9").unwrap();
-    let secret_hash = &[1; 20];
-    let amount = BigDecimal::from_str("0.2").unwrap();
+    let correct_maker_pub = hex::decode("03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9").unwrap();
+    let correct_amount = BigDecimal::from_str("0.2").unwrap();
+
+    let mut input = ValidatePaymentInput {
+        payment_tx,
+        time_lock: 1601367157,
+        other_pub: correct_maker_pub.clone(),
+        secret_hash: vec![1; 20],
+        amount: correct_amount.clone(),
+        swap_contract_address: coin.swap_contract_address(),
+        try_spv_proof_until: now_ms() / 1000 + 30,
+        confirmations: 1,
+        unique_swap_data: Vec::new(),
+    };
 
-    coin.validate_maker_payment(
-        &payment_tx,
-        time_lock,
-        &maker_pub,
-        secret_hash,
-        amount.clone(),
-        &coin.swap_contract_address(),
-    )
-    .wait()
-    .unwrap();
+    coin.validate_maker_payment(input.clone()).wait().unwrap();
 
-    let maker_pub_dif = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
-    let error = coin
-        .validate_maker_payment(
-            &payment_tx,
-            time_lock,
-            &maker_pub_dif,
-            secret_hash,
-            amount.clone(),
-            &coin.swap_contract_address(),
-        )
-        .wait()
-        .unwrap_err();
-    log!("error: "[error]);
+    input.other_pub = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
+    let error = coin.validate_maker_payment(input.clone()).wait().unwrap_err();
+    log!("error: {:?}", error);
     assert!(
         error.contains("Payment tx was sent from wrong address, expected 0x783cf0be521101942da509846ea476e683aad832")
     );
+    input.other_pub = correct_maker_pub;
 
-    let amount_dif = BigDecimal::from_str("0.3").unwrap();
-    let error = coin
-        .validate_maker_payment(
-            &payment_tx,
-            time_lock,
-            &maker_pub,
-            secret_hash,
-            amount_dif,
-            &coin.swap_contract_address(),
-        )
-        .wait()
-        .unwrap_err();
-    log!("error: "[error]);
+    input.amount = BigDecimal::from_str("0.3").unwrap();
+    let error = coin.validate_maker_payment(input.clone()).wait().unwrap_err();
+    log!("error: {:?}", error);
     assert!(error.contains("Unexpected 'erc20Payment' contract call bytes"));
+    input.amount = correct_amount;
 
-    let secret_hash_dif = &[2; 20];
-    let error = coin
-        .validate_maker_payment(
-            &payment_tx,
-            time_lock,
-            &maker_pub,
-            secret_hash_dif,
-            amount.clone(),
-            &coin.swap_contract_address(),
-        )
-        .wait()
-        .unwrap_err();
-    log!("error: "[error]);
+    input.secret_hash = vec![2; 20];
+    let error = coin.validate_maker_payment(input.clone()).wait().unwrap_err();
+    log!("error: {:?}", error);
     assert!(error.contains("Payment state is not PAYMENT_STATE_SENT, got 0"));
+    input.secret_hash = vec![1; 20];
 
-    let time_lock_dif = 123;
-    let error = coin
-        .validate_maker_payment(
-            &payment_tx,
-            time_lock_dif,
-            &maker_pub,
-            secret_hash,
-            amount,
-            &coin.swap_contract_address(),
-        )
-        .wait()
-        .unwrap_err();
-    log!("error: "[error]);
+    input.time_lock = 123;
+    let error = coin.validate_maker_payment(input).wait().unwrap_err();
+    log!("error: {:?}", error);
     assert!(error.contains("Payment state is not PAYMENT_STATE_SENT, got 0"));
 }
 
@@ -201,7 +204,10 @@ fn test_wait_for_confirmations_excepted() {
     ];
     let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
 
-    assert_eq!(coin.utxo.my_address, "qUX9FGHubczidVjWPCUWuwCUJWpkAtGCgf".into());
+    assert_eq!(
+        *coin.utxo.derivation_method.unwrap_iguana(),
+        "qUX9FGHubczidVjWPCUWuwCUJWpkAtGCgf".into()
+    );
 
     // tx_hash: 35e03bc529528a853ee75dde28f27eec8ed7b152b6af7ab6dfa5d55ea46f25ac
     // `approve` contract call excepted only, and `erc20Payment` completed
@@ -222,7 +228,7 @@ fn test_wait_for_confirmations_excepted() {
         .wait_for_confirmations(&payment_tx, confirmations, requires_nota, wait_until, check_every)
         .wait()
         .unwrap_err();
-    log!("error: "[error]);
+    log!("error: {:?}", error);
     assert!(error.contains("Contract call failed with an error: Revert"));
 
     // tx_hash: aa992c028c07e239dbd2ff32bf67251f026929c644b4d02a469e351cb44abab7
@@ -232,7 +238,7 @@ fn test_wait_for_confirmations_excepted() {
         .wait_for_confirmations(&payment_tx, confirmations, requires_nota, wait_until, check_every)
         .wait()
         .unwrap_err();
-    log!("error: "[error]);
+    log!("error: {:?}", error);
     assert!(error.contains("Contract call failed with an error: Revert"));
 }
 
@@ -247,17 +253,24 @@ fn test_send_taker_fee() {
 
     let amount = BigDecimal::from_str("0.01").unwrap();
     let tx = coin
-        .send_taker_fee(&DEX_FEE_ADDR_RAW_PUBKEY, amount.clone())
+        .send_taker_fee(&DEX_FEE_ADDR_RAW_PUBKEY, amount.clone(), &[])
         .wait()
         .unwrap();
     let tx_hash: H256Json = match tx {
         TransactionEnum::UtxoTx(ref tx) => tx.hash().reversed().into(),
         _ => panic!("Expected UtxoTx"),
     };
-    log!("Fee tx "[tx_hash]);
+    log!("Fee tx {:?}", tx_hash);
 
     let result = coin
-        .validate_fee(&tx, &*coin.utxo.key_pair.public(), &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0)
+        .validate_fee(
+            &tx,
+            coin.my_public_key().unwrap(),
+            &DEX_FEE_ADDR_RAW_PUBKEY,
+            &amount,
+            0,
+            &[],
+        )
         .wait();
     assert_eq!(result, Ok(()));
 }
@@ -278,53 +291,53 @@ fn test_validate_fee() {
     let amount = BigDecimal::from_str("0.01").unwrap();
 
     let result = coin
-        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0)
+        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0, &[])
         .wait();
     assert_eq!(result, Ok(()));
 
     let fee_addr_dif = hex::decode("03bc2c7ba671bae4a6fc835244c9762b41647b9827d4780a89a949b984a8ddcc05").unwrap();
     let err = coin
-        .validate_fee(&tx, &sender_pub, &fee_addr_dif, &amount, 0)
+        .validate_fee(&tx, &sender_pub, &fee_addr_dif, &amount, 0, &[])
         .wait()
         .err()
         .expect("Expected an error");
-    log!("error: "[err]);
+    log!("error: {:?}", err);
     assert!(err.contains("QRC20 Fee tx was sent to wrong address"));
 
     let err = coin
-        .validate_fee(&tx, &DEX_FEE_ADDR_RAW_PUBKEY, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0)
+        .validate_fee(&tx, &DEX_FEE_ADDR_RAW_PUBKEY, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0, &[])
         .wait()
         .err()
         .expect("Expected an error");
-    log!("error: "[err]);
+    log!("error: {:?}", err);
     assert!(err.contains("was sent from wrong address"));
 
     let err = coin
-        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 2000000)
+        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 2000000, &[])
         .wait()
         .err()
         .expect("Expected an error");
-    log!("error: "[err]);
+    log!("error: {:?}", err);
     assert!(err.contains("confirmed before min_block"));
 
     let amount_dif = BigDecimal::from_str("0.02").unwrap();
     let err = coin
-        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount_dif, 0)
+        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount_dif, 0, &[])
         .wait()
         .err()
         .expect("Expected an error");
-    log!("error: "[err]);
+    log!("error: {:?}", err);
     assert!(err.contains("QRC20 Fee tx value 1000000 is less than expected 2000000"));
 
     // QTUM tx "8a51f0ffd45f34974de50f07c5bf2f0949da4e88433f8f75191953a442cf9310"
     let tx = TransactionEnum::UtxoTx("020000000113640281c9332caeddd02a8dd0d784809e1ad87bda3c972d89d5ae41f5494b85010000006a47304402207c5c904a93310b8672f4ecdbab356b65dd869a426e92f1064a567be7ccfc61ff02203e4173b9467127f7de4682513a21efb5980e66dbed4da91dff46534b8e77c7ef012102baefe72b3591de2070c0da3853226b00f082d72daa417688b61cb18c1d543d1afeffffff020001b2c4000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acbc4dd20c2f0000001976a9144208fa7be80dcf972f767194ad365950495064a488ac76e70800".into());
     let sender_pub = hex::decode("02baefe72b3591de2070c0da3853226b00f082d72daa417688b61cb18c1d543d1a").unwrap();
     let err = coin
-        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0)
+        .validate_fee(&tx, &sender_pub, &DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0, &[])
         .wait()
         .err()
         .expect("Expected an error");
-    log!("error: "[err]);
+    log!("error: {:?}", err);
     assert!(err.contains("Expected 'transfer' contract call"));
 }
 
@@ -422,7 +435,7 @@ fn test_generate_token_transfer_script_pubkey() {
     };
 
     let to_addr: UtxoAddress = "qHmJ3KA6ZAjR9wGjpFASn4gtUSeFAqdZgs".into();
-    let to_addr = qtum::contract_addr_from_utxo_addr(to_addr);
+    let to_addr = qtum::contract_addr_from_utxo_addr(to_addr).unwrap();
     let amount: U256 = 1000000000.into();
     let actual = coin
         .transfer_output(to_addr.clone(), amount, gas_limit, gas_price)
@@ -475,11 +488,10 @@ fn test_transfer_details_by_hash() {
     };
 
     // qKVvtDqpnFGDxsDzck5jmLwdnD2jRH6aM8 is UTXO representation of 1549128bbfb33b997949b4105b6a6371c998e212 contract address
-
     let (_id, actual) = it.next().unwrap();
     let expected = TransactionDetails {
         tx_hex: tx_hex.clone(),
-        tx_hash: tx_hash_bytes.clone().into(),
+        tx_hash: tx_hash_bytes.to_tx_hash(),
         from: vec!["qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG".into()],
         to: vec!["qKVvtDqpnFGDxsDzck5jmLwdnD2jRH6aM8".into()],
         total_amount: BigDecimal::from_str("0.003").unwrap(),
@@ -496,13 +508,14 @@ fn test_transfer_details_by_hash() {
         .unwrap()
         .into(),
         kmd_rewards: None,
+        transaction_type: Default::default(),
     };
     assert_eq!(actual, expected);
 
     let (_id, actual) = it.next().unwrap();
     let expected = TransactionDetails {
         tx_hex: tx_hex.clone(),
-        tx_hash: tx_hash_bytes.clone().into(),
+        tx_hash: tx_hash_bytes.to_tx_hash(),
         from: vec!["qKVvtDqpnFGDxsDzck5jmLwdnD2jRH6aM8".into()],
         to: vec!["qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG".into()],
         total_amount: BigDecimal::from_str("0.00295").unwrap(),
@@ -519,13 +532,14 @@ fn test_transfer_details_by_hash() {
         .unwrap()
         .into(),
         kmd_rewards: None,
+        transaction_type: Default::default(),
     };
     assert_eq!(actual, expected);
 
     let (_id, actual) = it.next().unwrap();
     let expected = TransactionDetails {
         tx_hex: tx_hex.clone(),
-        tx_hash: tx_hash_bytes.clone().into(),
+        tx_hash: tx_hash_bytes.to_tx_hash(),
         from: vec!["qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG".into()],
         to: vec!["qKVvtDqpnFGDxsDzck5jmLwdnD2jRH6aM8".into()],
         total_amount: BigDecimal::from_str("0.003").unwrap(),
@@ -542,13 +556,14 @@ fn test_transfer_details_by_hash() {
         .unwrap()
         .into(),
         kmd_rewards: None,
+        transaction_type: Default::default(),
     };
     assert_eq!(actual, expected);
 
     let (_id, actual) = it.next().unwrap();
     let expected = TransactionDetails {
         tx_hex: tx_hex.clone(),
-        tx_hash: tx_hash_bytes.clone().into(),
+        tx_hash: tx_hash_bytes.to_tx_hash(),
         from: vec!["qKVvtDqpnFGDxsDzck5jmLwdnD2jRH6aM8".into()],
         to: vec!["qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG".into()],
         total_amount: BigDecimal::from_str("0.00295").unwrap(),
@@ -565,13 +580,14 @@ fn test_transfer_details_by_hash() {
         .unwrap()
         .into(),
         kmd_rewards: None,
+        transaction_type: Default::default(),
     };
     assert_eq!(actual, expected);
 
     let (_id, actual) = it.next().unwrap();
     let expected = TransactionDetails {
         tx_hex: tx_hex.clone(),
-        tx_hash: tx_hash_bytes.clone().into(),
+        tx_hash: tx_hash_bytes.to_tx_hash(),
         from: vec!["qKVvtDqpnFGDxsDzck5jmLwdnD2jRH6aM8".into()],
         to: vec!["qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG".into()],
         total_amount: BigDecimal::from_str("0.00005000").unwrap(),
@@ -588,6 +604,7 @@ fn test_transfer_details_by_hash() {
         .unwrap()
         .into(),
         kmd_rewards: None,
+        transaction_type: Default::default(),
     };
     assert_eq!(actual, expected);
     assert!(it.next().is_none());
@@ -640,10 +657,9 @@ fn test_sender_trade_preimage_zero_allowance() {
     );
     let sender_refund_fee = big_decimal_from_sat(CONTRACT_CALL_GAS_FEE + EXPECTED_TX_FEE, coin.utxo.decimals);
 
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(1.into()), FeeApproxStage::WithoutApprox)
-        .wait()
-        .expect("!get_sender_trade_fee");
+    let actual =
+        block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(1.into()), FeeApproxStage::WithoutApprox))
+            .expect("!get_sender_trade_fee");
     // one `approve` contract call should be included into the expected trade fee
     let expected = TradeFee {
         coin: "QTUM".to_owned(),
@@ -679,10 +695,11 @@ fn test_sender_trade_preimage_with_allowance() {
     );
     let sender_refund_fee = big_decimal_from_sat(CONTRACT_CALL_GAS_FEE + EXPECTED_TX_FEE, coin.utxo.decimals);
 
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(2.5.into()), FeeApproxStage::WithoutApprox)
-        .wait()
-        .expect("!get_sender_trade_fee");
+    let actual = block_on(coin.get_sender_trade_fee(
+        TradePreimageValue::Exact(BigDecimal::try_from(2.5).unwrap()),
+        FeeApproxStage::WithoutApprox,
+    ))
+    .expect("!get_sender_trade_fee");
     // the expected fee should not include any `approve` contract call
     let expected = TradeFee {
         coin: "QTUM".to_owned(),
@@ -691,10 +708,11 @@ fn test_sender_trade_preimage_with_allowance() {
     };
     assert_eq!(actual, expected);
 
-    let actual = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(3.5.into()), FeeApproxStage::WithoutApprox)
-        .wait()
-        .expect("!get_sender_trade_fee");
+    let actual = block_on(coin.get_sender_trade_fee(
+        TradePreimageValue::Exact(BigDecimal::try_from(3.5).unwrap()),
+        FeeApproxStage::WithoutApprox,
+    ))
+    .expect("!get_sender_trade_fee");
     // two `approve` contract calls should be included into the expected trade fee
     let expected = TradeFee {
         coin: "QTUM".to_owned(),
@@ -704,6 +722,63 @@ fn test_sender_trade_preimage_with_allowance() {
     assert_eq!(actual, expected);
 }
 
+#[test]
+fn test_get_sender_trade_fee_preimage_for_correct_ticker() {
+    // where balance for tQTUM is at 0 for the priv_key below (using 0 bal just to make sure we get required(TradePreimageError::NotSufficientBalance) result for get_sender_trade_fee)
+    let priv_key = [
+        48, 88, 65, 23, 20, 154, 63, 74, 243, 8, 108, 134, 154, 199, 60, 197, 51, 238, 7, 68, 199, 14, 127, 221, 89,
+        80, 37, 174, 221, 178, 233, 65,
+    ];
+    let conf = json!({
+        "coin":"QRC20",
+        "required_confirmations":0,
+        "pubtype":120,
+        "p2shtype":110,
+        "wiftype":128,
+        "mm2":1,
+        "mature_confirmations":2000,
+        "protocol": {
+        "type": "QRC20",
+        "protocol_data": {
+        "platform": "tQTUM",
+        "contract_address": "0xd362e096e873eb7907e205fadc6175c6fec7bc44"
+      }
+    }
+    });
+    let req = json!({
+        "method": "electrum",
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
+        "swap_contract_address": "0xba8b71f3544b93e2f681f996da519a98ace0107a",
+    });
+
+    let contract_address = "0xd362e096e873eb7907e205fadc6175c6fec7bc44".into();
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = Qrc20ActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(qrc20_coin_from_conf_and_params(
+        &ctx,
+        "QRC20",
+        "tQTUM",
+        &conf,
+        &params,
+        &priv_key,
+        contract_address,
+    ))
+    .unwrap();
+
+    let actual = block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(0.into()), FeeApproxStage::OrderIssue))
+        .err()
+        .unwrap()
+        .into_inner();
+    // expecting TradePreimageError::NotSufficientBalance
+    let expected = TradePreimageError::NotSufficientBalance {
+        coin: "tQTUM".to_string(),
+        available: BigDecimal::from_str("0").unwrap(),
+        required: BigDecimal::from_str("0.08").unwrap(),
+    };
+    assert_eq!(expected, actual);
+}
+
 /// `receiverSpend` should be included in the estimated trade fee.
 #[test]
 fn test_receiver_trade_preimage() {
@@ -744,15 +819,13 @@ fn test_taker_fee_tx_fee() {
     // check if the coin's tx fee is expected
     check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
     let expected_balance = CoinBalance {
-        spendable: BigDecimal::from(5),
-        unspendable: BigDecimal::from(0),
+        spendable: BigDecimal::from(5u32),
+        unspendable: BigDecimal::from(0u32),
     };
     assert_eq!(coin.my_balance().wait().expect("!my_balance"), expected_balance);
 
-    let dex_fee_amount = BigDecimal::from(5);
-    let actual = coin
-        .get_fee_to_send_taker_fee(dex_fee_amount, FeeApproxStage::WithoutApprox)
-        .wait()
+    let dex_fee_amount = BigDecimal::from(5u32);
+    let actual = block_on(coin.get_fee_to_send_taker_fee(dex_fee_amount, FeeApproxStage::WithoutApprox))
         .expect("!get_fee_to_send_taker_fee");
     // only one contract call should be included into the expected trade fee
     let expected_receiver_fee = big_decimal_from_sat(CONTRACT_CALL_GAS_FEE + EXPECTED_TX_FEE, coin.utxo.decimals);
@@ -777,24 +850,25 @@ fn test_coin_from_conf_without_decimals() {
         "pubtype":120,
         "p2shtype":110,
         "wiftype":128,
-        "segwit":true,
         "mm2":1,
         "mature_confirmations":2000,
     });
     let req = json!({
         "method": "electrum",
-        "servers": [{"url":"95.217.83.126:10001"}],
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
         "swap_contract_address": "0xba8b71f3544b93e2f681f996da519a98ace0107a",
     });
     // 0459c999c3edf05e73c83f3fbae9f0f020919f91 has 12 decimals instead of standard 8
     let contract_address = "0x0459c999c3edf05e73c83f3fbae9f0f020919f91".into();
     let ctx = MmCtxBuilder::new().into_mm_arc();
-    let coin = block_on(qrc20_coin_from_conf_and_request(
+    let params = Qrc20ActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(qrc20_coin_from_conf_and_params(
         &ctx,
         "QRC20",
         "QTUM",
         &conf,
-        &req,
+        &params,
         &priv_key,
         contract_address,
     ))
@@ -857,24 +931,28 @@ fn test_validate_maker_payment_malicious() {
 
     // Malicious tx 81540dc6abe59cf1e301a97a7e1c9b66d5f475da916faa3f0ef7ea896c0b3e5a
     let payment_tx = hex::decode("01000000010144e2b8b5e6da0666faf1db95075653ef49e2acaa8924e1ec595f6b89a6f715050000006a4730440220415adec5e24148db8e9654a6beda4b1af8aded596ab1cd8667af32187853e8f5022007a91d44ee13046194aafc07ca46ec44f770e75b41187acaa4e38e17d4eccb5d012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff030000000000000000625403a08601012844095ea7b300000000000000000000000085a4df739bbb2d247746bea611d5d365204725830000000000000000000000000000000000000000000000000000000005f5e10014d362e096e873eb7907e205fadc6175c6fec7bc44c20000000000000000e35403a0860101284cc49b415b2a0a1a8b4af2762154115ced87e2424b3cb940c0181cc3c850523702f1ec298fef0000000000000000000000000000000000000000000000000000000005f5e100000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc44000000000000000000000000783cf0be521101942da509846ea476e683aad8324b6b2e5444c2639cc0fb7bcea5afba3f3cdce239000000000000000000000000000000000000000000000000000000000000000000000000000000005fa0fffb1485a4df739bbb2d247746bea611d5d36520472583c208535c01000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acc700a15f").unwrap();
-    let time_lock = 1604386811;
     let maker_pub = hex::decode("03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9").unwrap();
     let secret = &[1; 32];
-    let secret_hash = &*dhash160(secret);
+    let secret_hash = dhash160(secret).to_vec();
     let amount = BigDecimal::from_str("1").unwrap();
+
+    let input = ValidatePaymentInput {
+        payment_tx,
+        time_lock: 1604386811,
+        secret_hash,
+        amount,
+        swap_contract_address: coin.swap_contract_address(),
+        try_spv_proof_until: now_ms() / 1000 + 30,
+        confirmations: 1,
+        other_pub: maker_pub,
+        unique_swap_data: Vec::new(),
+    };
     let error = coin
-        .validate_maker_payment(
-            &payment_tx,
-            time_lock,
-            &maker_pub,
-            secret_hash,
-            amount,
-            &coin.swap_contract_address(),
-        )
+        .validate_maker_payment(input)
         .wait()
         .err()
         .expect("'erc20Payment' was called from another swap contract, expected an error");
-    log!("error: "(error));
+    log!("error: {}", error);
     assert!(error.contains("Unexpected amount 1000 in 'Transfer' event, expected 100000000"));
 }
 
@@ -938,3 +1016,35 @@ fn test_negotiate_swap_contract_addr_has_fallback() {
     let result = coin.negotiate_swap_contract_addr(Some(slice)).unwrap();
     assert_eq!(Some(fallback_addr.to_vec().into()), result);
 }
+
+#[test]
+fn test_send_contract_calls_recoverable_tx() {
+    let priv_key = [
+        3, 98, 177, 3, 108, 39, 234, 144, 131, 178, 103, 103, 127, 80, 230, 166, 53, 68, 147, 215, 42, 216, 144, 72,
+        172, 110, 180, 13, 123, 179, 10, 49,
+    ];
+    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+
+    let tx = TransactionEnum::UtxoTx("010000000160fd74b5714172f285db2b36f0b391cd6883e7291441631c8b18f165b0a4635d020000006a47304402205d409e141111adbc4f185ae856997730de935ac30a0d2b1ccb5a6c4903db8171022024fc59bbcfdbba283556d7eeee4832167301dc8e8ad9739b7865f67b9676b226012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff020000000000000000625403a08601012844a9059cbb000000000000000000000000ca1e04745e8ca0c60d8c5881531d51bec470743f00000000000000000000000000000000000000000000000000000000000f424014d362e096e873eb7907e205fadc6175c6fec7bc44c200ada205000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acfe967d5f".into());
+
+    let fee_addr = hex::decode("03bc2c7ba671bae4a6fc835244c9762b41647b9827d4780a89a949b984a8ddcc05").unwrap();
+    let to_address = coin.contract_address_from_raw_pubkey(&fee_addr).unwrap();
+    let amount = BigDecimal::try_from(0.2).unwrap();
+    let amount = wei_from_big_decimal(&amount, coin.utxo.decimals).unwrap();
+    let mut transfer_output = coin
+        .transfer_output(to_address, amount, QRC20_GAS_LIMIT_DEFAULT, QRC20_GAS_PRICE_DEFAULT)
+        .unwrap();
+
+    // break the transfer output
+    transfer_output.value = 777;
+    transfer_output.gas_limit = 777;
+    transfer_output.gas_price = 777;
+
+    let tx_err = block_on(coin.send_contract_calls(vec![transfer_output])).unwrap_err();
+
+    // The error variant should equal to `TxRecoverable`
+    assert_eq!(
+        discriminant(&tx_err),
+        discriminant(&TransactionErr::TxRecoverable(TransactionEnum::from(tx), String::new()))
+    );
+}
diff --git a/mm2src/coins/qrc20/rpc_clients.rs b/mm2src/coins/qrc20/rpc_clients.rs
index 61a2da8c45..4feb1848a1 100644
--- a/mm2src/coins/qrc20/rpc_clients.rs
+++ b/mm2src/coins/qrc20/rpc_clients.rs
@@ -139,6 +139,7 @@ pub struct ExecutionResult {
 
 #[derive(Debug, Deserialize)]
 pub struct ContractCallResult {
+    #[allow(dead_code)]
     address: H160Json,
     #[serde(rename = "executionResult")]
     pub execution_result: ExecutionResult,
@@ -185,7 +186,7 @@ impl ViewContractCallType {
 
 /// The structure is the same as Qtum Core RPC gettransactionreceipt returned data.
 /// https://docs.qtum.site/en/Qtum-RPC-API/#gettransactionreceipt
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct TxReceipt {
     /// Hash of the block this transaction was included within.
     #[serde(rename = "blockHash")]
@@ -225,7 +226,7 @@ pub struct TxReceipt {
     pub excepted_message: Option<String>,
 }
 
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct LogEntry {
     /// Contract address.
     pub address: String,
@@ -277,7 +278,7 @@ pub trait Qrc20ElectrumOps {
     /// This can be used to get eventlogs in the transaction, the returned data is the same as Qtum Core RPC gettransactionreceipt.
     /// from the eventlogs, we can get QRC20 Token transafer informations(from, to, amount).
     /// https://github.com/qtumproject/qtum-electrumx-server/blob/master/docs/qrc20-integration.md#blochchaintransactionget_receipttxid
-    fn blochchain_transaction_get_receipt(&self, hash: &H256Json) -> RpcRes<Vec<TxReceipt>>;
+    fn blockchain_transaction_get_receipt(&self, hash: &H256Json) -> RpcRes<Vec<TxReceipt>>;
 }
 
 pub trait Qrc20NativeOps {
@@ -359,7 +360,7 @@ impl Qrc20ElectrumOps for ElectrumClient {
         )
     }
 
-    fn blochchain_transaction_get_receipt(&self, hash: &H256Json) -> RpcRes<Vec<TxReceipt>> {
+    fn blockchain_transaction_get_receipt(&self, hash: &H256Json) -> RpcRes<Vec<TxReceipt>> {
         rpc_func!(self, "blochchain.transaction.get_receipt", hash)
     }
 }
@@ -380,7 +381,7 @@ pub trait Qrc20RpcOps {
 impl Qrc20RpcOps for UtxoRpcClientEnum {
     fn get_transaction_receipts(&self, tx_hash: &H256) -> RpcRes<Vec<TxReceipt>> {
         match self {
-            UtxoRpcClientEnum::Electrum(electrum) => electrum.blochchain_transaction_get_receipt(tx_hash),
+            UtxoRpcClientEnum::Electrum(electrum) => electrum.blockchain_transaction_get_receipt(tx_hash),
             UtxoRpcClientEnum::Native(native) => native.get_transaction_receipt(tx_hash),
         }
     }
diff --git a/mm2src/coins/qrc20/script_pubkey.rs b/mm2src/coins/qrc20/script_pubkey.rs
index caf3793184..2cbb4bba9e 100644
--- a/mm2src/coins/qrc20/script_pubkey.rs
+++ b/mm2src/coins/qrc20/script_pubkey.rs
@@ -214,8 +214,8 @@ mod tests {
             (-256, vec![0, 129]),
             (2500000, vec![160, 37, 38]),
             (-2500000, vec![160, 37, 166]),
-            (i64::max_value(), vec![255, 255, 255, 255, 255, 255, 255, 127]),
-            (i64::min_value(), vec![0, 0, 0, 0, 0, 0, 0, 128, 128]),
+            (i64::MAX, vec![255, 255, 255, 255, 255, 255, 255, 127]),
+            (i64::MIN, vec![0, 0, 0, 0, 0, 0, 0, 128, 128]),
             (Opcode::OP_4 as i64, vec![84]),
             (Opcode::OP_CALL as i64, vec![194, 0]),
         ];
@@ -247,7 +247,7 @@ mod tests {
         let script: Script = "5403a02526012844a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca0014d362e096e873eb7907e205fadc6175c6fec7bc44c2".into();
 
         let to_addr: UtxoAddress = "qHmJ3KA6ZAjR9wGjpFASn4gtUSeFAqdZgs".into();
-        let to_addr = qtum::contract_addr_from_utxo_addr(to_addr);
+        let to_addr = qtum::contract_addr_from_utxo_addr(to_addr).unwrap();
         let amount: U256 = 1000000000.into();
         let function = eth::ERC20_CONTRACT.function("transfer").unwrap();
         let expected = function
diff --git a/mm2src/coins/qrc20/swap.rs b/mm2src/coins/qrc20/swap.rs
index 3f790a97dc..098ddd8ab9 100644
--- a/mm2src/coins/qrc20/swap.rs
+++ b/mm2src/coins/qrc20/swap.rs
@@ -37,16 +37,16 @@ impl Qrc20Coin {
         secret_hash: Vec<u8>,
         receiver_addr: H160,
         swap_contract_address: H160,
-    ) -> Result<TransactionEnum, String> {
-        let balance = try_s!(self.my_spendable_balance().compat().await);
-        let balance = try_s!(wei_from_big_decimal(&balance, self.utxo.decimals));
+    ) -> Result<TransactionEnum, TransactionErr> {
+        let balance = try_tx_s!(self.my_spendable_balance().compat().await);
+        let balance = try_tx_s!(wei_from_big_decimal(&balance, self.utxo.decimals));
 
         // Check the balance to avoid unnecessary burning of gas
         if balance < value {
-            return ERR!("Balance {} is less than value {}", balance, value);
+            return TX_PLAIN_ERR!("Balance {} is less than value {}", balance, value);
         }
 
-        let outputs = try_s!(
+        let outputs = try_tx_s!(
             self.generate_swap_payment_outputs(
                 balance,
                 id,
@@ -67,17 +67,18 @@ impl Qrc20Coin {
         payment_tx: UtxoTx,
         swap_contract_address: H160,
         secret: Vec<u8>,
-    ) -> Result<TransactionEnum, String> {
+    ) -> Result<TransactionEnum, TransactionErr> {
         let Erc20PaymentDetails {
             swap_id, value, sender, ..
-        } = try_s!(self.erc20_payment_details_from_tx(&payment_tx).await);
+        } = try_tx_s!(self.erc20_payment_details_from_tx(&payment_tx).await);
 
-        let status = try_s!(self.payment_status(&swap_contract_address, swap_id.clone()).await);
+        let status = try_tx_s!(self.payment_status(&swap_contract_address, swap_id.clone()).await);
         if status != eth::PAYMENT_STATE_SENT.into() {
-            return ERR!("Payment state is not PAYMENT_STATE_SENT, got {}", status);
+            return TX_PLAIN_ERR!("Payment state is not PAYMENT_STATE_SENT, got {}", status);
         }
 
-        let spend_output = try_s!(self.receiver_spend_output(&swap_contract_address, swap_id, value, secret, sender));
+        let spend_output =
+            try_tx_s!(self.receiver_spend_output(&swap_contract_address, swap_id, value, secret, sender));
         self.send_contract_calls(vec![spend_output]).await
     }
 
@@ -85,22 +86,22 @@ impl Qrc20Coin {
         &self,
         swap_contract_address: H160,
         payment_tx: UtxoTx,
-    ) -> Result<TransactionEnum, String> {
+    ) -> Result<TransactionEnum, TransactionErr> {
         let Erc20PaymentDetails {
             swap_id,
             value,
             receiver,
             secret_hash,
             ..
-        } = try_s!(self.erc20_payment_details_from_tx(&payment_tx).await);
+        } = try_tx_s!(self.erc20_payment_details_from_tx(&payment_tx).await);
 
-        let status = try_s!(self.payment_status(&swap_contract_address, swap_id.clone()).await);
+        let status = try_tx_s!(self.payment_status(&swap_contract_address, swap_id.clone()).await);
         if status != eth::PAYMENT_STATE_SENT.into() {
-            return ERR!("Payment state is not PAYMENT_STATE_SENT, got {}", status);
+            return TX_PLAIN_ERR!("Payment state is not PAYMENT_STATE_SENT, got {}", status);
         }
 
         let refund_output =
-            try_s!(self.sender_refund_output(&swap_contract_address, swap_id, value, secret_hash, receiver));
+            try_tx_s!(self.sender_refund_output(&swap_contract_address, swap_id, value, secret_hash, receiver));
         self.send_contract_calls(vec![refund_output]).await
     }
 
@@ -124,7 +125,8 @@ impl Qrc20Coin {
 
         let expected_call_bytes = {
             let expected_value = try_s!(wei_from_big_decimal(&amount, self.utxo.decimals));
-            let expected_receiver = qtum::contract_addr_from_utxo_addr(self.utxo.my_address.clone());
+            let my_address = try_s!(self.utxo.derivation_method.iguana_or_err()).clone();
+            let expected_receiver = try_s!(qtum::contract_addr_from_utxo_addr(my_address));
             try_s!(self.erc20_payment_call_bytes(
                 expected_swap_id,
                 expected_value,
@@ -163,7 +165,13 @@ impl Qrc20Coin {
         expected_value: U256,
         min_block_number: u64,
     ) -> Result<(), String> {
-        let verbose_tx = try_s!(self.utxo.rpc_client.get_verbose_transaction(fee_tx_hash).compat().await);
+        let verbose_tx = try_s!(
+            self.utxo
+                .rpc_client
+                .get_verbose_transaction(&fee_tx_hash)
+                .compat()
+                .await
+        );
         let conf_before_block = utxo_common::is_tx_confirmed_before_block(self, &verbose_tx, min_block_number);
         if try_s!(conf_before_block.await) {
             return ERR!(
@@ -213,18 +221,18 @@ impl Qrc20Coin {
     pub async fn search_for_swap_tx_spend(
         &self,
         time_lock: u32,
-        secret_hash: Vec<u8>,
+        secret_hash: &[u8],
         tx: UtxoTx,
         search_from_block: u64,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
         let tx_hash = tx.hash().reversed().into();
-        let verbose_tx = try_s!(self.utxo.rpc_client.get_verbose_transaction(tx_hash).compat().await);
+        let verbose_tx = try_s!(self.utxo.rpc_client.get_verbose_transaction(&tx_hash).compat().await);
         if verbose_tx.confirmations < 1 {
             return ERR!("'erc20Payment' was not confirmed yet. Please wait for at least one confirmation");
         }
 
         let Erc20PaymentDetails { swap_id, receiver, .. } = try_s!(self.erc20_payment_details_from_tx(&tx).await);
-        let expected_swap_id = qrc20_swap_id(time_lock, &secret_hash);
+        let expected_swap_id = qrc20_swap_id(time_lock, secret_hash);
         if expected_swap_id != swap_id {
             return ERR!("Unexpected swap_id {}", hex::encode(swap_id));
         }
@@ -233,13 +241,14 @@ impl Qrc20Coin {
         let spend_txs = try_s!(self.receiver_spend_transactions(receiver, search_from_block).await);
         let found = spend_txs
             .into_iter()
-            .find(|tx| find_receiver_spend_with_swap_id_and_secret_hash(tx, &expected_swap_id, &secret_hash).is_some());
+            .find(|tx| find_receiver_spend_with_swap_id_and_secret_hash(tx, &expected_swap_id, secret_hash).is_some());
         if let Some(spent_tx) = found {
             return Ok(Some(FoundSwapTxSpend::Spent(TransactionEnum::UtxoTx(spent_tx))));
         }
 
         // Else try to find a 'senderRefund' contract call.
-        let sender = qtum::contract_addr_from_utxo_addr(self.utxo.my_address.clone());
+        let my_address = try_s!(self.utxo.derivation_method.iguana_or_err()).clone();
+        let sender = try_s!(qtum::contract_addr_from_utxo_addr(my_address));
         let refund_txs = try_s!(self.sender_refund_transactions(sender, search_from_block).await);
         let found = refund_txs.into_iter().find(|tx| {
             find_swap_contract_call_with_swap_id(MutContractCallType::SenderRefund, tx, &expected_swap_id).is_some()
@@ -262,7 +271,8 @@ impl Qrc20Coin {
             return Ok(None);
         };
 
-        let sender = qtum::contract_addr_from_utxo_addr(self.utxo.my_address.clone());
+        let my_address = try_s!(self.utxo.derivation_method.iguana_or_err()).clone();
+        let sender = try_s!(qtum::contract_addr_from_utxo_addr(my_address));
         let erc20_payment_txs = try_s!(self.erc20_payment_transactions(sender, search_from_block).await);
         let found = erc20_payment_txs
             .into_iter()
@@ -341,14 +351,21 @@ impl Qrc20Coin {
         wait_until: u64,
         check_every: u64,
     ) -> Result<(), String> {
+        let tx_hash = H256Json::from(qtum_tx.hash().reversed());
         try_s!(
             self.utxo
                 .rpc_client
-                .wait_for_confirmations(&qtum_tx, confirmations as u32, requires_nota, wait_until, check_every)
+                .wait_for_confirmations(
+                    tx_hash,
+                    qtum_tx.expiry_height,
+                    confirmations as u32,
+                    requires_nota,
+                    wait_until,
+                    check_every
+                )
                 .compat()
                 .await
         );
-        let tx_hash = qtum_tx.hash().reversed().into();
         let receipts = try_s!(self.utxo.rpc_client.get_transaction_receipts(&tx_hash).compat().await);
 
         for receipt in receipts {
@@ -416,11 +433,19 @@ impl Qrc20Coin {
     }
 
     pub async fn allowance(&self, spender: H160) -> UtxoRpcResult<U256> {
+        let my_address = self
+            .utxo
+            .derivation_method
+            .iguana_or_err()
+            .mm_err(|e| UtxoRpcError::Internal(e.to_string()))?;
         let tokens = self
             .utxo
             .rpc_client
             .rpc_contract_call(ViewContractCallType::Allowance, &self.contract_address, &[
-                Token::Address(qtum::contract_addr_from_utxo_addr(self.utxo.my_address.clone())),
+                Token::Address(
+                    qtum::contract_addr_from_utxo_addr(my_address.clone())
+                        .mm_err(|e| UtxoRpcError::Internal(e.to_string()))?,
+                ),
                 Token::Address(spender),
             ])
             .compat()
@@ -771,7 +796,7 @@ impl Qrc20Coin {
             let verbose_tx = try_s!(
                 self.utxo
                     .rpc_client
-                    .get_verbose_transaction(receipt.transaction_hash)
+                    .get_verbose_transaction(&receipt.transaction_hash)
                     .compat()
                     .await
             );
diff --git a/mm2src/coins/rpc_command/account_balance.rs b/mm2src/coins/rpc_command/account_balance.rs
new file mode 100644
index 0000000000..4c29383d1e
--- /dev/null
+++ b/mm2src/coins/rpc_command/account_balance.rs
@@ -0,0 +1,111 @@
+use crate::coin_balance::HDAddressBalance;
+use crate::hd_wallet::HDWalletCoinOps;
+use crate::rpc_command::hd_account_balance_rpc_error::HDAccountBalanceRpcError;
+use crate::{lp_coinfind_or_err, CoinBalance, CoinWithDerivationMethod, MmCoinEnum};
+use async_trait::async_trait;
+use common::PagingOptionsEnum;
+use crypto::{Bip44Chain, RpcDerivationPath};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use std::fmt;
+
+#[derive(Deserialize)]
+pub struct HDAccountBalanceRequest {
+    coin: String,
+    #[serde(flatten)]
+    params: AccountBalanceParams,
+}
+
+#[derive(Deserialize)]
+pub struct AccountBalanceParams {
+    pub account_index: u32,
+    pub chain: Bip44Chain,
+    #[serde(default = "common::ten")]
+    pub limit: usize,
+    #[serde(default)]
+    pub paging_options: PagingOptionsEnum<u32>,
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+pub struct HDAccountBalanceResponse {
+    pub account_index: u32,
+    pub derivation_path: RpcDerivationPath,
+    pub addresses: Vec<HDAddressBalance>,
+    pub page_balance: CoinBalance,
+    pub limit: usize,
+    pub skipped: u32,
+    pub total: u32,
+    pub total_pages: usize,
+    pub paging_options: PagingOptionsEnum<u32>,
+}
+
+#[async_trait]
+pub trait AccountBalanceRpcOps {
+    async fn account_balance_rpc(
+        &self,
+        params: AccountBalanceParams,
+    ) -> MmResult<HDAccountBalanceResponse, HDAccountBalanceRpcError>;
+}
+
+pub async fn account_balance(
+    ctx: MmArc,
+    req: HDAccountBalanceRequest,
+) -> MmResult<HDAccountBalanceResponse, HDAccountBalanceRpcError> {
+    match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::UtxoCoin(utxo) => utxo.account_balance_rpc(req.params).await,
+        MmCoinEnum::QtumCoin(qtum) => qtum.account_balance_rpc(req.params).await,
+        _ => MmError::err(HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet),
+    }
+}
+
+pub mod common_impl {
+    use super::*;
+    use crate::coin_balance::HDWalletBalanceOps;
+    use crate::hd_wallet::{HDAccountOps, HDWalletOps};
+    use common::calc_total_pages;
+
+    pub async fn account_balance_rpc<Coin>(
+        coin: &Coin,
+        params: AccountBalanceParams,
+    ) -> MmResult<HDAccountBalanceResponse, HDAccountBalanceRpcError>
+    where
+        Coin: HDWalletBalanceOps + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet> + Sync,
+        <Coin as HDWalletCoinOps>::Address: fmt::Display + Clone,
+    {
+        let account_id = params.account_index;
+        let hd_account = coin
+            .derivation_method()
+            .hd_wallet_or_err()?
+            .get_account(account_id)
+            .await
+            .or_mm_err(|| HDAccountBalanceRpcError::UnknownAccount { account_id })?;
+        let total_addresses_number = hd_account.known_addresses_number(params.chain)?;
+
+        let from_address_id = match params.paging_options {
+            PagingOptionsEnum::FromId(from_address_id) => from_address_id + 1,
+            PagingOptionsEnum::PageNumber(page_number) => ((page_number.get() - 1) * params.limit) as u32,
+        };
+        let to_address_id = std::cmp::min(from_address_id + params.limit as u32, total_addresses_number);
+
+        let addresses = coin
+            .known_addresses_balances_with_ids(&hd_account, params.chain, from_address_id..to_address_id)
+            .await?;
+        let page_balance = addresses.iter().fold(CoinBalance::default(), |total, addr_balance| {
+            total + addr_balance.balance.clone()
+        });
+
+        let result = HDAccountBalanceResponse {
+            account_index: account_id,
+            derivation_path: RpcDerivationPath(hd_account.account_derivation_path()),
+            addresses,
+            page_balance,
+            limit: params.limit,
+            skipped: std::cmp::min(from_address_id, total_addresses_number),
+            total: total_addresses_number,
+            total_pages: calc_total_pages(total_addresses_number as usize, params.limit),
+            paging_options: params.paging_options,
+        };
+
+        Ok(result)
+    }
+}
diff --git a/mm2src/coins/rpc_command/hd_account_balance_rpc_error.rs b/mm2src/coins/rpc_command/hd_account_balance_rpc_error.rs
new file mode 100644
index 0000000000..851d2b42d8
--- /dev/null
+++ b/mm2src/coins/rpc_command/hd_account_balance_rpc_error.rs
@@ -0,0 +1,106 @@
+use crate::hd_wallet::{AddressDerivingError, InvalidBip44ChainError};
+use crate::{BalanceError, CoinFindError, UnexpectedDerivationMethod};
+use common::HttpStatusCode;
+use crypto::Bip44Chain;
+use derive_more::Display;
+use http::StatusCode;
+use rpc_task::RpcTaskError;
+use std::time::Duration;
+
+#[derive(Clone, Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum HDAccountBalanceRpcError {
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "RPC timed out {:?}", _0)]
+    Timeout(Duration),
+    #[display(fmt = "Coin is expected to be activated with the HD wallet derivation method")]
+    CoinIsActivatedNotWithHDWallet,
+    #[display(fmt = "HD account '{}' is not activated", account_id)]
+    UnknownAccount { account_id: u32 },
+    #[display(fmt = "Coin doesn't support the given BIP44 chain: {:?}", chain)]
+    InvalidBip44Chain { chain: Bip44Chain },
+    #[display(fmt = "Error deriving an address: {}", _0)]
+    ErrorDerivingAddress(String),
+    #[display(fmt = "Wallet storage error: {}", _0)]
+    WalletStorageError(String),
+    #[display(fmt = "Electrum/Native RPC invalid response: {}", _0)]
+    RpcInvalidResponse(String),
+    #[display(fmt = "Transport: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal: {}", _0)]
+    Internal(String),
+}
+
+impl HttpStatusCode for HDAccountBalanceRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            HDAccountBalanceRpcError::NoSuchCoin { .. }
+            | HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet
+            | HDAccountBalanceRpcError::UnknownAccount { .. }
+            | HDAccountBalanceRpcError::InvalidBip44Chain { .. }
+            | HDAccountBalanceRpcError::ErrorDerivingAddress(_) => StatusCode::BAD_REQUEST,
+            HDAccountBalanceRpcError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
+            HDAccountBalanceRpcError::Transport(_)
+            | HDAccountBalanceRpcError::WalletStorageError(_)
+            | HDAccountBalanceRpcError::RpcInvalidResponse(_)
+            | HDAccountBalanceRpcError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for HDAccountBalanceRpcError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => HDAccountBalanceRpcError::NoSuchCoin { coin },
+        }
+    }
+}
+
+impl From<UnexpectedDerivationMethod> for HDAccountBalanceRpcError {
+    fn from(e: UnexpectedDerivationMethod) -> Self {
+        match e {
+            UnexpectedDerivationMethod::HDWalletUnavailable => HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet,
+            unexpected_error => HDAccountBalanceRpcError::Internal(unexpected_error.to_string()),
+        }
+    }
+}
+
+impl From<BalanceError> for HDAccountBalanceRpcError {
+    fn from(e: BalanceError) -> Self {
+        match e {
+            BalanceError::Transport(transport) => HDAccountBalanceRpcError::Transport(transport),
+            BalanceError::InvalidResponse(rpc) => HDAccountBalanceRpcError::RpcInvalidResponse(rpc),
+            BalanceError::UnexpectedDerivationMethod(der_method) => HDAccountBalanceRpcError::from(der_method),
+            BalanceError::WalletStorageError(e) => HDAccountBalanceRpcError::Internal(e),
+            BalanceError::Internal(internal) => HDAccountBalanceRpcError::Internal(internal),
+        }
+    }
+}
+
+impl From<InvalidBip44ChainError> for HDAccountBalanceRpcError {
+    fn from(e: InvalidBip44ChainError) -> Self { HDAccountBalanceRpcError::InvalidBip44Chain { chain: e.chain } }
+}
+
+impl From<AddressDerivingError> for HDAccountBalanceRpcError {
+    fn from(e: AddressDerivingError) -> Self {
+        match e {
+            AddressDerivingError::Bip32Error(bip32) => {
+                HDAccountBalanceRpcError::ErrorDerivingAddress(bip32.to_string())
+            },
+        }
+    }
+}
+
+impl From<RpcTaskError> for HDAccountBalanceRpcError {
+    fn from(e: RpcTaskError) -> Self {
+        match e {
+            RpcTaskError::Canceled => HDAccountBalanceRpcError::Internal("Canceled".to_owned()),
+            RpcTaskError::Timeout(timeout) => HDAccountBalanceRpcError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
+                HDAccountBalanceRpcError::Internal(e.to_string())
+            },
+            RpcTaskError::Internal(internal) => HDAccountBalanceRpcError::Internal(internal),
+        }
+    }
+}
diff --git a/mm2src/coins/rpc_command/init_create_account.rs b/mm2src/coins/rpc_command/init_create_account.rs
new file mode 100644
index 0000000000..89667aa649
--- /dev/null
+++ b/mm2src/coins/rpc_command/init_create_account.rs
@@ -0,0 +1,197 @@
+use crate::coin_balance::HDAccountBalance;
+use crate::hd_pubkey::{HDXPubExtractor, RpcTaskXPubExtractor};
+use crate::hd_wallet::HDWalletRpcError;
+use crate::{lp_coinfind_or_err, CoinBalance, CoinWithDerivationMethod, CoinsContext, MmCoinEnum};
+use async_trait::async_trait;
+use common::{true_f, SuccessResponse};
+use crypto::hw_rpc_task::{HwConnectStatuses, HwRpcTaskAwaitingStatus, HwRpcTaskUserAction, HwRpcTaskUserActionRequest};
+use crypto::RpcDerivationPath;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{InitRpcTaskResponse, RpcTaskStatusError, RpcTaskStatusRequest, RpcTaskUserActionError};
+use rpc_task::{RpcTask, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+
+pub type CreateAccountUserAction = HwRpcTaskUserAction;
+pub type CreateAccountAwaitingStatus = HwRpcTaskAwaitingStatus;
+pub type CreateAccountTaskManager = RpcTaskManager<InitCreateAccountTask>;
+pub type CreateAccountTaskManagerShared = RpcTaskManagerShared<InitCreateAccountTask>;
+pub type CreateAccountTaskHandle = RpcTaskHandle<InitCreateAccountTask>;
+pub type CreateAccountRpcTaskStatus =
+    RpcTaskStatus<HDAccountBalance, HDWalletRpcError, CreateAccountInProgressStatus, CreateAccountAwaitingStatus>;
+
+type CreateAccountXPubExtractor<'task> = RpcTaskXPubExtractor<'task, InitCreateAccountTask>;
+
+#[derive(Deserialize)]
+pub struct CreateNewAccountRequest {
+    coin: String,
+    #[serde(flatten)]
+    params: CreateNewAccountParams,
+}
+
+#[derive(Deserialize)]
+pub struct CreateNewAccountParams {
+    #[serde(default = "true_f")]
+    scan: bool,
+    gap_limit: Option<u32>,
+}
+
+#[derive(Clone, Serialize)]
+pub enum CreateAccountInProgressStatus {
+    Preparing,
+    RequestingAccountBalance,
+    Finishing,
+    /// The following statuses don't require the user to send `UserAction`,
+    /// but they tell the user that he should confirm/decline the operation on his device.
+    WaitingForTrezorToConnect,
+    WaitingForUserToConfirmPubkey,
+}
+
+#[async_trait]
+pub trait InitCreateHDAccountRpcOps {
+    async fn init_create_account_rpc<XPubExtractor>(
+        &self,
+        params: CreateNewAccountParams,
+        xpub_extractor: &XPubExtractor,
+    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync;
+}
+
+pub struct InitCreateAccountTask {
+    ctx: MmArc,
+    coin: MmCoinEnum,
+    req: CreateNewAccountRequest,
+}
+
+impl RpcTaskTypes for InitCreateAccountTask {
+    type Item = HDAccountBalance;
+    type Error = HDWalletRpcError;
+    type InProgressStatus = CreateAccountInProgressStatus;
+    type AwaitingStatus = CreateAccountAwaitingStatus;
+    type UserAction = CreateAccountUserAction;
+}
+
+#[async_trait]
+impl RpcTask for InitCreateAccountTask {
+    fn initial_status(&self) -> Self::InProgressStatus { CreateAccountInProgressStatus::Preparing }
+
+    async fn run(self, task_handle: &CreateAccountTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
+        async fn create_new_account_helper<Coin>(
+            ctx: &MmArc,
+            coin: Coin,
+            params: CreateNewAccountParams,
+            task_handle: &CreateAccountTaskHandle,
+        ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+        where
+            Coin: InitCreateHDAccountRpcOps + Send + Sync,
+        {
+            let hw_statuses = HwConnectStatuses {
+                on_connect: CreateAccountInProgressStatus::WaitingForTrezorToConnect,
+                on_connected: CreateAccountInProgressStatus::Preparing,
+                on_connection_failed: CreateAccountInProgressStatus::Finishing,
+                on_button_request: CreateAccountInProgressStatus::WaitingForUserToConfirmPubkey,
+                on_pin_request: CreateAccountAwaitingStatus::WaitForTrezorPin,
+                on_ready: CreateAccountInProgressStatus::RequestingAccountBalance,
+            };
+            let xpub_extractor = CreateAccountXPubExtractor::new(ctx, task_handle, hw_statuses)?;
+            coin.init_create_account_rpc(params, &xpub_extractor).await
+        }
+
+        match self.coin {
+            MmCoinEnum::UtxoCoin(utxo) => {
+                create_new_account_helper(&self.ctx, utxo, self.req.params, task_handle).await
+            },
+            MmCoinEnum::QtumCoin(qtum) => {
+                create_new_account_helper(&self.ctx, qtum, self.req.params, task_handle).await
+            },
+            _ => MmError::err(HDWalletRpcError::CoinIsActivatedNotWithHDWallet),
+        }
+    }
+}
+
+pub async fn init_create_new_account(
+    ctx: MmArc,
+    req: CreateNewAccountRequest,
+) -> MmResult<InitRpcTaskResponse, HDWalletRpcError> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(HDWalletRpcError::Internal)?;
+    let task = InitCreateAccountTask { ctx, coin, req };
+    let task_id = CreateAccountTaskManager::spawn_rpc_task(&coins_ctx.create_account_manager, task)?;
+    Ok(InitRpcTaskResponse { task_id })
+}
+
+pub async fn init_create_new_account_status(
+    ctx: MmArc,
+    req: RpcTaskStatusRequest,
+) -> MmResult<CreateAccountRpcTaskStatus, RpcTaskStatusError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(RpcTaskStatusError::Internal)?;
+    let mut task_manager = coins_ctx
+        .create_account_manager
+        .lock()
+        .map_to_mm(|e| RpcTaskStatusError::Internal(e.to_string()))?;
+    task_manager
+        .task_status(req.task_id, req.forget_if_finished)
+        .or_mm_err(|| RpcTaskStatusError::NoSuchTask(req.task_id))
+}
+
+pub async fn init_create_new_account_user_action(
+    ctx: MmArc,
+    req: HwRpcTaskUserActionRequest,
+) -> MmResult<SuccessResponse, RpcTaskUserActionError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(RpcTaskUserActionError::Internal)?;
+    let mut task_manager = coins_ctx
+        .create_account_manager
+        .lock()
+        .map_to_mm(|e| RpcTaskUserActionError::Internal(e.to_string()))?;
+    task_manager.on_user_action(req.task_id, req.user_action)?;
+    Ok(SuccessResponse::new())
+}
+
+pub(crate) mod common_impl {
+    use super::*;
+    use crate::coin_balance::HDWalletBalanceOps;
+    use crate::hd_wallet::{HDAccountOps, HDWalletCoinOps, HDWalletOps};
+    use crate::MarketCoinOps;
+
+    pub async fn init_create_new_account_rpc<'a, Coin, XPubExtractor>(
+        coin: &Coin,
+        params: CreateNewAccountParams,
+        xpub_extractor: &XPubExtractor,
+    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    where
+        Coin: HDWalletBalanceOps
+            + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet>
+            + Send
+            + Sync
+            + MarketCoinOps,
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        let hd_wallet = coin.derivation_method().hd_wallet_or_err()?;
+
+        let mut new_account = coin.create_new_account(hd_wallet, xpub_extractor).await?;
+        let address_scanner = coin.produce_hd_address_scanner().await?;
+        let account_index = new_account.account_id();
+        let account_derivation_path = new_account.account_derivation_path();
+
+        let addresses = if params.scan {
+            let gap_limit = params.gap_limit.unwrap_or_else(|| hd_wallet.gap_limit());
+            coin.scan_for_new_addresses(hd_wallet, &mut new_account, &address_scanner, gap_limit)
+                .await?
+        } else {
+            Vec::new()
+        };
+
+        let total_balance = addresses
+            .iter()
+            .fold(CoinBalance::default(), |total_balance, address_balance| {
+                total_balance + address_balance.balance.clone()
+            });
+
+        Ok(HDAccountBalance {
+            account_index,
+            derivation_path: RpcDerivationPath(account_derivation_path),
+            total_balance,
+            addresses,
+        })
+    }
+}
diff --git a/mm2src/coins/rpc_command/init_scan_for_new_addresses.rs b/mm2src/coins/rpc_command/init_scan_for_new_addresses.rs
new file mode 100644
index 0000000000..e2400e8b4a
--- /dev/null
+++ b/mm2src/coins/rpc_command/init_scan_for_new_addresses.rs
@@ -0,0 +1,153 @@
+use crate::coin_balance::HDAddressBalance;
+use crate::rpc_command::hd_account_balance_rpc_error::HDAccountBalanceRpcError;
+use crate::{lp_coinfind_or_err, CoinsContext, MmCoinEnum};
+use async_trait::async_trait;
+use crypto::RpcDerivationPath;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{InitRpcTaskResponse, RpcTaskStatusError, RpcTaskStatusRequest};
+use rpc_task::{RpcTask, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+
+pub type ScanAddressesTaskManager = RpcTaskManager<InitScanAddressesTask>;
+pub type ScanAddressesTaskManagerShared = RpcTaskManagerShared<InitScanAddressesTask>;
+pub type ScanAddressesTaskHandle = RpcTaskHandle<InitScanAddressesTask>;
+pub type ScanAddressesRpcTaskStatus = RpcTaskStatus<
+    ScanAddressesResponse,
+    HDAccountBalanceRpcError,
+    ScanAddressesInProgressStatus,
+    ScanAddressesAwaitingStatus,
+>;
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct ScanAddressesResponse {
+    pub account_index: u32,
+    pub derivation_path: RpcDerivationPath,
+    pub new_addresses: Vec<HDAddressBalance>,
+}
+
+#[derive(Deserialize)]
+pub struct ScanAddressesRequest {
+    coin: String,
+    #[serde(flatten)]
+    params: ScanAddressesParams,
+}
+
+#[derive(Deserialize)]
+pub struct ScanAddressesParams {
+    pub account_index: u32,
+    pub gap_limit: Option<u32>,
+}
+
+#[derive(Clone, Serialize)]
+pub enum ScanAddressesInProgressStatus {
+    InProgress,
+}
+
+/// We can't use `std::convert::Infallible` as [`RpcTaskTypes::UserAction`] because it doesn't implement `Serialize`.
+/// Use `!` when it's stable.
+#[derive(Clone, Serialize)]
+pub enum ScanAddressesUserAction {}
+
+/// We can't use `std::convert::Infallible` as [`RpcTaskTypes::AwaitingStatus`] because it doesn't implement `Serialize`.
+/// Use `!` when it's stable.
+#[derive(Clone, Serialize)]
+pub enum ScanAddressesAwaitingStatus {}
+
+#[async_trait]
+pub trait InitScanAddressesRpcOps {
+    async fn init_scan_for_new_addresses_rpc(
+        &self,
+        params: ScanAddressesParams,
+    ) -> MmResult<ScanAddressesResponse, HDAccountBalanceRpcError>;
+}
+
+pub struct InitScanAddressesTask {
+    req: ScanAddressesRequest,
+    coin: MmCoinEnum,
+}
+
+impl RpcTaskTypes for InitScanAddressesTask {
+    type Item = ScanAddressesResponse;
+    type Error = HDAccountBalanceRpcError;
+    type InProgressStatus = ScanAddressesInProgressStatus;
+    type AwaitingStatus = ScanAddressesAwaitingStatus;
+    type UserAction = ScanAddressesUserAction;
+}
+
+#[async_trait]
+impl RpcTask for InitScanAddressesTask {
+    #[inline]
+    fn initial_status(&self) -> Self::InProgressStatus { ScanAddressesInProgressStatus::InProgress }
+
+    async fn run(self, _task_handle: &ScanAddressesTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
+        match self.coin {
+            MmCoinEnum::UtxoCoin(utxo) => utxo.init_scan_for_new_addresses_rpc(self.req.params).await,
+            MmCoinEnum::QtumCoin(qtum) => qtum.init_scan_for_new_addresses_rpc(self.req.params).await,
+            _ => MmError::err(HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet),
+        }
+    }
+}
+
+pub async fn init_scan_for_new_addresses(
+    ctx: MmArc,
+    req: ScanAddressesRequest,
+) -> MmResult<InitRpcTaskResponse, HDAccountBalanceRpcError> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(HDAccountBalanceRpcError::Internal)?;
+    let task = InitScanAddressesTask { req, coin };
+    let task_id = ScanAddressesTaskManager::spawn_rpc_task(&coins_ctx.scan_addresses_manager, task)?;
+    Ok(InitRpcTaskResponse { task_id })
+}
+
+pub async fn init_scan_for_new_addresses_status(
+    ctx: MmArc,
+    req: RpcTaskStatusRequest,
+) -> MmResult<ScanAddressesRpcTaskStatus, RpcTaskStatusError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(RpcTaskStatusError::Internal)?;
+    let mut task_manager = coins_ctx
+        .scan_addresses_manager
+        .lock()
+        .map_to_mm(|e| RpcTaskStatusError::Internal(e.to_string()))?;
+    task_manager
+        .task_status(req.task_id, req.forget_if_finished)
+        .or_mm_err(|| RpcTaskStatusError::NoSuchTask(req.task_id))
+}
+
+pub mod common_impl {
+    use super::*;
+    use crate::coin_balance::HDWalletBalanceOps;
+    use crate::hd_wallet::{HDAccountOps, HDWalletCoinOps, HDWalletOps};
+    use crate::CoinWithDerivationMethod;
+    use std::fmt;
+    use std::ops::DerefMut;
+
+    pub async fn scan_for_new_addresses_rpc<Coin>(
+        coin: &Coin,
+        params: ScanAddressesParams,
+    ) -> MmResult<ScanAddressesResponse, HDAccountBalanceRpcError>
+    where
+        Coin: CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet> + HDWalletBalanceOps + Sync,
+        <Coin as HDWalletCoinOps>::Address: fmt::Display,
+    {
+        let hd_wallet = coin.derivation_method().hd_wallet_or_err()?;
+
+        let account_id = params.account_index;
+        let mut hd_account = hd_wallet
+            .get_account_mut(account_id)
+            .await
+            .or_mm_err(|| HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet)?;
+        let account_derivation_path = hd_account.account_derivation_path();
+        let address_scanner = coin.produce_hd_address_scanner().await?;
+        let gap_limit = params.gap_limit.unwrap_or_else(|| hd_wallet.gap_limit());
+
+        let new_addresses = coin
+            .scan_for_new_addresses(hd_wallet, hd_account.deref_mut(), &address_scanner, gap_limit)
+            .await?;
+
+        Ok(ScanAddressesResponse {
+            account_index: account_id,
+            derivation_path: RpcDerivationPath(account_derivation_path),
+            new_addresses,
+        })
+    }
+}
diff --git a/mm2src/coins/rpc_command/init_withdraw.rs b/mm2src/coins/rpc_command/init_withdraw.rs
new file mode 100644
index 0000000000..dd3d22ca63
--- /dev/null
+++ b/mm2src/coins/rpc_command/init_withdraw.rs
@@ -0,0 +1,126 @@
+use crate::{lp_coinfind_or_err, CoinsContext, MmCoinEnum, WithdrawError};
+use crate::{TransactionDetails, WithdrawRequest};
+use async_trait::async_trait;
+use common::SuccessResponse;
+use crypto::hw_rpc_task::{HwRpcTaskAwaitingStatus, HwRpcTaskUserAction, HwRpcTaskUserActionRequest};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{InitRpcTaskResponse, RpcTaskStatusError, RpcTaskStatusRequest, RpcTaskUserActionError};
+use rpc_task::{RpcTask, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatusAlias, RpcTaskTypes};
+
+pub type WithdrawAwaitingStatus = HwRpcTaskAwaitingStatus;
+pub type WithdrawUserAction = HwRpcTaskUserAction;
+pub type WithdrawStatusError = RpcTaskStatusError;
+pub type WithdrawUserActionError = RpcTaskUserActionError;
+pub type InitWithdrawResponse = InitRpcTaskResponse;
+pub type WithdrawStatusRequest = RpcTaskStatusRequest;
+pub type WithdrawUserActionRequest = HwRpcTaskUserActionRequest;
+pub type WithdrawTaskManager = RpcTaskManager<WithdrawTask>;
+pub type WithdrawTaskManagerShared = RpcTaskManagerShared<WithdrawTask>;
+pub type WithdrawTaskHandle = RpcTaskHandle<WithdrawTask>;
+pub type WithdrawRpcStatus = RpcTaskStatusAlias<WithdrawTask>;
+pub type WithdrawInitResult<T> = Result<T, MmError<WithdrawError>>;
+
+#[async_trait]
+pub trait CoinWithdrawInit {
+    fn init_withdraw(
+        ctx: MmArc,
+        req: WithdrawRequest,
+        rpc_task_handle: &WithdrawTaskHandle,
+    ) -> WithdrawInitResult<TransactionDetails>;
+}
+
+pub async fn init_withdraw(ctx: MmArc, request: WithdrawRequest) -> WithdrawInitResult<InitWithdrawResponse> {
+    let coin = lp_coinfind_or_err(&ctx, &request.coin).await?;
+    let task = WithdrawTask {
+        ctx: ctx.clone(),
+        coin,
+        request,
+    };
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(WithdrawError::InternalError)?;
+    let task_id = WithdrawTaskManager::spawn_rpc_task(&coins_ctx.withdraw_task_manager, task)?;
+    Ok(InitWithdrawResponse { task_id })
+}
+
+pub async fn withdraw_status(
+    ctx: MmArc,
+    req: WithdrawStatusRequest,
+) -> Result<WithdrawRpcStatus, MmError<WithdrawStatusError>> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(WithdrawStatusError::Internal)?;
+    let mut task_manager = coins_ctx
+        .withdraw_task_manager
+        .lock()
+        .map_to_mm(|e| WithdrawStatusError::Internal(e.to_string()))?;
+    task_manager
+        .task_status(req.task_id, req.forget_if_finished)
+        .or_mm_err(|| WithdrawStatusError::NoSuchTask(req.task_id))
+}
+
+#[derive(Clone, Serialize)]
+pub enum WithdrawInProgressStatus {
+    Preparing,
+    GeneratingTransaction,
+    SigningTransaction,
+    Finishing,
+    /// The following statuses don't require the user to send `UserAction`,
+    /// but they tell the user that he should confirm/decline the operation on his device.
+    WaitingForTrezorToConnect,
+    WaitingForUserToConfirmPubkey,
+    WaitingForUserToConfirmSigning,
+}
+
+pub async fn withdraw_user_action(
+    ctx: MmArc,
+    req: WithdrawUserActionRequest,
+) -> Result<SuccessResponse, MmError<WithdrawUserActionError>> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(WithdrawUserActionError::Internal)?;
+    let mut task_manager = coins_ctx
+        .withdraw_task_manager
+        .lock()
+        .map_to_mm(|e| WithdrawUserActionError::Internal(e.to_string()))?;
+    task_manager.on_user_action(req.task_id, req.user_action)?;
+    Ok(SuccessResponse::new())
+}
+
+#[async_trait]
+pub trait InitWithdrawCoin {
+    async fn init_withdraw(
+        &self,
+        ctx: MmArc,
+        req: WithdrawRequest,
+        task_handle: &WithdrawTaskHandle,
+    ) -> Result<TransactionDetails, MmError<WithdrawError>>;
+}
+
+pub struct WithdrawTask {
+    ctx: MmArc,
+    coin: MmCoinEnum,
+    request: WithdrawRequest,
+}
+
+impl RpcTaskTypes for WithdrawTask {
+    type Item = TransactionDetails;
+    type Error = WithdrawError;
+    type InProgressStatus = WithdrawInProgressStatus;
+    type AwaitingStatus = WithdrawAwaitingStatus;
+    type UserAction = WithdrawUserAction;
+}
+
+#[async_trait]
+impl RpcTask for WithdrawTask {
+    fn initial_status(&self) -> Self::InProgressStatus { WithdrawInProgressStatus::Preparing }
+
+    async fn run(self, task_handle: &WithdrawTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
+        match self.coin {
+            MmCoinEnum::UtxoCoin(ref standard_utxo) => {
+                standard_utxo.init_withdraw(self.ctx, self.request, task_handle).await
+            },
+            MmCoinEnum::QtumCoin(ref qtum) => qtum.init_withdraw(self.ctx, self.request, task_handle).await,
+            #[cfg(not(target_arch = "wasm32"))]
+            MmCoinEnum::ZCoin(ref z) => z.init_withdraw(self.ctx, self.request, task_handle).await,
+            _ => MmError::err(WithdrawError::CoinDoesntSupportInitWithdraw {
+                coin: self.coin.ticker().to_owned(),
+            }),
+        }
+    }
+}
diff --git a/mm2src/coins/rpc_command/mod.rs b/mm2src/coins/rpc_command/mod.rs
new file mode 100644
index 0000000000..7a98d3fc2e
--- /dev/null
+++ b/mm2src/coins/rpc_command/mod.rs
@@ -0,0 +1,5 @@
+pub mod account_balance;
+pub mod hd_account_balance_rpc_error;
+pub mod init_create_account;
+pub mod init_scan_for_new_addresses;
+pub mod init_withdraw;
diff --git a/mm2src/coins/solana.rs b/mm2src/coins/solana.rs
new file mode 100644
index 0000000000..6bf3c7049c
--- /dev/null
+++ b/mm2src/coins/solana.rs
@@ -0,0 +1,670 @@
+use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum};
+use crate::solana::solana_common::{lamports_to_sol, PrepareTransferData, SufficientBalanceError};
+use crate::solana::spl::SplTokenInfo;
+use crate::{BalanceError, BalanceFut, FeeApproxStage, FoundSwapTxSpend, NegotiateSwapContractAddrErr,
+            RawTransactionFut, RawTransactionRequest, SearchForSwapTxSpendInput, SignatureResult, TradePreimageFut,
+            TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionFut, TransactionType,
+            UnexpectedDerivationMethod, ValidateAddressResult, ValidatePaymentInput, VerificationResult,
+            WithdrawError, WithdrawFut, WithdrawRequest, WithdrawResult};
+use async_trait::async_trait;
+use base58::ToBase58;
+use bincode::{deserialize, serialize};
+use common::{async_blocking, now_ms};
+use derive_more::Display;
+use futures::{FutureExt, TryFutureExt};
+use futures01::Future;
+use keys::KeyPair;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
+use rpc::v1::types::Bytes as BytesJson;
+use serde_json::{self as json, Value as Json};
+use solana_client::rpc_request::TokenAccountsFilter;
+use solana_client::{client_error::{ClientError, ClientErrorKind},
+                    rpc_client::RpcClient};
+use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel};
+use solana_sdk::program_error::ProgramError;
+use solana_sdk::pubkey::ParsePubkeyError;
+use solana_sdk::transaction::Transaction;
+use solana_sdk::{pubkey::Pubkey,
+                 signature::{Keypair, Signer}};
+use std::collections::HashMap;
+use std::str::FromStr;
+use std::sync::Mutex;
+use std::{convert::TryFrom,
+          fmt::{Debug, Formatter, Result as FmtResult},
+          ops::Deref,
+          sync::Arc};
+
+pub mod solana_common;
+#[cfg(test)] mod solana_common_tests;
+mod solana_decode_tx_helpers;
+#[cfg(test)] mod solana_tests;
+pub mod spl;
+#[cfg(test)] mod spl_tests;
+
+pub const SOLANA_DEFAULT_DECIMALS: u64 = 9;
+pub const LAMPORTS_DUMMY_AMOUNT: u64 = 10;
+
+#[async_trait]
+pub trait SolanaCommonOps {
+    fn rpc(&self) -> &RpcClient;
+
+    fn is_token(&self) -> bool;
+
+    async fn check_balance_and_prepare_transfer(
+        &self,
+        max: bool,
+        amount: BigDecimal,
+        fees: u64,
+    ) -> Result<PrepareTransferData, MmError<SufficientBalanceError>>;
+}
+
+impl From<ClientError> for BalanceError {
+    fn from(e: ClientError) -> Self {
+        match e.kind {
+            ClientErrorKind::Io(e) => BalanceError::Transport(e.to_string()),
+            ClientErrorKind::Reqwest(e) => BalanceError::Transport(e.to_string()),
+            ClientErrorKind::RpcError(e) => BalanceError::Transport(format!("{:?}", e)),
+            ClientErrorKind::SerdeJson(e) => BalanceError::InvalidResponse(e.to_string()),
+            ClientErrorKind::Custom(e) => BalanceError::Internal(e),
+            ClientErrorKind::SigningError(_)
+            | ClientErrorKind::TransactionError(_)
+            | ClientErrorKind::FaucetError(_) => BalanceError::Internal("not_reacheable".to_string()),
+        }
+    }
+}
+
+impl From<ParsePubkeyError> for BalanceError {
+    fn from(e: ParsePubkeyError) -> Self { BalanceError::Internal(format!("{:?}", e)) }
+}
+
+impl From<ClientError> for WithdrawError {
+    fn from(e: ClientError) -> Self {
+        match e.kind {
+            ClientErrorKind::Io(e) => WithdrawError::Transport(e.to_string()),
+            ClientErrorKind::Reqwest(e) => WithdrawError::Transport(e.to_string()),
+            ClientErrorKind::RpcError(e) => WithdrawError::Transport(format!("{:?}", e)),
+            ClientErrorKind::SerdeJson(e) => WithdrawError::InternalError(e.to_string()),
+            ClientErrorKind::Custom(e) => WithdrawError::InternalError(e),
+            ClientErrorKind::SigningError(_)
+            | ClientErrorKind::TransactionError(_)
+            | ClientErrorKind::FaucetError(_) => WithdrawError::InternalError("not_reacheable".to_string()),
+        }
+    }
+}
+
+impl From<ParsePubkeyError> for WithdrawError {
+    fn from(e: ParsePubkeyError) -> Self { WithdrawError::InvalidAddress(format!("{:?}", e)) }
+}
+
+impl From<ProgramError> for WithdrawError {
+    fn from(e: ProgramError) -> Self { WithdrawError::InternalError(format!("{:?}", e)) }
+}
+
+#[derive(Debug)]
+pub enum AccountError {
+    NotFundedError(String),
+    ParsePubKeyError(String),
+    ClientError(ClientErrorKind),
+}
+
+impl From<ClientError> for AccountError {
+    fn from(e: ClientError) -> Self { AccountError::ClientError(e.kind) }
+}
+
+impl From<ParsePubkeyError> for AccountError {
+    fn from(e: ParsePubkeyError) -> Self { AccountError::ParsePubKeyError(format!("{:?}", e)) }
+}
+
+impl From<AccountError> for WithdrawError {
+    fn from(e: AccountError) -> Self {
+        match e {
+            AccountError::NotFundedError(_) => WithdrawError::ZeroBalanceToWithdrawMax,
+            AccountError::ParsePubKeyError(err) => WithdrawError::InternalError(err),
+            AccountError::ClientError(e) => WithdrawError::Transport(format!("{:?}", e)),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct SolanaActivationParams {
+    confirmation_commitment: CommitmentLevel,
+    client_url: String,
+}
+
+#[derive(Debug, Display)]
+pub enum SolanaFromLegacyReqErr {
+    InvalidCommitmentLevel(String),
+    InvalidClientParsing(json::Error),
+    ClientNoAvailableNodes(String),
+}
+
+#[derive(Debug, Display)]
+pub enum KeyPairCreationError {
+    #[display(fmt = "Signature error: {}", _0)]
+    SignatureError(ed25519_dalek::SignatureError),
+    #[display(fmt = "KeyPairFromSeed error: {}", _0)]
+    KeyPairFromSeed(String),
+}
+
+impl From<ed25519_dalek::SignatureError> for KeyPairCreationError {
+    fn from(e: ed25519_dalek::SignatureError) -> Self { KeyPairCreationError::SignatureError(e) }
+}
+
+fn generate_keypair_from_slice(priv_key: &[u8]) -> Result<Keypair, MmError<KeyPairCreationError>> {
+    let secret_key = ed25519_dalek::SecretKey::from_bytes(priv_key)?;
+    let public_key = ed25519_dalek::PublicKey::from(&secret_key);
+    let key_pair = ed25519_dalek::Keypair {
+        secret: secret_key,
+        public: public_key,
+    };
+    solana_sdk::signature::keypair_from_seed(key_pair.to_bytes().as_ref())
+        .map_to_mm(|e| KeyPairCreationError::KeyPairFromSeed(e.to_string()))
+}
+
+pub async fn solana_coin_from_conf_and_params(
+    ticker: &str,
+    conf: &Json,
+    params: SolanaActivationParams,
+    priv_key: &[u8],
+) -> Result<SolanaCoin, String> {
+    let client = RpcClient::new_with_commitment(params.client_url.clone(), CommitmentConfig {
+        commitment: params.confirmation_commitment,
+    });
+    let decimals = conf["decimals"].as_u64().unwrap_or(SOLANA_DEFAULT_DECIMALS) as u8;
+    let key_pair = try_s!(generate_keypair_from_slice(priv_key));
+    let my_address = key_pair.pubkey().to_string();
+    let spl_tokens_infos = Arc::new(Mutex::new(HashMap::new()));
+    let solana_coin = SolanaCoin(Arc::new(SolanaCoinImpl {
+        my_address,
+        key_pair,
+        ticker: ticker.to_string(),
+        client,
+        decimals,
+        spl_tokens_infos,
+    }));
+    Ok(solana_coin)
+}
+
+/// pImpl idiom.
+pub struct SolanaCoinImpl {
+    ticker: String,
+    key_pair: Keypair,
+    client: RpcClient,
+    decimals: u8,
+    my_address: String,
+    spl_tokens_infos: Arc<Mutex<HashMap<String, SplTokenInfo>>>,
+}
+
+impl Debug for SolanaCoinImpl {
+    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { f.write_str(&*self.ticker) }
+}
+
+#[derive(Clone, Debug)]
+pub struct SolanaCoin(Arc<SolanaCoinImpl>);
+impl Deref for SolanaCoin {
+    type Target = SolanaCoinImpl;
+    fn deref(&self) -> &SolanaCoinImpl { &*self.0 }
+}
+
+#[async_trait]
+impl SolanaCommonOps for SolanaCoin {
+    fn rpc(&self) -> &RpcClient { &self.client }
+
+    fn is_token(&self) -> bool { false }
+
+    async fn check_balance_and_prepare_transfer(
+        &self,
+        max: bool,
+        amount: BigDecimal,
+        fees: u64,
+    ) -> Result<PrepareTransferData, MmError<SufficientBalanceError>> {
+        solana_common::check_balance_and_prepare_transfer(self, max, amount, fees).await
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct SolanaFeeDetails {
+    pub amount: BigDecimal,
+}
+
+async fn withdraw_base_coin_impl(coin: SolanaCoin, req: WithdrawRequest) -> WithdrawResult {
+    let (hash, fees) = coin.estimate_withdraw_fees().await?;
+    let res = coin
+        .check_balance_and_prepare_transfer(req.max, req.amount.clone(), fees)
+        .await?;
+    let to = solana_sdk::pubkey::Pubkey::try_from(&*req.to)?;
+    let tx = solana_sdk::system_transaction::transfer(&coin.key_pair, &to, res.lamports_to_send, hash);
+    let serialized_tx = serialize(&tx).map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+    let total_amount = lamports_to_sol(res.lamports_to_send);
+    let received_by_me = if req.to == coin.my_address {
+        total_amount.clone()
+    } else {
+        0.into()
+    };
+    let spent_by_me = &total_amount + &res.sol_required;
+    Ok(TransactionDetails {
+        tx_hex: serialized_tx.into(),
+        tx_hash: tx.signatures[0].to_string(),
+        from: vec![coin.my_address.clone()],
+        to: vec![req.to],
+        total_amount: spent_by_me.clone(),
+        my_balance_change: &received_by_me - &spent_by_me,
+        spent_by_me,
+        received_by_me,
+        block_height: 0,
+        timestamp: now_ms() / 1000,
+        fee_details: Some(
+            SolanaFeeDetails {
+                amount: res.sol_required,
+            }
+            .into(),
+        ),
+        coin: coin.ticker.clone(),
+        internal_id: vec![].into(),
+        kmd_rewards: None,
+        transaction_type: TransactionType::StandardTransfer,
+    })
+}
+
+async fn withdraw_impl(coin: SolanaCoin, req: WithdrawRequest) -> WithdrawResult {
+    let validate_address_result = coin.validate_address(&*req.to);
+    if !validate_address_result.is_valid {
+        return MmError::err(WithdrawError::InvalidAddress(
+            validate_address_result.reason.unwrap_or_else(|| "Unknown".to_string()),
+        ));
+    }
+    withdraw_base_coin_impl(coin, req).await
+}
+
+impl SolanaCoin {
+    pub async fn estimate_withdraw_fees(&self) -> Result<(solana_sdk::hash::Hash, u64), MmError<ClientError>> {
+        let hash = async_blocking({
+            let coin = self.clone();
+            move || coin.rpc().get_latest_blockhash()
+        })
+        .await?;
+        let to = self.key_pair.pubkey();
+
+        let tx = solana_sdk::system_transaction::transfer(&self.key_pair, &to, LAMPORTS_DUMMY_AMOUNT, hash);
+        let fees = async_blocking({
+            let coin = self.clone();
+            move || coin.rpc().get_fee_for_message(tx.message())
+        })
+        .await?;
+        Ok((hash, fees))
+    }
+
+    pub async fn my_balance_spl(&self, infos: &SplTokenInfo) -> Result<CoinBalance, MmError<BalanceError>> {
+        let token_accounts = async_blocking({
+            let coin = self.clone();
+            let infos = infos.clone();
+            move || {
+                coin.rpc().get_token_accounts_by_owner(
+                    &coin.key_pair.pubkey(),
+                    TokenAccountsFilter::Mint(infos.token_contract_address),
+                )
+            }
+        })
+        .await?;
+        if token_accounts.is_empty() {
+            return Ok(CoinBalance {
+                spendable: Default::default(),
+                unspendable: Default::default(),
+            });
+        }
+        let actual_token_pubkey =
+            Pubkey::from_str(&*token_accounts[0].pubkey).map_err(|e| BalanceError::Internal(format!("{:?}", e)))?;
+        let amount = async_blocking({
+            let coin = self.clone();
+            move || coin.rpc().get_token_account_balance(&actual_token_pubkey)
+        })
+        .await?;
+        let balance =
+            BigDecimal::from_str(&*amount.ui_amount_string).map_to_mm(|e| BalanceError::Internal(e.to_string()))?;
+        Ok(CoinBalance {
+            spendable: balance,
+            unspendable: Default::default(),
+        })
+    }
+
+    fn my_balance_impl(&self) -> BalanceFut<BigDecimal> {
+        let coin = self.clone();
+        let fut = async_blocking(move || {
+            // this is blocking IO
+            let res = coin.rpc().get_balance(&coin.key_pair.pubkey())?;
+            Ok(lamports_to_sol(res))
+        });
+        Box::new(fut.boxed().compat())
+    }
+
+    pub fn add_spl_token_info(&self, ticker: String, info: SplTokenInfo) {
+        self.spl_tokens_infos.lock().unwrap().insert(ticker, info);
+    }
+
+    pub fn get_spl_tokens_infos(&self) -> HashMap<String, SplTokenInfo> {
+        let guard = self.spl_tokens_infos.lock().unwrap();
+        (*guard).clone()
+    }
+}
+
+impl MarketCoinOps for SolanaCoin {
+    fn ticker(&self) -> &str { &self.ticker }
+
+    fn my_address(&self) -> Result<String, String> { Ok(self.my_address.clone()) }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
+
+    fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { unimplemented!() }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> { solana_common::sign_message(self, message) }
+
+    fn verify_message(&self, signature: &str, message: &str, pubkey_bs58: &str) -> VerificationResult<bool> {
+        solana_common::verify_message(self, signature, message, pubkey_bs58)
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> {
+        let decimals = self.decimals as u64;
+        let fut = self.my_balance_impl().and_then(move |result| {
+            Ok(CoinBalance {
+                spendable: result.with_prec(decimals),
+                unspendable: 0.into(),
+            })
+        });
+        Box::new(fut)
+    }
+
+    fn base_coin_balance(&self) -> BalanceFut<BigDecimal> {
+        let decimals = self.decimals as u64;
+        let fut = self
+            .my_balance_impl()
+            .and_then(move |result| Ok(result.with_prec(decimals)));
+        Box::new(fut)
+    }
+
+    fn platform_ticker(&self) -> &str { self.ticker() }
+
+    fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        let coin = self.clone();
+        let tx = tx.to_owned();
+        let fut = async_blocking(move || {
+            let bytes = hex::decode(tx).map_to_mm(|e| e).map_err(|e| format!("{:?}", e))?;
+            let tx: Transaction = deserialize(bytes.as_slice())
+                .map_to_mm(|e| e)
+                .map_err(|e| format!("{:?}", e))?;
+            // this is blocking IO
+            let signature = coin.rpc().send_transaction(&tx).map_err(|e| format!("{:?}", e))?;
+            Ok(signature.to_string())
+        });
+        Box::new(fut.boxed().compat())
+    }
+
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        let coin = self.clone();
+        let tx = tx.to_owned();
+        let fut = async_blocking(move || {
+            let tx = try_s!(deserialize(tx.as_slice()));
+            // this is blocking IO
+            let signature = coin.rpc().send_transaction(&tx).map_err(|e| format!("{:?}", e))?;
+            Ok(signature.to_string())
+        });
+        Box::new(fut.boxed().compat())
+    }
+
+    fn wait_for_confirmations(
+        &self,
+        _tx: &[u8],
+        _confirmations: u64,
+        _requires_nota: bool,
+        _wait_until: u64,
+        _check_every: u64,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn wait_for_tx_spend(
+        &self,
+        _transaction: &[u8],
+        _wait_until: u64,
+        _from_block: u64,
+        _swap_contract_address: &Option<BytesJson>,
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, String> { unimplemented!() }
+
+    fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> {
+        let coin = self.clone();
+        let fut = async_blocking(move || coin.rpc().get_block_height().map_err(|e| format!("{:?}", e)));
+        Box::new(fut.boxed().compat())
+    }
+
+    fn display_priv_key(&self) -> Result<String, String> { Ok(self.key_pair.secret().to_bytes()[..].to_base58()) }
+
+    fn min_tx_amount(&self) -> BigDecimal { BigDecimal::from(0) }
+
+    fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
+}
+
+#[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
+#[async_trait]
+impl SwapOps for SolanaCoin {
+    fn send_taker_fee(&self, _fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut { unimplemented!() }
+
+    fn send_maker_payment(
+        &self,
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_payment(
+        &self,
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_maker_spends_taker_payment(
+        &self,
+        taker_payment_tx: &[u8],
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_spends_maker_payment(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_refunds_payment(
+        &self,
+        taker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_maker_refunds_payment(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret_hash: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn validate_fee(
+        &self,
+        _fee_tx: &TransactionEnum,
+        _expected_sender: &[u8],
+        _fee_addr: &[u8],
+        _amount: &BigDecimal,
+        _min_block_number: u64,
+        _uuid: &[u8],
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn check_if_my_payment_sent(
+        &self,
+        time_lock: u32,
+        my_pub: &[u8],
+        other_pub: &[u8],
+        search_from_block: u64,
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+        unimplemented!()
+    }
+
+    async fn search_for_swap_tx_spend_my(
+        &self,
+        _: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!()
+    }
+
+    async fn search_for_swap_tx_spend_other(
+        &self,
+        _: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!()
+    }
+
+    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+
+    fn negotiate_swap_contract_addr(
+        &self,
+        _other_side_address: Option<&[u8]>,
+    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
+        unimplemented!()
+    }
+
+    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { todo!() }
+}
+
+#[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
+#[async_trait]
+impl MmCoin for SolanaCoin {
+    fn is_asset_chain(&self) -> bool { false }
+
+    fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
+        Box::new(Box::pin(withdraw_impl(self.clone(), req)).compat())
+    }
+
+    fn get_raw_transaction(&self, _req: RawTransactionRequest) -> RawTransactionFut { unimplemented!() }
+
+    fn decimals(&self) -> u8 { self.decimals }
+
+    fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> { unimplemented!() }
+
+    fn validate_address(&self, address: &str) -> ValidateAddressResult {
+        if address.len() != 44 {
+            return ValidateAddressResult {
+                is_valid: false,
+                reason: Some("Invalid address length".to_string()),
+            };
+        }
+        let result = Pubkey::try_from(address);
+        match result {
+            Ok(pubkey) => {
+                if pubkey.is_on_curve() {
+                    ValidateAddressResult {
+                        is_valid: true,
+                        reason: None,
+                    }
+                } else {
+                    ValidateAddressResult {
+                        is_valid: false,
+                        reason: Some("not_on_curve".to_string()),
+                    }
+                }
+            },
+            Err(err) => ValidateAddressResult {
+                is_valid: false,
+                reason: Some(format!("{:?}", err)),
+            },
+        }
+    }
+
+    fn process_history_loop(&self, _ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> { unimplemented!() }
+
+    fn history_sync_status(&self) -> HistorySyncState { unimplemented!() }
+
+    /// Get fee to be paid per 1 swap transaction
+    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> { unimplemented!() }
+
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        unimplemented!()
+    }
+
+    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
+
+    async fn get_fee_to_send_taker_fee(
+        &self,
+        dex_fee_amount: BigDecimal,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        unimplemented!()
+    }
+
+    fn required_confirmations(&self) -> u64 { 1 }
+
+    fn requires_notarization(&self) -> bool { false }
+
+    fn set_required_confirmations(&self, _confirmations: u64) { unimplemented!() }
+
+    fn set_requires_notarization(&self, _requires_nota: bool) { unimplemented!() }
+
+    fn swap_contract_address(&self) -> Option<BytesJson> { unimplemented!() }
+
+    fn mature_confirmations(&self) -> Option<u32> { None }
+
+    fn coin_protocol_info(&self) -> Vec<u8> { Vec::new() }
+
+    fn is_coin_protocol_supported(&self, _info: &Option<Vec<u8>>) -> bool { true }
+}
diff --git a/mm2src/coins/solana/solana_common.rs b/mm2src/coins/solana/solana_common.rs
new file mode 100644
index 0000000000..3f74c1caff
--- /dev/null
+++ b/mm2src/coins/solana/solana_common.rs
@@ -0,0 +1,181 @@
+use crate::solana::SolanaCommonOps;
+use crate::{BalanceError, MarketCoinOps, NumConversError, SignatureError, SignatureResult, SolanaCoin,
+            UnexpectedDerivationMethod, VerificationError, VerificationResult, WithdrawError};
+use base58::FromBase58;
+use derive_more::Display;
+use futures::compat::Future01CompatExt;
+use mm2_err_handle::prelude::*;
+use mm2_number::bigdecimal::{BigDecimal, ToPrimitive};
+use solana_sdk::native_token::LAMPORTS_PER_SOL;
+use solana_sdk::signature::{Signature, Signer};
+use std::str::FromStr;
+
+#[derive(Debug, Display)]
+pub enum SufficientBalanceError {
+    #[display(
+        fmt = "Not enough {} to withdraw: available {}, required at least {}",
+        coin,
+        available,
+        required
+    )]
+    NotSufficientBalance {
+        coin: String,
+        available: BigDecimal,
+        required: BigDecimal,
+    },
+    #[display(fmt = "The amount {} is too small, required at least {}", amount, threshold)]
+    AmountTooLow { amount: BigDecimal, threshold: BigDecimal },
+    #[display(fmt = "{}", _0)]
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+    #[display(fmt = "Wallet storage error: {}", _0)]
+    WalletStorageError(String),
+    #[display(fmt = "Invalid response: {}", _0)]
+    InvalidResponse(String),
+    #[display(fmt = "Transport: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal: {}", _0)]
+    Internal(String),
+}
+
+impl From<NumConversError> for SufficientBalanceError {
+    fn from(e: NumConversError) -> Self { SufficientBalanceError::Internal(e.to_string()) }
+}
+
+impl From<BalanceError> for SufficientBalanceError {
+    fn from(e: BalanceError) -> Self {
+        match e {
+            BalanceError::Transport(e) => SufficientBalanceError::Transport(e),
+            BalanceError::InvalidResponse(e) => SufficientBalanceError::InvalidResponse(e),
+            BalanceError::UnexpectedDerivationMethod(e) => SufficientBalanceError::UnexpectedDerivationMethod(e),
+            BalanceError::Internal(e) => SufficientBalanceError::Internal(e),
+            BalanceError::WalletStorageError(e) => SufficientBalanceError::WalletStorageError(e),
+        }
+    }
+}
+impl From<SufficientBalanceError> for WithdrawError {
+    fn from(e: SufficientBalanceError) -> Self {
+        match e {
+            SufficientBalanceError::NotSufficientBalance {
+                coin,
+                available,
+                required,
+            } => WithdrawError::NotSufficientBalance {
+                coin,
+                available,
+                required,
+            },
+            SufficientBalanceError::UnexpectedDerivationMethod(e) => WithdrawError::from(e),
+            SufficientBalanceError::InvalidResponse(e) | SufficientBalanceError::Transport(e) => {
+                WithdrawError::Transport(e)
+            },
+            SufficientBalanceError::Internal(e) | SufficientBalanceError::WalletStorageError(e) => {
+                WithdrawError::InternalError(e)
+            },
+            SufficientBalanceError::AmountTooLow { amount, threshold } => {
+                WithdrawError::AmountTooLow { amount, threshold }
+            },
+        }
+    }
+}
+
+pub struct PrepareTransferData {
+    pub to_send: BigDecimal,
+    pub my_balance: BigDecimal,
+    pub sol_required: BigDecimal,
+    pub lamports_to_send: u64,
+}
+
+pub fn lamports_to_sol(lamports: u64) -> BigDecimal { BigDecimal::from(lamports) / BigDecimal::from(LAMPORTS_PER_SOL) }
+
+pub fn sol_to_lamports(sol: &BigDecimal) -> Result<u64, MmError<NumConversError>> {
+    let maybe_lamports = (sol * BigDecimal::from(LAMPORTS_PER_SOL)).to_u64();
+    match maybe_lamports {
+        None => MmError::err(NumConversError("Error when converting sol to lamports".to_string())),
+        Some(lamports) => Ok(lamports),
+    }
+}
+
+pub fn ui_amount_to_amount(ui_amount: BigDecimal, decimals: u8) -> Result<u64, MmError<NumConversError>> {
+    let maybe_amount = (ui_amount * BigDecimal::from(10_u64.pow(decimals as u32))).to_u64();
+    match maybe_amount {
+        None => MmError::err(NumConversError("Error when converting ui amount to amount".to_string())),
+        Some(amount) => Ok(amount),
+    }
+}
+
+pub fn amount_to_ui_amount(amount: u64, decimals: u8) -> BigDecimal {
+    BigDecimal::from(amount) / BigDecimal::from(10_u64.pow(decimals as u32))
+}
+
+pub fn sign_message(coin: &SolanaCoin, message: &str) -> SignatureResult<String> {
+    let signature = coin
+        .key_pair
+        .try_sign_message(message.as_bytes())
+        .map_err(|e| SignatureError::InternalError(e.to_string()))?;
+    Ok(signature.to_string())
+}
+
+pub fn verify_message(
+    coin: &SolanaCoin,
+    signature: &str,
+    message: &str,
+    pubkey_bs58: &str,
+) -> VerificationResult<bool> {
+    let pubkey = pubkey_bs58.from_base58()?;
+    let signature =
+        Signature::from_str(signature).map_err(|e| VerificationError::SignatureDecodingError(e.to_string()))?;
+    let is_valid = signature.verify(&pubkey, message.as_bytes());
+    Ok(is_valid)
+}
+
+pub async fn check_balance_and_prepare_transfer<T>(
+    coin: &T,
+    max: bool,
+    amount: BigDecimal,
+    fees: u64,
+) -> Result<PrepareTransferData, MmError<SufficientBalanceError>>
+where
+    T: SolanaCommonOps + MarketCoinOps,
+{
+    let base_balance = coin.base_coin_balance().compat().await?;
+    let sol_required = lamports_to_sol(fees);
+    if base_balance < sol_required {
+        return MmError::err(SufficientBalanceError::NotSufficientBalance {
+            coin: coin.platform_ticker().to_string(),
+            available: base_balance.clone(),
+            required: sol_required.clone(),
+        });
+    }
+
+    let my_balance = coin.my_balance().compat().await?.spendable;
+    let to_send = if max { my_balance.clone() } else { amount.clone() };
+    let to_check = if max || coin.is_token() {
+        to_send.clone()
+    } else {
+        &to_send + &sol_required
+    };
+    if to_check > my_balance {
+        return MmError::err(SufficientBalanceError::NotSufficientBalance {
+            coin: coin.ticker().to_string(),
+            available: my_balance,
+            required: to_check,
+        });
+    }
+
+    let lamports_to_send = if !coin.is_token() {
+        if max {
+            sol_to_lamports(&my_balance)? - sol_to_lamports(&sol_required)?
+        } else {
+            sol_to_lamports(&amount)?
+        }
+    } else {
+        0_u64
+    };
+
+    Ok(PrepareTransferData {
+        to_send,
+        my_balance,
+        sol_required,
+        lamports_to_send,
+    })
+}
diff --git a/mm2src/coins/solana/solana_common_tests.rs b/mm2src/coins/solana/solana_common_tests.rs
new file mode 100644
index 0000000000..9f5eebddf7
--- /dev/null
+++ b/mm2src/coins/solana/solana_common_tests.rs
@@ -0,0 +1,98 @@
+use super::*;
+use crate::solana::spl::{SplToken, SplTokenConf};
+use bip39::Language;
+use crypto::privkey::key_pair_from_seed;
+use ed25519_dalek_bip32::{DerivationPath, ExtendedSecretKey};
+use mm2_core::mm_ctx::MmCtxBuilder;
+use solana_client::rpc_client::RpcClient;
+use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel};
+use std::str::FromStr;
+
+pub enum SolanaNet {
+    //Mainnet,
+    Testnet,
+    Devnet,
+}
+
+pub fn solana_net_to_url(net_type: SolanaNet) -> String {
+    match net_type {
+        //SolanaNet::Mainnet => "https://api.mainnet-beta.solana.com".to_string(),
+        SolanaNet::Testnet => "https://api.testnet.solana.com/".to_string(),
+        SolanaNet::Devnet => "https://api.devnet.solana.com".to_string(),
+    }
+}
+
+pub fn generate_key_pair_from_seed(seed: String) -> Keypair {
+    let derivation_path = DerivationPath::from_str("m/44'/501'/0'").unwrap();
+    let mnemonic = bip39::Mnemonic::from_phrase(seed.as_str(), Language::English).unwrap();
+    let seed = bip39::Seed::new(&mnemonic, "");
+    let seed_bytes: &[u8] = seed.as_bytes();
+
+    let ext = ExtendedSecretKey::from_seed(seed_bytes)
+        .unwrap()
+        .derive(&derivation_path)
+        .unwrap();
+    let ref priv_key = ext.secret_key;
+    let pub_key = ext.public_key();
+    let pair = ed25519_dalek::Keypair {
+        secret: ext.secret_key,
+        public: pub_key,
+    };
+
+    solana_sdk::signature::keypair_from_seed(pair.to_bytes().as_ref()).unwrap()
+}
+
+pub fn generate_key_pair_from_iguana_seed(seed: String) -> Keypair {
+    let key_pair = key_pair_from_seed(seed.as_str()).unwrap();
+    let secret_key = ed25519_dalek::SecretKey::from_bytes(key_pair.private().secret.as_slice()).unwrap();
+    let public_key = ed25519_dalek::PublicKey::from(&secret_key);
+    let other_key_pair = ed25519_dalek::Keypair {
+        secret: secret_key,
+        public: public_key,
+    };
+    solana_sdk::signature::keypair_from_seed(other_key_pair.to_bytes().as_ref()).unwrap()
+}
+
+pub fn spl_coin_for_test(
+    solana_coin: SolanaCoin,
+    ticker: String,
+    decimals: u8,
+    token_contract_address: Pubkey,
+) -> SplToken {
+    let spl_coin = SplToken {
+        conf: Arc::new(SplTokenConf {
+            decimals,
+            ticker,
+            token_contract_address,
+        }),
+        platform_coin: solana_coin,
+    };
+    spl_coin
+}
+
+pub fn solana_coin_for_test(seed: String, net_type: SolanaNet) -> (MmArc, SolanaCoin) {
+    let url = solana_net_to_url(net_type);
+    let client = RpcClient::new_with_commitment(url, CommitmentConfig {
+        commitment: CommitmentLevel::Finalized,
+    });
+    let conf = json!({
+        "coins":[
+           {"coin":"SOL","name":"solana","protocol":{"type":"SOL"},"rpcport":80,"mm2":1}
+        ]
+    });
+    let ctx = MmCtxBuilder::new().with_conf(conf.clone()).into_mm_arc();
+    let (ticker, decimals) = ("SOL".to_string(), 8);
+    let key_pair = generate_key_pair_from_iguana_seed(seed);
+    let my_address = key_pair.pubkey().to_string();
+    let spl_tokens_infos = Arc::new(Mutex::new(HashMap::new()));
+
+    let solana_coin = SolanaCoin(Arc::new(SolanaCoinImpl {
+        decimals,
+        my_address,
+        key_pair,
+        ticker,
+        client,
+        spl_tokens_infos,
+    }));
+    (ctx, solana_coin)
+}
diff --git a/mm2src/coins/solana/solana_decode_tx_helpers.rs b/mm2src/coins/solana/solana_decode_tx_helpers.rs
new file mode 100644
index 0000000000..1f089de2df
--- /dev/null
+++ b/mm2src/coins/solana/solana_decode_tx_helpers.rs
@@ -0,0 +1,222 @@
+extern crate serde_derive;
+
+use crate::{NumConversResult, SolanaCoin, SolanaFeeDetails, TransactionDetails, TransactionType};
+use mm2_number::BigDecimal;
+use solana_sdk::native_token::lamports_to_sol;
+use std::convert::TryFrom;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SolanaConfirmedTransaction {
+    slot: u64,
+    transaction: Transaction,
+    meta: Meta,
+    #[serde(rename = "blockTime")]
+    block_time: u64,
+}
+
+#[allow(dead_code)]
+impl SolanaConfirmedTransaction {
+    pub fn extract_account_index(&self, address: String) -> usize {
+        // find the equivalent of index_of(needle) in rust, and return result later
+        let mut idx = 0_usize;
+        for account in self.transaction.message.account_keys.iter() {
+            if account.pubkey == address {
+                return idx;
+            }
+            idx += 1;
+        }
+        idx
+    }
+
+    pub fn extract_solana_transactions(&self, solana_coin: &SolanaCoin) -> NumConversResult<Vec<TransactionDetails>> {
+        let mut transactions = Vec::new();
+        let account_idx = self.extract_account_index(solana_coin.my_address.clone());
+        for instruction in self.transaction.message.instructions.iter() {
+            if instruction.is_solana_transfer() {
+                let lamports = instruction.parsed.info.lamports.unwrap_or_default();
+                let amount = BigDecimal::try_from(lamports_to_sol(lamports))?;
+                let is_self_transfer = instruction.parsed.info.source == instruction.parsed.info.destination;
+                let am_i_sender = instruction.parsed.info.source == solana_coin.my_address;
+                let spent_by_me = if am_i_sender && !is_self_transfer {
+                    amount.clone()
+                } else {
+                    0.into()
+                };
+                let received_by_me = if is_self_transfer { amount.clone() } else { 0.into() };
+                let my_balance_change = if am_i_sender {
+                    BigDecimal::try_from(lamports_to_sol(
+                        self.meta.pre_balances[account_idx] - self.meta.post_balances[account_idx],
+                    ))?
+                } else {
+                    BigDecimal::try_from(lamports_to_sol(
+                        self.meta.post_balances[account_idx] - self.meta.pre_balances[account_idx],
+                    ))?
+                };
+                let fee = BigDecimal::try_from(lamports_to_sol(self.meta.fee))?;
+                let tx = TransactionDetails {
+                    tx_hex: Default::default(),
+                    tx_hash: self.transaction.signatures[0].to_string(),
+                    from: vec![instruction.parsed.info.source.clone()],
+                    to: vec![instruction.parsed.info.destination.clone()],
+                    total_amount: amount,
+                    spent_by_me,
+                    received_by_me,
+                    my_balance_change,
+                    block_height: self.slot,
+                    timestamp: self.block_time,
+                    fee_details: Some(SolanaFeeDetails { amount: fee }.into()),
+                    coin: solana_coin.ticker.clone(),
+                    internal_id: Default::default(),
+                    kmd_rewards: None,
+                    transaction_type: TransactionType::StandardTransfer,
+                };
+                transactions.push(tx);
+            }
+        }
+        Ok(transactions)
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Meta {
+    err: Option<serde_json::Value>,
+    status: Status,
+    fee: u64,
+    #[serde(rename = "preBalances")]
+    pre_balances: Vec<u64>,
+    #[serde(rename = "postBalances")]
+    post_balances: Vec<u64>,
+    #[serde(rename = "innerInstructions")]
+    inner_instructions: Vec<Option<serde_json::Value>>,
+    #[serde(rename = "logMessages")]
+    log_messages: Vec<String>,
+    #[serde(rename = "preTokenBalances")]
+    pre_token_balances: Vec<TokenBalance>,
+    #[serde(rename = "postTokenBalances")]
+    post_token_balances: Vec<TokenBalance>,
+    rewards: Vec<Option<serde_json::Value>>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TokenBalance {
+    #[serde(rename = "accountIndex")]
+    account_index: u64,
+    mint: String,
+    #[serde(rename = "uiTokenAmount")]
+    ui_token_amount: TokenAmount,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TokenAmount {
+    #[serde(rename = "uiAmount")]
+    ui_amount: f64,
+    decimals: u64,
+    amount: String,
+    #[serde(rename = "uiAmountString")]
+    ui_amount_string: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Status {
+    #[serde(rename = "Ok")]
+    ok: Option<serde_json::Value>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Transaction {
+    signatures: Vec<String>,
+    message: Message,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Message {
+    #[serde(rename = "accountKeys")]
+    account_keys: Vec<AccountKey>,
+    #[serde(rename = "recentBlockhash")]
+    recent_blockhash: String,
+    instructions: Vec<Instruction>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct AccountKey {
+    pubkey: String,
+    writable: bool,
+    signer: bool,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Instruction {
+    program: Program,
+    #[serde(rename = "programId")]
+    program_id: String,
+    parsed: Parsed,
+}
+
+#[allow(dead_code)]
+impl Instruction {
+    pub fn is_solana_transfer(&self) -> bool {
+        let is_system = match self.program {
+            Program::SplToken => return false,
+            Program::System => true,
+        };
+        let is_transfer = match self.parsed.parsed_type {
+            Type::Transfer => true,
+            Type::TransferChecked => true,
+            Type::Unknown => false,
+        };
+        is_system && is_transfer && self.parsed.info.lamports.is_some()
+    }
+
+    // Will be used later
+    pub fn is_spl_transfer(&self) -> bool {
+        let is_spl_token = match self.program {
+            Program::SplToken => true,
+            Program::System => return false,
+        };
+        let is_transfer = match self.parsed.parsed_type {
+            Type::Transfer => true,
+            Type::TransferChecked => true,
+            Type::Unknown => false,
+        };
+        is_spl_token && is_transfer
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Parsed {
+    info: Info,
+    #[serde(rename = "type")]
+    parsed_type: Type,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Info {
+    destination: String,
+    lamports: Option<u64>,
+    source: String,
+    mint: Option<String>,
+    #[serde(rename = "multisigAuthority")]
+    multisig_authority: Option<String>,
+    signers: Option<Vec<String>>,
+    #[serde(rename = "tokenAmount")]
+    token_amount: Option<TokenAmount>,
+    authority: Option<String>,
+    amount: Option<String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum Type {
+    #[serde(rename = "transfer")]
+    Transfer,
+    #[serde(rename = "transferChecked")]
+    TransferChecked,
+    Unknown,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum Program {
+    #[serde(rename = "spl-token")]
+    SplToken,
+    #[serde(rename = "system")]
+    System,
+}
diff --git a/mm2src/coins/solana/solana_tests.rs b/mm2src/coins/solana/solana_tests.rs
new file mode 100644
index 0000000000..300d9014cf
--- /dev/null
+++ b/mm2src/coins/solana/solana_tests.rs
@@ -0,0 +1,322 @@
+use super::*;
+use crate::solana::solana_common_tests::{generate_key_pair_from_iguana_seed, generate_key_pair_from_seed,
+                                         solana_coin_for_test, SolanaNet};
+use crate::solana::solana_decode_tx_helpers::SolanaConfirmedTransaction;
+use crate::MarketCoinOps;
+use base58::ToBase58;
+use common::{block_on, Future01CompatExt};
+use solana_client::rpc_request::TokenAccountsFilter;
+use solana_sdk::signature::{Signature, Signer};
+use solana_transaction_status::UiTransactionEncoding;
+use std::ops::Neg;
+use std::str::FromStr;
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_keypair_from_secp() {
+    let solana_key_pair = generate_key_pair_from_iguana_seed("federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string());
+    assert_eq!(
+        "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf",
+        solana_key_pair.pubkey().to_string()
+    );
+
+    let other_solana_keypair = generate_key_pair_from_iguana_seed("bob passphrase".to_string());
+    assert_eq!(
+        "B7KMMHyc3eYguUMneXRznY1NWh91HoVA2muVJetstYKE",
+        other_solana_keypair.pubkey().to_string()
+    );
+}
+
+// Research tests
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_prerequisites() {
+    // same test as trustwallet
+    {
+        let fin = generate_key_pair_from_seed(
+            "shoot island position soft burden budget tooth cruel issue economy destroy above".to_string(),
+        );
+        let public_address = fin.pubkey().to_string();
+        let priv_key = &fin.secret().to_bytes()[..].to_base58();
+        assert_eq!(public_address.len(), 44);
+        assert_eq!(public_address, "2bUBiBNZyD29gP1oV6de7nxowMLoDBtopMMTGgMvjG5m");
+        assert_eq!(priv_key, "F6czu7fdefbsCDH52JesQrBSJS5Sz25AkPLWFf8zUWhm");
+        let client = solana_client::rpc_client::RpcClient::new("https://api.testnet.solana.com/".to_string());
+        let balance = client.get_balance(&fin.pubkey()).expect("Expect to retrieve balance");
+        assert_eq!(balance, 0);
+    }
+
+    {
+        let key_pair = generate_key_pair_from_iguana_seed("passphrase not really secure".to_string());
+        let public_address = key_pair.pubkey().to_string();
+        assert_eq!(public_address.len(), 44);
+        assert_eq!(public_address, "2jTgfhf98GosnKSCXjL5YSiEa3MLrmR42yy9kZZq1i2c");
+        let client = solana_client::rpc_client::RpcClient::new("https://api.testnet.solana.com/".to_string());
+        let balance = client
+            .get_balance(&key_pair.pubkey())
+            .expect("Expect to retrieve balance");
+        assert_eq!(lamports_to_sol(balance), BigDecimal::from(0));
+        assert_eq!(balance, 0);
+
+        //  This will fetch all the balance from all tokens
+        let token_accounts = client
+            .get_token_accounts_by_owner(&key_pair.pubkey(), TokenAccountsFilter::ProgramId(spl_token::id()))
+            .expect("");
+        println!("{:?}", token_accounts);
+        let actual_token_pubkey = solana_sdk::pubkey::Pubkey::from_str(token_accounts[0].pubkey.as_str()).unwrap();
+        let amount = client.get_token_account_balance(&actual_token_pubkey).unwrap();
+        assert_ne!(amount.ui_amount_string.as_str(), "0");
+    }
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_coin_creation() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    assert_eq!(
+        sol_coin.my_address().unwrap(),
+        "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf"
+    );
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_my_balance() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let res = block_on(sol_coin.my_balance().compat()).unwrap();
+    assert_ne!(res.spendable, BigDecimal::from(0));
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_block_height() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let res = block_on(sol_coin.current_block().compat()).unwrap();
+    println!("block is : {}", res);
+    assert!(res > 0);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_validate_address() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+
+    // invalid len
+    let res = sol_coin.validate_address("invalidaddressobviously");
+    assert_eq!(res.is_valid, false);
+
+    let res = sol_coin.validate_address("GMtMFbuVgjDnzsBd3LLBfM4X8RyYcDGCM92tPq2PG6B2");
+    assert_eq!(res.is_valid, true);
+
+    // Typo
+    let res = sol_coin.validate_address("Fr8fraJXAe1cFU81mF7NhHTrUzXjZAJkQE1gUQ11riH");
+    assert_eq!(res.is_valid, false);
+
+    // invalid len
+    let res = sol_coin.validate_address("r8fraJXAe1cFU81mF7NhHTrUzXjZAJkQE1gUQ11riHn");
+    assert_eq!(res.is_valid, false);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_sign_message() {
+    let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let signature = sol_coin.sign_message("test").unwrap();
+    assert_eq!(
+        signature,
+        "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF"
+    );
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_verify_message() {
+    let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let is_valid = sol_coin
+        .verify_message(
+            "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF",
+            "test",
+            "8UF6jSVE1jW8mSiGqt8Hft1rLwPjdKLaTfhkNozFwoAG",
+        )
+        .unwrap();
+    assert!(is_valid);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_transaction_simulations() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Devnet);
+    let request_amount = BigDecimal::try_from(0.0001).unwrap();
+    let valid_tx_details = block_on(
+        sol_coin
+            .withdraw(WithdrawRequest {
+                coin: "SOL".to_string(),
+                from: None,
+                to: sol_coin.my_address.clone(),
+                amount: request_amount.clone(),
+                max: false,
+                fee: None,
+            })
+            .compat(),
+    )
+    .unwrap();
+    let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
+    let sol_required = lamports_to_sol(fees);
+    let expected_spent_by_me = &request_amount + &sol_required;
+    assert_eq!(valid_tx_details.spent_by_me, expected_spent_by_me);
+    assert_eq!(valid_tx_details.received_by_me, request_amount);
+    assert_eq!(valid_tx_details.total_amount, expected_spent_by_me);
+    assert_eq!(valid_tx_details.my_balance_change, sol_required.neg());
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_transaction_zero_balance() {
+    let passphrase = "fake passphrase".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Devnet);
+    let invalid_tx_details = block_on(
+        sol_coin
+            .withdraw(WithdrawRequest {
+                coin: "SOL".to_string(),
+                from: None,
+                to: sol_coin.my_address.clone(),
+                amount: BigDecimal::from_str("0.000001").unwrap(),
+                max: false,
+                fee: None,
+            })
+            .compat(),
+    );
+    let error = invalid_tx_details.unwrap_err();
+    let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
+    let sol_required = lamports_to_sol(fees);
+    match error.into_inner() {
+        WithdrawError::NotSufficientBalance { required, .. } => {
+            assert_eq!(required, sol_required);
+        },
+        e @ _ => panic!("Unexpected err {:?}", e),
+    };
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_transaction_simulations_not_enough_for_fees() {
+    let passphrase = "non existent passphrase".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Devnet);
+    let invalid_tx_details = block_on(
+        sol_coin
+            .withdraw(WithdrawRequest {
+                coin: "SOL".to_string(),
+                from: None,
+                to: sol_coin.my_address.clone(),
+                amount: BigDecimal::from(1),
+                max: false,
+                fee: None,
+            })
+            .compat(),
+    );
+    let error = invalid_tx_details.unwrap_err();
+    let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
+    let sol_required = lamports_to_sol(fees);
+    match error.into_inner() {
+        WithdrawError::NotSufficientBalance {
+            coin: _,
+            available,
+            required,
+        } => {
+            assert_eq!(available, 0.into());
+            assert_eq!(required, sol_required);
+        },
+        e @ _ => panic!("Unexpected err {:?}", e),
+    };
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_transaction_simulations_max() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Devnet);
+    let valid_tx_details = block_on(
+        sol_coin
+            .withdraw(WithdrawRequest {
+                coin: "SOL".to_string(),
+                from: None,
+                to: sol_coin.my_address.clone(),
+                amount: BigDecimal::from(0),
+                max: true,
+                fee: None,
+            })
+            .compat(),
+    )
+    .unwrap();
+    let balance = block_on(sol_coin.my_balance().compat()).unwrap().spendable;
+    let (_, fees) = block_on(sol_coin.estimate_withdraw_fees()).unwrap();
+    let sol_required = lamports_to_sol(fees);
+    assert_eq!(valid_tx_details.my_balance_change, sol_required.clone().neg());
+    assert_eq!(valid_tx_details.total_amount, balance);
+    assert_eq!(valid_tx_details.spent_by_me, balance);
+    assert_eq!(valid_tx_details.received_by_me, &balance - &sol_required);
+    println!("{:?}", valid_tx_details);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_test_transactions() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Devnet);
+    let valid_tx_details = block_on(
+        sol_coin
+            .withdraw(WithdrawRequest {
+                coin: "SOL".to_string(),
+                from: None,
+                to: sol_coin.my_address.clone(),
+                amount: BigDecimal::try_from(0.0001).unwrap(),
+                max: false,
+                fee: None,
+            })
+            .compat(),
+    )
+    .unwrap();
+    println!("{:?}", valid_tx_details);
+
+    let tx_str = hex::encode(&*valid_tx_details.tx_hex.0);
+    let res = block_on(sol_coin.send_raw_tx(&tx_str).compat()).unwrap();
+
+    let res2 = block_on(sol_coin.send_raw_tx_bytes(&*valid_tx_details.tx_hex.0).compat()).unwrap();
+    assert_eq!(res, res2);
+
+    //println!("{:?}", res);
+}
+
+// This test is just a unit test for brainstorming around tx_history for base_coin.
+#[test]
+#[ignore]
+#[cfg(not(target_arch = "wasm32"))]
+fn solana_test_tx_history() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let res = sol_coin
+        .client
+        .get_signatures_for_address(&sol_coin.key_pair.pubkey())
+        .unwrap();
+    let mut history = Vec::new();
+    for cur in res.iter() {
+        let signature = Signature::from_str(cur.signature.clone().as_str()).unwrap();
+        let res = sol_coin
+            .client
+            .get_transaction(&signature, UiTransactionEncoding::JsonParsed)
+            .unwrap();
+        println!("{}", serde_json::to_string(&res).unwrap());
+        let parsed = serde_json::to_value(&res).unwrap();
+        let tx_infos: SolanaConfirmedTransaction = serde_json::from_value(parsed).unwrap();
+        let mut txs = tx_infos.extract_solana_transactions(&sol_coin).unwrap();
+        history.append(&mut txs);
+    }
+    println!("{}", serde_json::to_string(&history).unwrap());
+}
diff --git a/mm2src/coins/solana/spl.rs b/mm2src/coins/solana/spl.rs
new file mode 100644
index 0000000000..8447d10b28
--- /dev/null
+++ b/mm2src/coins/solana/spl.rs
@@ -0,0 +1,473 @@
+use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum};
+use crate::solana::solana_common::{ui_amount_to_amount, PrepareTransferData, SufficientBalanceError};
+use crate::solana::{solana_common, AccountError, SolanaCommonOps, SolanaFeeDetails};
+use crate::{BalanceFut, FeeApproxStage, FoundSwapTxSpend, NegotiateSwapContractAddrErr, RawTransactionFut,
+            RawTransactionRequest, SearchForSwapTxSpendInput, SignatureResult, SolanaCoin, TradePreimageFut,
+            TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionFut, TransactionType,
+            UnexpectedDerivationMethod, ValidateAddressResult, ValidatePaymentInput, VerificationResult,
+            WithdrawError, WithdrawFut, WithdrawRequest, WithdrawResult};
+use async_trait::async_trait;
+use bincode::serialize;
+use common::{async_blocking, now_ms};
+use futures::{FutureExt, TryFutureExt};
+use futures01::Future;
+use keys::KeyPair;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
+use rpc::v1::types::Bytes as BytesJson;
+use serde_json::Value as Json;
+use solana_client::{rpc_client::RpcClient, rpc_request::TokenAccountsFilter};
+use solana_sdk::message::Message;
+use solana_sdk::transaction::Transaction;
+use solana_sdk::{pubkey::Pubkey, signature::Signer};
+use spl_associated_token_account::{create_associated_token_account, get_associated_token_address};
+use std::{convert::TryFrom,
+          fmt::{Debug, Formatter, Result as FmtResult},
+          str::FromStr,
+          sync::Arc};
+
+#[derive(Debug)]
+pub enum SplTokenCreationError {
+    InvalidPubkey(String),
+}
+
+#[derive(Debug)]
+pub struct SplTokenConf {
+    pub decimals: u8,
+    pub ticker: String,
+    pub token_contract_address: Pubkey,
+}
+
+#[derive(Clone, Debug)]
+pub struct SplTokenInfo {
+    pub token_contract_address: Pubkey,
+    pub decimals: u8,
+}
+
+#[derive(Debug)]
+pub struct SplProtocolConf {
+    pub platform_coin_ticker: String,
+    pub decimals: u8,
+    pub token_contract_address: String,
+}
+
+#[derive(Clone)]
+pub struct SplToken {
+    pub conf: Arc<SplTokenConf>,
+    pub platform_coin: SolanaCoin,
+}
+
+impl Debug for SplToken {
+    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { f.write_str(&*self.conf.ticker) }
+}
+
+impl SplToken {
+    pub fn new(
+        decimals: u8,
+        ticker: String,
+        token_address: String,
+        platform_coin: SolanaCoin,
+    ) -> Result<SplToken, MmError<SplTokenCreationError>> {
+        let token_contract_address = solana_sdk::pubkey::Pubkey::from_str(&token_address)
+            .map_err(|e| MmError::new(SplTokenCreationError::InvalidPubkey(format!("{:?}", e))))?;
+        let conf = Arc::new(SplTokenConf {
+            decimals,
+            ticker,
+            token_contract_address,
+        });
+        Ok(SplToken { conf, platform_coin })
+    }
+
+    pub fn get_info(&self) -> SplTokenInfo {
+        SplTokenInfo {
+            token_contract_address: self.conf.token_contract_address,
+            decimals: self.decimals(),
+        }
+    }
+}
+
+async fn withdraw_spl_token_impl(coin: SplToken, req: WithdrawRequest) -> WithdrawResult {
+    let (hash, fees) = coin.platform_coin.estimate_withdraw_fees().await?;
+    let res = coin
+        .check_balance_and_prepare_transfer(req.max, req.amount.clone(), fees)
+        .await?;
+    let system_destination_pubkey = solana_sdk::pubkey::Pubkey::try_from(&*req.to)?;
+    let contract_key = coin.get_underlying_contract_pubkey();
+    let auth_key = coin.platform_coin.key_pair.pubkey();
+    let funding_address = coin.get_pubkey().await?;
+    let dest_token_address = get_associated_token_address(&system_destination_pubkey, &contract_key);
+    let mut instructions = Vec::with_capacity(1);
+    let account_info = async_blocking({
+        let coin = coin.clone();
+        move || coin.rpc().get_account(&dest_token_address)
+    })
+    .await;
+    if account_info.is_err() {
+        let instruction_creation = create_associated_token_account(&auth_key, &dest_token_address, &contract_key);
+        instructions.push(instruction_creation);
+    }
+    let amount = ui_amount_to_amount(req.amount, coin.conf.decimals)?;
+    let instruction_transfer_checked = spl_token::instruction::transfer_checked(
+        &spl_token::id(),
+        &funding_address,
+        &contract_key,
+        &dest_token_address,
+        &auth_key,
+        &[&auth_key],
+        amount,
+        coin.conf.decimals,
+    )?;
+    instructions.push(instruction_transfer_checked);
+    let msg = Message::new(&instructions, Some(&auth_key));
+    let signers = vec![&coin.platform_coin.key_pair];
+    let tx = Transaction::new(&signers, msg, hash);
+    let serialized_tx = serialize(&tx).map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+    let received_by_me = if req.to == coin.platform_coin.my_address {
+        res.to_send.clone()
+    } else {
+        0.into()
+    };
+    Ok(TransactionDetails {
+        tx_hex: serialized_tx.into(),
+        tx_hash: tx.signatures[0].to_string(),
+        from: vec![coin.platform_coin.my_address.clone()],
+        to: vec![req.to],
+        total_amount: res.to_send.clone(),
+        spent_by_me: res.to_send.clone(),
+        my_balance_change: &received_by_me - &res.to_send,
+        received_by_me,
+        block_height: 0,
+        timestamp: now_ms() / 1000,
+        fee_details: Some(
+            SolanaFeeDetails {
+                amount: res.sol_required,
+            }
+            .into(),
+        ),
+        coin: coin.conf.ticker.clone(),
+        internal_id: vec![].into(),
+        kmd_rewards: None,
+        transaction_type: TransactionType::StandardTransfer,
+    })
+}
+
+async fn withdraw_impl(coin: SplToken, req: WithdrawRequest) -> WithdrawResult {
+    let validate_address_result = coin.validate_address(&*req.to);
+    if !validate_address_result.is_valid {
+        return MmError::err(WithdrawError::InvalidAddress(
+            validate_address_result.reason.unwrap_or_else(|| "Unknown".to_string()),
+        ));
+    }
+    withdraw_spl_token_impl(coin, req).await
+}
+
+#[async_trait]
+impl SolanaCommonOps for SplToken {
+    fn rpc(&self) -> &RpcClient { &self.platform_coin.client }
+
+    fn is_token(&self) -> bool { true }
+
+    async fn check_balance_and_prepare_transfer(
+        &self,
+        max: bool,
+        amount: BigDecimal,
+        fees: u64,
+    ) -> Result<PrepareTransferData, MmError<SufficientBalanceError>> {
+        solana_common::check_balance_and_prepare_transfer(self, max, amount, fees).await
+    }
+}
+
+impl SplToken {
+    fn get_underlying_contract_pubkey(&self) -> Pubkey { self.conf.token_contract_address }
+
+    async fn get_pubkey(&self) -> Result<Pubkey, MmError<AccountError>> {
+        let coin = self.clone();
+        let token_accounts = async_blocking(move || {
+            coin.rpc().get_token_accounts_by_owner(
+                &coin.platform_coin.key_pair.pubkey(),
+                TokenAccountsFilter::Mint(coin.get_underlying_contract_pubkey()),
+            )
+        })
+        .await?;
+        if token_accounts.is_empty() {
+            return MmError::err(AccountError::NotFundedError("account_not_funded".to_string()));
+        }
+        Ok(Pubkey::from_str(&*token_accounts[0].pubkey)?)
+    }
+
+    fn my_balance_impl(&self) -> BalanceFut<CoinBalance> {
+        let coin = self.clone();
+        let fut = async move {
+            coin.platform_coin
+                .my_balance_spl(&SplTokenInfo {
+                    token_contract_address: coin.conf.token_contract_address,
+                    decimals: coin.conf.decimals,
+                })
+                .await
+        };
+        Box::new(fut.boxed().compat())
+    }
+}
+
+impl MarketCoinOps for SplToken {
+    fn ticker(&self) -> &str { &self.conf.ticker }
+
+    fn my_address(&self) -> Result<String, String> { Ok(self.platform_coin.my_address.clone()) }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
+
+    fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { unimplemented!() }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        solana_common::sign_message(&self.platform_coin, message)
+    }
+
+    fn verify_message(&self, signature: &str, message: &str, pubkey_bs58: &str) -> VerificationResult<bool> {
+        solana_common::verify_message(&self.platform_coin, signature, message, pubkey_bs58)
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> {
+        let fut = self.my_balance_impl().and_then(Ok);
+        Box::new(fut)
+    }
+
+    fn base_coin_balance(&self) -> BalanceFut<BigDecimal> { self.platform_coin.base_coin_balance() }
+
+    fn platform_ticker(&self) -> &str { self.platform_coin.ticker() }
+
+    #[inline(always)]
+    fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        self.platform_coin.send_raw_tx(tx)
+    }
+
+    #[inline(always)]
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        self.platform_coin.send_raw_tx_bytes(tx)
+    }
+
+    fn wait_for_confirmations(
+        &self,
+        _tx: &[u8],
+        _confirmations: u64,
+        _requires_nota: bool,
+        _wait_until: u64,
+        _check_every: u64,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn wait_for_tx_spend(
+        &self,
+        _transaction: &[u8],
+        _wait_until: u64,
+        _from_block: u64,
+        _swap_contract_address: &Option<BytesJson>,
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, String> { unimplemented!() }
+
+    fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { self.platform_coin.current_block() }
+
+    fn display_priv_key(&self) -> Result<String, String> { self.platform_coin.display_priv_key() }
+
+    fn min_tx_amount(&self) -> BigDecimal { BigDecimal::from(0) }
+
+    fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
+}
+
+#[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
+#[async_trait]
+impl SwapOps for SplToken {
+    fn send_taker_fee(&self, _fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut { unimplemented!() }
+
+    fn send_maker_payment(
+        &self,
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_payment(
+        &self,
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_maker_spends_taker_payment(
+        &self,
+        taker_payment_tx: &[u8],
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_spends_maker_payment(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_taker_refunds_payment(
+        &self,
+        taker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!()
+    }
+
+    fn send_maker_refunds_payment(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret_hash: &[u8],
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        todo!()
+    }
+
+    fn validate_fee(
+        &self,
+        _fee_tx: &TransactionEnum,
+        _expected_sender: &[u8],
+        _fee_addr: &[u8],
+        _amount: &BigDecimal,
+        _min_block_number: u64,
+        _uuid: &[u8],
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        unimplemented!()
+    }
+
+    fn check_if_my_payment_sent(
+        &self,
+        time_lock: u32,
+        other_pub: &[u8],
+        secret_hash: &[u8],
+        search_from_block: u64,
+        swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+        unimplemented!()
+    }
+
+    async fn search_for_swap_tx_spend_my(
+        &self,
+        _: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!()
+    }
+
+    async fn search_for_swap_tx_spend_other(
+        &self,
+        _: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!()
+    }
+
+    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+
+    fn negotiate_swap_contract_addr(
+        &self,
+        _other_side_address: Option<&[u8]>,
+    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
+        unimplemented!()
+    }
+
+    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { todo!() }
+}
+
+#[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
+#[async_trait]
+impl MmCoin for SplToken {
+    fn is_asset_chain(&self) -> bool { false }
+
+    fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
+        Box::new(Box::pin(withdraw_impl(self.clone(), req)).compat())
+    }
+
+    fn get_raw_transaction(&self, _req: RawTransactionRequest) -> RawTransactionFut { unimplemented!() }
+
+    fn decimals(&self) -> u8 { self.conf.decimals }
+
+    fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> { unimplemented!() }
+
+    fn validate_address(&self, address: &str) -> ValidateAddressResult { self.platform_coin.validate_address(address) }
+
+    fn process_history_loop(&self, _ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> { unimplemented!() }
+
+    fn history_sync_status(&self) -> HistorySyncState { unimplemented!() }
+
+    /// Get fee to be paid per 1 swap transaction
+    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> { unimplemented!() }
+
+    async fn get_sender_trade_fee(
+        &self,
+        _value: TradePreimageValue,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        unimplemented!()
+    }
+
+    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
+
+    async fn get_fee_to_send_taker_fee(
+        &self,
+        _dex_fee_amount: BigDecimal,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        unimplemented!()
+    }
+
+    fn required_confirmations(&self) -> u64 { 1 }
+
+    fn requires_notarization(&self) -> bool { false }
+
+    fn set_required_confirmations(&self, _confirmations: u64) { unimplemented!() }
+
+    fn set_requires_notarization(&self, _requires_nota: bool) { unimplemented!() }
+
+    fn swap_contract_address(&self) -> Option<BytesJson> { unimplemented!() }
+
+    fn mature_confirmations(&self) -> Option<u32> { Some(1) }
+
+    fn coin_protocol_info(&self) -> Vec<u8> { Vec::new() }
+
+    fn is_coin_protocol_supported(&self, _info: &Option<Vec<u8>>) -> bool { true }
+}
diff --git a/mm2src/coins/solana/spl_tests.rs b/mm2src/coins/solana/spl_tests.rs
new file mode 100644
index 0000000000..aa0c58b717
--- /dev/null
+++ b/mm2src/coins/solana/spl_tests.rs
@@ -0,0 +1,129 @@
+use super::*;
+use crate::{solana::solana_common_tests::solana_coin_for_test,
+            solana::solana_common_tests::{spl_coin_for_test, SolanaNet}};
+use common::{block_on, Future01CompatExt};
+use std::ops::Neg;
+use std::str::FromStr;
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn spl_coin_creation() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let sol_spl_usdc_coin = spl_coin_for_test(
+        sol_coin.clone(),
+        "USDC".to_string(),
+        6,
+        solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
+    );
+
+    println!("address: {}", sol_spl_usdc_coin.my_address().unwrap());
+    assert_eq!(
+        sol_spl_usdc_coin.my_address().unwrap(),
+        "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf"
+    );
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_sign_message() {
+    let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let sol_spl_usdc_coin = spl_coin_for_test(
+        sol_coin.clone(),
+        "USDC".to_string(),
+        6,
+        solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
+    );
+    let signature = sol_spl_usdc_coin.sign_message("test").unwrap();
+    assert_eq!(
+        signature,
+        "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF"
+    );
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_verify_message() {
+    let passphrase = "spice describe gravity federal blast come thank unfair canal monkey style afraid".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let sol_spl_usdc_coin = spl_coin_for_test(
+        sol_coin.clone(),
+        "USDC".to_string(),
+        6,
+        solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
+    );
+    let is_valid = sol_spl_usdc_coin
+        .verify_message(
+            "4dzKwEteN8nch76zPMEjPX19RsaQwGTxsbtfg2bwGTkGenLfrdm31zvn9GH5rvaJBwivp6ESXx1KYR672ngs3UfF",
+            "test",
+            "8UF6jSVE1jW8mSiGqt8Hft1rLwPjdKLaTfhkNozFwoAG",
+        )
+        .unwrap();
+    assert!(is_valid);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn spl_my_balance() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let sol_spl_usdc_coin = spl_coin_for_test(
+        sol_coin.clone(),
+        "USDC".to_string(),
+        6,
+        solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
+    );
+
+    let res = block_on(sol_spl_usdc_coin.my_balance().compat()).unwrap();
+    assert_ne!(res.spendable, BigDecimal::from(0));
+    assert!(res.spendable < BigDecimal::from(10));
+
+    let sol_spl_wsol_coin = spl_coin_for_test(
+        sol_coin.clone(),
+        "WSOL".to_string(),
+        8,
+        solana_sdk::pubkey::Pubkey::from_str("So11111111111111111111111111111111111111112").unwrap(),
+    );
+    let res = block_on(sol_spl_wsol_coin.my_balance().compat()).unwrap();
+    assert_eq!(res.spendable, BigDecimal::from(0));
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_spl_transactions() {
+    let passphrase = "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron".to_string();
+    let (_, sol_coin) = solana_coin_for_test(passphrase.clone(), SolanaNet::Testnet);
+    let usdc_sol_coin = spl_coin_for_test(
+        sol_coin.clone(),
+        "USDC".to_string(),
+        6,
+        solana_sdk::pubkey::Pubkey::from_str("CpMah17kQEL2wqyMKt3mZBdTnZbkbfx4nqmQMFDP5vwp").unwrap(),
+    );
+    let withdraw_amount = BigDecimal::from_str("0.0001").unwrap();
+    let valid_tx_details = block_on(
+        usdc_sol_coin
+            .withdraw(WithdrawRequest {
+                coin: "USDC".to_string(),
+                from: None,
+                to: "AYJmtzc9D4KU6xsDzhKShFyYKUNXY622j9QoQEo4LfpX".to_string(),
+                amount: withdraw_amount.clone(),
+                max: false,
+                fee: None,
+            })
+            .compat(),
+    )
+    .unwrap();
+    println!("{:?}", valid_tx_details);
+    assert_eq!(valid_tx_details.total_amount, withdraw_amount);
+    assert_eq!(valid_tx_details.my_balance_change, withdraw_amount.neg());
+    assert_eq!(valid_tx_details.coin, "USDC".to_string());
+    assert_ne!(valid_tx_details.timestamp, 0);
+
+    let tx_str = hex::encode(&*valid_tx_details.tx_hex.0);
+    let res = block_on(usdc_sol_coin.send_raw_tx(&tx_str).compat()).unwrap();
+    println!("{:?}", res);
+
+    let res2 = block_on(usdc_sol_coin.send_raw_tx_bytes(&*valid_tx_details.tx_hex.0).compat()).unwrap();
+    assert_eq!(res, res2);
+}
diff --git a/mm2src/coins/test_coin.rs b/mm2src/coins/test_coin.rs
index 7562b00a13..fa8d4d1662 100644
--- a/mm2src/coins/test_coin.rs
+++ b/mm2src/coins/test_coin.rs
@@ -1,11 +1,14 @@
-use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum, TransactionFut};
-use crate::{BalanceFut, FeeApproxStage, FoundSwapTxSpend, NegotiateSwapContractAddrErr, TradePreimageFut,
-            TradePreimageValue, ValidateAddressResult, WithdrawFut, WithdrawRequest};
-use bigdecimal::BigDecimal;
-use common::mm_ctx::MmArc;
-use common::mm_error::MmError;
-use common::mm_number::MmNumber;
+use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, RawTransactionFut, RawTransactionRequest, SwapOps,
+            TradeFee, TransactionEnum, TransactionFut};
+use crate::{BalanceFut, FeeApproxStage, FoundSwapTxSpend, NegotiateSwapContractAddrErr, SearchForSwapTxSpendInput,
+            SignatureResult, TradePreimageFut, TradePreimageResult, TradePreimageValue, UnexpectedDerivationMethod,
+            ValidateAddressResult, ValidatePaymentInput, VerificationResult, WithdrawFut, WithdrawRequest};
+use async_trait::async_trait;
 use futures01::Future;
+use keys::KeyPair;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
 use mocktopus::macros::*;
 use rpc::v1::types::Bytes as BytesJson;
 use serde_json::Value as Json;
@@ -32,13 +35,27 @@ impl MarketCoinOps for TestCoin {
 
     fn my_address(&self) -> Result<String, String> { unimplemented!() }
 
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
+
+    fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { unimplemented!() }
+
+    fn sign_message(&self, _message: &str) -> SignatureResult<String> { unimplemented!() }
+
+    fn verify_message(&self, _signature: &str, _message: &str, _address: &str) -> VerificationResult<bool> {
+        unimplemented!()
+    }
+
     fn my_balance(&self) -> BalanceFut<CoinBalance> { unimplemented!() }
 
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> { unimplemented!() }
 
+    fn platform_ticker(&self) -> &str { unimplemented!() }
+
     /// Receives raw transaction bytes in hexadecimal format as input and returns tx hash in hexadecimal format
     fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> { unimplemented!() }
 
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> { unimplemented!() }
+
     fn wait_for_confirmations(
         &self,
         tx: &[u8],
@@ -64,17 +81,18 @@ impl MarketCoinOps for TestCoin {
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { unimplemented!() }
 
-    fn display_priv_key(&self) -> String { unimplemented!() }
+    fn display_priv_key(&self) -> Result<String, String> { unimplemented!() }
 
     fn min_tx_amount(&self) -> BigDecimal { unimplemented!() }
 
     fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
 }
 
+#[async_trait]
 #[mockable]
 #[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
 impl SwapOps for TestCoin {
-    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal) -> TransactionFut { unimplemented!() }
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, uuid: &[u8]) -> TransactionFut { unimplemented!() }
 
     fn send_maker_payment(
         &self,
@@ -83,6 +101,7 @@ impl SwapOps for TestCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
         unimplemented!()
     }
@@ -94,6 +113,7 @@ impl SwapOps for TestCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
         unimplemented!()
     }
@@ -105,6 +125,7 @@ impl SwapOps for TestCoin {
         taker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
         unimplemented!()
     }
@@ -116,6 +137,7 @@ impl SwapOps for TestCoin {
         maker_pub: &[u8],
         secret: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
         unimplemented!()
     }
@@ -127,6 +149,7 @@ impl SwapOps for TestCoin {
         maker_pub: &[u8],
         secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
         unimplemented!()
     }
@@ -138,6 +161,7 @@ impl SwapOps for TestCoin {
         taker_pub: &[u8],
         secret_hash: &[u8],
         swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
     ) -> TransactionFut {
         unimplemented!()
     }
@@ -149,30 +173,21 @@ impl SwapOps for TestCoin {
         fee_addr: &[u8],
         amount: &BigDecimal,
         min_block_number: u64,
+        _uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         unimplemented!()
     }
 
     fn validate_maker_payment(
         &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
+        _input: ValidatePaymentInput,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         unimplemented!()
     }
 
     fn validate_taker_payment(
         &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        swap_contract_address: &Option<BytesJson>,
+        _input: ValidatePaymentInput,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         unimplemented!()
     }
@@ -184,30 +199,21 @@ impl SwapOps for TestCoin {
         secret_hash: &[u8],
         search_from_block: u64,
         swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
         unimplemented!()
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        swap_contract_address: &Option<BytesJson>,
+        _: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
         unimplemented!()
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        swap_contract_address: &Option<BytesJson>,
+        _: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
         unimplemented!()
     }
@@ -220,13 +226,18 @@ impl SwapOps for TestCoin {
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
         unimplemented!()
     }
+
+    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { unimplemented!() }
 }
 
+#[async_trait]
 #[mockable]
 #[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
 impl MmCoin for TestCoin {
     fn is_asset_chain(&self) -> bool { unimplemented!() }
 
+    fn get_raw_transaction(&self, _req: RawTransactionRequest) -> RawTransactionFut { unimplemented!() }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut { unimplemented!() }
 
     fn decimals(&self) -> u8 { unimplemented!() }
@@ -242,17 +253,21 @@ impl MmCoin for TestCoin {
     /// Get fee to be paid per 1 swap transaction
     fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> { unimplemented!() }
 
-    fn get_sender_trade_fee(&self, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
         unimplemented!()
     }
 
     fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
 
-    fn get_fee_to_send_taker_fee(
+    async fn get_fee_to_send_taker_fee(
         &self,
         dex_fee_amount: BigDecimal,
         stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee> {
+    ) -> TradePreimageResult<TradeFee> {
         unimplemented!()
     }
 
diff --git a/mm2src/coins/tx_history_db.rs b/mm2src/coins/tx_history_db.rs
deleted file mode 100644
index 27a0f7b2ec..0000000000
--- a/mm2src/coins/tx_history_db.rs
+++ /dev/null
@@ -1,467 +0,0 @@
-use crate::TransactionDetails;
-use async_trait::async_trait;
-use common::mm_error::prelude::*;
-use derive_more::Display;
-use std::path::PathBuf;
-
-#[cfg(not(target_arch = "wasm32"))]
-pub use native_db::TxHistoryDb;
-#[cfg(target_arch = "wasm32")] pub use wasm_db::TxHistoryDb;
-
-pub type TxHistoryResult<T> = Result<T, MmError<TxHistoryError>>;
-
-#[derive(Debug, Display)]
-pub enum TxHistoryError {
-    ErrorSerializing(String),
-    ErrorDeserializing(String),
-    ErrorSaving(String),
-    ErrorLoading(String),
-    ErrorClearing(String),
-    NotSupported(String),
-    InternalError(String),
-}
-
-#[async_trait]
-pub trait TxHistoryOps {
-    async fn init_with_fs_path(db_dir: PathBuf) -> TxHistoryResult<TxHistoryDb>;
-
-    async fn load_history(&mut self, ticker: &str, wallet_address: &str) -> TxHistoryResult<Vec<TransactionDetails>>;
-
-    async fn save_history(
-        &mut self,
-        ticker: &str,
-        wallet_address: &str,
-        txs: Vec<TransactionDetails>,
-    ) -> TxHistoryResult<()>;
-
-    async fn clear(&mut self, ticker: &str, wallet_address: &str) -> TxHistoryResult<()>;
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-mod native_db {
-    use super::*;
-    use async_std::fs;
-    use futures::AsyncWriteExt;
-    use serde_json as json;
-    use std::io;
-
-    pub struct TxHistoryDb {
-        tx_history_path: PathBuf,
-    }
-
-    #[async_trait]
-    impl TxHistoryOps for TxHistoryDb {
-        async fn init_with_fs_path(db_dir: PathBuf) -> TxHistoryResult<TxHistoryDb> {
-            Ok(TxHistoryDb {
-                tx_history_path: db_dir,
-            })
-        }
-
-        async fn load_history(
-            &mut self,
-            ticker: &str,
-            wallet_address: &str,
-        ) -> TxHistoryResult<Vec<TransactionDetails>> {
-            let path = self.ticker_history_path(ticker, wallet_address);
-            let content = match fs::read(&path).await {
-                Ok(content) => content,
-                Err(err) if err.kind() == io::ErrorKind::NotFound => {
-                    return Ok(Vec::new());
-                },
-                Err(err) => {
-                    let error = format!("Error '{}' reading from the history file {}", err, path.display());
-                    return MmError::err(TxHistoryError::ErrorLoading(error));
-                },
-            };
-            json::from_slice(&content).map_to_mm(|e| TxHistoryError::ErrorDeserializing(e.to_string()))
-        }
-
-        async fn save_history(
-            &mut self,
-            ticker: &str,
-            wallet_address: &str,
-            txs: Vec<TransactionDetails>,
-        ) -> TxHistoryResult<()> {
-            let content = json::to_vec(&txs).map_to_mm(|e| TxHistoryError::ErrorSerializing(e.to_string()))?;
-            let path = self.ticker_history_path(ticker, wallet_address);
-
-            let tmp_file = format!("{}.tmp", path.display());
-            let fut = async {
-                let mut file = fs::File::create(&tmp_file).await?;
-                file.write_all(&content).await?;
-                file.flush().await?;
-                fs::rename(&tmp_file, &path).await?;
-                Ok(())
-            };
-            let res: io::Result<_> = fut.await;
-            if let Err(e) = res {
-                let error = format!("Error '{}' creating/writing/renaming the tmp file {}", e, tmp_file);
-                return MmError::err(TxHistoryError::ErrorSaving(error));
-            }
-            Ok(())
-        }
-
-        async fn clear(&mut self, ticker: &str, wallet_address: &str) -> TxHistoryResult<()> {
-            fs::remove_file(&self.ticker_history_path(ticker, wallet_address))
-                .await
-                .map_to_mm(|e| TxHistoryError::ErrorClearing(e.to_string()))
-        }
-    }
-
-    impl TxHistoryDb {
-        fn ticker_history_path(&self, ticker: &str, wallet_address: &str) -> PathBuf {
-            // BCH cash address format has colon after prefix, e.g. bitcoincash:
-            // Colon can't be used in file names on Windows so it should be escaped
-            let wallet_address = wallet_address.replace(":", "_");
-            self.tx_history_path.join(format!("{}_{}.json", ticker, wallet_address))
-        }
-    }
-}
-
-/// Since `IndexedDb`, `DbTransaction`, `DbTable` are not `Send`,
-/// so we have to spawn locally the database and communicate with it through the `mpsc` channel.
-#[cfg(target_arch = "wasm32")]
-mod wasm_db {
-    use super::*;
-    use common::executor::spawn_local;
-    use common::panic_w;
-    use common::wasm_indexed_db::{DbTransactionError, DbUpgrader, IndexedDb, IndexedDbBuilder, InitDbError,
-                                  InitDbResult, OnUpgradeResult, TableSignature};
-    use common::WasmUnwrapExt;
-    use futures::channel::{mpsc, oneshot};
-    use futures::StreamExt;
-    use std::path::PathBuf;
-
-    const DB_NAME: &str = "tx_history";
-    const DB_VERSION: u32 = 1;
-
-    impl From<InitDbError> for TxHistoryError {
-        fn from(e: InitDbError) -> Self {
-            match &e {
-                InitDbError::NotSupported(_) => TxHistoryError::NotSupported(e.to_string()),
-                InitDbError::EmptyTableList
-                | InitDbError::DbIsOpenAlready { .. }
-                | InitDbError::InvalidVersion(_)
-                | InitDbError::OpeningError(_)
-                | InitDbError::TypeMismatch { .. }
-                | InitDbError::UnexpectedState(_)
-                | InitDbError::UpgradingError { .. } => TxHistoryError::InternalError(e.to_string()),
-            }
-        }
-    }
-
-    impl From<DbTransactionError> for TxHistoryError {
-        fn from(e: DbTransactionError) -> Self {
-            match e {
-                DbTransactionError::ErrorSerializingItem(_) => TxHistoryError::ErrorSerializing(e.to_string()),
-                DbTransactionError::ErrorDeserializingItem(_) => TxHistoryError::ErrorDeserializing(e.to_string()),
-                DbTransactionError::ErrorUploadingItem(_) => TxHistoryError::ErrorSaving(e.to_string()),
-                DbTransactionError::ErrorGettingItems(_) => TxHistoryError::ErrorLoading(e.to_string()),
-                DbTransactionError::ErrorDeletingItems(_) => TxHistoryError::ErrorClearing(e.to_string()),
-                DbTransactionError::NoSuchTable { .. }
-                | DbTransactionError::ErrorCreatingTransaction(_)
-                | DbTransactionError::ErrorOpeningTable { .. }
-                | DbTransactionError::UnexpectedState(_)
-                | DbTransactionError::TransactionAborted
-                | DbTransactionError::NoSuchIndex { .. }
-                | DbTransactionError::InvalidIndex { .. } => TxHistoryError::InternalError(e.to_string()),
-            }
-        }
-    }
-
-    type LoadHistoryResult = TxHistoryResult<Vec<TransactionDetails>>;
-    type SaveHistoryResult = TxHistoryResult<()>;
-    type ClearHistoryResult = TxHistoryResult<()>;
-
-    #[derive(Debug)]
-    enum TxHistoryEvent {
-        LoadHistory {
-            history_id: HistoryId,
-            result_tx: oneshot::Sender<LoadHistoryResult>,
-        },
-        SaveHistory {
-            history_id: HistoryId,
-            txs: Vec<TransactionDetails>,
-            result_tx: oneshot::Sender<SaveHistoryResult>,
-        },
-        Clear {
-            history_id: HistoryId,
-            result_tx: oneshot::Sender<ClearHistoryResult>,
-        },
-    }
-
-    pub struct TxHistoryDb {
-        event_tx: mpsc::Sender<TxHistoryEvent>,
-    }
-
-    #[async_trait]
-    impl TxHistoryOps for TxHistoryDb {
-        async fn init_with_fs_path(_path: PathBuf) -> TxHistoryResult<TxHistoryDb> {
-            let (init_tx, init_rx) = oneshot::channel();
-            let (event_tx, event_rx) = mpsc::channel(1024);
-
-            Self::init_and_spawn(init_tx, event_rx);
-            init_rx.await.expect_w("The init channel must not be closed")?;
-            Ok(TxHistoryDb { event_tx })
-        }
-
-        async fn load_history(&mut self, ticker: &str, wallet_address: &str) -> LoadHistoryResult {
-            let (result_tx, result_rx) = oneshot::channel();
-            let load_event = TxHistoryEvent::LoadHistory {
-                history_id: HistoryId::new(ticker, wallet_address),
-                result_tx,
-            };
-            if let Err(e) = self.event_tx.try_send(load_event) {
-                let error = format!("Couldn't send the 'TxHistoryEvent::LoadHistory' event: {}", e);
-                return MmError::err(TxHistoryError::InternalError(error));
-            }
-            result_rx.await.expect_w("The result channel must not be closed")
-        }
-
-        async fn save_history(
-            &mut self,
-            ticker: &str,
-            wallet_address: &str,
-            txs: Vec<TransactionDetails>,
-        ) -> SaveHistoryResult {
-            let (result_tx, result_rx) = oneshot::channel();
-            let save_event = TxHistoryEvent::SaveHistory {
-                history_id: HistoryId::new(ticker, wallet_address),
-                txs,
-                result_tx,
-            };
-            if let Err(e) = self.event_tx.try_send(save_event) {
-                let error = format!("Couldn't send the 'TxHistoryEvent::SaveHistory' event: {}", e);
-                return MmError::err(TxHistoryError::InternalError(error));
-            }
-            result_rx.await.expect_w("The result channel must not be closed")
-        }
-
-        async fn clear(&mut self, ticker: &str, wallet_address: &str) -> TxHistoryResult<()> {
-            let (result_tx, result_rx) = oneshot::channel();
-            let clear_event = TxHistoryEvent::Clear {
-                history_id: HistoryId::new(ticker, wallet_address),
-                result_tx,
-            };
-            if let Err(e) = self.event_tx.try_send(clear_event) {
-                let error = format!("Couldn't send the 'TxHistoryEvent::Clear' event: {}", e);
-                return MmError::err(TxHistoryError::InternalError(error));
-            }
-            result_rx.await.expect_w("The result channel must not be closed")
-        }
-    }
-
-    impl TxHistoryDb {
-        fn init_and_spawn(init_tx: oneshot::Sender<InitDbResult<()>>, event_rx: mpsc::Receiver<TxHistoryEvent>) {
-            let fut = async move {
-                let db = match IndexedDbBuilder::new(DB_NAME)
-                    .with_version(DB_VERSION)
-                    .with_table::<TxHistoryTable>()
-                    .init()
-                    .await
-                {
-                    Ok(db) => db,
-                    Err(e) => {
-                        // ignore if the receiver is closed
-                        let _res = init_tx.send(Err(e));
-                        return;
-                    },
-                };
-
-                // ignore if the receiver is closed
-                let _res = init_tx.send(Ok(()));
-                // run the event loop
-                Self::event_loop(event_rx, db).await;
-            };
-            spawn_local(fut);
-        }
-
-        async fn event_loop(mut rx: mpsc::Receiver<TxHistoryEvent>, db: IndexedDb) {
-            while let Some(event) = rx.next().await {
-                match event {
-                    TxHistoryEvent::LoadHistory { history_id, result_tx } => {
-                        let result = Self::load_history(&db, history_id).await;
-                        // ignore if the receiver is closed
-                        let _res = result_tx.send(result);
-                    },
-                    TxHistoryEvent::SaveHistory {
-                        history_id,
-                        txs,
-                        result_tx,
-                    } => {
-                        let result = Self::save_history(&db, history_id, txs).await;
-                        // ignore if the receiver is closed
-                        let _res = result_tx.send(result);
-                    },
-                    TxHistoryEvent::Clear { history_id, result_tx } => {
-                        let result = Self::clear_history(&db, history_id).await;
-                        // ignore if the receiver is closed
-                        let _res = result_tx.send(result);
-                    },
-                }
-            }
-        }
-
-        async fn load_history(db: &IndexedDb, history_id: HistoryId) -> LoadHistoryResult {
-            let transaction = db.transaction()?;
-            let table = transaction.open_table::<TxHistoryTable>()?;
-            let items = table.get_items("history_id", &history_id.0).await?;
-            if items.len() > 1 {
-                let error = format!(
-                    "Expected only one item by the 'history_id' index, found {}",
-                    items.len()
-                );
-                return MmError::err(TxHistoryError::InternalError(error));
-            }
-
-            let mut item_iter = items.into_iter();
-            match item_iter.next() {
-                Some((_item_id, TxHistoryTable { txs, .. })) => Ok(txs),
-                None => Ok(Vec::new()),
-            }
-        }
-
-        async fn save_history(
-            db: &IndexedDb,
-            history_id: HistoryId,
-            txs: Vec<TransactionDetails>,
-        ) -> SaveHistoryResult {
-            let history_id_value = history_id.0.clone();
-            let tx_history_item = TxHistoryTable { history_id, txs };
-
-            let transaction = db.transaction()?;
-            let table = transaction.open_table::<TxHistoryTable>()?;
-
-            // First, check if the coin's tx history exists already.
-            let ids = table.get_item_ids("history_id", &history_id_value).await?;
-            match ids.len() {
-                // The history doesn't exist, add the new `tx_history_item`.
-                0 => {
-                    table.add_item(&tx_history_item).await?;
-                },
-                // The history exists already, replace it with the actual `tx_history_item`.
-                1 => {
-                    let item_id = ids[0];
-                    table.replace_item(item_id, tx_history_item).await?;
-                },
-                unexpected_len => {
-                    let error = format!(
-                        "Expected only one item by the 'history_id' index, found {}",
-                        unexpected_len
-                    );
-                    return MmError::err(TxHistoryError::InternalError(error));
-                },
-            }
-
-            transaction.wait_for_complete().await?;
-            Ok(())
-        }
-
-        async fn clear_history(db: &IndexedDb, history_id: HistoryId) -> ClearHistoryResult {
-            let transaction = db.transaction()?;
-            let table = transaction.open_table::<TxHistoryTable>()?;
-
-            // First, check if the coin's tx history exists.
-            let ids = table.get_item_ids("history_id", &history_id.0).await?;
-            match ids.len() {
-                // The history doesn't exist, we don't need to do anything.
-                0 => (),
-                1 => {
-                    let item_id = ids[0];
-                    table.delete_item(item_id).await?;
-                },
-                unexpected_len => {
-                    let error = format!(
-                        "Expected only one item by the 'history_id' index, found {}",
-                        unexpected_len
-                    );
-                    return MmError::err(TxHistoryError::InternalError(error));
-                },
-            }
-
-            transaction.wait_for_complete().await?;
-            Ok(())
-        }
-    }
-
-    #[derive(Debug, Deserialize, Serialize)]
-    struct HistoryId(String);
-
-    impl HistoryId {
-        fn new(ticker: &str, wallet_address: &str) -> HistoryId { HistoryId(format!("{}_{}", ticker, wallet_address)) }
-    }
-
-    #[derive(Debug, Deserialize, Serialize)]
-    struct TxHistoryTable {
-        history_id: HistoryId,
-        txs: Vec<TransactionDetails>,
-    }
-
-    impl TableSignature for TxHistoryTable {
-        fn table_name() -> &'static str { "tx_history" }
-
-        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
-            match (old_version, new_version) {
-                (0, 1) => {
-                    let table = upgrader.create_table(Self::table_name())?;
-                    table.create_index("history_id", true)?;
-                },
-                (1, 1) => (),
-                v => panic_w(&format!("Unexpected (old, new) versions: {:?}", v)),
-            }
-            Ok(())
-        }
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-mod tests {
-    use super::wasm_db::*;
-    use super::*;
-    use common::WasmUnwrapExt;
-    use serde_json as json;
-    use wasm_bindgen_test::*;
-
-    wasm_bindgen_test_configure!(run_in_browser);
-
-    #[wasm_bindgen_test]
-    async fn test_tx_history() {
-        let mut db = TxHistoryDb::init_with_fs_path(PathBuf::default())
-            .await
-            .expect_w("!TxHistoryDb::init_with_fs_path");
-
-        let history = db
-            .load_history("RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
-            .await
-            .expect_w("!TxHistoryDb::load_history");
-        assert!(history.is_empty());
-
-        let history_str = r#"[{"tx_hex":"0400008085202f89018ec8f6f02e008ebd57bbf94c0d8297c1825f3af204490c43f5652b002a2c8b17010000006b483045022100e625a8b77beac5ec891e7d44b18fc4d780ef8456847eb2c6fa2f765e3379a9c102200f323612189fa44ee16f5deb39809b71c4811545b36ee4d6cc622d01aab10ef3012102043663e9c5af8275771809b3889d437f559e49e8df79b6ba19ade4cc5d8eb3e0ffffffff03809698000000000017a9142ffaf6694c6b441790546eefd277e430e08e47a6870000000000000000166a14094ab490fffa9939544545a656b345bf21920a90f6b35714000000001976a9145ed376ce9faa63cb2fef5862e1a5cc811c17316588acf9d29260000000000000000000000000000000","tx_hash":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8","from":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3"],"to":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3","bH6y6RtvbLToqSUNtLA5rQRjSwyNNzUSNc"],"total_amount":"3.51293022","spent_by_me":"3.51293022","received_by_me":"3.41292022","my_balance_change":"-0.10001","block_height":916940,"timestamp":1620235027,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"RICK","internal_id":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8"}]"#;
-        let history: Vec<TransactionDetails> = json::from_str(history_str).unwrap_w();
-        db.save_history("RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD", history)
-            .await
-            .expect_w("!TxHistoryDb::save_history");
-
-        let updated_history_str = r#"[{"tx_hex":"0400008085202f89018ec8f6f02e008ebd57bbf94c0d8297c1825f3af204490c43f5652b002a2c8b17010000006b483045022100e625a8b77beac5ec891e7d44b18fc4d780ef8456847eb2c6fa2f765e3379a9c102200f323612189fa44ee16f5deb39809b71c4811545b36ee4d6cc622d01aab10ef3012102043663e9c5af8275771809b3889d437f559e49e8df79b6ba19ade4cc5d8eb3e0ffffffff03809698000000000017a9142ffaf6694c6b441790546eefd277e430e08e47a6870000000000000000166a14094ab490fffa9939544545a656b345bf21920a90f6b35714000000001976a9145ed376ce9faa63cb2fef5862e1a5cc811c17316588acf9d29260000000000000000000000000000000","tx_hash":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8","from":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3"],"to":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3","bH6y6RtvbLToqSUNtLA5rQRjSwyNNzUSNc"],"total_amount":"3.51293022","spent_by_me":"3.51293022","received_by_me":"3.41292022","my_balance_change":"-0.10001","block_height":916940,"timestamp":1620235027,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"RICK","internal_id":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8"},{"tx_hex":"0400008085202f8901a5620f30001e5e31bcbffacee7687fd84490fa1f8625ddd1e098f0bc530d673e020000006b483045022100a9864707855307681b81d94ae17328f6feccb2a9439d27378dfeae2df0220cc102207476f8304af14794a9cd2fe6287e07a1c802c05ec134b789ddb22ab51f7d2238012102043663e9c5af8275771809b3889d437f559e49e8df79b6ba19ade4cc5d8eb3e0ffffffff0246320000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac5e4ef014000000001976a9145ed376ce9faa63cb2fef5862e1a5cc811c17316588acacd29260000000000000000000000000000000","tx_hash":"178b2c2a002b65f5430c4904f23a5f82c197820d4cf9bb57bd8e002ef0f6c88e","from":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3"],"to":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3","RThtXup6Zo7LZAi8kRWgjAyi1s4u6U9Cpf"],"total_amount":"3.51306892","spent_by_me":"3.51306892","received_by_me":"3.51293022","my_balance_change":"-0.0001387","block_height":916939,"timestamp":1620234997,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"RICK","internal_id":"178b2c2a002b65f5430c4904f23a5f82c197820d4cf9bb57bd8e002ef0f6c88e"}]"#;
-        let updated_history: Vec<TransactionDetails> = json::from_str(updated_history_str).unwrap_w();
-        db.save_history("RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD", updated_history.clone())
-            .await
-            .expect_w("!TxHistoryDb::save_history");
-
-        let actual_history = db
-            .load_history("RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
-            .await
-            .expect_w("!TxHistoryDb::load_history");
-        assert_eq!(actual_history, updated_history);
-
-        db.clear("RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
-            .await
-            .expect_w("!TxHistoryDb::clear");
-
-        let history = db
-            .load_history("RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
-            .await
-            .expect_w("!TxHistoryDb::load_history");
-        assert!(history.is_empty());
-    }
-}
diff --git a/mm2src/coins/tx_history_storage/mod.rs b/mm2src/coins/tx_history_storage/mod.rs
new file mode 100644
index 0000000000..9fca3dcc3d
--- /dev/null
+++ b/mm2src/coins/tx_history_storage/mod.rs
@@ -0,0 +1,183 @@
+use crate::my_tx_history_v2::TxHistoryStorage;
+use crate::TransactionType;
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use num_traits::Zero;
+use primitives::hash::H160;
+use serde::de::Error;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::collections::HashSet;
+use std::iter::FromIterator;
+
+#[cfg(target_arch = "wasm32")] pub mod wasm;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub mod sql_tx_history_storage_v2;
+
+#[cfg(any(test, target_arch = "wasm32"))]
+mod tx_history_v2_tests;
+
+/// Get `token_id` from the transaction type.
+/// Returns an empty `token_id` if the transaction is [`TransactionType::StandardTransfer`].
+#[inline]
+pub fn token_id_from_tx_type(tx_type: &TransactionType) -> String {
+    match tx_type {
+        TransactionType::TokenTransfer(token_id) => format!("{:02x}", token_id),
+        _ => String::new(),
+    }
+}
+
+#[derive(Debug, Display)]
+pub enum CreateTxHistoryStorageError {
+    Internal(String),
+}
+
+/// `TxHistoryStorageBuilder` is used to create an instance that implements the `TxHistoryStorage` trait.
+pub struct TxHistoryStorageBuilder<'a> {
+    ctx: &'a MmArc,
+}
+
+impl<'a> TxHistoryStorageBuilder<'a> {
+    #[inline]
+    pub fn new(ctx: &MmArc) -> TxHistoryStorageBuilder<'_> { TxHistoryStorageBuilder { ctx } }
+
+    #[inline]
+    pub fn build(self) -> MmResult<impl TxHistoryStorage, CreateTxHistoryStorageError> {
+        #[cfg(target_arch = "wasm32")]
+        return wasm::IndexedDbTxHistoryStorage::new(self.ctx);
+        #[cfg(not(target_arch = "wasm32"))]
+        sql_tx_history_storage_v2::SqliteTxHistoryStorage::new(self.ctx)
+    }
+}
+
+/// Whether transaction is unconfirmed or confirmed.
+/// Serializes to either `0u8` or `1u8` correspondingly.
+#[repr(u8)]
+#[derive(Clone, Copy, Debug)]
+pub enum ConfirmationStatus {
+    Unconfirmed = 0,
+    Confirmed = 1,
+}
+
+impl ConfirmationStatus {
+    #[inline]
+    pub fn from_block_height<Height: Zero>(height: Height) -> ConfirmationStatus {
+        if height.is_zero() {
+            ConfirmationStatus::Unconfirmed
+        } else {
+            ConfirmationStatus::Confirmed
+        }
+    }
+}
+
+impl Serialize for ConfirmationStatus {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        (*self as u8).serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for ConfirmationStatus {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let code = u8::deserialize(deserializer)?;
+        match code {
+            0 => Ok(ConfirmationStatus::Unconfirmed),
+            1 => Ok(ConfirmationStatus::Confirmed),
+            unknown => Err(D::Error::custom(format!(
+                "Expected either '0' or '1' confirmation status, found '{}'",
+                unknown
+            ))),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct WalletId {
+    ticker: String,
+    hd_wallet_rmd160: Option<H160>,
+}
+
+impl WalletId {
+    #[inline]
+    pub fn new(ticker: String) -> WalletId {
+        WalletId {
+            ticker,
+            hd_wallet_rmd160: None,
+        }
+    }
+
+    #[inline]
+    pub fn set_hd_wallet_rmd160(&mut self, hd_wallet_rmd160: H160) { self.hd_wallet_rmd160 = Some(hd_wallet_rmd160); }
+
+    #[inline]
+    pub fn with_hd_wallet_rmd160(mut self, hd_wallet_rmd160: H160) -> WalletId {
+        self.set_hd_wallet_rmd160(hd_wallet_rmd160);
+        self
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct GetTxHistoryFilters {
+    token_id: Option<String>,
+    for_addresses: Option<FilteringAddresses>,
+}
+
+impl GetTxHistoryFilters {
+    #[inline]
+    pub fn new() -> GetTxHistoryFilters { GetTxHistoryFilters::default() }
+
+    #[inline]
+    pub fn with_token_id(mut self, token_id: String) -> GetTxHistoryFilters {
+        self.token_id = Some(token_id);
+        self
+    }
+
+    #[inline]
+    pub fn set_for_addresses<I: IntoIterator<Item = String>>(&mut self, addresses: I) {
+        self.for_addresses = Some(addresses.into_iter().collect());
+    }
+
+    #[inline]
+    pub fn with_for_addresses<I: IntoIterator<Item = String>>(mut self, addresses: I) -> GetTxHistoryFilters {
+        self.set_for_addresses(addresses);
+        self
+    }
+
+    /// If [`GetTxHistoryFilters::token_id`] is not specified,
+    /// we should exclude token's transactions by applying an empty `token_id` filter.
+    fn token_id_or_exclude(&self) -> String { self.token_id.clone().unwrap_or_default() }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct FilteringAddresses(HashSet<String>);
+
+impl FilteringAddresses {
+    #[inline]
+    pub fn is_empty(&self) -> bool { self.0.is_empty() }
+
+    #[inline]
+    pub fn len(&self) -> usize { self.0.len() }
+
+    /// Whether the containers have the same addresses.
+    #[inline]
+    pub fn has_intersection(&self, other: &FilteringAddresses) -> bool {
+        self.0.intersection(&other.0).next().is_some()
+    }
+}
+
+impl IntoIterator for FilteringAddresses {
+    type Item = String;
+    type IntoIter = std::collections::hash_set::IntoIter<String>;
+
+    fn into_iter(self) -> Self::IntoIter { self.0.into_iter() }
+}
+
+impl FromIterator<String> for FilteringAddresses {
+    fn from_iter<T: IntoIterator<Item = String>>(iter: T) -> Self { FilteringAddresses(iter.into_iter().collect()) }
+}
diff --git a/mm2src/coins/tx_history_storage/sql_tx_history_storage_v2.rs b/mm2src/coins/tx_history_storage/sql_tx_history_storage_v2.rs
new file mode 100644
index 0000000000..a0bcf1c915
--- /dev/null
+++ b/mm2src/coins/tx_history_storage/sql_tx_history_storage_v2.rs
@@ -0,0 +1,642 @@
+use crate::my_tx_history_v2::{GetHistoryResult, RemoveTxResult, TxHistoryStorage, TxHistoryStorageError};
+use crate::tx_history_storage::{token_id_from_tx_type, ConfirmationStatus, CreateTxHistoryStorageError,
+                                FilteringAddresses, GetTxHistoryFilters, WalletId};
+use crate::TransactionDetails;
+use async_trait::async_trait;
+use common::{async_blocking, PagingOptionsEnum};
+use db_common::sql_query::SqlQuery;
+use db_common::sqlite::rusqlite::types::Type;
+use db_common::sqlite::rusqlite::{Connection, Error as SqlError, Row, NO_PARAMS};
+use db_common::sqlite::{query_single_row, string_from_row, validate_table_name, CHECK_TABLE_EXISTS_SQL};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::Bytes as BytesJson;
+use serde_json::{self as json};
+use std::convert::TryInto;
+use std::sync::{Arc, Mutex};
+
+fn tx_history_table(wallet_id: &WalletId) -> String { wallet_id.to_sql_table_name() + "_tx_history" }
+
+fn tx_address_table(wallet_id: &WalletId) -> String { wallet_id.to_sql_table_name() + "_tx_address" }
+
+/// Please note TX cache table name doesn't depend on [`WalletId::hd_wallet_rmd160`].
+fn tx_cache_table(wallet_id: &WalletId) -> String { format!("{}_tx_cache", wallet_id.ticker) }
+
+fn create_tx_history_table_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "CREATE TABLE IF NOT EXISTS {} (
+            id INTEGER NOT NULL PRIMARY KEY,
+            tx_hash VARCHAR(255) NOT NULL,
+            internal_id VARCHAR(255) NOT NULL UNIQUE,
+            block_height INTEGER NOT NULL,
+            confirmation_status INTEGER NOT NULL,
+            token_id VARCHAR(255) NOT NULL,
+            details_json TEXT
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn create_tx_address_table_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let tx_address_table = tx_address_table(wallet_id);
+    validate_table_name(&tx_address_table)?;
+
+    let sql = format!(
+        "CREATE TABLE IF NOT EXISTS {} (
+            id INTEGER NOT NULL PRIMARY KEY,
+            internal_id VARCHAR(255) NOT NULL,
+            address TEXT NOT NULL
+        );",
+        tx_address_table
+    );
+
+    Ok(sql)
+}
+
+fn create_tx_cache_table_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_cache_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "CREATE TABLE IF NOT EXISTS {} (
+            tx_hash VARCHAR(255) NOT NULL UNIQUE,
+            tx_hex TEXT NOT NULL
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn create_internal_id_index_sql<F>(wallet_id: &WalletId, table_name_creator: F) -> Result<String, MmError<SqlError>>
+where
+    F: FnOnce(&WalletId) -> String,
+{
+    let table_name = table_name_creator(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "CREATE INDEX IF NOT EXISTS internal_id_idx ON {} (internal_id);",
+        table_name
+    );
+    Ok(sql)
+}
+
+fn insert_tx_in_history_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "INSERT INTO {} (
+            tx_hash,
+            internal_id,
+            block_height,
+            confirmation_status,
+            token_id,
+            details_json
+        ) VALUES (
+            ?1, ?2, ?3, ?4, ?5, ?6
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn insert_tx_address_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_address_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "INSERT INTO {} (
+            internal_id,
+            address
+        ) VALUES (?1, ?2);",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn insert_tx_in_cache_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_cache_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    // We can simply ignore the repetitive attempt to insert the same tx_hash
+    let sql = format!(
+        "INSERT OR IGNORE INTO {} (tx_hash, tx_hex) VALUES (?1, ?2);",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn remove_tx_by_internal_id_sql<F>(wallet_id: &WalletId, table_name_creator: F) -> Result<String, MmError<SqlError>>
+where
+    F: FnOnce(&WalletId) -> String,
+{
+    let table_name = table_name_creator(wallet_id);
+    validate_table_name(&table_name)?;
+    let sql = format!("DELETE FROM {} WHERE internal_id=?1;", table_name);
+    Ok(sql)
+}
+
+fn select_tx_by_internal_id_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!("SELECT details_json FROM {} WHERE internal_id=?1;", table_name);
+
+    Ok(sql)
+}
+
+fn update_tx_in_table_by_internal_id_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET
+            block_height = ?1,
+            confirmation_status = ?2,
+            details_json = ?3
+        WHERE
+            internal_id=?4;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn contains_unconfirmed_transactions_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "SELECT COUNT(id) FROM {} WHERE confirmation_status = {};",
+        table_name,
+        ConfirmationStatus::Unconfirmed.to_sql_param()
+    );
+
+    Ok(sql)
+}
+
+fn get_unconfirmed_transactions_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "SELECT details_json FROM {} WHERE confirmation_status = {};",
+        table_name,
+        ConfirmationStatus::Unconfirmed.to_sql_param()
+    );
+
+    Ok(sql)
+}
+
+fn has_transactions_with_hash_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!("SELECT COUNT(id) FROM {} WHERE tx_hash = ?1;", table_name);
+
+    Ok(sql)
+}
+
+fn unique_tx_hashes_num_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_history_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!("SELECT COUNT(DISTINCT tx_hash) FROM {};", table_name);
+
+    Ok(sql)
+}
+
+fn get_tx_hex_from_cache_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+    let table_name = tx_cache_table(wallet_id);
+    validate_table_name(&table_name)?;
+
+    let sql = format!("SELECT tx_hex FROM {} WHERE tx_hash = ?1 LIMIT 1;", table_name);
+
+    Ok(sql)
+}
+
+/// Creates an `SqlQuery` instance with the required `WHERE`, `ORDER`, `GROUP_BY` constraints.
+/// Please note you can refer to the [`tx_history_table(wallet_id)`] table by the `tx_history` alias.
+fn get_history_builder_preimage<'a>(
+    connection: &'a Connection,
+    wallet_id: &WalletId,
+    token_id: String,
+    for_addresses: Option<FilteringAddresses>,
+) -> Result<SqlQuery<'a>, MmError<SqlError>> {
+    let mut sql_builder = SqlQuery::select_from_alias(connection, &tx_history_table(wallet_id), "tx_history")?;
+
+    // Check if we need to join the [`tx_address_table(wallet_id)`] table
+    // to query transactions that were sent from/to `for_addresses` addresses.
+    if let Some(for_addresses) = for_addresses {
+        let tx_address_table_name = tx_address_table(wallet_id);
+
+        sql_builder
+            .join_alias(&tx_address_table_name, "tx_address")?
+            .on_join_eq("tx_history.internal_id", "tx_address.internal_id")?;
+
+        sql_builder
+            .and_where_in_params("tx_address.address", for_addresses)?
+            .group_by("tx_history.internal_id")?;
+    }
+
+    sql_builder
+        .and_where_eq_param("tx_history.token_id", token_id)?
+        .order_asc("tx_history.confirmation_status")?
+        .order_desc("tx_history.block_height")?
+        .order_asc("tx_history.id")?;
+    Ok(sql_builder)
+}
+
+fn finalize_get_total_count_sql_builder(mut subquery: SqlQuery<'_>) -> Result<SqlQuery<'_>, MmError<SqlError>> {
+    /// The alias is needed so that the external query can access the results of the subquery.
+    /// Example:
+    ///   SUBQUERY: `SELECT h.internal_id AS __INTERNAL_ID_ALIAS FROM tx_history h JOIN tx_address a ON h.internal_id = a.internal_id WHERE a.address IN ('address_2', 'address_4') GROUP BY h.internal_id`
+    ///   EXTERNAL_QUERY: `SELECT COUNT(__INTERNAL_ID_ALIAS) FROM (<SUBQUERY>);`
+    /// Here we can't use `h.internal_id` in the external query because it doesn't know about the `tx_history h` table.
+    /// So we need to give the `h.internal_id` an alias like `__INTERNAL_ID_ALIAS`.
+    const INTERNAL_ID_ALIAS: &str = "__INTERNAL_ID_ALIAS";
+
+    // Query `id_field` and give it the `__ID_FIELD` alias.
+    subquery.field_alias("tx_history.internal_id", INTERNAL_ID_ALIAS)?;
+
+    let mut external_query = SqlQuery::select_from_subquery(subquery.subquery())?;
+    external_query.count(INTERNAL_ID_ALIAS)?;
+    Ok(external_query)
+}
+
+fn finalize_get_history_sql_builder(sql_builder: &mut SqlQuery, offset: usize, limit: usize) -> Result<(), SqlError> {
+    sql_builder
+        .field("tx_history.details_json")?
+        .offset(offset)
+        .limit(limit);
+    Ok(())
+}
+
+fn tx_details_from_row(row: &Row<'_>) -> Result<TransactionDetails, SqlError> {
+    let json_string: String = row.get(0)?;
+    json::from_str(&json_string).map_err(|e| SqlError::FromSqlConversionFailure(0, Type::Text, Box::new(e)))
+}
+
+impl TxHistoryStorageError for SqlError {}
+
+impl ConfirmationStatus {
+    fn to_sql_param(self) -> String { (self as u8).to_string() }
+}
+
+impl WalletId {
+    fn to_sql_table_name(&self) -> String {
+        match self.hd_wallet_rmd160 {
+            Some(hd_wallet_rmd160) => format!("{}_{}", self.ticker, hd_wallet_rmd160),
+            None => self.ticker.clone(),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct SqliteTxHistoryStorage(Arc<Mutex<Connection>>);
+
+impl SqliteTxHistoryStorage {
+    pub fn new(ctx: &MmArc) -> Result<Self, MmError<CreateTxHistoryStorageError>> {
+        let sqlite_connection = ctx
+            .sqlite_connection
+            .ok_or(MmError::new(CreateTxHistoryStorageError::Internal(
+                "sqlite_connection is not initialized".to_owned(),
+            )))?;
+        Ok(SqliteTxHistoryStorage(sqlite_connection.clone()))
+    }
+}
+
+#[async_trait]
+impl TxHistoryStorage for SqliteTxHistoryStorage {
+    type Error = SqlError;
+
+    async fn init(&self, wallet_id: &WalletId) -> Result<(), MmError<Self::Error>> {
+        let selfi = self.clone();
+
+        let sql_history = create_tx_history_table_sql(wallet_id)?;
+        let sql_cache = create_tx_cache_table_sql(wallet_id)?;
+        let sql_addr = create_tx_address_table_sql(wallet_id)?;
+
+        let sql_history_index = create_internal_id_index_sql(wallet_id, tx_history_table)?;
+        let sql_addr_index = create_internal_id_index_sql(wallet_id, tx_address_table)?;
+
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+
+            conn.execute(&sql_history, NO_PARAMS).map(|_| ())?;
+            conn.execute(&sql_addr, NO_PARAMS).map(|_| ())?;
+            conn.execute(&sql_cache, NO_PARAMS).map(|_| ())?;
+
+            conn.execute(&sql_history_index, NO_PARAMS).map(|_| ())?;
+            conn.execute(&sql_addr_index, NO_PARAMS).map(|_| ())?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn is_initialized_for(&self, wallet_id: &WalletId) -> Result<bool, MmError<Self::Error>> {
+        let tx_history_table = tx_history_table(wallet_id);
+        validate_table_name(&tx_history_table)?;
+
+        let tx_cache_table = tx_cache_table(wallet_id);
+        validate_table_name(&tx_cache_table)?;
+
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let history_initialized =
+                query_single_row(&conn, CHECK_TABLE_EXISTS_SQL, [tx_history_table], string_from_row)?;
+            let cache_initialized = query_single_row(&conn, CHECK_TABLE_EXISTS_SQL, [tx_cache_table], string_from_row)?;
+            Ok(history_initialized.is_some() && cache_initialized.is_some())
+        })
+        .await
+    }
+
+    async fn add_transactions_to_history<I>(
+        &self,
+        wallet_id: &WalletId,
+        transactions: I,
+    ) -> Result<(), MmError<Self::Error>>
+    where
+        I: IntoIterator<Item = TransactionDetails> + Send + 'static,
+        I::IntoIter: Send,
+    {
+        let selfi = self.clone();
+        let wallet_id = wallet_id.clone();
+        async_blocking(move || {
+            let mut conn = selfi.0.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+
+            for tx in transactions {
+                let tx_hash = tx.tx_hash.clone();
+                let internal_id = format!("{:02x}", tx.internal_id);
+                let confirmation_status = ConfirmationStatus::from_block_height(tx.block_height);
+                let token_id = token_id_from_tx_type(&tx.transaction_type);
+                let tx_json = json::to_string(&tx).expect("serialization should not fail");
+
+                let tx_hex = format!("{:02x}", tx.tx_hex);
+                let tx_cache_params = [&tx_hash, &tx_hex];
+
+                sql_transaction.execute(&insert_tx_in_cache_sql(&wallet_id)?, tx_cache_params)?;
+
+                let params = [
+                    tx_hash,
+                    internal_id.clone(),
+                    tx.block_height.to_string(),
+                    confirmation_status.to_sql_param(),
+                    token_id,
+                    tx_json,
+                ];
+                sql_transaction.execute(&insert_tx_in_history_sql(&wallet_id)?, &params)?;
+
+                let addresses: FilteringAddresses = tx.from.into_iter().chain(tx.to.into_iter()).collect();
+                for address in addresses {
+                    let params = [internal_id.clone(), address];
+                    sql_transaction.execute(&insert_tx_address_sql(&wallet_id)?, &params)?;
+                }
+            }
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn remove_tx_from_history(
+        &self,
+        wallet_id: &WalletId,
+        internal_id: &BytesJson,
+    ) -> Result<RemoveTxResult, MmError<Self::Error>> {
+        let remove_tx_history_sql = remove_tx_by_internal_id_sql(wallet_id, tx_history_table)?;
+        let remove_tx_addr_sql = remove_tx_by_internal_id_sql(wallet_id, tx_address_table)?;
+
+        let params = [format!("{:02x}", internal_id)];
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let mut conn = selfi.0.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+
+            sql_transaction.execute(&remove_tx_addr_sql, &params)?;
+
+            let rows_num = sql_transaction.execute(&remove_tx_history_sql, &params)?;
+            let remove_tx_result = if rows_num > 0 {
+                RemoveTxResult::TxRemoved
+            } else {
+                RemoveTxResult::TxDidNotExist
+            };
+
+            sql_transaction.commit()?;
+            Ok(remove_tx_result)
+        })
+        .await
+    }
+
+    async fn get_tx_from_history(
+        &self,
+        wallet_id: &WalletId,
+        internal_id: &BytesJson,
+    ) -> Result<Option<TransactionDetails>, MmError<Self::Error>> {
+        let params = [format!("{:02x}", internal_id)];
+        let sql = select_tx_by_internal_id_sql(wallet_id)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            query_single_row(&conn, &sql, params, tx_details_from_row).map_to_mm(SqlError::from)
+        })
+        .await
+    }
+
+    async fn history_contains_unconfirmed_txes(&self, wallet_id: &WalletId) -> Result<bool, MmError<Self::Error>> {
+        let sql = contains_unconfirmed_transactions_sql(wallet_id)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let count_unconfirmed = conn.query_row::<u32, _, _>(&sql, NO_PARAMS, |row| row.get(0))?;
+            Ok(count_unconfirmed > 0)
+        })
+        .await
+    }
+
+    async fn get_unconfirmed_txes_from_history(
+        &self,
+        wallet_id: &WalletId,
+    ) -> Result<Vec<TransactionDetails>, MmError<Self::Error>> {
+        let sql = get_unconfirmed_transactions_sql(wallet_id)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let mut stmt = conn.prepare(&sql)?;
+            let rows = stmt.query(NO_PARAMS)?;
+            let result = rows.mapped(tx_details_from_row).collect::<Result<_, _>>()?;
+            Ok(result)
+        })
+        .await
+    }
+
+    async fn update_tx_in_history(
+        &self,
+        wallet_id: &WalletId,
+        tx: &TransactionDetails,
+    ) -> Result<(), MmError<Self::Error>> {
+        let sql = update_tx_in_table_by_internal_id_sql(wallet_id)?;
+
+        let block_height = tx.block_height.to_string();
+        let confirmation_status = ConfirmationStatus::from_block_height(tx.block_height);
+        let json_details = json::to_string(tx).unwrap();
+        let internal_id = format!("{:02x}", tx.internal_id);
+
+        let params = [
+            block_height,
+            confirmation_status.to_sql_param(),
+            json_details,
+            internal_id,
+        ];
+
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            conn.execute(&sql, params).map(|_| ()).map_err(MmError::new)
+        })
+        .await
+    }
+
+    async fn history_has_tx_hash(&self, wallet_id: &WalletId, tx_hash: &str) -> Result<bool, MmError<Self::Error>> {
+        let sql = has_transactions_with_hash_sql(wallet_id)?;
+        let params = [tx_hash.to_owned()];
+
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let count: u32 = conn.query_row(&sql, params, |row| row.get(0))?;
+            Ok(count > 0)
+        })
+        .await
+    }
+
+    async fn unique_tx_hashes_num_in_history(&self, wallet_id: &WalletId) -> Result<usize, MmError<Self::Error>> {
+        let sql = unique_tx_hashes_num_sql(wallet_id)?;
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let count: u32 = conn.query_row(&sql, NO_PARAMS, |row| row.get(0))?;
+            Ok(count as usize)
+        })
+        .await
+    }
+
+    async fn add_tx_to_cache(
+        &self,
+        wallet_id: &WalletId,
+        tx_hash: &str,
+        tx_hex: &BytesJson,
+    ) -> Result<(), MmError<Self::Error>> {
+        let sql = insert_tx_in_cache_sql(wallet_id)?;
+        let params = [tx_hash.to_owned(), format!("{:02x}", tx_hex)];
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            conn.execute(&sql, params)?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn tx_bytes_from_cache(
+        &self,
+        wallet_id: &WalletId,
+        tx_hash: &str,
+    ) -> Result<Option<BytesJson>, MmError<Self::Error>> {
+        let sql = get_tx_hex_from_cache_sql(wallet_id)?;
+        let params = [tx_hash.to_owned()];
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let maybe_tx_hex: Result<String, _> = conn.query_row(&sql, params, |row| row.get(0));
+            if let Err(SqlError::QueryReturnedNoRows) = maybe_tx_hex {
+                return Ok(None);
+            }
+            let tx_hex = maybe_tx_hex?;
+            let tx_bytes =
+                hex::decode(&tx_hex).map_err(|e| SqlError::FromSqlConversionFailure(0, Type::Text, Box::new(e)))?;
+            Ok(Some(tx_bytes.into()))
+        })
+        .await
+    }
+
+    async fn get_history(
+        &self,
+        wallet_id: &WalletId,
+        filters: GetTxHistoryFilters,
+        paging: PagingOptionsEnum<BytesJson>,
+        limit: usize,
+    ) -> Result<GetHistoryResult, MmError<Self::Error>> {
+        // Check if [`GetTxHistoryFilters::for_addresses`] is specified and empty.
+        // If it is, it's much more efficient to return an empty result before we do any query.
+        if matches!(filters.for_addresses, Some(ref for_addresses) if for_addresses.is_empty()) {
+            return Ok(GetHistoryResult {
+                transactions: Vec::new(),
+                skipped: 0,
+                total: 0,
+            });
+        }
+
+        let wallet_id = wallet_id.clone();
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let token_id = filters.token_id_or_exclude();
+            let mut sql_builder = get_history_builder_preimage(&conn, &wallet_id, token_id, filters.for_addresses)?;
+
+            let total_count_builder = finalize_get_total_count_sql_builder(sql_builder.clone())?;
+            let total: isize = total_count_builder
+                .query_single_row(|row| row.get(0))?
+                .or_mm_err(|| SqlError::QueryReturnedNoRows)?;
+            let total = total.try_into().expect("count should be always above zero");
+
+            let offset = match paging {
+                PagingOptionsEnum::PageNumber(page) => (page.get() - 1) * limit,
+                PagingOptionsEnum::FromId(from_internal_id) => {
+                    let maybe_offset = sql_builder
+                        .clone()
+                        .query_offset_by_id("tx_history.internal_id", format!("{:02x}", from_internal_id))?;
+                    match maybe_offset {
+                        Some(offset) => offset,
+                        None => {
+                            // TODO do we need to return `SqlError::QueryReturnedNoRows` error instead?
+                            return Ok(GetHistoryResult {
+                                transactions: vec![],
+                                skipped: 0,
+                                total,
+                            });
+                        },
+                    }
+                },
+            };
+
+            finalize_get_history_sql_builder(&mut sql_builder, offset, limit)?;
+            let transactions = sql_builder.query(tx_details_from_row)?;
+
+            let result = GetHistoryResult {
+                transactions,
+                skipped: offset,
+                total,
+            };
+            Ok(result)
+        })
+        .await
+    }
+}
diff --git a/mm2src/coins/tx_history_storage/tx_history_v2_tests.rs b/mm2src/coins/tx_history_storage/tx_history_v2_tests.rs
new file mode 100644
index 0000000000..8adefb6a74
--- /dev/null
+++ b/mm2src/coins/tx_history_storage/tx_history_v2_tests.rs
@@ -0,0 +1,646 @@
+use crate::my_tx_history_v2::{GetHistoryResult, TxHistoryStorage};
+use crate::tx_history_storage::{GetTxHistoryFilters, TxHistoryStorageBuilder, WalletId};
+use crate::{BytesJson, TransactionDetails};
+use common::PagingOptionsEnum;
+use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+use serde_json as json;
+use std::collections::HashMap;
+use std::num::NonZeroUsize;
+
+const BCH_TX_HISTORY_STR: &str = include_str!("../for_tests/tBCH_tx_history_fixtures.json");
+
+lazy_static! {
+    static ref BCH_TX_HISTORY: Vec<TransactionDetails> = parse_tx_history();
+    static ref BCH_TX_HISTORY_MAP: HashMap<String, TransactionDetails> = parse_tx_history_map();
+}
+
+fn parse_tx_history() -> Vec<TransactionDetails> { json::from_str(BCH_TX_HISTORY_STR).unwrap() }
+
+fn parse_tx_history_map() -> HashMap<String, TransactionDetails> {
+    parse_tx_history()
+        .into_iter()
+        .map(|tx| (format!("{:02x}", tx.internal_id), tx))
+        .collect()
+}
+
+fn get_bch_tx_details(internal_id: &str) -> TransactionDetails { BCH_TX_HISTORY_MAP.get(internal_id).unwrap().clone() }
+
+fn wallet_id_for_test(test_name: &str) -> WalletId { WalletId::new(test_name.to_owned()) }
+
+#[track_caller]
+fn assert_get_history_result(actual: GetHistoryResult, expected_ids: Vec<BytesJson>, skipped: usize, total: usize) {
+    let actual_ids: Vec<_> = actual.transactions.into_iter().map(|tx| tx.internal_id).collect();
+    assert_eq!(actual_ids, expected_ids);
+    assert_eq!(actual.skipped, skipped, "!skipped");
+    assert_eq!(actual.total, total, "!total");
+}
+
+async fn get_coin_history<Storage: TxHistoryStorage>(
+    storage: &Storage,
+    wallet_id: &WalletId,
+) -> Vec<TransactionDetails> {
+    let filters = GetTxHistoryFilters::new();
+    let paging_options = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+    let limit = u32::MAX as usize;
+    storage
+        .get_history(wallet_id, filters, paging_options, limit)
+        .await
+        .unwrap()
+        .transactions
+}
+
+async fn test_add_transactions_impl() {
+    let wallet_id = wallet_id_for_test("TEST_ADD_TRANSACTIONS");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    let tx1 = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+    let transactions = [tx1.clone(), tx1.clone()];
+
+    // must fail because we are adding transactions with the same internal_id
+    storage
+        .add_transactions_to_history(&wallet_id, transactions)
+        .await
+        .unwrap_err();
+    let actual_txs = get_coin_history(&storage, &wallet_id).await;
+    assert!(actual_txs.is_empty());
+
+    let tx2 = get_bch_tx_details("c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce");
+    let transactions = vec![tx1, tx2];
+    storage
+        .add_transactions_to_history(&wallet_id, transactions.clone())
+        .await
+        .unwrap();
+    let actual_txs = get_coin_history(&storage, &wallet_id).await;
+    assert_eq!(actual_txs, transactions);
+}
+
+async fn test_remove_transaction_impl() {
+    let wallet_id = wallet_id_for_test("TEST_REMOVE_TRANSACTION");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+    let tx_details = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+    storage
+        .add_transactions_to_history(&wallet_id, [tx_details])
+        .await
+        .unwrap();
+
+    let remove_res = storage
+        .remove_tx_from_history(
+            &wallet_id,
+            &"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into(),
+        )
+        .await
+        .unwrap();
+    assert!(remove_res.tx_existed());
+
+    let remove_res = storage
+        .remove_tx_from_history(
+            &wallet_id,
+            &"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into(),
+        )
+        .await
+        .unwrap();
+    assert!(!remove_res.tx_existed());
+}
+
+async fn test_get_transaction_impl() {
+    let wallet_id = wallet_id_for_test("TEST_GET_TRANSACTION");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    let tx_details = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+    storage
+        .add_transactions_to_history(&wallet_id, [tx_details])
+        .await
+        .unwrap();
+
+    let tx = storage
+        .get_tx_from_history(
+            &wallet_id,
+            &"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into(),
+        )
+        .await
+        .unwrap()
+        .unwrap();
+    println!("{:?}", tx);
+
+    storage
+        .remove_tx_from_history(
+            &wallet_id,
+            &"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into(),
+        )
+        .await
+        .unwrap();
+
+    let tx = storage
+        .get_tx_from_history(
+            &wallet_id,
+            &"6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into(),
+        )
+        .await
+        .unwrap();
+    assert!(tx.is_none());
+}
+
+async fn test_update_transaction_impl() {
+    let wallet_id = wallet_id_for_test("TEST_UPDATE_TRANSACTION");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    let mut tx_details = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+    storage
+        .add_transactions_to_history(&wallet_id, [tx_details.clone()])
+        .await
+        .unwrap();
+
+    tx_details.block_height = 12345;
+
+    storage.update_tx_in_history(&wallet_id, &tx_details).await.unwrap();
+
+    let updated = storage
+        .get_tx_from_history(&wallet_id, &tx_details.internal_id)
+        .await
+        .unwrap()
+        .unwrap();
+
+    assert_eq!(12345, updated.block_height);
+}
+
+async fn test_contains_and_get_unconfirmed_transaction_impl() {
+    let wallet_id = wallet_id_for_test("TEST_CONTAINS_AND_GET_UNCONFIRMED_TRANSACTION");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    let mut tx_details = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+    tx_details.block_height = 0;
+    storage
+        .add_transactions_to_history(&wallet_id, [tx_details.clone()])
+        .await
+        .unwrap();
+
+    let contains_unconfirmed = storage.history_contains_unconfirmed_txes(&wallet_id).await.unwrap();
+    assert!(contains_unconfirmed);
+
+    let unconfirmed_transactions = storage.get_unconfirmed_txes_from_history(&wallet_id).await.unwrap();
+    assert_eq!(unconfirmed_transactions.len(), 1);
+
+    tx_details.block_height = 12345;
+    storage.update_tx_in_history(&wallet_id, &tx_details).await.unwrap();
+
+    let contains_unconfirmed = storage.history_contains_unconfirmed_txes(&wallet_id).await.unwrap();
+    assert!(!contains_unconfirmed);
+
+    let unconfirmed_transactions = storage.get_unconfirmed_txes_from_history(&wallet_id).await.unwrap();
+    assert!(unconfirmed_transactions.is_empty());
+}
+
+async fn test_has_transactions_with_hash_impl() {
+    let wallet_id = wallet_id_for_test("TEST_HAS_TRANSACTIONS_WITH_HASH");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    let has_tx_hash = storage
+        .history_has_tx_hash(
+            &wallet_id,
+            "6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69",
+        )
+        .await
+        .unwrap();
+    assert!(!has_tx_hash);
+
+    let tx_details = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+    storage
+        .add_transactions_to_history(&wallet_id, [tx_details])
+        .await
+        .unwrap();
+
+    let has_tx_hash = storage
+        .history_has_tx_hash(
+            &wallet_id,
+            "6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69",
+        )
+        .await
+        .unwrap();
+    assert!(has_tx_hash);
+}
+
+async fn test_unique_tx_hashes_num_impl() {
+    let wallet_id = wallet_id_for_test("TEST_UNIQUE_TX_HASHES_NUM");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    let tx1 = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+
+    let mut tx2 = tx1.clone();
+    tx2.internal_id = BytesJson(vec![1; 32]);
+
+    let tx3 = get_bch_tx_details("c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce");
+
+    let transactions = [tx1, tx2, tx3];
+    storage
+        .add_transactions_to_history(&wallet_id, transactions)
+        .await
+        .unwrap();
+
+    let tx_hashes_num = storage.unique_tx_hashes_num_in_history(&wallet_id).await.unwrap();
+    assert_eq!(2, tx_hashes_num);
+}
+
+async fn test_add_and_get_tx_from_cache_impl() {
+    let wallet_id_1 = WalletId::new("TEST_ADD_AND_GET_TX_FROM_CACHE".to_owned());
+    // `wallet_id_2` has the same `ticker` and a non-empty `hd_wallet_rmd160`.
+    let wallet_id_2 = WalletId::new("TEST_ADD_AND_GET_TX_FROM_CACHE".to_owned())
+        .with_hd_wallet_rmd160("108f07b8382412612c048d07d13f814118445acd".into());
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id_1).await.unwrap();
+    storage.init(&wallet_id_2).await.unwrap();
+
+    let tx = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+
+    storage
+        .add_tx_to_cache(&wallet_id_1, &tx.tx_hash, &tx.tx_hex)
+        .await
+        .unwrap();
+
+    let tx_hex_from_1 = storage
+        .tx_bytes_from_cache(&wallet_id_1, &tx.tx_hash)
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(tx_hex_from_1, tx.tx_hex);
+
+    // Since `wallet_id_1` and `wallet_id_2` wallets have the same `ticker`, the wallets must have one transaction cache.
+    let tx_hex_from_2 = storage
+        .tx_bytes_from_cache(&wallet_id_2, &tx.tx_hash)
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(tx_hex_from_2, tx.tx_hex);
+}
+
+async fn test_get_raw_tx_bytes_on_add_transactions_impl() {
+    let wallet_id = wallet_id_for_test("TEST_GET_RAW_TX_BYTES_ON_ADD_TRANSACTIONS");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    let tx_hash = "6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69";
+
+    let maybe_tx_hex = storage.tx_bytes_from_cache(&wallet_id, &tx_hash).await.unwrap();
+    assert!(maybe_tx_hex.is_none());
+
+    let tx1 = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
+
+    let mut tx2 = tx1.clone();
+    tx2.internal_id = BytesJson(vec![1; 32]);
+
+    let expected_tx_hex = tx1.tx_hex.clone();
+
+    let transactions = [tx1, tx2];
+    storage
+        .add_transactions_to_history(&wallet_id, transactions)
+        .await
+        .unwrap();
+
+    let tx_hex = storage
+        .tx_bytes_from_cache(&wallet_id, &tx_hash)
+        .await
+        .unwrap()
+        .unwrap();
+
+    assert_eq!(tx_hex, expected_tx_hex);
+}
+
+async fn test_get_history_page_number_impl() {
+    let wallet_id = wallet_id_for_test("TEST_GET_HISTORY_PAGE_NUMBER");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    storage
+        .add_transactions_to_history(&wallet_id, BCH_TX_HISTORY.clone())
+        .await
+        .unwrap();
+
+    let filters = GetTxHistoryFilters::new();
+    let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+    let limit = 4;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+
+    let expected_internal_ids: Vec<BytesJson> = vec![
+        "6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into(),
+        "c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce".into(),
+        "091877294268b2b1734255067146f15c3ac5e6199e72cd4f68a8d9dec32bb0c0".into(),
+        "d76723c092b64bc598d5d2ceafd6f0db37dce4032db569d6f26afb35491789a7".into(),
+    ];
+    assert_get_history_result(result, expected_internal_ids, 0, 123);
+
+    let filters = GetTxHistoryFilters::new()
+        .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
+    let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap());
+    let limit = 5;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+
+    let expected_internal_ids: Vec<BytesJson> = vec![
+        "433b641bc89e1b59c22717918583c60ec98421805c8e85b064691705d9aeb970".into(),
+        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989".into(),
+        "1c1e68357cf5a6dacb53881f13aa5d2048fe0d0fab24b76c9ec48f53884bed97".into(),
+        "c4304b5ef4f1b88ed4939534a8ca9eca79f592939233174ae08002e8454e3f06".into(),
+        "b0035434a1e7be5af2ed991ee2a21a90b271c5852a684a0b7d315c5a770d1b1c".into(),
+    ];
+    assert_get_history_result(result, expected_internal_ids, 5, 121);
+}
+
+async fn test_get_history_from_id_impl() {
+    let wallet_id = wallet_id_for_test("TEST_GET_HISTORY_FROM_ID");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    storage
+        .add_transactions_to_history(&wallet_id, BCH_TX_HISTORY.clone())
+        .await
+        .unwrap();
+
+    let filters = GetTxHistoryFilters::new();
+    let paging = PagingOptionsEnum::FromId("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into());
+    let limit = 3;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+
+    let expected_internal_ids: Vec<BytesJson> = vec![
+        "c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce".into(),
+        "091877294268b2b1734255067146f15c3ac5e6199e72cd4f68a8d9dec32bb0c0".into(),
+        "d76723c092b64bc598d5d2ceafd6f0db37dce4032db569d6f26afb35491789a7".into(),
+    ];
+    assert_get_history_result(result, expected_internal_ids, 1, 123);
+
+    let filters = GetTxHistoryFilters::new()
+        .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
+    let paging = PagingOptionsEnum::FromId("433b641bc89e1b59c22717918583c60ec98421805c8e85b064691705d9aeb970".into());
+    let limit = 4;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+
+    let expected_internal_ids: Vec<BytesJson> = vec![
+        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989".into(),
+        "1c1e68357cf5a6dacb53881f13aa5d2048fe0d0fab24b76c9ec48f53884bed97".into(),
+        "c4304b5ef4f1b88ed4939534a8ca9eca79f592939233174ae08002e8454e3f06".into(),
+        "b0035434a1e7be5af2ed991ee2a21a90b271c5852a684a0b7d315c5a770d1b1c".into(),
+    ];
+    assert_get_history_result(result, expected_internal_ids, 6, 121);
+}
+
+async fn test_get_history_for_addresses_impl() {
+    let wallet_id = wallet_id_for_test("TEST_GET_HISTORY_FROM_ID");
+
+    let ctx = mm_ctx_with_custom_db();
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init(&wallet_id).await.unwrap();
+
+    storage
+        .add_transactions_to_history(&wallet_id, BCH_TX_HISTORY.clone())
+        .await
+        .unwrap();
+
+    let for_addresses = vec![
+        "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
+        "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
+    ];
+    let filters = GetTxHistoryFilters::new()
+        .with_for_addresses(for_addresses)
+        .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
+    let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+    let limit = 5;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+    let expected_ids = vec![
+        "660d57aad6e7807ee99459a77ed6b526771db8567fff99ca055d652913555d08".into(),
+        "e46fa0836be0534f7799b2ef5b538551ea25b6f430b7e015a95731efb7a0cd4f".into(),
+        "fc666307cafcbf29e4b95ccc261a24603c8168535283c6ed8243d4cd8c2543c8".into(),
+        "fe78e04399219ef75271019f6d5db5d77179e9f310f8364604a6e4e05c4d7563".into(),
+    ];
+    assert_get_history_result(result, expected_ids, 0, 4);
+
+    // Try to request by the specified internal ID.
+
+    let for_addresses = vec![
+        "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
+        "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
+    ];
+    let filters = GetTxHistoryFilters::new()
+        .with_for_addresses(for_addresses)
+        .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
+    let paging = PagingOptionsEnum::FromId("e46fa0836be0534f7799b2ef5b538551ea25b6f430b7e015a95731efb7a0cd4f".into());
+    let limit = 4;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+    let expected_ids = vec![
+        "fc666307cafcbf29e4b95ccc261a24603c8168535283c6ed8243d4cd8c2543c8".into(),
+        "fe78e04399219ef75271019f6d5db5d77179e9f310f8364604a6e4e05c4d7563".into(),
+    ];
+    assert_get_history_result(result, expected_ids, 2, 4);
+
+    // If there are no transactions by the specified filters and paging options,
+    // we need to get an empty history.
+
+    let for_addresses = vec![
+        "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
+        "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
+    ];
+    let filters = GetTxHistoryFilters::new()
+        .with_for_addresses(for_addresses)
+        .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
+    let paging = PagingOptionsEnum::FromId("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into());
+    let limit = 2;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+    assert_get_history_result(result, Vec::new(), 0, 4);
+
+    // If there are no transactions by the specified filters and paging option,
+    // we need to get an empty history.
+
+    let for_addresses = vec![
+        "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
+        "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
+    ];
+    let filters = GetTxHistoryFilters::new()
+        .with_for_addresses(for_addresses)
+        .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
+    let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap());
+    let limit = 4;
+
+    let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
+    assert_get_history_result(result, Vec::new(), 4, 4);
+}
+
+#[cfg(test)]
+mod native_tests {
+    use super::wallet_id_for_test;
+    use crate::my_tx_history_v2::TxHistoryStorage;
+    use crate::tx_history_storage::sql_tx_history_storage_v2::SqliteTxHistoryStorage;
+    use common::block_on;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+
+    #[test]
+    fn test_init_collection() {
+        let wallet_id = wallet_id_for_test("TEST_INIT_COLLECTION");
+
+        let ctx = mm_ctx_with_custom_db();
+        let storage = SqliteTxHistoryStorage::new(&ctx).unwrap();
+
+        let initialized = block_on(storage.is_initialized_for(&wallet_id)).unwrap();
+        assert!(!initialized);
+
+        block_on(storage.init(&wallet_id)).unwrap();
+        // repetitive init must not fail
+        block_on(storage.init(&wallet_id)).unwrap();
+
+        let initialized = block_on(storage.is_initialized_for(&wallet_id)).unwrap();
+        assert!(initialized);
+    }
+
+    #[test]
+    fn test_add_transactions() { block_on(super::test_add_transactions_impl()); }
+
+    #[test]
+    fn test_remove_transaction() { block_on(super::test_remove_transaction_impl()); }
+
+    #[test]
+    fn test_get_transaction() { block_on(super::test_get_transaction_impl()); }
+
+    #[test]
+    fn test_update_transaction() { block_on(super::test_update_transaction_impl()); }
+
+    #[test]
+    fn test_contains_and_get_unconfirmed_transaction() {
+        block_on(super::test_contains_and_get_unconfirmed_transaction_impl());
+    }
+
+    #[test]
+    fn test_has_transactions_with_hash() { block_on(super::test_has_transactions_with_hash_impl()); }
+
+    #[test]
+    fn test_unique_tx_hashes_num() { block_on(super::test_unique_tx_hashes_num_impl()); }
+
+    #[test]
+    fn test_add_and_get_tx_from_cache() { block_on(super::test_add_and_get_tx_from_cache_impl()); }
+
+    #[test]
+    fn test_get_raw_tx_bytes_on_add_transactions() {
+        block_on(super::test_get_raw_tx_bytes_on_add_transactions_impl());
+    }
+
+    #[test]
+    fn test_get_history_page_number() { block_on(super::test_get_history_page_number_impl()); }
+
+    #[test]
+    fn test_get_history_from_id() { block_on(super::test_get_history_from_id_impl()); }
+
+    #[test]
+    fn test_get_history_for_addresses() { block_on(super::test_get_history_for_addresses_impl()); }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_tests {
+    use super::wallet_id_for_test;
+    use crate::my_tx_history_v2::TxHistoryStorage;
+    use crate::tx_history_storage::wasm::tx_history_storage_v2::IndexedDbTxHistoryStorage;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn test_init_collection() {
+        let wallet_id = wallet_id_for_test("TEST_INIT_COLLECTION");
+
+        let ctx = mm_ctx_with_custom_db();
+        let storage = IndexedDbTxHistoryStorage::new(&ctx).unwrap();
+
+        // Please note this is the `IndexedDbTxHistoryStorage` specific:
+        // [`IndexedDbTxHistoryStorage::is_initialized_for`] always returns `true`.
+        let initialized = storage.is_initialized_for(&wallet_id).await.unwrap();
+        assert!(initialized);
+
+        // repetitive init must not fail
+        storage.init(&wallet_id).await.unwrap();
+
+        let initialized = storage.is_initialized_for(&wallet_id).await.unwrap();
+        assert!(initialized);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_add_transactions() { super::test_add_transactions_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_remove_transaction() { super::test_remove_transaction_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_get_transaction() { super::test_get_transaction_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_update_transaction() { super::test_update_transaction_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_contains_and_get_unconfirmed_transaction() {
+        super::test_contains_and_get_unconfirmed_transaction_impl().await;
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_has_transactions_with_hash() { super::test_has_transactions_with_hash_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_unique_tx_hashes_num() { super::test_unique_tx_hashes_num_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_add_and_get_tx_from_cache() { super::test_add_and_get_tx_from_cache_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_get_raw_tx_bytes_on_add_transactions() {
+        super::test_get_raw_tx_bytes_on_add_transactions_impl().await;
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_get_history_page_number() { super::test_get_history_page_number_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_get_history_from_id() { super::test_get_history_from_id_impl().await; }
+
+    #[wasm_bindgen_test]
+    async fn test_get_history_for_addresses() { super::test_get_history_for_addresses_impl().await; }
+}
diff --git a/mm2src/coins/tx_history_storage/wasm/mod.rs b/mm2src/coins/tx_history_storage/wasm/mod.rs
new file mode 100644
index 0000000000..a3ba6cb193
--- /dev/null
+++ b/mm2src/coins/tx_history_storage/wasm/mod.rs
@@ -0,0 +1,54 @@
+use crate::my_tx_history_v2::TxHistoryStorageError;
+use mm2_db::indexed_db::{DbTransactionError, InitDbError};
+use mm2_err_handle::prelude::*;
+
+pub mod tx_history_db;
+pub mod tx_history_storage_v1;
+pub mod tx_history_storage_v2;
+
+pub use tx_history_db::{TxHistoryDb, TxHistoryDbLocked};
+pub use tx_history_storage_v1::{clear_tx_history, load_tx_history, save_tx_history};
+pub use tx_history_storage_v2::IndexedDbTxHistoryStorage;
+
+pub type WasmTxHistoryResult<T> = MmResult<T, WasmTxHistoryError>;
+pub type WasmTxHistoryError = crate::TxHistoryError;
+
+impl TxHistoryStorageError for WasmTxHistoryError {}
+
+impl From<InitDbError> for WasmTxHistoryError {
+    fn from(e: InitDbError) -> Self {
+        match &e {
+            InitDbError::NotSupported(_) => WasmTxHistoryError::NotSupported(e.to_string()),
+            InitDbError::EmptyTableList
+            | InitDbError::DbIsOpenAlready { .. }
+            | InitDbError::InvalidVersion(_)
+            | InitDbError::OpeningError(_)
+            | InitDbError::TypeMismatch { .. }
+            | InitDbError::UnexpectedState(_)
+            | InitDbError::UpgradingError { .. } => WasmTxHistoryError::InternalError(e.to_string()),
+        }
+    }
+}
+
+impl From<DbTransactionError> for WasmTxHistoryError {
+    fn from(e: DbTransactionError) -> Self {
+        match e {
+            DbTransactionError::ErrorSerializingItem(_) => WasmTxHistoryError::ErrorSerializing(e.to_string()),
+            DbTransactionError::ErrorDeserializingItem(_) => WasmTxHistoryError::ErrorDeserializing(e.to_string()),
+            DbTransactionError::ErrorUploadingItem(_) => WasmTxHistoryError::ErrorSaving(e.to_string()),
+            DbTransactionError::ErrorGettingItems(_) | DbTransactionError::ErrorCountingItems(_) => {
+                WasmTxHistoryError::ErrorLoading(e.to_string())
+            },
+            DbTransactionError::ErrorDeletingItems(_) => WasmTxHistoryError::ErrorClearing(e.to_string()),
+            DbTransactionError::NoSuchTable { .. }
+            | DbTransactionError::ErrorCreatingTransaction(_)
+            | DbTransactionError::ErrorOpeningTable { .. }
+            | DbTransactionError::ErrorSerializingIndex { .. }
+            | DbTransactionError::UnexpectedState(_)
+            | DbTransactionError::TransactionAborted
+            | DbTransactionError::MultipleItemsByUniqueIndex { .. }
+            | DbTransactionError::NoSuchIndex { .. }
+            | DbTransactionError::InvalidIndex { .. } => WasmTxHistoryError::InternalError(e.to_string()),
+        }
+    }
+}
diff --git a/mm2src/coins/tx_history_storage/wasm/tx_history_db.rs b/mm2src/coins/tx_history_storage/wasm/tx_history_db.rs
new file mode 100644
index 0000000000..c88fd3defc
--- /dev/null
+++ b/mm2src/coins/tx_history_storage/wasm/tx_history_db.rs
@@ -0,0 +1,33 @@
+use crate::tx_history_storage::wasm::tx_history_storage_v1::TxHistoryTableV1;
+use crate::tx_history_storage::wasm::tx_history_storage_v2::{TxCacheTableV2, TxHistoryTableV2};
+use async_trait::async_trait;
+use mm2_db::indexed_db::{DbIdentifier, DbInstance, DbLocked, IndexedDb, IndexedDbBuilder, InitDbResult};
+
+const DB_NAME: &str = "tx_history";
+const DB_VERSION: u32 = 1;
+
+pub type TxHistoryDbLocked<'a> = DbLocked<'a, TxHistoryDb>;
+
+pub struct TxHistoryDb {
+    inner: IndexedDb,
+}
+
+#[async_trait]
+impl DbInstance for TxHistoryDb {
+    fn db_name() -> &'static str { DB_NAME }
+
+    async fn init(db_id: DbIdentifier) -> InitDbResult<Self> {
+        let inner = IndexedDbBuilder::new(db_id)
+            .with_version(DB_VERSION)
+            .with_table::<TxHistoryTableV1>()
+            .with_table::<TxHistoryTableV2>()
+            .with_table::<TxCacheTableV2>()
+            .build()
+            .await?;
+        Ok(TxHistoryDb { inner })
+    }
+}
+
+impl TxHistoryDb {
+    pub fn get_inner(&self) -> &IndexedDb { &self.inner }
+}
diff --git a/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v1.rs b/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v1.rs
new file mode 100644
index 0000000000..80d573de23
--- /dev/null
+++ b/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v1.rs
@@ -0,0 +1,138 @@
+use crate::tx_history_storage::wasm::tx_history_db::TxHistoryDb;
+use crate::tx_history_storage::wasm::WasmTxHistoryResult;
+use crate::TransactionDetails;
+use mm2_db::indexed_db::{DbIdentifier, DbInstance, DbUpgrader, OnUpgradeResult, TableSignature};
+
+pub async fn load_tx_history(
+    db: &TxHistoryDb,
+    ticker: &str,
+    wallet_address: &str,
+) -> WasmTxHistoryResult<Vec<TransactionDetails>> {
+    let history_id = HistoryId::new(ticker, wallet_address);
+
+    let transaction = db.get_inner().transaction().await?;
+    let table = transaction.table::<TxHistoryTableV1>().await?;
+
+    let item_opt = table
+        .get_item_by_unique_index("history_id", history_id.as_str())
+        .await?;
+    match item_opt {
+        Some((_item_id, TxHistoryTableV1 { txs, .. })) => Ok(txs),
+        None => Ok(Vec::new()),
+    }
+}
+
+pub async fn save_tx_history(
+    db: &TxHistoryDb,
+    ticker: &str,
+    wallet_address: &str,
+    txs: Vec<TransactionDetails>,
+) -> WasmTxHistoryResult<()> {
+    let history_id = HistoryId::new(ticker, wallet_address);
+    let history_id_value = history_id.to_string();
+    let tx_history_item = TxHistoryTableV1 { history_id, txs };
+
+    let transaction = db.get_inner().transaction().await?;
+    let table = transaction.table::<TxHistoryTableV1>().await?;
+
+    table
+        .replace_item_by_unique_index("history_id", &history_id_value, &tx_history_item)
+        .await?;
+    Ok(())
+}
+
+pub async fn clear_tx_history(db: &TxHistoryDb, ticker: &str, wallet_address: &str) -> WasmTxHistoryResult<()> {
+    let history_id = HistoryId::new(ticker, wallet_address);
+
+    let transaction = db.get_inner().transaction().await?;
+    let table = transaction.table::<TxHistoryTableV1>().await?;
+
+    table
+        .delete_item_by_unique_index("history_id", history_id.as_str())
+        .await?;
+    Ok(())
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+struct HistoryId(String);
+
+impl HistoryId {
+    fn new(ticker: &str, wallet_address: &str) -> HistoryId { HistoryId(format!("{}_{}", ticker, wallet_address)) }
+
+    fn as_str(&self) -> &str { &self.0 }
+
+    fn to_string(&self) -> String { self.0.clone() }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub(crate) struct TxHistoryTableV1 {
+    history_id: HistoryId,
+    txs: Vec<TransactionDetails>,
+}
+
+impl TableSignature for TxHistoryTableV1 {
+    fn table_name() -> &'static str { "tx_history" }
+
+    fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+        match (old_version, new_version) {
+            (0, 1) => {
+                let table = upgrader.create_table(Self::table_name())?;
+                table.create_index("history_id", true)?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
+
+mod tests {
+    use super::*;
+    use serde_json as json;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn test_tx_history() {
+        const DB_NAME: &'static str = "TEST_TX_HISTORY";
+        let db = TxHistoryDb::init(DbIdentifier::for_test(DB_NAME))
+            .await
+            .expect("!TxHistoryDb::init_with_fs_path");
+
+        let history = load_tx_history(&db, "RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
+            .await
+            .expect("!TxHistoryDb::load_history");
+        assert!(history.is_empty());
+
+        let history_str = r#"[{"tx_hex":"0400008085202f89018ec8f6f02e008ebd57bbf94c0d8297c1825f3af204490c43f5652b002a2c8b17010000006b483045022100e625a8b77beac5ec891e7d44b18fc4d780ef8456847eb2c6fa2f765e3379a9c102200f323612189fa44ee16f5deb39809b71c4811545b36ee4d6cc622d01aab10ef3012102043663e9c5af8275771809b3889d437f559e49e8df79b6ba19ade4cc5d8eb3e0ffffffff03809698000000000017a9142ffaf6694c6b441790546eefd277e430e08e47a6870000000000000000166a14094ab490fffa9939544545a656b345bf21920a90f6b35714000000001976a9145ed376ce9faa63cb2fef5862e1a5cc811c17316588acf9d29260000000000000000000000000000000","tx_hash":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8","from":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3"],"to":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3","bH6y6RtvbLToqSUNtLA5rQRjSwyNNzUSNc"],"total_amount":"3.51293022","spent_by_me":"3.51293022","received_by_me":"3.41292022","my_balance_change":"-0.10001","block_height":916940,"timestamp":1620235027,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"RICK","internal_id":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8"}]"#;
+        let history: Vec<TransactionDetails> = json::from_str(history_str).unwrap();
+        save_tx_history(&db, "RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD", history)
+            .await
+            .expect("!TxHistoryDb::save_history");
+
+        let updated_history_str = r#"[{"tx_hex":"0400008085202f89018ec8f6f02e008ebd57bbf94c0d8297c1825f3af204490c43f5652b002a2c8b17010000006b483045022100e625a8b77beac5ec891e7d44b18fc4d780ef8456847eb2c6fa2f765e3379a9c102200f323612189fa44ee16f5deb39809b71c4811545b36ee4d6cc622d01aab10ef3012102043663e9c5af8275771809b3889d437f559e49e8df79b6ba19ade4cc5d8eb3e0ffffffff03809698000000000017a9142ffaf6694c6b441790546eefd277e430e08e47a6870000000000000000166a14094ab490fffa9939544545a656b345bf21920a90f6b35714000000001976a9145ed376ce9faa63cb2fef5862e1a5cc811c17316588acf9d29260000000000000000000000000000000","tx_hash":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8","from":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3"],"to":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3","bH6y6RtvbLToqSUNtLA5rQRjSwyNNzUSNc"],"total_amount":"3.51293022","spent_by_me":"3.51293022","received_by_me":"3.41292022","my_balance_change":"-0.10001","block_height":916940,"timestamp":1620235027,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"RICK","internal_id":"f05d786bd4b647a5720094bf0a2c6f23b5e131c451d750a96102898f7b5458e8"},{"tx_hex":"0400008085202f8901a5620f30001e5e31bcbffacee7687fd84490fa1f8625ddd1e098f0bc530d673e020000006b483045022100a9864707855307681b81d94ae17328f6feccb2a9439d27378dfeae2df0220cc102207476f8304af14794a9cd2fe6287e07a1c802c05ec134b789ddb22ab51f7d2238012102043663e9c5af8275771809b3889d437f559e49e8df79b6ba19ade4cc5d8eb3e0ffffffff0246320000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac5e4ef014000000001976a9145ed376ce9faa63cb2fef5862e1a5cc811c17316588acacd29260000000000000000000000000000000","tx_hash":"178b2c2a002b65f5430c4904f23a5f82c197820d4cf9bb57bd8e002ef0f6c88e","from":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3"],"to":["RHvavL8j683JwrN2ygk9Bg495DvPu5QVN3","RThtXup6Zo7LZAi8kRWgjAyi1s4u6U9Cpf"],"total_amount":"3.51306892","spent_by_me":"3.51306892","received_by_me":"3.51293022","my_balance_change":"-0.0001387","block_height":916939,"timestamp":1620234997,"fee_details":{"type":"Utxo","amount":"0.00001"},"coin":"RICK","internal_id":"178b2c2a002b65f5430c4904f23a5f82c197820d4cf9bb57bd8e002ef0f6c88e"}]"#;
+        let updated_history: Vec<TransactionDetails> = json::from_str(updated_history_str).unwrap();
+        save_tx_history(
+            &db,
+            "RICK",
+            "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD",
+            updated_history.clone(),
+        )
+        .await
+        .expect("!TxHistoryDb::save_history");
+
+        let actual_history = load_tx_history(&db, "RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
+            .await
+            .expect("!TxHistoryDb::load_history");
+        assert_eq!(actual_history, updated_history);
+
+        clear_tx_history(&db, "RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
+            .await
+            .expect("!TxHistoryDb::clear");
+
+        let history = load_tx_history(&db, "RICK", "RRnMcSeKiLrNdbp91qNVQwwXx5azD4S4CD")
+            .await
+            .expect("!TxHistoryDb::load_history");
+        assert!(history.is_empty());
+    }
+}
diff --git a/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v2.rs b/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v2.rs
new file mode 100644
index 0000000000..a07bdaf6fc
--- /dev/null
+++ b/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v2.rs
@@ -0,0 +1,484 @@
+use crate::my_tx_history_v2::{GetHistoryResult, RemoveTxResult, TxHistoryStorage};
+use crate::tx_history_storage::wasm::tx_history_db::{TxHistoryDb, TxHistoryDbLocked};
+use crate::tx_history_storage::wasm::{WasmTxHistoryError, WasmTxHistoryResult};
+use crate::tx_history_storage::{token_id_from_tx_type, ConfirmationStatus, CreateTxHistoryStorageError,
+                                FilteringAddresses, GetTxHistoryFilters, WalletId};
+use crate::{CoinsContext, TransactionDetails};
+use async_trait::async_trait;
+use common::PagingOptionsEnum;
+use itertools::Itertools;
+use mm2_core::mm_ctx::MmArc;
+use mm2_db::indexed_db::{BeBigUint, DbUpgrader, MultiIndex, OnUpgradeResult, SharedDb, TableSignature};
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::Bytes as BytesJson;
+use serde_json::{self as json, Value as Json};
+
+impl WalletId {
+    /// If [`WalletId::hd_wallet_rmd160`] is not specified,
+    /// we need to exclude transactions of each HD wallet by specifying an empty `hd_wallet_rmd160`.
+    fn hd_wallet_rmd160_or_exclude(&self) -> String {
+        self.hd_wallet_rmd160.map(|hash| hash.to_string()).unwrap_or_default()
+    }
+}
+
+#[derive(Clone)]
+pub struct IndexedDbTxHistoryStorage {
+    db: SharedDb<TxHistoryDb>,
+}
+
+impl IndexedDbTxHistoryStorage {
+    pub fn new(ctx: &MmArc) -> MmResult<Self, CreateTxHistoryStorageError>
+    where
+        Self: Sized,
+    {
+        let coins_ctx = CoinsContext::from_ctx(ctx).map_to_mm(CreateTxHistoryStorageError::Internal)?;
+        Ok(IndexedDbTxHistoryStorage {
+            db: coins_ctx.tx_history_db.clone(),
+        })
+    }
+}
+
+#[async_trait]
+impl TxHistoryStorage for IndexedDbTxHistoryStorage {
+    type Error = WasmTxHistoryError;
+
+    async fn init(&self, _wallet_id: &WalletId) -> MmResult<(), Self::Error> { Ok(()) }
+
+    async fn is_initialized_for(&self, _wallet_id: &WalletId) -> MmResult<bool, Self::Error> { Ok(true) }
+
+    /// Adds multiple transactions to the selected coin's history
+    /// Also consider adding tx_hex to the cache during this operation
+    async fn add_transactions_to_history<I>(&self, wallet_id: &WalletId, transactions: I) -> MmResult<(), Self::Error>
+    where
+        I: IntoIterator<Item = TransactionDetails> + Send + 'static,
+        I::IntoIter: Send,
+    {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let history_table = db_transaction.table::<TxHistoryTableV2>().await?;
+        let cache_table = db_transaction.table::<TxCacheTableV2>().await?;
+
+        for tx in transactions {
+            let history_item = TxHistoryTableV2::from_tx_details(wallet_id.clone(), &tx)?;
+            history_table.add_item(&history_item).await?;
+
+            let cache_item = TxCacheTableV2::from_tx_details(wallet_id.clone(), &tx);
+            let index_keys = MultiIndex::new(TxCacheTableV2::COIN_TX_HASH_INDEX)
+                .with_value(&wallet_id.ticker)?
+                .with_value(&tx.tx_hash)?;
+            // `TxHistoryTableV2::tx_hash` is not a unique field, but `TxCacheTableV2::tx_hash` is unique.
+            // So we use `DbTable::add_item_or_ignore_by_unique_multi_index` instead of `DbTable::add_item`
+            // since `transactions` may contain txs with same `tx_hash` but different `internal_id`.
+            cache_table
+                .add_item_or_ignore_by_unique_multi_index(index_keys, &cache_item)
+                .await?;
+        }
+        Ok(())
+    }
+
+    async fn remove_tx_from_history(
+        &self,
+        wallet_id: &WalletId,
+        internal_id: &BytesJson,
+    ) -> MmResult<RemoveTxResult, Self::Error> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_INTERNAL_ID_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
+            .with_value(internal_id)?;
+
+        if table.delete_item_by_unique_multi_index(index_keys).await?.is_some() {
+            Ok(RemoveTxResult::TxRemoved)
+        } else {
+            Ok(RemoveTxResult::TxDidNotExist)
+        }
+    }
+
+    async fn get_tx_from_history(
+        &self,
+        wallet_id: &WalletId,
+        internal_id: &BytesJson,
+    ) -> MmResult<Option<TransactionDetails>, Self::Error> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_INTERNAL_ID_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
+            .with_value(internal_id)?;
+
+        let details_json = match table.get_item_by_unique_multi_index(index_keys).await? {
+            Some((_item_id, item)) => item.details_json,
+            None => return Ok(None),
+        };
+        json::from_value(details_json).map_to_mm(|e| WasmTxHistoryError::ErrorDeserializing(e.to_string()))
+    }
+
+    async fn history_contains_unconfirmed_txes(&self, wallet_id: &WalletId) -> Result<bool, MmError<Self::Error>> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_CONFIRMATION_STATUS_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
+            .with_value(ConfirmationStatus::Unconfirmed)?;
+
+        let count_unconfirmed = table.count_by_multi_index(index_keys).await?;
+        Ok(count_unconfirmed > 0)
+    }
+
+    /// Gets the unconfirmed transactions from the history
+    async fn get_unconfirmed_txes_from_history(
+        &self,
+        wallet_id: &WalletId,
+    ) -> MmResult<Vec<TransactionDetails>, Self::Error> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_CONFIRMATION_STATUS_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
+            .with_value(ConfirmationStatus::Unconfirmed)?;
+
+        table
+            .get_items_by_multi_index(index_keys)
+            .await?
+            .into_iter()
+            .map(|(_item_id, item)| tx_details_from_item(item))
+            // Collect `WasmTxHistoryResult<Vec<TransactionDetails>>`.
+            .collect()
+    }
+
+    /// Updates transaction in the selected coin's history
+    async fn update_tx_in_history(&self, wallet_id: &WalletId, tx: &TransactionDetails) -> MmResult<(), Self::Error> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_INTERNAL_ID_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
+            .with_value(&tx.internal_id)?;
+        let item = TxHistoryTableV2::from_tx_details(wallet_id.clone(), tx)?;
+        table.replace_item_by_unique_multi_index(index_keys, &item).await?;
+        Ok(())
+    }
+
+    async fn history_has_tx_hash(&self, wallet_id: &WalletId, tx_hash: &str) -> Result<bool, MmError<Self::Error>> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_TX_HASH_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
+            .with_value(tx_hash)?;
+        let count_txs = table.count_by_multi_index(index_keys).await?;
+        Ok(count_txs > 0)
+    }
+
+    /// TODO consider refactoring this method to return unique internal_id's instead of tx_hash,
+    /// since the method requests the whole TX history of the specified wallet.
+    async fn unique_tx_hashes_num_in_history(&self, wallet_id: &WalletId) -> Result<usize, MmError<Self::Error>> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?;
+
+        // `IndexedDb` doesn't provide an elegant way to count records applying custom filters to index properties like `tx_hash`,
+        // so currently fetch all records with `coin,hd_wallet_rmd160=wallet_id` and apply the `unique_by(|tx| tx.tx_hash)` to them.
+        Ok(table
+            .get_items_by_multi_index(index_keys)
+            .await?
+            .into_iter()
+            .unique_by(|(_item_id, tx)| tx.tx_hash.clone())
+            .count())
+    }
+
+    async fn add_tx_to_cache(
+        &self,
+        wallet_id: &WalletId,
+        tx_hash: &str,
+        tx_hex: &BytesJson,
+    ) -> Result<(), MmError<Self::Error>> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxCacheTableV2>().await?;
+
+        table
+            .add_item(&TxCacheTableV2 {
+                coin: wallet_id.ticker.clone(),
+                tx_hash: tx_hash.to_owned(),
+                tx_hex: tx_hex.clone(),
+            })
+            .await?;
+        Ok(())
+    }
+
+    async fn tx_bytes_from_cache(
+        &self,
+        wallet_id: &WalletId,
+        tx_hash: &str,
+    ) -> MmResult<Option<BytesJson>, Self::Error> {
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxCacheTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxCacheTableV2::COIN_TX_HASH_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(tx_hash)?;
+        match table.get_item_by_unique_multi_index(index_keys).await? {
+            Some((_item_id, item)) => Ok(Some(item.tx_hex)),
+            None => Ok(None),
+        }
+    }
+
+    /// This is totally inefficient due to we query all items from the storage
+    /// and then checks whether it were sent from/to one of the specified `for_addresses`.
+    ///
+    /// TODO One of the possible solutions is to do the following:
+    /// 1) Add `TxFromAddressTable` and `TxToAddressTable` tables;
+    /// 2) Add [`CursorBoundValue::BTreeSet`] that iterates items over its index values;
+    /// 3) Query transaction internal IDs from the `TxFromAddressTable` and `TxToAddressTable` tables
+    ///    by using a cursor with the specified `ticker`, `hd_wallet_rmd160`, `token_id` constant indexes
+    ///    and the iterable [`CursorBoundValue::BTreeMap = for_addresses`] index;
+    /// 4) Query transaction details from the `TxHistoryTableV2` table by using a cursor with the specified `ticker`, `hd_wallet_rmd160`, `token_id` constant indexes
+    ///    and the iterable [`CursorBoundValue::BTreeMap = expected_internal_ids`].
+    async fn get_history(
+        &self,
+        wallet_id: &WalletId,
+        filters: GetTxHistoryFilters,
+        paging: PagingOptionsEnum<BytesJson>,
+        limit: usize,
+    ) -> MmResult<GetHistoryResult, Self::Error> {
+        // Check if [`GetTxHistoryFilters::for_addresses`] is specified and empty.
+        // If it is, it's much more efficient to return an empty result before we do any query.
+        if matches!(filters.for_addresses, Some(ref for_addresses) if for_addresses.is_empty()) {
+            return Ok(GetHistoryResult {
+                transactions: Vec::new(),
+                skipped: 0,
+                total: 0,
+            });
+        }
+
+        let locked_db = self.lock_db().await?;
+        let db_transaction = locked_db.get_inner().transaction().await?;
+        let table = db_transaction.table::<TxHistoryTableV2>().await?;
+
+        let index_keys = MultiIndex::new(TxHistoryTableV2::WALLET_ID_TOKEN_ID_INDEX)
+            .with_value(&wallet_id.ticker)?
+            .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
+            .with_value(filters.token_id_or_exclude())?;
+
+        let transactions = table
+            .get_items_by_multi_index(index_keys)
+            .await?
+            .into_iter()
+            .map(|(_item_id, tx)| tx);
+
+        let transactions = Self::take_according_to_filtering_addresses(transactions, &filters.for_addresses);
+        Self::take_according_to_paging_opts(transactions, paging, limit)
+    }
+}
+
+impl IndexedDbTxHistoryStorage {
+    fn take_according_to_filtering_addresses<I>(
+        txs: I,
+        for_addresses: &Option<FilteringAddresses>,
+    ) -> Vec<TxHistoryTableV2>
+    where
+        I: Iterator<Item = TxHistoryTableV2>,
+    {
+        match for_addresses {
+            Some(for_addresses) => txs
+                .filter(|tx| {
+                    tx.from_addresses.has_intersection(for_addresses) || tx.to_addresses.has_intersection(for_addresses)
+                })
+                .collect(),
+            None => txs.collect(),
+        }
+    }
+
+    pub(super) fn take_according_to_paging_opts(
+        txs: Vec<TxHistoryTableV2>,
+        paging: PagingOptionsEnum<BytesJson>,
+        limit: usize,
+    ) -> WasmTxHistoryResult<GetHistoryResult> {
+        let total_count = txs.len();
+
+        let skip = match paging {
+            // `page_number` is ignored if from_uuid is set
+            PagingOptionsEnum::FromId(from_internal_id) => {
+                let maybe_skip = txs
+                    .iter()
+                    .position(|tx| tx.internal_id == from_internal_id)
+                    .map(|pos| pos + 1);
+                match maybe_skip {
+                    Some(skip) => skip,
+                    None => {
+                        return Ok(GetHistoryResult {
+                            transactions: Vec::new(),
+                            skipped: 0,
+                            total: total_count,
+                        })
+                    },
+                }
+            },
+            PagingOptionsEnum::PageNumber(page_number) => (page_number.get() - 1) * limit,
+        };
+
+        let transactions = txs
+            .into_iter()
+            .skip(skip)
+            .take(limit)
+            .map(tx_details_from_item)
+            // Collect `WasmTxHistoryResult<TransactionDetails>` items into `WasmTxHistoryResult<Vec<TransactionDetails>>`
+            .collect::<WasmTxHistoryResult<Vec<_>>>()?;
+        Ok(GetHistoryResult {
+            transactions,
+            skipped: skip,
+            total: total_count,
+        })
+    }
+
+    async fn lock_db(&self) -> WasmTxHistoryResult<TxHistoryDbLocked<'_>> {
+        self.db.get_or_initialize().await.mm_err(WasmTxHistoryError::from)
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub(crate) struct TxHistoryTableV2 {
+    coin: String,
+    hd_wallet_rmd160: String,
+    tx_hash: String,
+    internal_id: BytesJson,
+    block_height: BeBigUint,
+    confirmation_status: ConfirmationStatus,
+    token_id: String,
+    from_addresses: FilteringAddresses,
+    to_addresses: FilteringAddresses,
+    details_json: Json,
+}
+
+impl TxHistoryTableV2 {
+    /// An index that consists of the only one `coin` property.
+    const WALLET_ID_INDEX: &'static str = "wallet_id";
+    /// A **unique** index that consists of the following properties:
+    /// * coin - coin ticker
+    /// * internal_id - transaction internal ID
+    const WALLET_ID_INTERNAL_ID_INDEX: &'static str = "wallet_id_internal_id";
+    /// An index that consists of the following properties:
+    /// * coin - coin ticker
+    /// * tx_hash - transaction hash
+    const WALLET_ID_TX_HASH_INDEX: &'static str = "wallet_id_tx_hash";
+    /// An index that consists of the following properties:
+    /// * coin - coin ticker
+    /// * confirmation_status - whether transaction is confirmed or unconfirmed
+    const WALLET_ID_CONFIRMATION_STATUS_INDEX: &'static str = "wallet_id_confirmation_status";
+    /// An index that consists of the following properties:
+    /// * coin - coin ticker
+    /// * token_id - token ID (can be an empty string)
+    const WALLET_ID_TOKEN_ID_INDEX: &'static str = "wallet_id_token_id";
+
+    fn from_tx_details(wallet_id: WalletId, tx: &TransactionDetails) -> WasmTxHistoryResult<TxHistoryTableV2> {
+        let details_json = json::to_value(tx).map_to_mm(|e| WasmTxHistoryError::ErrorSerializing(e.to_string()))?;
+        let hd_wallet_rmd160 = wallet_id.hd_wallet_rmd160_or_exclude();
+        Ok(TxHistoryTableV2 {
+            coin: wallet_id.ticker,
+            hd_wallet_rmd160,
+            tx_hash: tx.tx_hash.clone(),
+            internal_id: tx.internal_id.clone(),
+            block_height: BeBigUint::from(tx.block_height),
+            confirmation_status: ConfirmationStatus::from_block_height(tx.block_height),
+            token_id: token_id_from_tx_type(&tx.transaction_type),
+            from_addresses: tx.from.clone().into_iter().collect(),
+            to_addresses: tx.to.clone().into_iter().collect(),
+            details_json,
+        })
+    }
+}
+
+impl TableSignature for TxHistoryTableV2 {
+    fn table_name() -> &'static str { "tx_history_v2" }
+
+    fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+        match (old_version, new_version) {
+            (0, 1) => {
+                let table = upgrader.create_table(Self::table_name())?;
+                table.create_multi_index(TxHistoryTableV2::WALLET_ID_INDEX, &["coin", "hd_wallet_rmd160"], false)?;
+                table.create_multi_index(
+                    TxHistoryTableV2::WALLET_ID_INTERNAL_ID_INDEX,
+                    &["coin", "hd_wallet_rmd160", "internal_id"],
+                    true,
+                )?;
+                table.create_multi_index(
+                    TxHistoryTableV2::WALLET_ID_TX_HASH_INDEX,
+                    &["coin", "hd_wallet_rmd160", "tx_hash"],
+                    false,
+                )?;
+                table.create_multi_index(
+                    TxHistoryTableV2::WALLET_ID_CONFIRMATION_STATUS_INDEX,
+                    &["coin", "hd_wallet_rmd160", "confirmation_status"],
+                    false,
+                )?;
+                table.create_multi_index(
+                    TxHistoryTableV2::WALLET_ID_TOKEN_ID_INDEX,
+                    &["coin", "hd_wallet_rmd160", "token_id"],
+                    false,
+                )?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub(crate) struct TxCacheTableV2 {
+    coin: String,
+    tx_hash: String,
+    tx_hex: BytesJson,
+}
+
+impl TxCacheTableV2 {
+    /// A **unique** index that consists of the following properties:
+    /// * coin - coin ticker
+    /// * tx_hash - transaction hash
+    const COIN_TX_HASH_INDEX: &'static str = "coin_tx_hash";
+
+    fn from_tx_details(wallet_id: WalletId, tx: &TransactionDetails) -> TxCacheTableV2 {
+        TxCacheTableV2 {
+            coin: wallet_id.ticker,
+            tx_hash: tx.tx_hash.clone(),
+            tx_hex: tx.tx_hex.clone(),
+        }
+    }
+}
+
+impl TableSignature for TxCacheTableV2 {
+    fn table_name() -> &'static str { "tx_cache_v2" }
+
+    fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+        match (old_version, new_version) {
+            (0, 1) => {
+                let table = upgrader.create_table(Self::table_name())?;
+                table.create_multi_index(TxCacheTableV2::COIN_TX_HASH_INDEX, &["coin", "tx_hash"], true)?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
+
+fn tx_details_from_item(item: TxHistoryTableV2) -> WasmTxHistoryResult<TransactionDetails> {
+    json::from_value(item.details_json).map_to_mm(|e| WasmTxHistoryError::ErrorDeserializing(e.to_string()))
+}
diff --git a/mm2src/coins/utxo.rs b/mm2src/coins/utxo.rs
index 6a3ad7b8ac..6e30d5468f 100644
--- a/mm2src/coins/utxo.rs
+++ b/mm2src/coins/utxo.rs
@@ -1,13 +1,15 @@
 /******************************************************************************
- * Copyright © 2014-2019 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -16,73 +18,104 @@
 //  utxo.rs
 //  marketmaker
 //
-//  Copyright © 2017-2019 SuperNET. All rights reserved.
+//  Copyright © 2022 AtomicDEX. All rights reserved.
 //
 
+pub mod bch;
+pub mod bch_and_slp_tx_history;
+mod bchd_grpc;
+#[allow(clippy::all)]
+#[rustfmt::skip]
+#[path = "utxo/pb.rs"]
+mod bchd_pb;
 pub mod qtum;
 pub mod rpc_clients;
 pub mod slp;
+pub mod utxo_block_header_storage;
+pub mod utxo_builder;
 pub mod utxo_common;
 pub mod utxo_standard;
-
-#[cfg(not(target_arch = "wasm32"))] pub mod tx_cache;
+pub mod utxo_withdraw;
 
 use async_trait::async_trait;
-use bigdecimal::BigDecimal;
+use bitcoin::network::constants::Network as BitcoinNetwork;
 pub use bitcrypto::{dhash160, sha256, ChecksumType};
-use chain::{OutPoint, TransactionInput, TransactionOutput, TxHashAlgo};
-use common::executor::{spawn, Timer};
+pub use chain::Transaction as UtxoTx;
+use chain::{OutPoint, TransactionOutput, TxHashAlgo};
 #[cfg(not(target_arch = "wasm32"))]
 use common::first_char_to_upper;
 use common::jsonrpc_client::JsonRpcError;
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
 use common::mm_metrics::MetricsArc;
-use common::{now_ms, small_rng};
+use common::now_ms;
+use crypto::trezor::utxo::TrezorUtxoCoin;
+use crypto::{Bip32DerPathOps, Bip32Error, Bip44Chain, Bip44DerPathError, Bip44PathToAccount, Bip44PathToCoin,
+             ChildNumber, DerivationPath, Secp256k1ExtendedPublicKey};
 use derive_more::Display;
 #[cfg(not(target_arch = "wasm32"))] use dirs::home_dir;
 use futures::channel::mpsc;
 use futures::compat::Future01CompatExt;
 use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
-use futures::stream::StreamExt;
 use futures01::Future;
 use keys::bytes::Bytes;
-pub use keys::{Address, AddressFormat as UtxoAddressFormat, KeyPair, Private, Public, Secret, Type as ScriptType};
+pub use keys::{Address, AddressFormat as UtxoAddressFormat, AddressHashEnum, KeyPair, Private, Public, Secret,
+               Type as ScriptType};
+use lightning_invoice::Currency as LightningCurrency;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
 #[cfg(test)] use mocktopus::macros::*;
 use num_traits::ToPrimitive;
-use primitives::hash::{H256, H264, H512};
-use rand::seq::SliceRandom;
+use primitives::hash::{H256, H264};
 use rpc::v1::types::{Bytes as BytesJson, Transaction as RpcTransaction, H256 as H256Json};
 use script::{Builder, Script, SignatureVersion, TransactionInputSigner};
 use serde_json::{self as json, Value as Json};
 use serialization::{serialize, serialize_with_flags, SERIALIZE_TRANSACTION_WITNESS};
+use spv_validation::helpers_validation::SPVError;
+use std::array::TryFromSliceError;
 use std::collections::{HashMap, HashSet};
 use std::convert::TryInto;
+use std::hash::Hash;
 use std::num::NonZeroU64;
 use std::ops::Deref;
-#[cfg(not(target_arch = "wasm32"))] use std::path::Path;
-use std::path::PathBuf;
+#[cfg(not(target_arch = "wasm32"))]
+use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::atomic::{AtomicBool, AtomicU64};
 use std::sync::{Arc, Mutex, Weak};
-use utxo_common::big_decimal_from_sat;
-
-pub use chain::Transaction as UtxoTx;
-
+use utxo_builder::UtxoConfBuilder;
+use utxo_common::{big_decimal_from_sat, UtxoTxBuilder};
+use utxo_signer::with_key_pair::sign_tx;
+use utxo_signer::{TxProvider, TxProviderError, UtxoSignTxError, UtxoSignTxResult};
+
+use self::rpc_clients::{electrum_script_hash, ElectrumClient, ElectrumRpcRequest, EstimateFeeMethod, EstimateFeeMode,
+                        NativeClient, UnspentInfo, UnspentMap, UtxoRpcClientEnum, UtxoRpcError, UtxoRpcFut,
+                        UtxoRpcResult};
+use super::{big_decimal_from_sat_unsigned, BalanceError, BalanceFut, BalanceResult, CoinBalance, CoinsContext,
+            DerivationMethod, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, KmdRewardsDetails, MarketCoinOps,
+            MmCoin, NumConversError, NumConversResult, PrivKeyActivationPolicy, PrivKeyNotAllowed, PrivKeyPolicy,
+            RawTransactionFut, RawTransactionRequest, RawTransactionResult, RpcTransportEventHandler,
+            RpcTransportEventHandlerShared, TradeFee, TradePreimageError, TradePreimageFut, TradePreimageResult,
+            Transaction, TransactionDetails, TransactionEnum, UnexpectedDerivationMethod, WithdrawError,
+            WithdrawRequest};
+use crate::coin_balance::{EnableCoinScanPolicy, HDAddressBalanceScanner};
+use crate::hd_wallet::{HDAccountOps, HDAccountsMutex, HDAddress, HDWalletCoinOps, HDWalletOps, InvalidBip44ChainError};
+use crate::hd_wallet_storage::{HDAccountStorageItem, HDWalletCoinStorage, HDWalletStorageError, HDWalletStorageResult};
+use crate::utxo::tx_cache::UtxoVerboseCacheShared;
+use crate::utxo::utxo_block_header_storage::BlockHeaderStorageError;
+use crate::TransactionErr;
+use utxo_block_header_storage::BlockHeaderStorage;
+
+pub mod tx_cache;
+#[cfg(target_arch = "wasm32")]
+pub mod utxo_indexedb_block_header_storage;
 #[cfg(not(target_arch = "wasm32"))]
-use self::rpc_clients::{ConcurrentRequestMap, NativeClient, NativeClientImpl};
-use self::rpc_clients::{ElectrumClient, ElectrumClientImpl, ElectrumRpcRequest, EstimateFeeMethod, EstimateFeeMode,
-                        UnspentInfo, UtxoRpcClientEnum, UtxoRpcError, UtxoRpcResult};
-use super::{BalanceError, BalanceFut, BalanceResult, CoinTransportMetrics, CoinsContext, FeeApproxStage,
-            FoundSwapTxSpend, HistorySyncState, KmdRewardsDetails, MarketCoinOps, MmCoin, NumConversError,
-            NumConversResult, RpcClientType, RpcTransportEventHandler, RpcTransportEventHandlerShared, TradeFee,
-            TradePreimageError, TradePreimageFut, TradePreimageResult, Transaction, TransactionDetails,
-            TransactionEnum, TransactionFut, WithdrawError, WithdrawFee, WithdrawRequest};
+pub mod utxo_sql_block_header_storage;
 
+#[cfg(any(test, target_arch = "wasm32"))]
+pub mod utxo_common_tests;
 #[cfg(test)] pub mod utxo_tests;
 #[cfg(target_arch = "wasm32")] pub mod utxo_wasm_tests;
 
-const SWAP_TX_SPEND_SIZE: u64 = 305;
 const KILO_BYTE: u64 = 1000;
 /// https://bitcoin.stackexchange.com/a/77192
 const MAX_DER_SIGNATURE_LEN: usize = 72;
@@ -96,9 +129,12 @@ const UTXO_DUST_AMOUNT: u64 = 1000;
 /// 11 > 0
 const KMD_MTP_BLOCK_COUNT: NonZeroU64 = unsafe { NonZeroU64::new_unchecked(11u64) };
 const DEFAULT_DYNAMIC_FEE_VOLATILITY_PERCENT: f64 = 0.5;
+const DEFAULT_GAP_LIMIT: u32 = 20;
 
 pub type GenerateTxResult = Result<(TransactionInputSigner, AdditionalTxData), MmError<GenerateTxError>>;
 pub type HistoryUtxoTxMap = HashMap<H256Json, HistoryUtxoTx>;
+pub type MatureUnspentMap = HashMap<Address, MatureUnspentList>;
+pub type RecentlySpentOutPointsGuard<'a> = AsyncMutexGuard<'a, RecentlySpentOutPoints>;
 
 #[cfg(windows)]
 #[cfg(not(target_arch = "wasm32"))]
@@ -177,6 +213,33 @@ impl From<UtxoRpcError> for TradePreimageError {
     }
 }
 
+impl From<UtxoRpcError> for TxProviderError {
+    fn from(rpc: UtxoRpcError) -> Self {
+        match rpc {
+            resp @ UtxoRpcError::ResponseParseError(_) | resp @ UtxoRpcError::InvalidResponse(_) => {
+                TxProviderError::InvalidResponse(resp.to_string())
+            },
+            UtxoRpcError::Transport(transport) => TxProviderError::Transport(transport.to_string()),
+            UtxoRpcError::Internal(internal) => TxProviderError::Internal(internal),
+        }
+    }
+}
+
+impl From<Bip44DerPathError> for HDWalletStorageError {
+    fn from(e: Bip44DerPathError) -> Self { HDWalletStorageError::ErrorDeserializing(e.to_string()) }
+}
+
+impl From<Bip32Error> for HDWalletStorageError {
+    fn from(e: Bip32Error) -> Self { HDWalletStorageError::ErrorDeserializing(e.to_string()) }
+}
+
+#[async_trait]
+impl TxProvider for UtxoRpcClientEnum {
+    async fn get_rpc_transaction(&self, tx_hash: &H256Json) -> Result<RpcTransaction, MmError<TxProviderError>> {
+        Ok(self.get_verbose_transaction(tx_hash).compat().await?)
+    }
+}
+
 /// The `UtxoTx` with the block height transaction mined in.
 pub struct HistoryUtxoTx {
     pub height: Option<u64>,
@@ -205,7 +268,7 @@ pub enum TxFee {
 }
 
 /// The actual "runtime" fee that is received from RPC in case of dynamic calculation
-#[derive(Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub enum ActualTxFee {
     /// fee amount per Kbyte received from coin RPC
     Dynamic(u64),
@@ -277,7 +340,7 @@ impl RecentlySpentOutPoints {
                 if output.script_pubkey == self.for_script_pubkey {
                     Some(CachedUnspentInfo {
                         outpoint: OutPoint {
-                            hash: spend_tx_hash.clone(),
+                            hash: spend_tx_hash,
                             index: index as u32,
                         },
                         value: output.value,
@@ -343,7 +406,7 @@ impl RecentlySpentOutPoints {
     }
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum BlockchainNetwork {
     #[serde(rename = "mainnet")]
     Mainnet,
@@ -353,6 +416,26 @@ pub enum BlockchainNetwork {
     Regtest,
 }
 
+impl From<BlockchainNetwork> for BitcoinNetwork {
+    fn from(network: BlockchainNetwork) -> Self {
+        match network {
+            BlockchainNetwork::Mainnet => BitcoinNetwork::Bitcoin,
+            BlockchainNetwork::Testnet => BitcoinNetwork::Testnet,
+            BlockchainNetwork::Regtest => BitcoinNetwork::Regtest,
+        }
+    }
+}
+
+impl From<BlockchainNetwork> for LightningCurrency {
+    fn from(network: BlockchainNetwork) -> Self {
+        match network {
+            BlockchainNetwork::Mainnet => LightningCurrency::Bitcoin,
+            BlockchainNetwork::Testnet => LightningCurrency::BitcoinTestnet,
+            BlockchainNetwork::Regtest => LightningCurrency::Regtest,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct UtxoCoinConf {
     pub ticker: String,
@@ -363,6 +446,7 @@ pub struct UtxoCoinConf {
     pub wif_prefix: u8,
     pub pub_t_addr_prefix: u8,
     pub p2sh_t_addr_prefix: u8,
+    pub sign_message_prefix: Option<String>,
     // https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#Segwit_address_format
     pub bech32_hrp: Option<String>,
     /// True if coins uses Proof of Stake consensus algo
@@ -380,9 +464,7 @@ pub struct UtxoCoinConf {
     /// Overwinter and then Sapling upgrades
     /// https://github.com/zcash/zips/blob/master/zip-0243.rst
     pub tx_version: i32,
-    /// If true - allow coins withdraw to P2SH addresses (Segwit).
-    /// the flag will also affect the address that MM2 generates by default in the future
-    /// will be the Segwit (starting from 3 for BTC case) instead of legacy
+    /// Defines if Segwit is enabled for this coin.
     /// https://en.bitcoin.it/wiki/Segregated_Witness
     pub segwit: bool,
     /// Does coin require transactions to be notarized to be considered as confirmed?
@@ -420,6 +502,10 @@ pub struct UtxoCoinConf {
     pub mature_confirmations: u32,
     /// The number of blocks used for estimate_fee/estimate_smart_fee RPC calls
     pub estimate_fee_blocks: u32,
+    /// The name of the coin with which Trezor wallet associates this asset.
+    pub trezor_coin: Option<TrezorUtxoCoin>,
+    /// Used in condition where the coin will validate spv proof or not
+    pub enable_spv_proof: bool,
 }
 
 #[derive(Debug)]
@@ -437,18 +523,22 @@ pub struct UtxoCoinFields {
     pub dust_amount: u64,
     /// RPC client
     pub rpc_client: UtxoRpcClientEnum,
-    /// ECDSA key pair
-    pub key_pair: KeyPair,
-    /// Lock the mutex when we deal with address utxos
-    pub my_address: Address,
+    /// Either ECDSA key pair or a Hardware Wallet info.
+    pub priv_key_policy: PrivKeyPolicy<KeyPair>,
+    /// Either an Iguana address or an info about last derived account/address.
+    pub derivation_method: DerivationMethod<Address, UtxoHDWallet>,
     pub history_sync_state: Mutex<HistorySyncState>,
-    /// Path to the TX cache directory
-    pub tx_cache_directory: Option<PathBuf>,
+    /// The cache of verbose transactions.
+    pub tx_cache: UtxoVerboseCacheShared,
+    pub block_headers_storage: Option<BlockHeaderStorage>,
     /// The cache of recently send transactions used to track the spent UTXOs and replace them with new outputs
     /// The daemon needs some time to update the listunspent list for address which makes it return already spent UTXOs
     /// This cache helps to prevent UTXO reuse in such cases
     pub recently_spent_outpoints: AsyncMutex<RecentlySpentOutPoints>,
     pub tx_hash_algo: TxHashAlgo,
+    /// The flag determines whether to use mature unspent outputs *only* to generate transactions.
+    /// https://github.com/KomodoPlatform/atomicDEX-API/issues/1181
+    pub check_utxo_maturity: bool,
 }
 
 #[derive(Debug, Display)]
@@ -472,6 +562,60 @@ pub enum UnsupportedAddr {
     SegwitNotActivated(String),
 }
 
+impl From<UnsupportedAddr> for WithdrawError {
+    fn from(e: UnsupportedAddr) -> Self { WithdrawError::InvalidAddress(e.to_string()) }
+}
+
+#[derive(Debug)]
+pub enum GetTxHeightError {
+    HeightNotFound,
+}
+
+impl From<GetTxHeightError> for SPVError {
+    fn from(e: GetTxHeightError) -> Self {
+        match e {
+            GetTxHeightError::HeightNotFound => SPVError::InvalidHeight,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum GetBlockHeaderError {
+    StorageError(BlockHeaderStorageError),
+    RpcError(JsonRpcError),
+    SerializationError(serialization::Error),
+    InvalidResponse(String),
+    SPVError(SPVError),
+    NativeNotSupported(String),
+    Internal(String),
+}
+
+impl From<JsonRpcError> for GetBlockHeaderError {
+    fn from(err: JsonRpcError) -> Self { GetBlockHeaderError::RpcError(err) }
+}
+
+impl From<UtxoRpcError> for GetBlockHeaderError {
+    fn from(e: UtxoRpcError) -> Self {
+        match e {
+            UtxoRpcError::Transport(e) | UtxoRpcError::ResponseParseError(e) => GetBlockHeaderError::RpcError(e),
+            UtxoRpcError::InvalidResponse(e) => GetBlockHeaderError::InvalidResponse(e),
+            UtxoRpcError::Internal(e) => GetBlockHeaderError::Internal(e),
+        }
+    }
+}
+
+impl From<SPVError> for GetBlockHeaderError {
+    fn from(e: SPVError) -> Self { GetBlockHeaderError::SPVError(e) }
+}
+
+impl From<serialization::Error> for GetBlockHeaderError {
+    fn from(err: serialization::Error) -> Self { GetBlockHeaderError::SerializationError(err) }
+}
+
+impl From<BlockHeaderStorageError> for GetBlockHeaderError {
+    fn from(err: BlockHeaderStorageError) -> Self { GetBlockHeaderError::StorageError(err) }
+}
+
 impl UtxoCoinFields {
     pub fn transaction_preimage(&self) -> TransactionInputSigner {
         let lock_time = if self.conf.ticker == "KMD" {
@@ -480,9 +624,21 @@ impl UtxoCoinFields {
             (now_ms() / 1000) as u32
         };
 
+        let str_d_zeel = if self.conf.ticker == "NAV" {
+            Some("".into())
+        } else {
+            None
+        };
+
+        let n_time = if self.conf.is_pos {
+            Some((now_ms() / 1000) as u32)
+        } else {
+            None
+        };
+
         TransactionInputSigner {
             version: self.conf.tx_version,
-            n_time: None,
+            n_time,
             overwintered: self.conf.overwintered,
             version_group_id: self.conf.version_group_id,
             consensus_branch_id: self.conf.consensus_branch_id,
@@ -495,69 +651,157 @@ impl UtxoCoinFields {
             shielded_spends: vec![],
             shielded_outputs: vec![],
             zcash: self.conf.zcash,
-            str_d_zeel: None,
+            str_d_zeel,
             hash_algo: self.tx_hash_algo.into(),
         }
     }
+}
 
-    pub fn check_withdraw_address_supported(&self, addr: &Address) -> Result<(), MmError<UnsupportedAddr>> {
-        let conf = &self.conf;
-
-        match addr.addr_format {
-            // Considering that legacy is supported with any configured formats
-            // This can be changed depending on the coins implementation
-            UtxoAddressFormat::Standard => {
-                let is_p2pkh = addr.prefix == conf.pub_addr_prefix && addr.t_addr_prefix == conf.pub_t_addr_prefix;
-                let is_p2sh = addr.prefix == conf.p2sh_addr_prefix
-                    && addr.t_addr_prefix == conf.p2sh_t_addr_prefix
-                    && conf.segwit;
-                if !is_p2pkh && !is_p2sh {
-                    MmError::err(UnsupportedAddr::PrefixError(conf.ticker.clone()))
-                } else {
-                    Ok(())
-                }
-            },
-            UtxoAddressFormat::Segwit => {
-                if !conf.segwit {
-                    return MmError::err(UnsupportedAddr::SegwitNotActivated(conf.ticker.clone()));
-                }
+#[derive(Debug, Display)]
+#[allow(clippy::large_enum_variant)]
+pub enum BroadcastTxErr {
+    /// RPC client error
+    Rpc(UtxoRpcError),
+    /// Other specific error
+    Other(String),
+}
 
-                if addr.hrp != conf.bech32_hrp {
-                    MmError::err(UnsupportedAddr::HrpError {
-                        ticker: conf.ticker.clone(),
-                        hrp: addr.hrp.clone().unwrap_or_default(),
-                    })
-                } else {
-                    Ok(())
-                }
-            },
-            UtxoAddressFormat::CashAddress { .. } => {
-                if addr.addr_format == conf.default_address_format || addr.addr_format == self.my_address.addr_format {
-                    Ok(())
-                } else {
-                    MmError::err(UnsupportedAddr::FormatMismatch {
-                        ticker: conf.ticker.clone(),
-                        activated_format: self.my_address.addr_format.to_string(),
-                        used_format: addr.addr_format.to_string(),
-                    })
-                }
+impl From<UtxoRpcError> for BroadcastTxErr {
+    fn from(err: UtxoRpcError) -> Self { BroadcastTxErr::Rpc(err) }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+pub trait UtxoTxBroadcastOps {
+    async fn broadcast_tx(&self, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>>;
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+pub trait UtxoTxGenerationOps {
+    async fn get_tx_fee(&self) -> UtxoRpcResult<ActualTxFee>;
+
+    /// Calculates interest if the coin is KMD
+    /// Adds the value to existing output to my_script_pub or creates additional interest output
+    /// returns transaction and data as is if the coin is not KMD
+    async fn calc_interest_if_required(
+        &self,
+        mut unsigned: TransactionInputSigner,
+        mut data: AdditionalTxData,
+        my_script_pub: Bytes,
+    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)>;
+}
+
+/// The UTXO address balance scanner.
+/// If the coin is initialized with a native RPC client, it's better to request the list of used addresses
+/// right on `UtxoAddressBalanceScanner` initialization.
+/// See [`NativeClientImpl::list_transactions`].
+pub enum UtxoAddressScanner {
+    Native { non_empty_addresses: HashSet<String> },
+    Electrum(ElectrumClient),
+}
+
+#[async_trait]
+impl HDAddressBalanceScanner for UtxoAddressScanner {
+    type Address = Address;
+
+    async fn is_address_used(&self, address: &Self::Address) -> BalanceResult<bool> {
+        let is_used = match self {
+            UtxoAddressScanner::Native { non_empty_addresses } => non_empty_addresses.contains(&address.to_string()),
+            UtxoAddressScanner::Electrum(electrum_client) => {
+                let script = output_script(address, ScriptType::P2PKH);
+                let script_hash = electrum_script_hash(&script);
+
+                let electrum_history = electrum_client
+                    .scripthash_get_history(&hex::encode(script_hash))
+                    .compat()
+                    .await?;
+
+                !electrum_history.is_empty()
             },
+        };
+        Ok(is_used)
+    }
+}
+
+impl UtxoAddressScanner {
+    pub async fn init(rpc_client: UtxoRpcClientEnum) -> UtxoRpcResult<UtxoAddressScanner> {
+        match rpc_client {
+            UtxoRpcClientEnum::Native(native) => UtxoAddressScanner::init_with_native_client(&native).await,
+            UtxoRpcClientEnum::Electrum(electrum) => Ok(UtxoAddressScanner::Electrum(electrum)),
+        }
+    }
+
+    pub async fn init_with_native_client(native: &NativeClient) -> UtxoRpcResult<UtxoAddressScanner> {
+        const STEP: u64 = 100;
+
+        let non_empty_addresses = native
+            .list_all_transactions(STEP)
+            .compat()
+            .await?
+            .into_iter()
+            .map(|tx_item| tx_item.address)
+            .collect();
+        Ok(UtxoAddressScanner::Native { non_empty_addresses })
+    }
+}
+
+/// Contains lists of mature and immature UTXOs.
+#[derive(Debug, Default)]
+pub struct MatureUnspentList {
+    mature: Vec<UnspentInfo>,
+    immature: Vec<UnspentInfo>,
+}
+
+impl MatureUnspentList {
+    #[inline]
+    pub fn with_capacity(capacity: usize) -> MatureUnspentList {
+        MatureUnspentList {
+            mature: Vec::with_capacity(capacity),
+            immature: Vec::with_capacity(capacity),
+        }
+    }
+
+    #[inline]
+    pub fn new_mature(mature: Vec<UnspentInfo>) -> MatureUnspentList {
+        MatureUnspentList {
+            mature,
+            immature: Vec::new(),
+        }
+    }
+
+    #[inline]
+    pub fn only_mature(self) -> Vec<UnspentInfo> { self.mature }
+
+    #[inline]
+    pub fn to_coin_balance(&self, decimals: u8) -> CoinBalance {
+        let fold = |acc: BigDecimal, x: &UnspentInfo| acc + big_decimal_from_sat_unsigned(x.value, decimals);
+        CoinBalance {
+            spendable: self.mature.iter().fold(BigDecimal::default(), fold),
+            unspendable: self.immature.iter().fold(BigDecimal::default(), fold),
         }
     }
 }
 
 #[async_trait]
 #[cfg_attr(test, mockable)]
-pub trait UtxoCommonOps {
-    async fn get_tx_fee(&self) -> Result<ActualTxFee, JsonRpcError>;
-
-    async fn get_htlc_spend_fee(&self) -> UtxoRpcResult<u64>;
+pub trait UtxoCommonOps:
+    AsRef<UtxoCoinFields> + UtxoTxGenerationOps + UtxoTxBroadcastOps + Clone + Send + Sync + 'static
+{
+    async fn get_htlc_spend_fee(&self, tx_size: u64) -> UtxoRpcResult<u64>;
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String>;
 
     fn denominate_satoshis(&self, satoshi: i64) -> f64;
 
-    fn my_public_key(&self) -> &Public;
+    /// Get a public key that matches [`PrivKeyPolicy::KeyPair`].
+    ///
+    /// # Fail
+    ///
+    /// The method is expected to fail if [`UtxoCoinFields::priv_key_policy`] is [`PrivKeyPolicy::HardwareWallet`].
+    /// It's worth adding a method like `my_public_key_der_path`
+    /// that takes a derivation path from which we derive the corresponding public key.
+    fn my_public_key(&self) -> Result<&Public, MmError<UnexpectedDerivationMethod>>;
 
     /// Try to parse address from string using specified on asset enable format,
     /// and if it failed inform user that he used a wrong format.
@@ -568,30 +812,6 @@ pub trait UtxoCommonOps {
     /// Check if the output is spendable (is not coinbase or it has enough confirmations).
     fn is_unspent_mature(&self, output: &RpcTransaction) -> bool;
 
-    /// Generates unsigned transaction (TransactionInputSigner) from specified utxos and outputs.
-    /// This function expects that utxos are sorted by amounts in ascending order
-    /// Consider sorting before calling this function
-    /// Sends the change (inputs amount - outputs amount) to "my_address"
-    /// Also returns additional transaction data
-    async fn generate_transaction(
-        &self,
-        utxos: Vec<UnspentInfo>,
-        outputs: Vec<TransactionOutput>,
-        fee_policy: FeePolicy,
-        fee: Option<ActualTxFee>,
-        gas_fee: Option<u64>,
-    ) -> GenerateTxResult;
-
-    /// Calculates interest if the coin is KMD
-    /// Adds the value to existing output to my_script_pub or creates additional interest output
-    /// returns transaction and data as is if the coin is not KMD
-    async fn calc_interest_if_required(
-        &self,
-        mut unsigned: TransactionInputSigner,
-        mut data: AdditionalTxData,
-        my_script_pub: Bytes,
-    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)>;
-
     /// Calculates interest of the specified transaction.
     /// Please note, this method has to be used for KMD transactions only.
     async fn calc_interest_of_tx(&self, tx: &UtxoTx, input_transactions: &mut HistoryUtxoTxMap) -> UtxoRpcResult<u64>;
@@ -603,37 +823,13 @@ pub trait UtxoCommonOps {
         utxo_tx_map: &'b mut HistoryUtxoTxMap,
     ) -> UtxoRpcResult<&'b mut HistoryUtxoTx>;
 
-    async fn p2sh_spending_tx(
-        &self,
-        prev_transaction: UtxoTx,
-        redeem_script: Bytes,
-        outputs: Vec<TransactionOutput>,
-        script_data: Script,
-        sequence: u32,
-        lock_time: u32,
-    ) -> Result<UtxoTx, String>;
+    async fn p2sh_spending_tx(&self, input: utxo_common::P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String>;
 
-    /// Get transaction outputs available to spend.
-    async fn ordered_mature_unspents<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)>;
-
-    /// Try to load verbose transaction from cache or try to request it from Rpc client.
-    fn get_verbose_transaction_from_cache_or_rpc(
-        &self,
-        txid: H256Json,
-    ) -> Box<dyn Future<Item = VerboseTransactionFrom, Error = String> + Send>;
-
-    /// Cache transaction if the coin supports `TX_CACHE` and tx height is set and not zero.
-    async fn cache_transaction_if_possible(&self, tx: &RpcTransaction) -> Result<(), String>;
-
-    /// Returns available unspents in ascending order + RecentlySpentOutPoints MutexGuard for further interaction
-    /// (e.g. to add new transaction to it).
-    async fn list_unspent_ordered(
+    /// Loads verbose transactions from cache or requests it using RPC client.
+    fn get_verbose_transactions_from_cache_or_rpc(
         &self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'_, RecentlySpentOutPoints>)>;
+        tx_ids: HashSet<H256Json>,
+    ) -> UtxoRpcFut<HashMap<H256Json, VerboseTransactionFrom>>;
 
     async fn preimage_trade_fee_required_to_send_outputs(
         &self,
@@ -649,7 +845,90 @@ pub trait UtxoCommonOps {
 
     async fn p2sh_tx_locktime(&self, htlc_locktime: u32) -> Result<u32, MmError<UtxoRpcError>>;
 
+    fn addr_format(&self) -> &UtxoAddressFormat;
+
     fn addr_format_for_standard_scripts(&self) -> UtxoAddressFormat;
+
+    fn address_from_pubkey(&self, pubkey: &Public) -> Address;
+
+    fn address_from_extended_pubkey(&self, extended_pubkey: &Secp256k1ExtendedPublicKey) -> Address {
+        let pubkey = Public::Compressed(H264::from(extended_pubkey.public_key().serialize()));
+        self.address_from_pubkey(&pubkey)
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+pub trait GetUtxoListOps {
+    /// Returns available unspents in ascending order
+    /// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+    /// The function uses either [`GetUtxoListOps::get_all_unspent_ordered_list`] or [`GetUtxoListOps::get_mature_unspent_ordered_list`]
+    /// depending on the coin configuration.
+    async fn get_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)>;
+
+    /// Returns available unspents in ascending order
+    /// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+    ///
+    /// # Important
+    ///
+    /// The function doesn't check if the unspents are mature or immature.
+    /// Consider using [`GetUtxoListOps::get_unspent_ordered_list`] instead.
+    async fn get_all_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)>;
+
+    /// Returns available mature and immature unspents in ascending order
+    /// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+    ///
+    /// # Important
+    ///
+    /// The function may request extra data using RPC to check each unspent output whether it's mature or not.
+    /// It may be overhead in some cases, so consider using [`GetUtxoListOps::get_unspent_ordered_list`] instead.
+    async fn get_mature_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(MatureUnspentList, RecentlySpentOutPointsGuard<'_>)>;
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+pub trait GetUtxoMapOps {
+    /// Returns available unspents in ascending order for every given `addresses`
+    /// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+    /// The function uses either [`GetUtxoMapOps::get_all_unspent_ordered_map`] or [`GetUtxoMapOps::get_mature_unspent_ordered_map`]
+    /// depending on the coin configuration.
+    async fn get_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)>;
+
+    /// Returns available unspents in ascending order for every given `addresses`
+    /// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+    ///
+    /// # Important
+    ///
+    /// The function doesn't check if the unspents are mature or immature.
+    /// Consider using [`GetUtxoMapOps::get_unspent_ordered_map`] instead.
+    async fn get_all_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)>;
+
+    /// Returns available mature and immature unspents in ascending order for every given `addresses`
+    /// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+    ///
+    /// # Important
+    ///
+    /// The function may request extra data using RPC to check each unspent output whether it's mature or not.
+    /// It may be overhead in some cases, so consider using [`GetUtxoMapOps::get_unspent_ordered_map`] instead.
+    async fn get_mature_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(MatureUnspentMap, RecentlySpentOutPointsGuard<'_>)>;
 }
 
 #[async_trait]
@@ -682,7 +961,7 @@ impl Deref for UtxoArc {
 }
 
 impl From<UtxoCoinFields> for UtxoArc {
-    fn from(coin: UtxoCoinFields) -> UtxoArc { UtxoArc(Arc::new(coin)) }
+    fn from(coin: UtxoCoinFields) -> UtxoArc { UtxoArc::new(coin) }
 }
 
 impl From<Arc<UtxoCoinFields>> for UtxoArc {
@@ -690,8 +969,12 @@ impl From<Arc<UtxoCoinFields>> for UtxoArc {
 }
 
 impl UtxoArc {
+    pub fn new(fields: UtxoCoinFields) -> UtxoArc { UtxoArc(Arc::new(fields)) }
+
+    pub fn with_arc(inner: Arc<UtxoCoinFields>) -> UtxoArc { UtxoArc(inner) }
+
     /// Returns weak reference to the inner UtxoCoinFields
-    fn downgrade(&self) -> UtxoWeak {
+    pub fn downgrade(&self) -> UtxoWeak {
         let weak = Arc::downgrade(&self.0);
         UtxoWeak(weak)
     }
@@ -705,7 +988,7 @@ impl From<Weak<UtxoCoinFields>> for UtxoWeak {
 }
 
 impl UtxoWeak {
-    fn upgrade(&self) -> Option<UtxoArc> { self.0.upgrade().map(UtxoArc::from) }
+    pub fn upgrade(&self) -> Option<UtxoArc> { self.0.upgrade().map(UtxoArc::from) }
 }
 
 // We can use a shared UTXO lock for all UTXO coins at 1 time.
@@ -772,14 +1055,31 @@ pub enum RequestTxHistoryResult {
     Ok(Vec<(H256Json, u64)>),
     Retry { error: String },
     HistoryTooLarge,
-    UnknownError(String),
+    CriticalError(String),
 }
 
+#[derive(Clone)]
 pub enum VerboseTransactionFrom {
     Cache(RpcTransaction),
     Rpc(RpcTransaction),
 }
 
+impl VerboseTransactionFrom {
+    #[inline]
+    fn to_inner(&self) -> &RpcTransaction {
+        match self {
+            VerboseTransactionFrom::Rpc(tx) | VerboseTransactionFrom::Cache(tx) => tx,
+        }
+    }
+
+    #[inline]
+    pub fn into_inner(self) -> RpcTransaction {
+        match self {
+            VerboseTransactionFrom::Rpc(tx) | VerboseTransactionFrom::Cache(tx) => tx,
+        }
+    }
+}
+
 pub fn compressed_key_pair_from_bytes(raw: &[u8], prefix: u8, checksum_type: ChecksumType) -> Result<KeyPair, String> {
     if raw.len() != 32 {
         return ERR!("Invalid raw priv key len {}", raw.len());
@@ -801,6 +1101,7 @@ pub fn compressed_pub_key_from_priv_raw(raw_priv: &[u8], sum_type: ChecksumType)
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct UtxoFeeDetails {
+    pub coin: Option<String>,
     pub amount: BigDecimal,
 }
 
@@ -858,50 +1159,6 @@ pub fn coin_daemon_data_dir(name: &str, is_asset_chain: bool) -> PathBuf {
     data_dir
 }
 
-/// Attempts to parse native daemon conf file and return rpcport, rpcuser and rpcpassword
-#[cfg(not(target_arch = "wasm32"))]
-fn read_native_mode_conf(
-    filename: &dyn AsRef<Path>,
-    network: &BlockchainNetwork,
-) -> Result<(Option<u16>, String, String), String> {
-    use ini::Ini;
-
-    fn read_property<'a>(conf: &'a ini::Ini, network: &BlockchainNetwork, property: &str) -> Option<&'a String> {
-        let subsection = match network {
-            BlockchainNetwork::Mainnet => None,
-            BlockchainNetwork::Testnet => conf.section(Some("test")),
-            BlockchainNetwork::Regtest => conf.section(Some("regtest")),
-        };
-        subsection
-            .and_then(|props| props.get(property))
-            .or_else(|| conf.general_section().get(property))
-    }
-
-    let conf: Ini = match Ini::load_from_file(&filename) {
-        Ok(ini) => ini,
-        Err(err) => {
-            return ERR!(
-                "Error parsing the native wallet configuration '{}': {}",
-                filename.as_ref().display(),
-                err
-            )
-        },
-    };
-    let rpc_port = match read_property(&conf, network, "rpcport") {
-        Some(port) => port.parse::<u16>().ok(),
-        None => None,
-    };
-    let rpc_user = try_s!(read_property(&conf, network, "rpcuser").ok_or(ERRL!(
-        "Conf file {} doesn't have the rpcuser key",
-        filename.as_ref().display()
-    )));
-    let rpc_password = try_s!(read_property(&conf, network, "rpcpassword").ok_or(ERRL!(
-        "Conf file {} doesn't have the rpcpassword key",
-        filename.as_ref().display()
-    )));
-    Ok((rpc_port, rpc_user.clone(), rpc_password.clone()))
-}
-
 /// Electrum protocol version verifier.
 /// The structure is used to handle the `on_connected` event and notify `electrum_version_loop`.
 struct ElectrumProtoVerifier {
@@ -925,241 +1182,106 @@ impl RpcTransportEventHandler for ElectrumProtoVerifier {
     }
 }
 
-pub struct UtxoConfBuilder<'a> {
-    conf: &'a Json,
-    req: &'a Json,
-    ticker: &'a str,
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct UtxoMergeParams {
+    pub merge_at: usize,
+    #[serde(default = "common::ten_f64")]
+    pub check_every: f64,
+    #[serde(default = "common::one_hundred")]
+    pub max_merge_at_once: usize,
 }
 
-impl<'a> UtxoConfBuilder<'a> {
-    pub fn new(conf: &'a Json, req: &'a Json, ticker: &'a str) -> Self { UtxoConfBuilder { conf, req, ticker } }
-
-    pub fn build(&self) -> Result<UtxoCoinConf, String> {
-        let checksum_type = self.checksum_type();
-        let pub_addr_prefix = self.pub_addr_prefix();
-        let p2sh_addr_prefix = self.p2sh_address_prefix();
-        let pub_t_addr_prefix = self.pub_t_address_prefix();
-        let p2sh_t_addr_prefix = self.p2sh_t_address_prefix();
-
-        let wif_prefix = self.wif_prefix();
-
-        let bech32_hrp = self.bech32_hrp();
-
-        let default_address_format = self.default_address_format();
-
-        let asset_chain = self.asset_chain();
-        let tx_version = self.tx_version();
-        let overwintered = self.overwintered();
-
-        let tx_fee_volatility_percent = self.tx_fee_volatility_percent();
-        let version_group_id = try_s!(self.version_group_id(tx_version, overwintered));
-        let consensus_branch_id = try_s!(self.consensus_branch_id(tx_version));
-        let signature_version = self.signature_version();
-        let fork_id = self.fork_id();
-
-        // should be sufficient to detect zcash by overwintered flag
-        let zcash = overwintered;
-
-        let required_confirmations = self.required_confirmations();
-        let requires_notarization = self.requires_notarization();
-
-        let mature_confirmations = self.mature_confirmations();
-
-        let is_pos = self.is_pos();
-        let segwit = self.segwit();
-        let force_min_relay_fee = self.conf["force_min_relay_fee"].as_bool().unwrap_or(false);
-        let mtp_block_count = self.mtp_block_count();
-        let estimate_fee_mode = self.estimate_fee_mode();
-        let estimate_fee_blocks = self.estimate_fee_blocks();
-
-        Ok(UtxoCoinConf {
-            ticker: self.ticker.to_owned(),
-            is_pos,
-            requires_notarization,
-            overwintered,
-            pub_addr_prefix,
-            p2sh_addr_prefix,
-            pub_t_addr_prefix,
-            p2sh_t_addr_prefix,
-            bech32_hrp,
-            segwit,
-            wif_prefix,
-            tx_version,
-            default_address_format,
-            asset_chain,
-            tx_fee_volatility_percent,
-            version_group_id,
-            consensus_branch_id,
-            zcash,
-            checksum_type,
-            signature_version,
-            fork_id,
-            required_confirmations: required_confirmations.into(),
-            force_min_relay_fee,
-            mtp_block_count,
-            estimate_fee_mode,
-            mature_confirmations,
-            estimate_fee_blocks,
-        })
-    }
-
-    fn checksum_type(&self) -> ChecksumType {
-        match self.ticker {
-            "GRS" => ChecksumType::DGROESTL512,
-            "SMART" => ChecksumType::KECCAK256,
-            _ => ChecksumType::DSHA256,
-        }
-    }
-
-    fn pub_addr_prefix(&self) -> u8 {
-        let pubtype = self.conf["pubtype"]
-            .as_u64()
-            .unwrap_or(if self.ticker == "BTC" { 0 } else { 60 });
-        pubtype as u8
-    }
-
-    fn p2sh_address_prefix(&self) -> u8 {
-        self.conf["p2shtype"]
-            .as_u64()
-            .unwrap_or(if self.ticker == "BTC" { 5 } else { 85 }) as u8
-    }
-
-    fn pub_t_address_prefix(&self) -> u8 { self.conf["taddr"].as_u64().unwrap_or(0) as u8 }
-
-    fn p2sh_t_address_prefix(&self) -> u8 { self.conf["taddr"].as_u64().unwrap_or(0) as u8 }
-
-    fn wif_prefix(&self) -> u8 {
-        let wiftype = self.conf["wiftype"]
-            .as_u64()
-            .unwrap_or(if self.ticker == "BTC" { 128 } else { 188 });
-        wiftype as u8
-    }
-
-    fn bech32_hrp(&self) -> Option<String> { json::from_value(self.conf["bech32_hrp"].clone()).unwrap_or(None) }
-
-    fn default_address_format(&self) -> UtxoAddressFormat {
-        let mut address_format: UtxoAddressFormat =
-            json::from_value(self.conf["address_format"].clone()).unwrap_or(UtxoAddressFormat::Standard);
-
-        if let UtxoAddressFormat::CashAddress {
-            network: _,
-            ref mut pub_addr_prefix,
-            ref mut p2sh_addr_prefix,
-        } = address_format
-        {
-            *pub_addr_prefix = self.pub_addr_prefix();
-            *p2sh_addr_prefix = self.p2sh_address_prefix();
-        }
-
-        address_format
-    }
-
-    fn asset_chain(&self) -> bool { self.conf["asset"].as_str().is_some() }
-
-    fn tx_version(&self) -> i32 { self.conf["txversion"].as_i64().unwrap_or(1) as i32 }
-
-    fn overwintered(&self) -> bool { self.conf["overwintered"].as_u64().unwrap_or(0) == 1 }
-
-    fn tx_fee_volatility_percent(&self) -> f64 {
-        match self.conf["txfee_volatility_percent"].as_f64() {
-            Some(volatility) => volatility,
-            None => DEFAULT_DYNAMIC_FEE_VOLATILITY_PERCENT,
-        }
-    }
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct UtxoBlockHeaderVerificationParams {
+    pub difficulty_check: bool,
+    pub constant_difficulty: bool,
+    pub blocks_limit_to_check: NonZeroU64,
+    pub check_every: f64,
+}
 
-    fn version_group_id(&self, tx_version: i32, overwintered: bool) -> Result<u32, String> {
-        let version_group_id = match self.conf["version_group_id"].as_str() {
-            Some(mut s) => {
-                if s.starts_with("0x") {
-                    s = &s[2..];
-                }
-                let bytes = try_s!(hex::decode(s));
-                u32::from_be_bytes(try_s!(bytes.as_slice().try_into()))
-            },
-            None => {
-                if tx_version == 3 && overwintered {
-                    0x03c4_8270
-                } else if tx_version == 4 && overwintered {
-                    0x892f_2085
-                } else {
-                    0
-                }
-            },
-        };
-        Ok(version_group_id)
-    }
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct UtxoActivationParams {
+    pub mode: UtxoRpcMode,
+    pub utxo_merge_params: Option<UtxoMergeParams>,
+    #[serde(default)]
+    pub tx_history: bool,
+    pub required_confirmations: Option<u64>,
+    pub requires_notarization: Option<bool>,
+    pub address_format: Option<UtxoAddressFormat>,
+    pub gap_limit: Option<u32>,
+    #[serde(default)]
+    pub scan_policy: EnableCoinScanPolicy,
+    #[serde(default = "PrivKeyActivationPolicy::iguana_priv_key")]
+    pub priv_key_policy: PrivKeyActivationPolicy,
+    /// The flag determines whether to use mature unspent outputs *only* to generate transactions.
+    /// https://github.com/KomodoPlatform/atomicDEX-API/issues/1181
+    pub check_utxo_maturity: Option<bool>,
+}
 
-    fn consensus_branch_id(&self, tx_version: i32) -> Result<u32, String> {
-        let consensus_branch_id = match self.conf["consensus_branch_id"].as_str() {
-            Some(mut s) => {
-                if s.starts_with("0x") {
-                    s = &s[2..];
-                }
-                let bytes = try_s!(hex::decode(s));
-                u32::from_be_bytes(try_s!(bytes.as_slice().try_into()))
-            },
-            None => match tx_version {
-                3 => 0x5ba8_1b19,
-                4 => 0x76b8_09bb,
-                _ => 0,
+#[derive(Debug, Display)]
+pub enum UtxoFromLegacyReqErr {
+    UnexpectedMethod,
+    InvalidElectrumServers(json::Error),
+    InvalidMergeParams(json::Error),
+    InvalidBlockHeaderVerificationParams(json::Error),
+    InvalidRequiredConfs(json::Error),
+    InvalidRequiresNota(json::Error),
+    InvalidAddressFormat(json::Error),
+    InvalidCheckUtxoMaturity(json::Error),
+    InvalidScanPolicy(json::Error),
+    InvalidPrivKeyPolicy(json::Error),
+}
+
+impl UtxoActivationParams {
+    pub fn from_legacy_req(req: &Json) -> Result<Self, MmError<UtxoFromLegacyReqErr>> {
+        let mode = match req["method"].as_str() {
+            Some("enable") => UtxoRpcMode::Native,
+            Some("electrum") => {
+                let servers =
+                    json::from_value(req["servers"].clone()).map_to_mm(UtxoFromLegacyReqErr::InvalidElectrumServers)?;
+                UtxoRpcMode::Electrum { servers }
             },
+            _ => return MmError::err(UtxoFromLegacyReqErr::UnexpectedMethod),
         };
-        Ok(consensus_branch_id)
-    }
-
-    fn signature_version(&self) -> SignatureVersion {
-        let default_signature_version = if self.ticker == "BCH" || self.fork_id() != 0 {
-            SignatureVersion::ForkId
-        } else {
-            SignatureVersion::Base
-        };
-        json::from_value(self.conf["signature_version"].clone()).unwrap_or(default_signature_version)
-    }
-
-    fn fork_id(&self) -> u32 {
-        let default_fork_id = match self.ticker {
-            "BCH" => "0x40",
-            _ => "0x0",
-        };
-        let hex_string = self.conf["fork_id"].as_str().unwrap_or(default_fork_id);
-        let fork_id = u32::from_str_radix(hex_string.trim_start_matches("0x"), 16).unwrap();
-        fork_id
-    }
-
-    fn required_confirmations(&self) -> u64 {
-        // param from request should override the config
-        self.req["required_confirmations"]
-            .as_u64()
-            .unwrap_or_else(|| self.conf["required_confirmations"].as_u64().unwrap_or(1))
-    }
-
-    fn requires_notarization(&self) -> AtomicBool {
-        self.req["requires_notarization"]
-            .as_bool()
-            .unwrap_or_else(|| self.conf["requires_notarization"].as_bool().unwrap_or(false))
-            .into()
-    }
-
-    fn mature_confirmations(&self) -> u32 {
-        self.conf["mature_confirmations"]
-            .as_u64()
-            .map(|x| x as u32)
-            .unwrap_or(MATURE_CONFIRMATIONS_DEFAULT)
-    }
-
-    fn is_pos(&self) -> bool { self.conf["isPoS"].as_u64() == Some(1) }
-
-    fn segwit(&self) -> bool { self.conf["segwit"].as_bool().unwrap_or(false) }
-
-    fn mtp_block_count(&self) -> NonZeroU64 {
-        json::from_value(self.conf["mtp_block_count"].clone()).unwrap_or(KMD_MTP_BLOCK_COUNT)
-    }
-
-    fn estimate_fee_mode(&self) -> Option<EstimateFeeMode> {
-        json::from_value(self.conf["estimate_fee_mode"].clone()).unwrap_or(None)
+        let utxo_merge_params =
+            json::from_value(req["utxo_merge_params"].clone()).map_to_mm(UtxoFromLegacyReqErr::InvalidMergeParams)?;
+
+        let tx_history = req["tx_history"].as_bool().unwrap_or_default();
+        let required_confirmations = json::from_value(req["required_confirmations"].clone())
+            .map_to_mm(UtxoFromLegacyReqErr::InvalidRequiredConfs)?;
+        let requires_notarization = json::from_value(req["requires_notarization"].clone())
+            .map_to_mm(UtxoFromLegacyReqErr::InvalidRequiresNota)?;
+        let address_format =
+            json::from_value(req["address_format"].clone()).map_to_mm(UtxoFromLegacyReqErr::InvalidAddressFormat)?;
+        let check_utxo_maturity = json::from_value(req["check_utxo_maturity"].clone())
+            .map_to_mm(UtxoFromLegacyReqErr::InvalidCheckUtxoMaturity)?;
+        let scan_policy = json::from_value::<Option<EnableCoinScanPolicy>>(req["scan_policy"].clone())
+            .map_to_mm(UtxoFromLegacyReqErr::InvalidScanPolicy)?
+            .unwrap_or_default();
+        let priv_key_policy = json::from_value::<Option<PrivKeyActivationPolicy>>(req["priv_key_policy"].clone())
+            .map_to_mm(UtxoFromLegacyReqErr::InvalidPrivKeyPolicy)?
+            .unwrap_or(PrivKeyActivationPolicy::IguanaPrivKey);
+
+        Ok(UtxoActivationParams {
+            mode,
+            utxo_merge_params,
+            tx_history,
+            required_confirmations,
+            requires_notarization,
+            address_format,
+            gap_limit: None,
+            scan_policy,
+            priv_key_policy,
+            check_utxo_maturity,
+        })
     }
+}
 
-    fn estimate_fee_blocks(&self) -> u32 { json::from_value(self.conf["estimate_fee_blocks"].clone()).unwrap_or(1) }
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(tag = "rpc", content = "rpc_data")]
+pub enum UtxoRpcMode {
+    Native,
+    Electrum { servers: Vec<ElectrumRpcRequest> },
 }
 
 #[derive(Debug)]
@@ -1179,438 +1301,87 @@ impl Default for ElectrumBuilderArgs {
     }
 }
 
-#[async_trait]
-pub trait UtxoCoinBuilder {
-    type ResultCoin;
-
-    async fn build(self) -> Result<Self::ResultCoin, String>;
-
-    fn ctx(&self) -> &MmArc;
-
-    fn conf(&self) -> &Json;
-
-    fn req(&self) -> &Json;
-
-    fn ticker(&self) -> &str;
-
-    fn priv_key(&self) -> &[u8];
-
-    async fn build_utxo_fields(&self) -> Result<UtxoCoinFields, String> {
-        let conf = try_s!(UtxoConfBuilder::new(self.conf(), self.req(), self.ticker()).build());
-
-        let private = Private {
-            prefix: conf.wif_prefix,
-            secret: H256::from(self.priv_key()),
-            compressed: true,
-            checksum_type: conf.checksum_type,
-        };
-        let key_pair = try_s!(KeyPair::from_private(private));
-        let addr_format = try_s!(self.address_format());
-        let my_address = Address {
-            prefix: conf.pub_addr_prefix,
-            t_addr_prefix: conf.pub_t_addr_prefix,
-            hash: key_pair.public().address_hash(),
-            checksum_type: conf.checksum_type,
-            hrp: conf.bech32_hrp.clone(),
-            addr_format,
-        };
-        let my_script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
-        let rpc_client = try_s!(self.rpc_client().await);
-        let tx_fee = try_s!(self.tx_fee(&rpc_client).await);
-        let decimals = try_s!(self.decimals(&rpc_client).await);
-        let dust_amount = self.dust_amount();
-
-        let initial_history_state = self.initial_history_state();
-        let tx_cache_directory = Some(self.ctx().dbdir().join("TX_CACHE"));
-        let tx_hash_algo = self.tx_hash_algo();
-
-        let coin = UtxoCoinFields {
-            conf,
-            decimals,
-            dust_amount,
-            rpc_client,
-            key_pair,
-            my_address,
-            history_sync_state: Mutex::new(initial_history_state),
-            tx_cache_directory,
-            recently_spent_outpoints: AsyncMutex::new(RecentlySpentOutPoints::new(my_script_pubkey)),
-            tx_fee,
-            tx_hash_algo,
-        };
-        Ok(coin)
-    }
-
-    fn address_format(&self) -> Result<UtxoAddressFormat, String> {
-        let format_from_req: Option<UtxoAddressFormat> = try_s!(json::from_value(self.req()["address_format"].clone()));
-        let format_from_conf = try_s!(json::from_value::<Option<UtxoAddressFormat>>(
-            self.conf()["address_format"].clone()
-        ))
-        .unwrap_or(UtxoAddressFormat::Standard);
-
-        let mut address_format = match format_from_req {
-            Some(from_req) => {
-                if from_req.is_segwit() != format_from_conf.is_segwit() {
-                    return ERR!(
-                        "Both conf {:?} and request {:?} must be either Segwit or Standard/CashAddress",
-                        format_from_conf,
-                        from_req
-                    );
-                } else {
-                    from_req
-                }
-            },
-            None => format_from_conf,
-        };
-
-        if let UtxoAddressFormat::CashAddress {
-            network: _,
-            ref mut pub_addr_prefix,
-            ref mut p2sh_addr_prefix,
-        } = address_format
-        {
-            *pub_addr_prefix = self.pub_addr_prefix();
-            *p2sh_addr_prefix = self.p2sh_address_prefix();
-        }
-
-        if address_format.is_segwit()
-            && (!self.conf()["segwit"].as_bool().unwrap_or(false) || self.conf()["bech32_hrp"].is_null())
-        {
-            ERR!("Cannot use Segwit address format for coin without segwit support or bech32_hrp in config")
-        } else {
-            Ok(address_format)
-        }
-    }
-
-    fn pub_addr_prefix(&self) -> u8 {
-        let pubtype = self.conf()["pubtype"]
-            .as_u64()
-            .unwrap_or(if self.ticker() == "BTC" { 0 } else { 60 });
-        pubtype as u8
-    }
-
-    fn p2sh_address_prefix(&self) -> u8 {
-        self.conf()["p2shtype"]
-            .as_u64()
-            .unwrap_or(if self.ticker() == "BTC" { 5 } else { 85 }) as u8
-    }
-
-    fn dust_amount(&self) -> u64 { json::from_value(self.conf()["dust"].clone()).unwrap_or(UTXO_DUST_AMOUNT) }
-
-    fn network(&self) -> Result<BlockchainNetwork, String> {
-        let conf = self.conf();
-        if !conf["network"].is_null() {
-            return json::from_value(conf["network"].clone()).map_err(|e| ERRL!("{}", e));
-        }
-        Ok(BlockchainNetwork::Mainnet)
-    }
-
-    async fn decimals(&self, _rpc_client: &UtxoRpcClientEnum) -> Result<u8, String> {
-        Ok(self.conf()["decimals"].as_u64().unwrap_or(8) as u8)
-    }
-
-    async fn tx_fee(&self, rpc_client: &UtxoRpcClientEnum) -> Result<TxFee, String> {
-        let tx_fee = match self.conf()["txfee"].as_u64() {
-            None => TxFee::FixedPerKb(1000),
-            Some(0) => {
-                let fee_method = match &rpc_client {
-                    UtxoRpcClientEnum::Electrum(_) => EstimateFeeMethod::Standard,
-                    UtxoRpcClientEnum::Native(client) => try_s!(client.detect_fee_method().compat().await),
-                };
-                TxFee::Dynamic(fee_method)
-            },
-            Some(fee) => TxFee::FixedPerKb(fee),
-        };
-        Ok(tx_fee)
-    }
-
-    fn initial_history_state(&self) -> HistorySyncState {
-        if self.req()["tx_history"].as_bool().unwrap_or(false) {
-            HistorySyncState::NotStarted
-        } else {
-            HistorySyncState::NotEnabled
-        }
-    }
-
-    async fn rpc_client(&self) -> Result<UtxoRpcClientEnum, String> {
-        match self.req()["method"].as_str() {
-            Some("enable") => {
-                #[cfg(target_arch = "wasm32")]
-                {
-                    ERR!("Native UTXO mode is only supported in native mode")
-                }
-                #[cfg(not(target_arch = "wasm32"))]
-                {
-                    let native = try_s!(self.native_client());
-                    Ok(UtxoRpcClientEnum::Native(native))
-                }
-            },
-            Some("electrum") => {
-                let electrum = try_s!(self.electrum_client(ElectrumBuilderArgs::default()).await);
-                Ok(UtxoRpcClientEnum::Electrum(electrum))
-            },
-            _ => ERR!("Expected enable or electrum request"),
-        }
-    }
-
-    async fn electrum_client(&self, args: ElectrumBuilderArgs) -> Result<ElectrumClient, String> {
-        let (on_connect_tx, on_connect_rx) = mpsc::unbounded();
-        let ticker = self.ticker().to_owned();
-        let ctx = self.ctx();
-        let mut event_handlers = vec![];
-        if args.collect_metrics {
-            event_handlers.push(
-                CoinTransportMetrics::new(ctx.metrics.weak(), ticker.clone(), RpcClientType::Electrum).into_shared(),
-            );
-        }
-
-        if args.negotiate_version {
-            event_handlers.push(ElectrumProtoVerifier { on_connect_tx }.into_shared());
-        }
-
-        let mut servers: Vec<ElectrumRpcRequest> = try_s!(json::from_value(self.req()["servers"].clone()));
-        let mut rng = small_rng();
-        servers.as_mut_slice().shuffle(&mut rng);
-        let client = ElectrumClientImpl::new(ticker, event_handlers);
-        for server in servers.iter() {
-            match client.add_server(server).await {
-                Ok(_) => (),
-                Err(e) => log!("Error " (e) " connecting to " [server] ". Address won't be used"),
-            };
-        }
-
-        let mut attempts = 0i32;
-        while !client.is_connected().await {
-            if attempts >= 10 {
-                return ERR!("Failed to connect to at least 1 of {:?} in 5 seconds.", servers);
-            }
-
-            Timer::sleep(0.5).await;
-            attempts += 1;
-        }
-
-        let client = Arc::new(client);
-
-        if args.negotiate_version {
-            let weak_client = Arc::downgrade(&client);
-            let client_name = format!("{} GUI/MM2 {}", ctx.gui().unwrap_or("UNKNOWN"), ctx.mm_version());
-            spawn_electrum_version_loop(weak_client, on_connect_rx, client_name);
-
-            try_s!(wait_for_protocol_version_checked(&client).await);
-        }
-
-        if args.spawn_ping {
-            let weak_client = Arc::downgrade(&client);
-            spawn_electrum_ping_loop(weak_client, servers);
+#[derive(Debug)]
+pub struct UtxoHDWallet {
+    pub hd_wallet_storage: HDWalletCoinStorage,
+    pub address_format: UtxoAddressFormat,
+    /// Derivation path of the coin.
+    /// This derivation path consists of `purpose` and `coin_type` only
+    /// where the full `BIP44` address has the following structure:
+    /// `m/purpose'/coin_type'/account'/change/address_index`.
+    pub derivation_path: Bip44PathToCoin,
+    /// User accounts.
+    pub accounts: HDAccountsMutex<UtxoHDAccount>,
+    pub gap_limit: u32,
+}
+
+impl HDWalletOps for UtxoHDWallet {
+    type HDAccount = UtxoHDAccount;
+
+    fn coin_type(&self) -> u32 { self.derivation_path.coin_type() }
+
+    fn gap_limit(&self) -> u32 { self.gap_limit }
+
+    fn get_accounts_mutex(&self) -> &HDAccountsMutex<Self::HDAccount> { &self.accounts }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct UtxoHDAccount {
+    pub account_id: u32,
+    /// [Extended public key](https://learnmeabitcoin.com/technical/extended-keys) that corresponds to the derivation path:
+    /// `m/purpose'/coin_type'/account'`.
+    pub extended_pubkey: Secp256k1ExtendedPublicKey,
+    /// [`UtxoHDWallet::derivation_path`] derived by [`UtxoHDAccount::account_id`].
+    pub account_derivation_path: Bip44PathToAccount,
+    /// The number of addresses that we know have been used by the user.
+    /// This is used in order not to check the transaction history for each address,
+    /// but to request the balance of addresses whose index is less than `address_number`.
+    pub external_addresses_number: u32,
+    pub internal_addresses_number: u32,
+}
+
+impl HDAccountOps for UtxoHDAccount {
+    fn known_addresses_number(&self, chain: Bip44Chain) -> MmResult<u32, InvalidBip44ChainError> {
+        match chain {
+            Bip44Chain::External => Ok(self.external_addresses_number),
+            Bip44Chain::Internal => Ok(self.internal_addresses_number),
         }
-
-        Ok(ElectrumClient(client))
     }
 
-    #[cfg(not(target_arch = "wasm32"))]
-    fn native_client(&self) -> Result<NativeClient, String> {
-        use base64::{encode_config as base64_encode, URL_SAFE};
-
-        let native_conf_path = try_s!(self.confpath());
-        let network = try_s!(self.network());
-        let (rpc_port, rpc_user, rpc_password) = try_s!(read_native_mode_conf(&native_conf_path, &network));
-        let auth_str = fomat!((rpc_user)":"(rpc_password));
-        let rpc_port = match rpc_port {
-            Some(p) => p,
-            None => try_s!(self.conf()["rpcport"].as_u64().ok_or(ERRL!(
-                "Rpc port is not set neither in `coins` file nor in native daemon config"
-            ))) as u16,
-        };
-
-        let ctx = self.ctx();
-        let coin_ticker = self.ticker().to_owned();
-        let event_handlers =
-            vec![
-                CoinTransportMetrics::new(ctx.metrics.weak(), coin_ticker.clone(), RpcClientType::Native).into_shared(),
-            ];
-        let client = Arc::new(NativeClientImpl {
-            coin_ticker,
-            uri: fomat!("http://127.0.0.1:"(rpc_port)),
-            auth: format!("Basic {}", base64_encode(&auth_str, URL_SAFE)),
-            event_handlers,
-            request_id: 0u64.into(),
-            list_unspent_concurrent_map: ConcurrentRequestMap::new(),
-        });
+    fn account_derivation_path(&self) -> DerivationPath { self.account_derivation_path.to_derivation_path() }
 
-        Ok(NativeClient(client))
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    fn confpath(&self) -> Result<PathBuf, String> {
-        let conf = self.conf();
-        // Documented at https://github.com/jl777/coins#bitcoin-protocol-specific-json
-        // "USERHOME/" prefix should be replaced with the user's home folder.
-        let declared_confpath = match self.conf()["confpath"].as_str() {
-            Some(path) if !path.is_empty() => path.trim(),
-            _ => {
-                let (name, is_asset_chain) = {
-                    match conf["asset"].as_str() {
-                        Some(a) => (a, true),
-                        None => (
-                            try_s!(conf["name"].as_str().ok_or("'name' field is not found in config")),
-                            false,
-                        ),
-                    }
-                };
-                let data_dir = coin_daemon_data_dir(name, is_asset_chain);
-                let confname = format!("{}.conf", name);
-
-                return Ok(data_dir.join(&confname[..]));
-            },
-        };
-
-        let (confpath, rel_to_home) = match declared_confpath.strip_prefix("~/") {
-            Some(stripped) => (stripped, true),
-            None => match declared_confpath.strip_prefix("USERHOME/") {
-                Some(stripped) => (stripped, true),
-                None => (declared_confpath, false),
-            },
-        };
-
-        if rel_to_home {
-            let home = try_s!(home_dir().ok_or("Can not detect the user home directory"));
-            Ok(home.join(confpath))
-        } else {
-            Ok(confpath.into())
-        }
-    }
-
-    fn tx_hash_algo(&self) -> TxHashAlgo {
-        if self.ticker() == "GRS" {
-            TxHashAlgo::SHA256
-        } else {
-            TxHashAlgo::DSHA256
-        }
-    }
+    fn account_id(&self) -> u32 { self.account_id }
 }
 
-/// Ping the electrum servers every 30 seconds to prevent them from disconnecting us.
-/// According to docs server can do it if there are no messages in ~10 minutes.
-/// https://electrumx.readthedocs.io/en/latest/protocol-methods.html?highlight=keep#server-ping
-/// Weak reference will allow to stop the thread if client is dropped.
-fn spawn_electrum_ping_loop(weak_client: Weak<ElectrumClientImpl>, servers: Vec<ElectrumRpcRequest>) {
-    spawn(async move {
-        loop {
-            if let Some(client) = weak_client.upgrade() {
-                if let Err(e) = ElectrumClient(client).server_ping().compat().await {
-                    log!("Electrum servers " [servers] " ping error " [e]);
-                }
-            } else {
-                log!("Electrum servers " [servers] " ping loop stopped");
-                break;
-            }
-            Timer::sleep(30.).await
-        }
-    });
-}
-
-async fn check_electrum_server_version(
-    weak_client: Weak<ElectrumClientImpl>,
-    client_name: String,
-    electrum_addr: String,
-) {
-    // client.remove_server() is called too often
-    async fn remove_server(client: ElectrumClient, electrum_addr: &str) {
-        if let Err(e) = client.remove_server(electrum_addr).await {
-            log!("Error on remove server "[e]);
-        }
-    }
-
-    if let Some(c) = weak_client.upgrade() {
-        let client = ElectrumClient(c);
-        let available_protocols = client.protocol_version();
-        let version = match client
-            .server_version(&electrum_addr, &client_name, available_protocols)
-            .compat()
-            .await
-        {
-            Ok(version) => version,
-            Err(e) => {
-                log!("Electrum " (electrum_addr) " server.version error \"" [e] "\".");
-                if !e.error.is_transport() {
-                    remove_server(client, &electrum_addr).await;
-                };
-                return;
-            },
-        };
-
-        // check if the version is allowed
-        let actual_version = match version.protocol_version.parse::<f32>() {
-            Ok(v) => v,
-            Err(e) => {
-                log!("Error on parse protocol_version "[e]);
-                remove_server(client, &electrum_addr).await;
-                return;
-            },
-        };
-
-        if !available_protocols.contains(&actual_version) {
-            log!("Received unsupported protocol version " [actual_version] " from " [electrum_addr] ". Remove the connection");
-            remove_server(client, &electrum_addr).await;
-            return;
-        }
+impl UtxoHDAccount {
+    pub fn try_from_storage_item(
+        wallet_der_path: &Bip44PathToCoin,
+        account_info: &HDAccountStorageItem,
+    ) -> HDWalletStorageResult<UtxoHDAccount> {
+        const ACCOUNT_CHILD_HARDENED: bool = true;
 
-        match client.set_protocol_version(&electrum_addr, actual_version).await {
-            Ok(()) => {
-                log!("Use protocol version " [actual_version] " for Electrum " [electrum_addr]);
-            },
-            Err(e) => {
-                log!("Error on set protocol_version "[e]);
-            },
-        };
+        let account_child = ChildNumber::new(account_info.account_id, ACCOUNT_CHILD_HARDENED)?;
+        let account_derivation_path = wallet_der_path
+            .derive(account_child)
+            .map_to_mm(Bip44DerPathError::from)?;
+        let extended_pubkey = Secp256k1ExtendedPublicKey::from_str(&account_info.account_xpub)?;
+        Ok(UtxoHDAccount {
+            account_id: account_info.account_id,
+            extended_pubkey,
+            account_derivation_path,
+            external_addresses_number: account_info.external_addresses_number,
+            internal_addresses_number: account_info.internal_addresses_number,
+        })
     }
-}
-
-/// Follow the `on_connect_rx` stream and verify the protocol version of each connected electrum server.
-/// https://electrumx.readthedocs.io/en/latest/protocol-methods.html?highlight=keep#server-version
-/// Weak reference will allow to stop the thread if client is dropped.
-fn spawn_electrum_version_loop(
-    weak_client: Weak<ElectrumClientImpl>,
-    mut on_connect_rx: mpsc::UnboundedReceiver<String>,
-    client_name: String,
-) {
-    spawn(async move {
-        while let Some(electrum_addr) = on_connect_rx.next().await {
-            spawn(check_electrum_server_version(
-                weak_client.clone(),
-                client_name.clone(),
-                electrum_addr,
-            ));
-        }
-
-        log!("Electrum server.version loop stopped");
-    });
-}
-
-/// Wait until the protocol version of at least one client's Electrum is checked.
-async fn wait_for_protocol_version_checked(client: &ElectrumClientImpl) -> Result<(), String> {
-    let mut attempts = 0;
-    loop {
-        if attempts >= 10 {
-            return ERR!("Failed protocol version verifying of at least 1 of Electrums in 5 seconds.");
-        }
-
-        if client.count_connections().await == 0 {
-            // All of the connections were removed because of server.version checking
-            return ERR!(
-                "There are no Electrums with the required protocol version {:?}",
-                client.protocol_version()
-            );
-        }
 
-        if client.is_protocol_version_checked().await {
-            break;
+    pub fn to_storage_item(&self) -> HDAccountStorageItem {
+        HDAccountStorageItem {
+            account_id: self.account_id,
+            account_xpub: self.extended_pubkey.to_string(bip32::Prefix::XPUB),
+            external_addresses_number: self.external_addresses_number,
+            internal_addresses_number: self.internal_addresses_number,
         }
-
-        Timer::sleep(0.5).await;
-        attempts += 1;
     }
-
-    Ok(())
 }
 
 /// Function calculating KMD interest
@@ -1728,25 +1499,22 @@ pub struct KmdRewardsInfoElement {
 
 /// Get rewards info of unspent outputs.
 /// The list is ordered by the output value.
-pub async fn kmd_rewards_info<T>(coin: &T) -> Result<Vec<KmdRewardsInfoElement>, String>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
-{
+pub async fn kmd_rewards_info<T: UtxoCommonOps>(coin: &T) -> Result<Vec<KmdRewardsInfoElement>, String> {
     if coin.as_ref().conf.ticker != "KMD" {
         return ERR!("rewards info can be obtained for KMD only");
     }
 
     let utxo = coin.as_ref();
+    let my_address = try_s!(utxo.derivation_method.iguana_or_err());
     let rpc_client = &utxo.rpc_client;
-    let mut unspents = try_s!(rpc_client.list_unspent(&utxo.my_address, utxo.decimals).compat().await);
-    // list_unspent_ordered() returns ordered from lowest to highest by value unspent outputs.
-    // reverse it to reorder from highest to lowest outputs.
-    unspents.reverse();
+    let mut unspents = try_s!(rpc_client.list_unspent(my_address, utxo.decimals).compat().await);
+    // Reorder from highest to lowest unspent outputs.
+    unspents.sort_unstable_by(|x, y| y.value.cmp(&x.value));
 
     let mut result = Vec::with_capacity(unspents.len());
     for unspent in unspents {
         let tx_hash: H256Json = unspent.outpoint.hash.reversed().into();
-        let tx_info = try_s!(rpc_client.get_verbose_transaction(tx_hash.clone()).compat().await);
+        let tx_info = try_s!(rpc_client.get_verbose_transaction(&tx_hash).compat().await);
 
         let value = unspent.value;
         let locktime = tx_info.locktime as u64;
@@ -1797,255 +1565,81 @@ pub fn sat_from_big_decimal(amount: &BigDecimal, decimals: u8) -> NumConversResu
         })
 }
 
-pub(crate) fn sign_tx(
-    unsigned: TransactionInputSigner,
-    key_pair: &KeyPair,
-    prev_script: Script,
-    signature_version: SignatureVersion,
-    fork_id: u32,
-) -> Result<UtxoTx, String> {
-    let mut signed_inputs = vec![];
-    match signature_version {
-        SignatureVersion::WitnessV0 => {
-            for (i, _) in unsigned.inputs.iter().enumerate() {
-                signed_inputs.push(try_s!(p2wpkh_spend(
-                    &unsigned,
-                    i,
-                    key_pair,
-                    &prev_script,
-                    signature_version,
-                    fork_id
-                )));
-            }
-        },
-        _ => {
-            for (i, _) in unsigned.inputs.iter().enumerate() {
-                signed_inputs.push(try_s!(p2pkh_spend(
-                    &unsigned,
-                    i,
-                    key_pair,
-                    &prev_script,
-                    signature_version,
-                    fork_id
-                )));
-            }
-        },
-    }
-
-    Ok(UtxoTx {
-        inputs: signed_inputs,
-        n_time: unsigned.n_time,
-        outputs: unsigned.outputs.clone(),
-        version: unsigned.version,
-        overwintered: unsigned.overwintered,
-        lock_time: unsigned.lock_time,
-        expiry_height: unsigned.expiry_height,
-        join_splits: vec![],
-        shielded_spends: vec![],
-        shielded_outputs: vec![],
-        value_balance: 0,
-        version_group_id: unsigned.version_group_id,
-        binding_sig: H512::default(),
-        join_split_sig: H512::default(),
-        join_split_pubkey: H256::default(),
-        zcash: unsigned.zcash,
-        str_d_zeel: unsigned.str_d_zeel,
-        tx_hash_algo: unsigned.hash_algo.into(),
-    })
-}
-
-async fn send_outputs_from_my_address_impl<T>(coin: T, outputs: Vec<TransactionOutput>) -> Result<UtxoTx, String>
+async fn send_outputs_from_my_address_impl<T>(
+    coin: T,
+    outputs: Vec<TransactionOutput>,
+) -> Result<UtxoTx, TransactionErr>
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
+    T: UtxoCommonOps + GetUtxoListOps,
 {
-    let (unspents, recently_sent_txs) = try_s!(coin.list_unspent_ordered(&coin.as_ref().my_address).await);
-    generate_and_send_tx(&coin, unspents, outputs, FeePolicy::SendExact, recently_sent_txs).await
+    let my_address = try_tx_s!(coin.as_ref().derivation_method.iguana_or_err());
+    let (unspents, recently_sent_txs) = try_tx_s!(coin.get_unspent_ordered_list(my_address).await);
+    generate_and_send_tx(&coin, unspents, None, FeePolicy::SendExact, recently_sent_txs, outputs).await
 }
 
 /// Generates and sends tx using unspents and outputs adding new record to the recently_spent in case of success
 async fn generate_and_send_tx<T>(
     coin: &T,
     unspents: Vec<UnspentInfo>,
-    outputs: Vec<TransactionOutput>,
+    required_inputs: Option<Vec<UnspentInfo>>,
     fee_policy: FeePolicy,
-    mut recently_spent: AsyncMutexGuard<'_, RecentlySpentOutPoints>,
-) -> Result<UtxoTx, String>
+    mut recently_spent: RecentlySpentOutPointsGuard<'_>,
+    outputs: Vec<TransactionOutput>,
+) -> Result<UtxoTx, TransactionErr>
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
+    T: AsRef<UtxoCoinFields> + UtxoTxGenerationOps + UtxoTxBroadcastOps,
 {
-    let (unsigned, _) = try_s!(
-        coin.generate_transaction(unspents, outputs, fee_policy, None, None)
-            .await
-    );
+    let my_address = try_tx_s!(coin.as_ref().derivation_method.iguana_or_err());
+    let key_pair = try_tx_s!(coin.as_ref().priv_key_policy.key_pair_or_err());
+
+    let mut builder = UtxoTxBuilder::new(coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs)
+        .with_fee_policy(fee_policy);
+    if let Some(required) = required_inputs {
+        builder = builder.add_required_inputs(required);
+    }
+    let (unsigned, _) = try_tx_s!(builder.build().await);
 
     let spent_unspents = unsigned
         .inputs
         .iter()
         .map(|input| UnspentInfo {
-            outpoint: input.previous_output.clone(),
+            outpoint: input.previous_output,
             value: input.amount,
             height: None,
         })
         .collect();
 
-    let signature_version = match &coin.as_ref().my_address.addr_format {
+    let signature_version = match &my_address.addr_format {
         UtxoAddressFormat::Segwit => SignatureVersion::WitnessV0,
         _ => coin.as_ref().conf.signature_version,
     };
 
-    let prev_script = Builder::build_p2pkh(&coin.as_ref().my_address.hash);
-    let signed = try_s!(sign_tx(
+    let prev_script = Builder::build_p2pkh(&my_address.hash);
+    let signed = try_tx_s!(sign_tx(
         unsigned,
-        &coin.as_ref().key_pair,
+        key_pair,
         prev_script,
         signature_version,
         coin.as_ref().conf.fork_id
     ));
 
-    try_s!(
-        coin.as_ref()
-            .rpc_client
-            .send_transaction(&signed)
-            .map_err(|e| ERRL!("{}", e))
-            .compat()
-            .await
-    );
+    try_tx_s!(coin.broadcast_tx(&signed).await, signed);
 
     recently_spent.add_spent(spent_unspents, signed.hash(), signed.outputs.clone());
 
     Ok(signed)
 }
 
-/// Creates signed input spending p2pkh output
-pub fn p2pkh_spend(
-    signer: &TransactionInputSigner,
-    input_index: usize,
-    key_pair: &KeyPair,
-    prev_script: &Script,
-    signature_version: SignatureVersion,
-    fork_id: u32,
-) -> Result<TransactionInput, String> {
-    let script = Builder::build_p2pkh(&key_pair.public().address_hash());
-    if script != *prev_script {
-        return ERR!(
-            "p2pkh script {} built from input key pair doesn't match expected prev script {}",
-            script,
-            prev_script
-        );
-    }
-    let sighash_type = 1 | fork_id;
-    let sighash = signer.signature_hash(
-        input_index,
-        signer.inputs[input_index].amount,
-        &script,
-        signature_version,
-        sighash_type,
-    );
-
-    let script_sig = try_s!(script_sig_with_pub(&sighash, key_pair, fork_id));
-
-    Ok(TransactionInput {
-        script_sig,
-        sequence: signer.inputs[input_index].sequence,
-        script_witness: vec![],
-        previous_output: signer.inputs[input_index].previous_output.clone(),
-    })
-}
-
-/// Creates signed input spending p2pkh output
-pub fn p2pk_spend(
-    signer: &TransactionInputSigner,
-    input_index: usize,
-    key_pair: &KeyPair,
-    signature_version: SignatureVersion,
-    fork_id: u32,
-) -> Result<TransactionInput, String> {
-    let script = Builder::build_p2pk(key_pair.public());
-    let sighash_type = 1 | fork_id;
-    let sighash = signer.signature_hash(
-        input_index,
-        signer.inputs[input_index].amount,
-        &script,
-        signature_version,
-        sighash_type,
-    );
-
-    let script_sig = try_s!(script_sig(&sighash, key_pair, fork_id));
-
-    Ok(TransactionInput {
-        script_sig: Builder::default().push_bytes(&script_sig).into_bytes(),
-        sequence: signer.inputs[input_index].sequence,
-        script_witness: vec![],
-        previous_output: signer.inputs[input_index].previous_output.clone(),
-    })
-}
-
-/// Creates signed input spending p2wpkh output
-fn p2wpkh_spend(
-    signer: &TransactionInputSigner,
-    input_index: usize,
-    key_pair: &KeyPair,
-    prev_script: &Script,
-    signature_version: SignatureVersion,
-    fork_id: u32,
-) -> Result<TransactionInput, String> {
-    let script = Builder::build_p2pkh(&key_pair.public().address_hash());
-
-    if script != *prev_script {
-        return ERR!(
-            "p2pkh script {} built from input key pair doesn't match expected prev script {}",
-            script,
-            prev_script
-        );
-    }
-    let sighash_type = 1 | fork_id;
-    let sighash = signer.signature_hash(
-        input_index,
-        signer.inputs[input_index].amount,
-        &script,
-        signature_version,
-        sighash_type,
-    );
-
-    let sig_script = try_s!(script_sig(&sighash, key_pair, fork_id));
-
-    Ok(TransactionInput {
-        previous_output: signer.inputs[input_index].previous_output.clone(),
-        script_sig: Bytes::from(Vec::new()),
-        sequence: signer.inputs[input_index].sequence,
-        script_witness: vec![sig_script, Bytes::from(key_pair.public().deref())],
-    })
-}
-
-fn script_sig_with_pub(message: &H256, key_pair: &KeyPair, fork_id: u32) -> Result<Bytes, String> {
-    let sig_script = try_s!(script_sig(message, key_pair, fork_id));
-
-    let builder = Builder::default();
-
-    Ok(builder
-        .push_data(&sig_script)
-        .push_data(&key_pair.public().to_vec())
-        .into_bytes())
-}
-
-fn script_sig(message: &H256, key_pair: &KeyPair, fork_id: u32) -> Result<Bytes, String> {
-    let signature = try_s!(key_pair.private().sign(message));
-
-    let mut sig_script = Bytes::default();
-    sig_script.append(&mut Bytes::from((*signature).to_vec()));
-    // Using SIGHASH_ALL only for now
-    sig_script.append(&mut Bytes::from(vec![1 | fork_id as u8]));
-
-    Ok(sig_script)
-}
-
 pub fn output_script(address: &Address, script_type: ScriptType) -> Script {
     match address.addr_format {
-        UtxoAddressFormat::Segwit => Builder::build_p2wpkh(&address.hash),
+        UtxoAddressFormat::Segwit => Builder::build_witness_script(&address.hash),
         _ => match script_type {
             ScriptType::P2PKH => Builder::build_p2pkh(&address.hash),
             ScriptType::P2SH => Builder::build_p2sh(&address.hash),
-            ScriptType::P2WPKH => Builder::build_p2wpkh(&address.hash),
+            ScriptType::P2WPKH => Builder::build_witness_script(&address.hash),
+            ScriptType::P2WSH => Builder::build_witness_script(&address.hash),
         },
     }
 }
@@ -2056,8 +1650,20 @@ pub fn address_by_conf_and_pubkey_str(
     pubkey: &str,
     addr_format: UtxoAddressFormat,
 ) -> Result<String, String> {
-    let null = Json::Null;
-    let conf_builder = UtxoConfBuilder::new(conf, &null, coin);
+    // using a reasonable default here
+    let params = UtxoActivationParams {
+        mode: UtxoRpcMode::Native,
+        utxo_merge_params: None,
+        tx_history: false,
+        required_confirmations: None,
+        requires_notarization: None,
+        address_format: None,
+        gap_limit: None,
+        scan_policy: EnableCoinScanPolicy::default(),
+        priv_key_policy: PrivKeyActivationPolicy::IguanaPrivKey,
+        check_utxo_maturity: None,
+    };
+    let conf_builder = UtxoConfBuilder::new(conf, &params, coin);
     let utxo_conf = try_s!(conf_builder.build());
     let pubkey_bytes = try_s!(hex::decode(pubkey));
     let hash = dhash160(&pubkey_bytes);
@@ -2065,10 +1671,27 @@ pub fn address_by_conf_and_pubkey_str(
     let address = Address {
         prefix: utxo_conf.pub_addr_prefix,
         t_addr_prefix: utxo_conf.pub_t_addr_prefix,
-        hash,
+        hash: hash.into(),
         checksum_type: utxo_conf.checksum_type,
         hrp: utxo_conf.bech32_hrp,
         addr_format,
     };
     address.display_address()
 }
+
+fn parse_hex_encoded_u32(hex_encoded: &str) -> Result<u32, MmError<String>> {
+    let hex_encoded = hex_encoded.strip_prefix("0x").unwrap_or(hex_encoded);
+    let bytes = hex::decode(hex_encoded).map_to_mm(|e| e.to_string())?;
+    let be_bytes: [u8; 4] = bytes
+        .as_slice()
+        .try_into()
+        .map_to_mm(|e: TryFromSliceError| e.to_string())?;
+    Ok(u32::from_be_bytes(be_bytes))
+}
+
+#[test]
+fn test_parse_hex_encoded_u32() {
+    assert_eq!(parse_hex_encoded_u32("0x892f2085"), Ok(2301567109));
+    assert_eq!(parse_hex_encoded_u32("892f2085"), Ok(2301567109));
+    assert_eq!(parse_hex_encoded_u32("0x7361707a"), Ok(1935765626));
+}
diff --git a/mm2src/coins/utxo/bch.rs b/mm2src/coins/utxo/bch.rs
new file mode 100644
index 0000000000..1cbaea6a5e
--- /dev/null
+++ b/mm2src/coins/utxo/bch.rs
@@ -0,0 +1,1451 @@
+use super::*;
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, TxDetailsBuilder, TxHistoryStorage, TxHistoryStorageError};
+use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
+use crate::utxo::rpc_clients::UtxoRpcFut;
+use crate::utxo::slp::{parse_slp_script, ParseSlpScriptError, SlpGenesisParams, SlpTokenInfo, SlpTransaction,
+                       SlpUnspent};
+use crate::utxo::utxo_builder::{UtxoArcBuilder, UtxoCoinBuilder};
+use crate::utxo::utxo_common::big_decimal_from_sat_unsigned;
+use crate::{BlockHeightAndTime, CanRefundHtlc, CoinBalance, CoinProtocol, NegotiateSwapContractAddrErr,
+            PrivKeyBuildPolicy, RawTransactionFut, RawTransactionRequest, SearchForSwapTxSpendInput, SignatureResult,
+            SwapOps, TradePreimageValue, TransactionFut, TransactionType, TxFeeDetails, UnexpectedDerivationMethod,
+            ValidateAddressResult, ValidatePaymentInput, VerificationResult, WithdrawFut};
+use common::log::warn;
+use common::mm_metrics::MetricsArc;
+use derive_more::Display;
+use futures::{FutureExt, TryFutureExt};
+use itertools::Either as EitherIter;
+use keys::hash::H256;
+use keys::CashAddress;
+pub use keys::NetworkPrefix as CashAddrPrefix;
+use mm2_number::MmNumber;
+use serde_json::{self as json, Value as Json};
+use serialization::{deserialize, CoinVariant};
+use std::sync::MutexGuard;
+
+pub type BchUnspentMap = HashMap<Address, BchUnspents>;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct BchActivationRequest {
+    #[serde(default)]
+    allow_slp_unsafe_conf: bool,
+    bchd_urls: Vec<String>,
+    #[serde(flatten)]
+    pub utxo_params: UtxoActivationParams,
+}
+
+#[derive(Debug, Display)]
+pub enum BchFromLegacyReqErr {
+    InvalidUtxoParams(UtxoFromLegacyReqErr),
+    InvalidBchdUrls(json::Error),
+}
+
+impl From<UtxoFromLegacyReqErr> for BchFromLegacyReqErr {
+    fn from(err: UtxoFromLegacyReqErr) -> Self { BchFromLegacyReqErr::InvalidUtxoParams(err) }
+}
+
+impl BchActivationRequest {
+    pub fn from_legacy_req(req: &Json) -> Result<Self, MmError<BchFromLegacyReqErr>> {
+        let bchd_urls = json::from_value(req["bchd_urls"].clone()).map_to_mm(BchFromLegacyReqErr::InvalidBchdUrls)?;
+        let allow_slp_unsafe_conf = req["allow_slp_unsafe_conf"].as_bool().unwrap_or_default();
+        let utxo_params = UtxoActivationParams::from_legacy_req(req)?;
+
+        Ok(BchActivationRequest {
+            allow_slp_unsafe_conf,
+            bchd_urls,
+            utxo_params,
+        })
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct BchCoin {
+    utxo_arc: UtxoArc,
+    slp_addr_prefix: CashAddrPrefix,
+    bchd_urls: Vec<String>,
+    slp_tokens_infos: Arc<Mutex<HashMap<String, SlpTokenInfo>>>,
+}
+
+#[allow(clippy::large_enum_variant)]
+pub enum IsSlpUtxoError {
+    Rpc(UtxoRpcError),
+    TxDeserialization(serialization::Error),
+}
+
+#[derive(Debug, Default)]
+pub struct BchUnspents {
+    /// Standard BCH UTXOs
+    standard: Vec<UnspentInfo>,
+    /// SLP related UTXOs
+    slp: HashMap<H256, Vec<SlpUnspent>>,
+    /// SLP minting batons outputs, DO NOT use them as MM2 doesn't support SLP minting by default
+    slp_batons: Vec<UnspentInfo>,
+    /// The unspents of transaction with an undetermined protocol (OP_RETURN in 0 output but not SLP)
+    /// DO NOT ever use them to avoid burning users funds
+    undetermined: Vec<UnspentInfo>,
+}
+
+impl BchUnspents {
+    fn add_standard(&mut self, utxo: UnspentInfo) { self.standard.push(utxo) }
+
+    fn add_slp(&mut self, token_id: H256, bch_unspent: UnspentInfo, slp_amount: u64) {
+        let slp_unspent = SlpUnspent {
+            bch_unspent,
+            slp_amount,
+        };
+        self.slp.entry(token_id).or_insert_with(Vec::new).push(slp_unspent);
+    }
+
+    fn add_slp_baton(&mut self, utxo: UnspentInfo) { self.slp_batons.push(utxo) }
+
+    fn add_undetermined(&mut self, utxo: UnspentInfo) { self.undetermined.push(utxo) }
+
+    pub fn platform_balance(&self, decimals: u8) -> CoinBalance {
+        let spendable_sat = total_unspent_value(&self.standard);
+
+        let unspendable_slp = self.slp.iter().fold(0, |cur, (_, slp_unspents)| {
+            let bch_value = total_unspent_value(slp_unspents.iter().map(|slp| &slp.bch_unspent));
+            cur + bch_value
+        });
+
+        let unspendable_slp_batons = total_unspent_value(&self.slp_batons);
+        let unspendable_undetermined = total_unspent_value(&self.undetermined);
+
+        let total_unspendable = unspendable_slp + unspendable_slp_batons + unspendable_undetermined;
+        CoinBalance {
+            spendable: big_decimal_from_sat_unsigned(spendable_sat, decimals),
+            unspendable: big_decimal_from_sat_unsigned(total_unspendable, decimals),
+        }
+    }
+
+    pub fn slp_token_balance(&self, token_id: &H256, decimals: u8) -> CoinBalance {
+        self.slp
+            .get(token_id)
+            .map(|unspents| {
+                let total_sat = unspents.iter().fold(0, |cur, unspent| cur + unspent.slp_amount);
+                CoinBalance {
+                    spendable: big_decimal_from_sat_unsigned(total_sat, decimals),
+                    unspendable: 0.into(),
+                }
+            })
+            .unwrap_or_default()
+    }
+}
+
+impl From<UtxoRpcError> for IsSlpUtxoError {
+    fn from(err: UtxoRpcError) -> IsSlpUtxoError { IsSlpUtxoError::Rpc(err) }
+}
+
+impl From<serialization::Error> for IsSlpUtxoError {
+    fn from(err: serialization::Error) -> IsSlpUtxoError { IsSlpUtxoError::TxDeserialization(err) }
+}
+
+#[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum GetTxDetailsError<E: TxHistoryStorageError> {
+    StorageError(E),
+    AddressesFromScriptError(String),
+    SlpTokenIdIsNotGenesisTx(H256),
+    TxDeserializationError(serialization::Error),
+    RpcError(UtxoRpcError),
+    ParseSlpScriptError(ParseSlpScriptError),
+    ToSlpAddressError(String),
+    InvalidSlpTransaction(H256),
+    AddressDerivationError(UnexpectedDerivationMethod),
+}
+
+impl<E: TxHistoryStorageError> From<UtxoRpcError> for GetTxDetailsError<E> {
+    fn from(err: UtxoRpcError) -> Self { GetTxDetailsError::RpcError(err) }
+}
+
+impl<E: TxHistoryStorageError> From<E> for GetTxDetailsError<E> {
+    fn from(err: E) -> Self { GetTxDetailsError::StorageError(err) }
+}
+
+impl<E: TxHistoryStorageError> From<serialization::Error> for GetTxDetailsError<E> {
+    fn from(err: serialization::Error) -> Self { GetTxDetailsError::TxDeserializationError(err) }
+}
+
+impl<E: TxHistoryStorageError> From<ParseSlpScriptError> for GetTxDetailsError<E> {
+    fn from(err: ParseSlpScriptError) -> Self { GetTxDetailsError::ParseSlpScriptError(err) }
+}
+
+impl<E: TxHistoryStorageError> From<UnexpectedDerivationMethod> for GetTxDetailsError<E> {
+    fn from(err: UnexpectedDerivationMethod) -> Self { GetTxDetailsError::AddressDerivationError(err) }
+}
+
+impl BchCoin {
+    pub fn slp_prefix(&self) -> &CashAddrPrefix { &self.slp_addr_prefix }
+
+    pub fn slp_address(&self, address: &Address) -> Result<CashAddress, String> {
+        let conf = &self.as_ref().conf;
+        address.to_cashaddress(
+            &self.slp_prefix().to_string(),
+            conf.pub_addr_prefix,
+            conf.p2sh_addr_prefix,
+        )
+    }
+
+    pub fn bchd_urls(&self) -> &[String] { &self.bchd_urls }
+
+    async fn utxos_into_bch_unspents(&self, utxos: Vec<UnspentInfo>) -> UtxoRpcResult<BchUnspents> {
+        let mut result = BchUnspents::default();
+        let mut temporary_undetermined = Vec::new();
+
+        let to_verbose: HashSet<H256Json> = utxos
+            .into_iter()
+            .filter_map(|unspent| {
+                if unspent.outpoint.index == 0 {
+                    // Zero output is reserved for OP_RETURN of specific protocols
+                    // so if we get it we can safely consider this as standard BCH UTXO.
+                    // There is no need to request verbose transaction for such UTXO.
+                    result.add_standard(unspent);
+                    None
+                } else {
+                    let hash = unspent.outpoint.hash.reversed().into();
+                    temporary_undetermined.push(unspent);
+                    Some(hash)
+                }
+            })
+            .collect();
+
+        let verbose_txs = self
+            .get_verbose_transactions_from_cache_or_rpc(to_verbose)
+            .compat()
+            .await?;
+
+        for unspent in temporary_undetermined {
+            let prev_tx_hash = unspent.outpoint.hash.reversed().into();
+            let prev_tx_bytes = verbose_txs
+                .get(&prev_tx_hash)
+                .or_mm_err(|| {
+                    UtxoRpcError::Internal(format!(
+                        "'get_verbose_transactions_from_cache_or_rpc' should have returned '{:?}'",
+                        prev_tx_hash
+                    ))
+                })?
+                .to_inner();
+            let prev_tx: UtxoTx = match deserialize(prev_tx_bytes.hex.as_slice()) {
+                Ok(b) => b,
+                Err(e) => {
+                    warn!(
+                        "Failed to deserialize prev_tx {:?} with error {:?}, considering {:?} as undetermined",
+                        prev_tx_bytes, e, unspent
+                    );
+                    result.add_undetermined(unspent);
+                    continue;
+                },
+            };
+
+            if prev_tx.outputs.is_empty() {
+                warn!(
+                    "Prev_tx {:?} outputs are empty, considering {:?} as undetermined",
+                    prev_tx_bytes, unspent
+                );
+                result.add_undetermined(unspent);
+                continue;
+            }
+
+            let zero_out_script: Script = prev_tx.outputs[0].script_pubkey.clone().into();
+            if zero_out_script.is_pay_to_public_key()
+                || zero_out_script.is_pay_to_public_key_hash()
+                || zero_out_script.is_pay_to_script_hash()
+            {
+                result.add_standard(unspent);
+            } else {
+                match parse_slp_script(&prev_tx.outputs[0].script_pubkey) {
+                    Ok(slp_data) => match slp_data.transaction {
+                        SlpTransaction::Send { token_id, amounts } => {
+                            match amounts.get(unspent.outpoint.index as usize - 1) {
+                                Some(slp_amount) => result.add_slp(token_id, unspent, *slp_amount),
+                                None => result.add_standard(unspent),
+                            }
+                        },
+                        SlpTransaction::Genesis(genesis) => {
+                            if unspent.outpoint.index == 1 {
+                                let token_id = prev_tx.hash().reversed();
+                                result.add_slp(token_id, unspent, genesis.initial_token_mint_quantity);
+                            } else if Some(unspent.outpoint.index) == genesis.mint_baton_vout.map(|u| u as u32) {
+                                result.add_slp_baton(unspent);
+                            } else {
+                                result.add_standard(unspent);
+                            }
+                        },
+                        SlpTransaction::Mint {
+                            token_id,
+                            additional_token_quantity,
+                            mint_baton_vout,
+                        } => {
+                            if unspent.outpoint.index == 1 {
+                                result.add_slp(token_id, unspent, additional_token_quantity);
+                            } else if Some(unspent.outpoint.index) == mint_baton_vout.map(|u| u as u32) {
+                                result.add_slp_baton(unspent);
+                            } else {
+                                result.add_standard(unspent);
+                            }
+                        },
+                    },
+                    Err(e) => {
+                        warn!(
+                            "Error {} parsing script {:?} as SLP, considering {:?} as undetermined",
+                            e, prev_tx.outputs[0].script_pubkey, unspent
+                        );
+                        result.undetermined.push(unspent);
+                    },
+                };
+            }
+        }
+        Ok(result)
+    }
+
+    /// Returns unspents to calculate balance, use for displaying purposes only!
+    /// DO NOT USE to build transactions, it can lead to double spending attempt and also have other unpleasant consequences
+    pub async fn bch_unspents_for_display(&self, address: &Address) -> UtxoRpcResult<BchUnspents> {
+        // ordering is not required to display balance to we can simply call "normal" list_unspent
+        let all_unspents = self
+            .utxo_arc
+            .rpc_client
+            .list_unspent(address, self.utxo_arc.decimals)
+            .compat()
+            .await?;
+        self.utxos_into_bch_unspents(all_unspents).await
+    }
+
+    /// Locks recently spent cache to safely return UTXOs for spending
+    pub async fn bch_unspents_for_spend(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(BchUnspents, RecentlySpentOutPointsGuard<'_>)> {
+        let (all_unspents, recently_spent) = utxo_common::get_unspent_ordered_list(self, address).await?;
+        let result = self.utxos_into_bch_unspents(all_unspents).await?;
+
+        Ok((result, recently_spent))
+    }
+
+    pub async fn get_token_utxos_for_spend(
+        &self,
+        token_id: &H256,
+    ) -> UtxoRpcResult<(Vec<SlpUnspent>, Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        let my_address = self
+            .as_ref()
+            .derivation_method
+            .iguana_or_err()
+            .mm_err(|e| UtxoRpcError::Internal(e.to_string()))?;
+        let (mut bch_unspents, recently_spent) = self.bch_unspents_for_spend(my_address).await?;
+        let (mut slp_unspents, standard_utxos) = (
+            bch_unspents.slp.remove(token_id).unwrap_or_default(),
+            bch_unspents.standard,
+        );
+
+        slp_unspents.sort_by(|a, b| a.slp_amount.cmp(&b.slp_amount));
+        Ok((slp_unspents, standard_utxos, recently_spent))
+    }
+
+    pub async fn get_token_utxos_for_display(
+        &self,
+        token_id: &H256,
+    ) -> UtxoRpcResult<(Vec<SlpUnspent>, Vec<UnspentInfo>)> {
+        let my_address = self
+            .as_ref()
+            .derivation_method
+            .iguana_or_err()
+            .mm_err(|e| UtxoRpcError::Internal(e.to_string()))?;
+        let mut bch_unspents = self.bch_unspents_for_display(my_address).await?;
+        let (mut slp_unspents, standard_utxos) = (
+            bch_unspents.slp.remove(token_id).unwrap_or_default(),
+            bch_unspents.standard,
+        );
+
+        slp_unspents.sort_by(|a, b| a.slp_amount.cmp(&b.slp_amount));
+        Ok((slp_unspents, standard_utxos))
+    }
+
+    pub fn add_slp_token_info(&self, ticker: String, info: SlpTokenInfo) {
+        self.slp_tokens_infos.lock().unwrap().insert(ticker, info);
+    }
+
+    pub fn get_slp_tokens_infos(&self) -> MutexGuard<'_, HashMap<String, SlpTokenInfo>> {
+        self.slp_tokens_infos.lock().unwrap()
+    }
+
+    pub fn get_my_slp_address(&self) -> Result<CashAddress, String> {
+        let my_address = try_s!(self.as_ref().derivation_method.iguana_or_err());
+        let slp_address = my_address.to_cashaddress(
+            &self.slp_prefix().to_string(),
+            self.as_ref().conf.pub_addr_prefix,
+            self.as_ref().conf.p2sh_addr_prefix,
+        )?;
+        Ok(slp_address)
+    }
+
+    async fn tx_from_storage_or_rpc<T: TxHistoryStorage>(
+        &self,
+        tx_hash: &H256Json,
+        storage: &T,
+    ) -> Result<UtxoTx, MmError<GetTxDetailsError<T::Error>>> {
+        let tx_hash_str = format!("{:02x}", tx_hash);
+        let wallet_id = self.history_wallet_id();
+        let tx_bytes = match storage.tx_bytes_from_cache(&wallet_id, &tx_hash_str).await? {
+            Some(tx_bytes) => tx_bytes,
+            None => {
+                let tx_bytes = self.as_ref().rpc_client.get_transaction_bytes(tx_hash).compat().await?;
+                storage.add_tx_to_cache(&wallet_id, &tx_hash_str, &tx_bytes).await?;
+                tx_bytes
+            },
+        };
+        let tx = deserialize(tx_bytes.0.as_slice())?;
+        Ok(tx)
+    }
+
+    /// Returns multiple details by tx hash if token transfers also occurred in the transaction
+    pub async fn transaction_details_with_token_transfers<T: TxHistoryStorage>(
+        &self,
+        tx_hash: &H256Json,
+        block_height_and_time: Option<BlockHeightAndTime>,
+        storage: &T,
+    ) -> Result<Vec<TransactionDetails>, MmError<GetTxDetailsError<T::Error>>> {
+        let tx = self.tx_from_storage_or_rpc(tx_hash, storage).await?;
+
+        let bch_tx_details = self
+            .bch_tx_details(tx_hash, &tx, block_height_and_time, storage)
+            .await?;
+        let maybe_op_return: Script = tx.outputs[0].script_pubkey.clone().into();
+        if !(maybe_op_return.is_pay_to_public_key_hash()
+            || maybe_op_return.is_pay_to_public_key()
+            || maybe_op_return.is_pay_to_script_hash())
+        {
+            if let Ok(slp_details) = parse_slp_script(&maybe_op_return) {
+                let slp_tx_details = self
+                    .slp_tx_details(
+                        &tx,
+                        slp_details.transaction,
+                        block_height_and_time,
+                        bch_tx_details.fee_details.clone(),
+                        storage,
+                    )
+                    .await?;
+                return Ok(vec![bch_tx_details, slp_tx_details]);
+            }
+        }
+
+        Ok(vec![bch_tx_details])
+    }
+
+    async fn bch_tx_details<T: TxHistoryStorage>(
+        &self,
+        tx_hash: &H256Json,
+        tx: &UtxoTx,
+        height_and_time: Option<BlockHeightAndTime>,
+        storage: &T,
+    ) -> Result<TransactionDetails, MmError<GetTxDetailsError<T::Error>>> {
+        let my_address = self.as_ref().derivation_method.iguana_or_err()?;
+        let my_addresses = [my_address.clone()];
+        let mut tx_builder = TxDetailsBuilder::new(self.ticker().to_owned(), tx, height_and_time, my_addresses);
+        for output in &tx.outputs {
+            let addresses = match self.addresses_from_script(&output.script_pubkey.clone().into()) {
+                Ok(a) => a,
+                Err(_) => continue,
+            };
+
+            if addresses.is_empty() {
+                continue;
+            }
+
+            if addresses.len() != 1 {
+                let msg = format!(
+                    "{} tx {:02x} output script resulted into unexpected number of addresses",
+                    self.ticker(),
+                    tx_hash,
+                );
+                return MmError::err(GetTxDetailsError::AddressesFromScriptError(msg));
+            }
+
+            let amount = big_decimal_from_sat_unsigned(output.value, self.decimals());
+            for address in addresses {
+                tx_builder.transferred_to(address, &amount);
+            }
+        }
+
+        let mut total_input = 0;
+        for input in &tx.inputs {
+            let index = input.previous_output.index;
+            let prev_tx = self
+                .tx_from_storage_or_rpc(&input.previous_output.hash.reversed().into(), storage)
+                .await?;
+            let prev_script = prev_tx.outputs[index as usize].script_pubkey.clone().into();
+            let addresses = self
+                .addresses_from_script(&prev_script)
+                .map_to_mm(GetTxDetailsError::AddressesFromScriptError)?;
+            if addresses.len() != 1 {
+                let msg = format!(
+                    "{} tx {:02x} output script resulted into unexpected number of addresses",
+                    self.ticker(),
+                    tx_hash,
+                );
+                return MmError::err(GetTxDetailsError::AddressesFromScriptError(msg));
+            }
+
+            let prev_value = prev_tx.outputs[index as usize].value;
+            total_input += prev_value;
+            let amount = big_decimal_from_sat_unsigned(prev_value, self.decimals());
+            for address in addresses {
+                tx_builder.transferred_from(address, &amount);
+            }
+        }
+
+        let total_output = tx.outputs.iter().fold(0, |total, output| total + output.value);
+        let fee = Some(TxFeeDetails::Utxo(UtxoFeeDetails {
+            coin: Some(self.ticker().into()),
+            amount: big_decimal_from_sat_unsigned(total_input - total_output, self.decimals()),
+        }));
+        tx_builder.set_tx_fee(fee);
+        Ok(tx_builder.build())
+    }
+
+    async fn get_slp_genesis_params<T: TxHistoryStorage>(
+        &self,
+        token_id: H256,
+        storage: &T,
+    ) -> Result<SlpGenesisParams, MmError<GetTxDetailsError<T::Error>>> {
+        let token_genesis_tx = self.tx_from_storage_or_rpc(&token_id.into(), storage).await?;
+        let maybe_genesis_script: Script = token_genesis_tx.outputs[0].script_pubkey.clone().into();
+        let slp_details = parse_slp_script(&maybe_genesis_script)?;
+        match slp_details.transaction {
+            SlpTransaction::Genesis(params) => Ok(params),
+            _ => MmError::err(GetTxDetailsError::SlpTokenIdIsNotGenesisTx(token_id)),
+        }
+    }
+
+    async fn slp_transferred_amounts<T: TxHistoryStorage>(
+        &self,
+        utxo_tx: &UtxoTx,
+        slp_tx: SlpTransaction,
+        storage: &T,
+    ) -> Result<HashMap<usize, (CashAddress, BigDecimal)>, MmError<GetTxDetailsError<T::Error>>> {
+        let slp_amounts = match slp_tx {
+            SlpTransaction::Send { token_id, amounts } => {
+                let genesis_params = self.get_slp_genesis_params(token_id, storage).await?;
+                EitherIter::Left(
+                    amounts
+                        .into_iter()
+                        .map(move |amount| big_decimal_from_sat_unsigned(amount, genesis_params.decimals[0])),
+                )
+            },
+            SlpTransaction::Mint {
+                token_id,
+                additional_token_quantity,
+                ..
+            } => {
+                let slp_genesis_params = self.get_slp_genesis_params(token_id, storage).await?;
+                EitherIter::Right(std::iter::once(big_decimal_from_sat_unsigned(
+                    additional_token_quantity,
+                    slp_genesis_params.decimals[0],
+                )))
+            },
+            SlpTransaction::Genesis(genesis_params) => EitherIter::Right(std::iter::once(
+                big_decimal_from_sat_unsigned(genesis_params.initial_token_mint_quantity, genesis_params.decimals[0]),
+            )),
+        };
+
+        let mut result = HashMap::new();
+        for (i, amount) in slp_amounts.into_iter().enumerate() {
+            let output_index = i + 1;
+            match utxo_tx.outputs.get(output_index) {
+                Some(output) => {
+                    let addresses = self
+                        .addresses_from_script(&output.script_pubkey.clone().into())
+                        .map_to_mm(GetTxDetailsError::AddressesFromScriptError)?;
+                    if addresses.len() != 1 {
+                        let msg = format!(
+                            "{} tx {:?} output script resulted into unexpected number of addresses",
+                            self.ticker(),
+                            utxo_tx.hash().reversed(),
+                        );
+                        return MmError::err(GetTxDetailsError::AddressesFromScriptError(msg));
+                    }
+
+                    let slp_address = self
+                        .slp_address(&addresses[0])
+                        .map_to_mm(GetTxDetailsError::ToSlpAddressError)?;
+                    result.insert(output_index, (slp_address, amount));
+                },
+                None => return MmError::err(GetTxDetailsError::InvalidSlpTransaction(utxo_tx.hash().reversed())),
+            }
+        }
+        Ok(result)
+    }
+
+    async fn slp_tx_details<Storage: TxHistoryStorage>(
+        &self,
+        tx: &UtxoTx,
+        slp_tx: SlpTransaction,
+        height_and_time: Option<BlockHeightAndTime>,
+        tx_fee: Option<TxFeeDetails>,
+        storage: &Storage,
+    ) -> Result<TransactionDetails, MmError<GetTxDetailsError<Storage::Error>>> {
+        let token_id = match slp_tx.token_id() {
+            Some(id) => id,
+            None => tx.hash().reversed(),
+        };
+
+        let my_address = self.as_ref().derivation_method.iguana_or_err()?;
+        let slp_address = self
+            .slp_address(my_address)
+            .map_to_mm(GetTxDetailsError::ToSlpAddressError)?;
+        let addresses = [slp_address];
+
+        let mut slp_tx_details_builder =
+            TxDetailsBuilder::new(self.ticker().to_owned(), tx, height_and_time, addresses);
+        let slp_transferred_amounts = self.slp_transferred_amounts(tx, slp_tx, storage).await?;
+        for (_, (address, amount)) in slp_transferred_amounts {
+            slp_tx_details_builder.transferred_to(address, &amount);
+        }
+
+        for input in &tx.inputs {
+            let prev_tx = self
+                .tx_from_storage_or_rpc(&input.previous_output.hash.reversed().into(), storage)
+                .await?;
+            if let Ok(slp_tx_details) = parse_slp_script(&prev_tx.outputs[0].script_pubkey) {
+                let mut prev_slp_transferred = self
+                    .slp_transferred_amounts(&prev_tx, slp_tx_details.transaction, storage)
+                    .await?;
+                let i = input.previous_output.index as usize;
+                if let Some((address, amount)) = prev_slp_transferred.remove(&i) {
+                    slp_tx_details_builder.transferred_from(address, &amount);
+                }
+            }
+        }
+
+        slp_tx_details_builder.set_transaction_type(TransactionType::TokenTransfer(token_id.take().to_vec().into()));
+        slp_tx_details_builder.set_tx_fee(tx_fee);
+
+        Ok(slp_tx_details_builder.build())
+    }
+
+    pub async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<UtxoRpcError>> {
+        self.as_ref().rpc_client.get_block_timestamp(height).await
+    }
+}
+
+impl AsRef<UtxoCoinFields> for BchCoin {
+    fn as_ref(&self) -> &UtxoCoinFields { &self.utxo_arc }
+}
+
+pub async fn bch_coin_from_conf_and_params(
+    ctx: &MmArc,
+    ticker: &str,
+    conf: &Json,
+    params: BchActivationRequest,
+    slp_addr_prefix: CashAddrPrefix,
+    priv_key: &[u8],
+) -> Result<BchCoin, String> {
+    if params.bchd_urls.is_empty() && !params.allow_slp_unsafe_conf {
+        return Err("Using empty bchd_urls is unsafe for SLP users!".into());
+    }
+
+    let bchd_urls = params.bchd_urls;
+    let slp_tokens_infos = Arc::new(Mutex::new(HashMap::new()));
+    let constructor = {
+        move |utxo_arc| BchCoin {
+            utxo_arc,
+            slp_addr_prefix: slp_addr_prefix.clone(),
+            bchd_urls: bchd_urls.clone(),
+            slp_tokens_infos: slp_tokens_infos.clone(),
+        }
+    };
+
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    let coin = try_s!(
+        UtxoArcBuilder::new(ctx, ticker, conf, &params.utxo_params, priv_key_policy, constructor)
+            .build()
+            .await
+    );
+    Ok(coin)
+}
+
+#[derive(Debug)]
+pub enum BchActivationError {
+    CoinInitError(String),
+    TokenConfIsNotFound {
+        token: String,
+    },
+    TokenCoinProtocolParseError {
+        token: String,
+        error: json::Error,
+    },
+    TokenCoinProtocolIsNotSlp {
+        token: String,
+        protocol: CoinProtocol,
+    },
+    TokenPlatformCoinIsInvalidInConf {
+        token: String,
+        expected_platform: String,
+        actual_platform: String,
+    },
+    RpcError(UtxoRpcError),
+    SlpPrefixParseError(String),
+}
+
+impl From<UtxoRpcError> for BchActivationError {
+    fn from(e: UtxoRpcError) -> Self { BchActivationError::RpcError(e) }
+}
+
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoTxBroadcastOps for BchCoin {
+    async fn broadcast_tx(&self, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>> {
+        utxo_common::broadcast_tx(self, tx).await
+    }
+}
+
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoTxGenerationOps for BchCoin {
+    async fn get_tx_fee(&self) -> UtxoRpcResult<ActualTxFee> { utxo_common::get_tx_fee(&self.utxo_arc).await }
+
+    async fn calc_interest_if_required(
+        &self,
+        unsigned: TransactionInputSigner,
+        data: AdditionalTxData,
+        my_script_pub: Bytes,
+    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
+        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl GetUtxoListOps for BchCoin {
+    async fn get_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        let (bch_unspents, recently_spent) = self.bch_unspents_for_spend(address).await?;
+        Ok((bch_unspents.standard, recently_spent))
+    }
+
+    async fn get_all_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_all_unspent_ordered_list(self, address).await
+    }
+
+    async fn get_mature_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(MatureUnspentList, RecentlySpentOutPointsGuard<'_>)> {
+        let (unspents, recently_spent) = utxo_common::get_all_unspent_ordered_list(self, address).await?;
+        Ok((MatureUnspentList::new_mature(unspents), recently_spent))
+    }
+}
+
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoCommonOps for BchCoin {
+    async fn get_htlc_spend_fee(&self, tx_size: u64) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size).await
+    }
+
+    fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
+        utxo_common::addresses_from_script(self, script)
+    }
+
+    fn denominate_satoshis(&self, satoshi: i64) -> f64 { utxo_common::denominate_satoshis(&self.utxo_arc, satoshi) }
+
+    fn my_public_key(&self) -> Result<&Public, MmError<UnexpectedDerivationMethod>> {
+        utxo_common::my_public_key(self.as_ref())
+    }
+
+    fn address_from_str(&self, address: &str) -> Result<Address, String> {
+        utxo_common::checked_address_from_str(self, address)
+    }
+
+    async fn get_current_mtp(&self) -> UtxoRpcResult<u32> {
+        utxo_common::get_current_mtp(&self.utxo_arc, CoinVariant::Standard).await
+    }
+
+    fn is_unspent_mature(&self, output: &RpcTransaction) -> bool {
+        utxo_common::is_unspent_mature(self.utxo_arc.conf.mature_confirmations, output)
+    }
+
+    async fn calc_interest_of_tx(&self, tx: &UtxoTx, input_transactions: &mut HistoryUtxoTxMap) -> UtxoRpcResult<u64> {
+        utxo_common::calc_interest_of_tx(self, tx, input_transactions).await
+    }
+
+    async fn get_mut_verbose_transaction_from_map_or_rpc<'a, 'b>(
+        &'a self,
+        tx_hash: H256Json,
+        utxo_tx_map: &'b mut HistoryUtxoTxMap,
+    ) -> UtxoRpcResult<&'b mut HistoryUtxoTx> {
+        utxo_common::get_mut_verbose_transaction_from_map_or_rpc(self, tx_hash, utxo_tx_map).await
+    }
+
+    async fn p2sh_spending_tx(&self, input: utxo_common::P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String> {
+        utxo_common::p2sh_spending_tx(self, input).await
+    }
+
+    fn get_verbose_transactions_from_cache_or_rpc(
+        &self,
+        tx_ids: HashSet<H256Json>,
+    ) -> UtxoRpcFut<HashMap<H256Json, VerboseTransactionFrom>> {
+        let selfi = self.clone();
+        let fut = async move { utxo_common::get_verbose_transactions_from_cache_or_rpc(&selfi.utxo_arc, tx_ids).await };
+        Box::new(fut.boxed().compat())
+    }
+
+    async fn preimage_trade_fee_required_to_send_outputs(
+        &self,
+        outputs: Vec<TransactionOutput>,
+        fee_policy: FeePolicy,
+        gas_fee: Option<u64>,
+        stage: &FeeApproxStage,
+    ) -> TradePreimageResult<BigDecimal> {
+        utxo_common::preimage_trade_fee_required_to_send_outputs(
+            self,
+            self.ticker(),
+            outputs,
+            fee_policy,
+            gas_fee,
+            stage,
+        )
+        .await
+    }
+
+    fn increase_dynamic_fee_by_stage(&self, dynamic_fee: u64, stage: &FeeApproxStage) -> u64 {
+        utxo_common::increase_dynamic_fee_by_stage(self, dynamic_fee, stage)
+    }
+
+    async fn p2sh_tx_locktime(&self, htlc_locktime: u32) -> Result<u32, MmError<UtxoRpcError>> {
+        utxo_common::p2sh_tx_locktime(self, &self.utxo_arc.conf.ticker, htlc_locktime).await
+    }
+
+    fn addr_format(&self) -> &UtxoAddressFormat { utxo_common::addr_format(self) }
+
+    fn addr_format_for_standard_scripts(&self) -> UtxoAddressFormat {
+        utxo_common::addr_format_for_standard_scripts(self)
+    }
+
+    fn address_from_pubkey(&self, pubkey: &Public) -> Address {
+        let conf = &self.utxo_arc.conf;
+        let addr_format = self.addr_format().clone();
+        utxo_common::address_from_pubkey(
+            pubkey,
+            conf.pub_addr_prefix,
+            conf.pub_t_addr_prefix,
+            conf.checksum_type,
+            conf.bech32_hrp.clone(),
+            addr_format,
+        )
+    }
+}
+
+#[async_trait]
+impl SwapOps for BchCoin {
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
+        utxo_common::send_taker_fee(self.clone(), fee_addr, amount)
+    }
+
+    fn send_maker_payment(
+        &self,
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::send_maker_payment(
+            self.clone(),
+            time_lock,
+            taker_pub,
+            secret_hash,
+            amount,
+            swap_unique_data,
+        )
+    }
+
+    fn send_taker_payment(
+        &self,
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::send_taker_payment(
+            self.clone(),
+            time_lock,
+            maker_pub,
+            secret_hash,
+            amount,
+            swap_unique_data,
+        )
+    }
+
+    fn send_maker_spends_taker_payment(
+        &self,
+        taker_payment_tx: &[u8],
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::send_maker_spends_taker_payment(
+            self.clone(),
+            taker_payment_tx,
+            time_lock,
+            taker_pub,
+            secret,
+            swap_unique_data,
+        )
+    }
+
+    fn send_taker_spends_maker_payment(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::send_taker_spends_maker_payment(
+            self.clone(),
+            maker_payment_tx,
+            time_lock,
+            maker_pub,
+            secret,
+            swap_unique_data,
+        )
+    }
+
+    fn send_taker_refunds_payment(
+        &self,
+        taker_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::send_taker_refunds_payment(
+            self.clone(),
+            taker_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    fn send_maker_refunds_payment(
+        &self,
+        maker_tx: &[u8],
+        time_lock: u32,
+        taker_pub: &[u8],
+        secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::send_maker_refunds_payment(
+            self.clone(),
+            maker_tx,
+            time_lock,
+            taker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    fn validate_fee(
+        &self,
+        fee_tx: &TransactionEnum,
+        expected_sender: &[u8],
+        fee_addr: &[u8],
+        amount: &BigDecimal,
+        min_block_number: u64,
+        _uuid: &[u8],
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let tx = match fee_tx {
+            TransactionEnum::UtxoTx(tx) => tx.clone(),
+            _ => panic!(),
+        };
+        utxo_common::validate_fee(
+            self.clone(),
+            tx,
+            utxo_common::DEFAULT_FEE_VOUT,
+            expected_sender,
+            amount,
+            min_block_number,
+            fee_addr,
+        )
+    }
+
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_maker_payment(self, input)
+    }
+
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_taker_payment(self, input)
+    }
+
+    fn check_if_my_payment_sent(
+        &self,
+        time_lock: u32,
+        other_pub: &[u8],
+        secret_hash: &[u8],
+        _search_from_block: u64,
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+        utxo_common::check_if_my_payment_sent(self.clone(), time_lock, other_pub, secret_hash, swap_unique_data)
+    }
+
+    async fn search_for_swap_tx_spend_my(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
+    }
+
+    async fn search_for_swap_tx_spend_other(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        utxo_common::search_for_swap_tx_spend_other(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
+    }
+
+    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
+        utxo_common::extract_secret(secret_hash, spend_tx)
+    }
+
+    fn can_refund_htlc(&self, locktime: u64) -> Box<dyn Future<Item = CanRefundHtlc, Error = String> + Send + '_> {
+        Box::new(
+            utxo_common::can_refund_htlc(self, locktime)
+                .boxed()
+                .map_err(|e| ERRL!("{}", e))
+                .compat(),
+        )
+    }
+
+    fn negotiate_swap_contract_addr(
+        &self,
+        _other_side_address: Option<&[u8]>,
+    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
+        Ok(None)
+    }
+
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
+    }
+}
+
+fn total_unspent_value<'a>(unspents: impl IntoIterator<Item = &'a UnspentInfo>) -> u64 {
+    unspents.into_iter().fold(0, |cur, unspent| cur + unspent.value)
+}
+
+impl MarketCoinOps for BchCoin {
+    fn ticker(&self) -> &str { &self.utxo_arc.conf.ticker }
+
+    fn my_address(&self) -> Result<String, String> { utxo_common::my_address(self) }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        let pubkey = utxo_common::my_public_key(&self.utxo_arc)?;
+        Ok(pubkey.to_string())
+    }
+
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
+        utxo_common::sign_message_hash(self.as_ref(), message)
+    }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        utxo_common::sign_message(self.as_ref(), message)
+    }
+
+    fn verify_message(&self, signature_base64: &str, message: &str, address: &str) -> VerificationResult<bool> {
+        utxo_common::verify_message(self, signature_base64, message, address)
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> {
+        let coin = self.clone();
+        let fut = async move {
+            let my_address = coin.as_ref().derivation_method.iguana_or_err()?;
+            let bch_unspents = coin.bch_unspents_for_display(my_address).await?;
+            Ok(bch_unspents.platform_balance(coin.as_ref().decimals))
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn base_coin_balance(&self) -> BalanceFut<BigDecimal> { utxo_common::base_coin_balance(self) }
+
+    fn platform_ticker(&self) -> &str { self.ticker() }
+
+    #[inline(always)]
+    fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        utxo_common::send_raw_tx(&self.utxo_arc, tx)
+    }
+
+    #[inline(always)]
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        utxo_common::send_raw_tx_bytes(&self.utxo_arc, tx)
+    }
+
+    fn wait_for_confirmations(
+        &self,
+        tx: &[u8],
+        confirmations: u64,
+        requires_nota: bool,
+        wait_until: u64,
+        check_every: u64,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::wait_for_confirmations(
+            &self.utxo_arc,
+            tx,
+            confirmations,
+            requires_nota,
+            wait_until,
+            check_every,
+        )
+    }
+
+    fn wait_for_tx_spend(
+        &self,
+        transaction: &[u8],
+        wait_until: u64,
+        from_block: u64,
+        _swap_contract_address: &Option<BytesJson>,
+    ) -> TransactionFut {
+        utxo_common::wait_for_output_spend(
+            &self.utxo_arc,
+            transaction,
+            utxo_common::DEFAULT_SWAP_VOUT,
+            from_block,
+            wait_until,
+        )
+    }
+
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
+        utxo_common::tx_enum_from_bytes(self.as_ref(), bytes)
+    }
+
+    fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> {
+        utxo_common::current_block(&self.utxo_arc)
+    }
+
+    fn display_priv_key(&self) -> Result<String, String> { utxo_common::display_priv_key(&self.utxo_arc) }
+
+    fn min_tx_amount(&self) -> BigDecimal { utxo_common::min_tx_amount(self.as_ref()) }
+
+    fn min_trading_vol(&self) -> MmNumber { utxo_common::min_trading_vol(self.as_ref()) }
+}
+
+#[async_trait]
+impl UtxoStandardOps for BchCoin {
+    async fn tx_details_by_hash(
+        &self,
+        hash: &[u8],
+        input_transactions: &mut HistoryUtxoTxMap,
+    ) -> Result<TransactionDetails, String> {
+        utxo_common::tx_details_by_hash(self, hash, input_transactions).await
+    }
+
+    async fn request_tx_history(&self, metrics: MetricsArc) -> RequestTxHistoryResult {
+        utxo_common::request_tx_history(self, metrics).await
+    }
+
+    async fn update_kmd_rewards(
+        &self,
+        tx_details: &mut TransactionDetails,
+        input_transactions: &mut HistoryUtxoTxMap,
+    ) -> UtxoRpcResult<()> {
+        utxo_common::update_kmd_rewards(self, tx_details, input_transactions).await
+    }
+}
+
+#[async_trait]
+impl MmCoin for BchCoin {
+    fn is_asset_chain(&self) -> bool { utxo_common::is_asset_chain(&self.utxo_arc) }
+
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
+    }
+
+    fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
+        Box::new(utxo_common::withdraw(self.clone(), req).boxed().compat())
+    }
+
+    fn decimals(&self) -> u8 { utxo_common::decimals(&self.utxo_arc) }
+
+    fn convert_to_address(&self, from: &str, to_address_format: Json) -> Result<String, String> {
+        utxo_common::convert_to_address(self, from, to_address_format)
+    }
+
+    fn validate_address(&self, address: &str) -> ValidateAddressResult { utxo_common::validate_address(self, address) }
+
+    fn process_history_loop(&self, ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> {
+        Box::new(
+            utxo_common::process_history_loop(self.clone(), ctx)
+                .map(|_| Ok(()))
+                .boxed()
+                .compat(),
+        )
+    }
+
+    fn history_sync_status(&self) -> HistorySyncState { utxo_common::history_sync_status(&self.utxo_arc) }
+
+    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> {
+        utxo_common::get_trade_fee(self.clone())
+    }
+
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        utxo_common::get_sender_trade_fee(self, value, stage).await
+    }
+
+    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        utxo_common::get_receiver_trade_fee(self.clone())
+    }
+
+    async fn get_fee_to_send_taker_fee(
+        &self,
+        dex_fee_amount: BigDecimal,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        utxo_common::get_fee_to_send_taker_fee(self, dex_fee_amount, stage).await
+    }
+
+    fn required_confirmations(&self) -> u64 { utxo_common::required_confirmations(&self.utxo_arc) }
+
+    fn requires_notarization(&self) -> bool { utxo_common::requires_notarization(&self.utxo_arc) }
+
+    fn set_required_confirmations(&self, confirmations: u64) {
+        utxo_common::set_required_confirmations(&self.utxo_arc, confirmations)
+    }
+
+    fn set_requires_notarization(&self, requires_nota: bool) {
+        utxo_common::set_requires_notarization(&self.utxo_arc, requires_nota)
+    }
+
+    fn swap_contract_address(&self) -> Option<BytesJson> { utxo_common::swap_contract_address() }
+
+    fn mature_confirmations(&self) -> Option<u32> { Some(self.utxo_arc.conf.mature_confirmations) }
+
+    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(self) }
+
+    fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
+        utxo_common::is_coin_protocol_supported(self, info)
+    }
+}
+
+impl CoinWithTxHistoryV2 for BchCoin {
+    fn history_wallet_id(&self) -> WalletId { WalletId::new(self.ticker().to_owned()) }
+
+    /// There are not specific filters for `BchCoin`.
+    fn get_tx_history_filters(&self) -> GetTxHistoryFilters { GetTxHistoryFilters::new() }
+}
+
+// testnet
+#[cfg(test)]
+pub fn tbch_coin_for_test() -> BchCoin {
+    use common::block_on;
+    use crypto::privkey::key_pair_from_seed;
+    use mm2_core::mm_ctx::MmCtxBuilder;
+
+    let ctx = MmCtxBuilder::default().into_mm_arc();
+    let keypair = key_pair_from_seed("BCH SLP test").unwrap();
+
+    let conf = json!({"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id":"0x40","protocol":{"type":"UTXO"}, "sign_message_prefix": "Bitcoin Signed Message:\n",
+         "address_format":{"format":"cashaddress","network":"bchtest"}});
+    let req = json!({
+        "method": "electrum",
+        "coin": "BCH",
+        "servers": [{"url":"blackie.c3-soft.com:60001"},{"url":"testnet.imaginary.cash:50001"},{"url":"tbch.loping.net:60001"},{"url":"electroncash.de:50003"}],
+        "bchd_urls": ["https://bchd-testnet.electroncash.de:18335"],
+        "allow_slp_unsafe_conf": false,
+    });
+
+    let params = BchActivationRequest::from_legacy_req(&req).unwrap();
+    block_on(bch_coin_from_conf_and_params(
+        &ctx,
+        "BCH",
+        &conf,
+        params,
+        CashAddrPrefix::SlpTest,
+        &*keypair.private().secret,
+    ))
+    .unwrap()
+}
+
+// mainnet
+#[cfg(test)]
+pub fn bch_coin_for_test() -> BchCoin {
+    use common::block_on;
+    use crypto::privkey::key_pair_from_seed;
+    use mm2_core::mm_ctx::MmCtxBuilder;
+
+    let ctx = MmCtxBuilder::default().into_mm_arc();
+    let keypair = key_pair_from_seed("BCH SLP test").unwrap();
+
+    let conf = json!({"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id":"0x40","protocol":{"type":"UTXO"},
+         "address_format":{"format":"cashaddress","network":"bitcoincash"}});
+    let req = json!({
+        "method": "electrum",
+        "coin": "BCH",
+        "servers": [{"url":"electrum1.cipig.net:10055"},{"url":"electrum2.cipig.net:10055"},{"url":"electrum3.cipig.net:10055"}],
+        "bchd_urls": [],
+        "allow_slp_unsafe_conf": true,
+    });
+
+    let params = BchActivationRequest::from_legacy_req(&req).unwrap();
+    block_on(bch_coin_from_conf_and_params(
+        &ctx,
+        "BCH",
+        &conf,
+        params,
+        CashAddrPrefix::SimpleLedger,
+        &*keypair.private().secret,
+    ))
+    .unwrap()
+}
+
+#[cfg(test)]
+mod bch_tests {
+    use super::*;
+    use crate::tx_history_storage::TxHistoryStorageBuilder;
+    use crate::{TransactionType, TxFeeDetails};
+    use common::block_on;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+
+    fn init_storage_for<Coin: CoinWithTxHistoryV2>(coin: &Coin) -> (MmArc, impl TxHistoryStorage) {
+        let ctx = mm_ctx_with_custom_db();
+        let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+        block_on(storage.init(&coin.history_wallet_id())).unwrap();
+        (ctx, storage)
+    }
+
+    #[test]
+    fn test_get_slp_genesis_params() {
+        let coin = tbch_coin_for_test();
+        let token_id = "bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".into();
+        let (_ctx, storage) = init_storage_for(&coin);
+
+        let slp_params = block_on(coin.get_slp_genesis_params(token_id, &storage)).unwrap();
+        assert_eq!("USDF", slp_params.token_ticker);
+        assert_eq!(4, slp_params.decimals[0]);
+    }
+
+    #[test]
+    fn test_plain_bch_tx_details() {
+        let coin = tbch_coin_for_test();
+        let (_ctx, storage) = init_storage_for(&coin);
+
+        let hash = "a8dcc3c6776e93e7bd21fb81551e853447c55e2d8ac141b418583bc8095ce390".into();
+        let tx = block_on(coin.tx_from_storage_or_rpc(&hash, &storage)).unwrap();
+
+        let details = block_on(coin.bch_tx_details(&hash, &tx, None, &storage)).unwrap();
+        let expected_total: BigDecimal = "0.11407782".parse().unwrap();
+        assert_eq!(expected_total, details.total_amount);
+
+        let expected_received: BigDecimal = "0.11405301".parse().unwrap();
+        assert_eq!(expected_received, details.received_by_me);
+
+        let expected_spent: BigDecimal = "0.11407782".parse().unwrap();
+        assert_eq!(expected_spent, details.spent_by_me);
+
+        let expected_balance_change: BigDecimal = "-0.00002481".parse().unwrap();
+        assert_eq!(expected_balance_change, details.my_balance_change);
+
+        let expected_from = vec!["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66".to_owned()];
+        assert_eq!(expected_from, details.from);
+
+        let expected_to = vec![
+            "bchtest:qrhdt5adye8lc68upfj9fctfdgcd3aq9hctf8ft6md".to_owned(),
+            "bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66".to_owned(),
+        ];
+        assert_eq!(expected_to, details.to);
+
+        let expected_internal_id = BytesJson::from("a8dcc3c6776e93e7bd21fb81551e853447c55e2d8ac141b418583bc8095ce390");
+        assert_eq!(expected_internal_id, details.internal_id);
+
+        let expected_fee = Some(TxFeeDetails::Utxo(UtxoFeeDetails {
+            coin: Some("BCH".into()),
+            amount: "0.00001481".parse().unwrap(),
+        }));
+        assert_eq!(expected_fee, details.fee_details);
+
+        assert_eq!(coin.ticker(), details.coin);
+    }
+
+    #[test]
+    fn test_slp_tx_details() {
+        let coin = tbch_coin_for_test();
+        let (_ctx, storage) = init_storage_for(&coin);
+
+        let hash = "a8dcc3c6776e93e7bd21fb81551e853447c55e2d8ac141b418583bc8095ce390".into();
+        let tx = block_on(coin.tx_from_storage_or_rpc(&hash, &storage)).unwrap();
+
+        let slp_details = parse_slp_script(&tx.outputs[0].script_pubkey).unwrap();
+
+        let slp_tx_details = block_on(coin.slp_tx_details(&tx, slp_details.transaction, None, None, &storage)).unwrap();
+
+        let expected_total: BigDecimal = "6.2974".parse().unwrap();
+        assert_eq!(expected_total, slp_tx_details.total_amount);
+
+        let expected_spent: BigDecimal = "6.2974".parse().unwrap();
+        assert_eq!(expected_spent, slp_tx_details.spent_by_me);
+
+        let expected_received: BigDecimal = "5.2974".parse().unwrap();
+        assert_eq!(expected_received, slp_tx_details.received_by_me);
+
+        let expected_balance_change = BigDecimal::from(-1i32);
+        assert_eq!(expected_balance_change, slp_tx_details.my_balance_change);
+
+        let expected_from = vec!["slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8".to_owned()];
+        assert_eq!(expected_from, slp_tx_details.from);
+
+        let expected_to = vec![
+            "slptest:qrhdt5adye8lc68upfj9fctfdgcd3aq9hcsaqj3dfs".to_owned(),
+            "slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8".to_owned(),
+        ];
+        assert_eq!(expected_to, slp_tx_details.to);
+
+        let expected_tx_type =
+            TransactionType::TokenTransfer("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".into());
+        assert_eq!(expected_tx_type, slp_tx_details.transaction_type);
+
+        assert_eq!(coin.ticker(), slp_tx_details.coin);
+    }
+
+    #[test]
+    fn test_sign_message() {
+        let coin = tbch_coin_for_test();
+        let signature = coin.sign_message("test").unwrap();
+        assert_eq!(
+            signature,
+            "ILuePKMsycXwJiNDOT7Zb7TfIlUW7Iq+5ylKd15AK72vGVYXbnf7Gj9Lk9MFV+6Ub955j7MiAkp0wQjvuIoRPPA="
+        );
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_verify_message() {
+        let coin = tbch_coin_for_test();
+        let is_valid = coin
+            .verify_message(
+                "ILuePKMsycXwJiNDOT7Zb7TfIlUW7Iq+5ylKd15AK72vGVYXbnf7Gj9Lk9MFV+6Ub955j7MiAkp0wQjvuIoRPPA=",
+                "test",
+                "bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66",
+            )
+            .unwrap();
+        assert!(is_valid);
+    }
+}
diff --git a/mm2src/coins/utxo/bch_and_slp_tx_history.rs b/mm2src/coins/utxo/bch_and_slp_tx_history.rs
new file mode 100644
index 0000000000..5da1212e9d
--- /dev/null
+++ b/mm2src/coins/utxo/bch_and_slp_tx_history.rs
@@ -0,0 +1,406 @@
+/// This module is named bch_and_slp_tx_history temporary. We will most likely use the same approach for every
+/// supported UTXO coin.
+use super::RequestTxHistoryResult;
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, TxHistoryStorage};
+use crate::utxo::bch::BchCoin;
+use crate::utxo::utxo_common;
+use crate::utxo::UtxoStandardOps;
+use crate::{BlockHeightAndTime, HistorySyncState, MarketCoinOps};
+use async_trait::async_trait;
+use common::executor::Timer;
+use common::log::{error, info};
+use common::mm_metrics::MetricsArc;
+use common::state_machine::prelude::*;
+use futures::compat::Future01CompatExt;
+use mm2_number::BigDecimal;
+use rpc::v1::types::H256 as H256Json;
+use std::collections::HashMap;
+use std::str::FromStr;
+
+struct BchAndSlpHistoryCtx<Storage: TxHistoryStorage> {
+    coin: BchCoin,
+    storage: Storage,
+    metrics: MetricsArc,
+    current_balance: BigDecimal,
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct Init<T> {
+    phantom: std::marker::PhantomData<T>,
+}
+
+impl<T> Init<T> {
+    fn new() -> Self {
+        Init {
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<T, E> TransitionFrom<Init<T>> for Stopped<T, E> {}
+
+#[async_trait]
+impl<T: TxHistoryStorage> State for Init<T> {
+    type Ctx = BchAndSlpHistoryCtx<T>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut BchAndSlpHistoryCtx<T>) -> StateResult<BchAndSlpHistoryCtx<T>, ()> {
+        *ctx.coin.as_ref().history_sync_state.lock().unwrap() = HistorySyncState::NotStarted;
+
+        if let Err(e) = ctx.storage.init(&ctx.coin.history_wallet_id()).await {
+            return Self::change_state(Stopped::storage_error(e));
+        }
+
+        Self::change_state(FetchingTxHashes::new())
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct FetchingTxHashes<T> {
+    phantom: std::marker::PhantomData<T>,
+}
+
+impl<T> FetchingTxHashes<T> {
+    fn new() -> Self {
+        FetchingTxHashes {
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<T> TransitionFrom<Init<T>> for FetchingTxHashes<T> {}
+impl<T> TransitionFrom<OnIoErrorCooldown<T>> for FetchingTxHashes<T> {}
+impl<T> TransitionFrom<WaitForHistoryUpdateTrigger<T>> for FetchingTxHashes<T> {}
+
+#[async_trait]
+impl<T: TxHistoryStorage> State for FetchingTxHashes<T> {
+    type Ctx = BchAndSlpHistoryCtx<T>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut BchAndSlpHistoryCtx<T>) -> StateResult<BchAndSlpHistoryCtx<T>, ()> {
+        let wallet_id = ctx.coin.history_wallet_id();
+        if let Err(e) = ctx.storage.init(&wallet_id).await {
+            return Self::change_state(Stopped::storage_error(e));
+        }
+
+        let maybe_tx_ids = ctx.coin.request_tx_history(ctx.metrics.clone()).await;
+        match maybe_tx_ids {
+            RequestTxHistoryResult::Ok(all_tx_ids_with_height) => {
+                let in_storage = match ctx.storage.unique_tx_hashes_num_in_history(&wallet_id).await {
+                    Ok(num) => num,
+                    Err(e) => return Self::change_state(Stopped::storage_error(e)),
+                };
+                if all_tx_ids_with_height.len() > in_storage {
+                    let txes_left = all_tx_ids_with_height.len() - in_storage;
+                    *ctx.coin.as_ref().history_sync_state.lock().unwrap() =
+                        HistorySyncState::InProgress(json!({ "transactions_left": txes_left }));
+                }
+
+                Self::change_state(UpdatingUnconfirmedTxes::new(all_tx_ids_with_height))
+            },
+            RequestTxHistoryResult::HistoryTooLarge => Self::change_state(Stopped::<T, T::Error>::history_too_large()),
+            RequestTxHistoryResult::Retry { error } => {
+                error!("Error {} on requesting tx history for {}", error, ctx.coin.ticker());
+                Self::change_state(OnIoErrorCooldown::new())
+            },
+            RequestTxHistoryResult::CriticalError(e) => {
+                error!(
+                    "Critical error {} on requesting tx history for {}",
+                    e,
+                    ctx.coin.ticker()
+                );
+                Self::change_state(Stopped::<T, T::Error>::unknown(e))
+            },
+        }
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct OnIoErrorCooldown<T> {
+    phantom: std::marker::PhantomData<T>,
+}
+
+impl<T> OnIoErrorCooldown<T> {
+    fn new() -> Self {
+        OnIoErrorCooldown {
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<T> TransitionFrom<FetchingTxHashes<T>> for OnIoErrorCooldown<T> {}
+impl<T> TransitionFrom<FetchingTransactionsData<T>> for OnIoErrorCooldown<T> {}
+impl<T> TransitionFrom<UpdatingUnconfirmedTxes<T>> for OnIoErrorCooldown<T> {}
+
+#[async_trait]
+impl<T: TxHistoryStorage> State for OnIoErrorCooldown<T> {
+    type Ctx = BchAndSlpHistoryCtx<T>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, _ctx: &mut BchAndSlpHistoryCtx<T>) -> StateResult<BchAndSlpHistoryCtx<T>, ()> {
+        Timer::sleep(30.).await;
+        Self::change_state(FetchingTxHashes::new())
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct WaitForHistoryUpdateTrigger<T> {
+    phantom: std::marker::PhantomData<T>,
+}
+
+impl<T> WaitForHistoryUpdateTrigger<T> {
+    fn new() -> Self {
+        WaitForHistoryUpdateTrigger {
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<T> TransitionFrom<FetchingTransactionsData<T>> for WaitForHistoryUpdateTrigger<T> {}
+
+#[async_trait]
+impl<T: TxHistoryStorage> State for WaitForHistoryUpdateTrigger<T> {
+    type Ctx = BchAndSlpHistoryCtx<T>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut BchAndSlpHistoryCtx<T>) -> StateResult<Self::Ctx, Self::Result> {
+        let wallet_id = ctx.coin.history_wallet_id();
+        loop {
+            Timer::sleep(30.).await;
+            match ctx.storage.history_contains_unconfirmed_txes(&wallet_id).await {
+                Ok(contains) => {
+                    if contains {
+                        return Self::change_state(FetchingTxHashes::new());
+                    }
+                },
+                Err(e) => return Self::change_state(Stopped::storage_error(e)),
+            }
+
+            match ctx.coin.my_balance().compat().await {
+                Ok(balance) => {
+                    let total_balance = balance.into_total();
+                    if ctx.current_balance != total_balance {
+                        ctx.current_balance = total_balance;
+                        return Self::change_state(FetchingTxHashes::new());
+                    }
+                },
+                Err(e) => {
+                    error!("Error {} on balance fetching for the coin {}", e, ctx.coin.ticker());
+                },
+            }
+        }
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct UpdatingUnconfirmedTxes<T> {
+    phantom: std::marker::PhantomData<T>,
+    all_tx_ids_with_height: Vec<(H256Json, u64)>,
+}
+
+impl<T> UpdatingUnconfirmedTxes<T> {
+    fn new(all_tx_ids_with_height: Vec<(H256Json, u64)>) -> Self {
+        UpdatingUnconfirmedTxes {
+            phantom: Default::default(),
+            all_tx_ids_with_height,
+        }
+    }
+}
+
+impl<T> TransitionFrom<FetchingTxHashes<T>> for UpdatingUnconfirmedTxes<T> {}
+
+#[async_trait]
+impl<T: TxHistoryStorage> State for UpdatingUnconfirmedTxes<T> {
+    type Ctx = BchAndSlpHistoryCtx<T>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut BchAndSlpHistoryCtx<T>) -> StateResult<BchAndSlpHistoryCtx<T>, ()> {
+        let wallet_id = ctx.coin.history_wallet_id();
+        match ctx.storage.get_unconfirmed_txes_from_history(&wallet_id).await {
+            Ok(unconfirmed) => {
+                let txs_with_height: HashMap<H256Json, u64> = self.all_tx_ids_with_height.clone().into_iter().collect();
+                for mut tx in unconfirmed {
+                    let found = match H256Json::from_str(&tx.tx_hash) {
+                        Ok(unconfirmed_tx_hash) => txs_with_height.get(&unconfirmed_tx_hash),
+                        Err(_) => None,
+                    };
+
+                    match found {
+                        Some(height) => {
+                            if *height > 0 {
+                                match ctx.coin.get_block_timestamp(*height).await {
+                                    Ok(time) => tx.timestamp = time,
+                                    Err(_) => return Self::change_state(OnIoErrorCooldown::new()),
+                                };
+                                tx.block_height = *height;
+                                if let Err(e) = ctx.storage.update_tx_in_history(&wallet_id, &tx).await {
+                                    return Self::change_state(Stopped::storage_error(e));
+                                }
+                            }
+                        },
+                        None => {
+                            // This can potentially happen when unconfirmed tx is removed from mempool for some reason.
+                            // Or if the hash is undecodable. We should remove it from storage too.
+                            if let Err(e) = ctx.storage.remove_tx_from_history(&wallet_id, &tx.internal_id).await {
+                                return Self::change_state(Stopped::storage_error(e));
+                            }
+                        },
+                    }
+                }
+                Self::change_state(FetchingTransactionsData::new(self.all_tx_ids_with_height))
+            },
+            Err(e) => Self::change_state(Stopped::storage_error(e)),
+        }
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct FetchingTransactionsData<T> {
+    phantom: std::marker::PhantomData<T>,
+    all_tx_ids_with_height: Vec<(H256Json, u64)>,
+}
+
+impl<T> TransitionFrom<UpdatingUnconfirmedTxes<T>> for FetchingTransactionsData<T> {}
+
+impl<T> FetchingTransactionsData<T> {
+    fn new(all_tx_ids_with_height: Vec<(H256Json, u64)>) -> Self {
+        FetchingTransactionsData {
+            phantom: Default::default(),
+            all_tx_ids_with_height,
+        }
+    }
+}
+
+#[async_trait]
+impl<T: TxHistoryStorage> State for FetchingTransactionsData<T> {
+    type Ctx = BchAndSlpHistoryCtx<T>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut BchAndSlpHistoryCtx<T>) -> StateResult<BchAndSlpHistoryCtx<T>, ()> {
+        let wallet_id = ctx.coin.history_wallet_id();
+        for (tx_hash, height) in self.all_tx_ids_with_height {
+            let tx_hash_string = format!("{:02x}", tx_hash);
+            match ctx.storage.history_has_tx_hash(&wallet_id, &tx_hash_string).await {
+                Ok(true) => continue,
+                Ok(false) => (),
+                Err(e) => return Self::change_state(Stopped::storage_error(e)),
+            }
+
+            let block_height_and_time = if height > 0 {
+                let timestamp = match ctx.coin.get_block_timestamp(height).await {
+                    Ok(time) => time,
+                    Err(_) => return Self::change_state(OnIoErrorCooldown::new()),
+                };
+                Some(BlockHeightAndTime { height, timestamp })
+            } else {
+                None
+            };
+            let tx_details = match ctx
+                .coin
+                .transaction_details_with_token_transfers(&tx_hash, block_height_and_time, &ctx.storage)
+                .await
+            {
+                Ok(tx) => tx,
+                Err(e) => {
+                    error!(
+                        "Error {:?} on getting {} tx details for hash {:02x}",
+                        e,
+                        ctx.coin.ticker(),
+                        tx_hash
+                    );
+                    return Self::change_state(OnIoErrorCooldown::new());
+                },
+            };
+
+            if let Err(e) = ctx.storage.add_transactions_to_history(&wallet_id, tx_details).await {
+                return Self::change_state(Stopped::storage_error(e));
+            }
+
+            // wait for for one second to reduce the number of requests to electrum servers
+            Timer::sleep(1.).await;
+        }
+        info!("Tx history fetching finished for {}", ctx.coin.ticker());
+        *ctx.coin.as_ref().history_sync_state.lock().unwrap() = HistorySyncState::Finished;
+        Self::change_state(WaitForHistoryUpdateTrigger::new())
+    }
+}
+
+#[derive(Debug)]
+enum StopReason<E> {
+    HistoryTooLarge,
+    StorageError(E),
+    UnknownError(String),
+}
+
+struct Stopped<T, E> {
+    phantom: std::marker::PhantomData<T>,
+    stop_reason: StopReason<E>,
+}
+
+impl<T, E> Stopped<T, E> {
+    fn history_too_large() -> Self {
+        Stopped {
+            phantom: Default::default(),
+            stop_reason: StopReason::HistoryTooLarge,
+        }
+    }
+
+    fn storage_error(e: E) -> Self {
+        Stopped {
+            phantom: Default::default(),
+            stop_reason: StopReason::StorageError(e),
+        }
+    }
+
+    fn unknown(e: String) -> Self {
+        Stopped {
+            phantom: Default::default(),
+            stop_reason: StopReason::UnknownError(e),
+        }
+    }
+}
+
+impl<T, E> TransitionFrom<FetchingTxHashes<T>> for Stopped<T, E> {}
+impl<T, E> TransitionFrom<UpdatingUnconfirmedTxes<T>> for Stopped<T, E> {}
+impl<T, E> TransitionFrom<WaitForHistoryUpdateTrigger<T>> for Stopped<T, E> {}
+impl<T, E> TransitionFrom<FetchingTransactionsData<T>> for Stopped<T, E> {}
+
+#[async_trait]
+impl<T: TxHistoryStorage, E: std::fmt::Debug + Send + 'static> LastState for Stopped<T, E> {
+    type Ctx = BchAndSlpHistoryCtx<T>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> Self::Result {
+        info!(
+            "Stopping tx history fetching for {}. Reason: {:?}",
+            ctx.coin.ticker(),
+            self.stop_reason
+        );
+        let new_state_json = match self.stop_reason {
+            StopReason::HistoryTooLarge => json!({
+                "code": utxo_common::HISTORY_TOO_LARGE_ERR_CODE,
+                "message": "Got `history too large` error from Electrum server. History is not available",
+            }),
+            reason => json!({
+                "message": format!("{:?}", reason),
+            }),
+        };
+        *ctx.coin.as_ref().history_sync_state.lock().unwrap() = HistorySyncState::Error(new_state_json);
+    }
+}
+
+pub async fn bch_and_slp_history_loop(
+    coin: BchCoin,
+    storage: impl TxHistoryStorage,
+    metrics: MetricsArc,
+    current_balance: BigDecimal,
+) {
+    let ctx = BchAndSlpHistoryCtx {
+        coin,
+        storage,
+        metrics,
+        current_balance,
+    };
+    let state_machine: StateMachine<_, ()> = StateMachine::from_ctx(ctx);
+    state_machine.run(Init::new()).await;
+}
diff --git a/mm2src/coins/utxo/bchd_grpc.rs b/mm2src/coins/utxo/bchd_grpc.rs
new file mode 100644
index 0000000000..f0a632cef6
--- /dev/null
+++ b/mm2src/coins/utxo/bchd_grpc.rs
@@ -0,0 +1,434 @@
+/// https://bchd.cash/
+/// https://bchd.fountainhead.cash/
+use super::bchd_pb::*;
+use crate::utxo::slp::SlpUnspent;
+use chain::OutPoint;
+use derive_more::Display;
+use futures::future::join_all;
+use futures::FutureExt;
+use get_slp_trusted_validation_response::validity_result::ValidityResultType;
+use keys::hash::H256;
+use mm2_err_handle::prelude::*;
+use mm2_net::grpc_web::{post_grpc_web, PostGrpcWebErr};
+
+#[derive(Debug, Display)]
+#[display(fmt = "Error {:?} on request to the url {}", err, to_url)]
+pub struct GrpcWebMultiUrlReqErr {
+    to_url: String,
+    err: PostGrpcWebErr,
+}
+
+/// This fn will simply return Ok() if urls are empty.
+/// It is intended behaviour to make "unsafe" mode possible for BCH.
+#[allow(clippy::needless_lifetimes)]
+async fn grpc_web_multi_url_request<'a, Req, Res, Url>(
+    urls: &'a [Url],
+    req: &'a Req,
+) -> Result<Vec<(&'a Url, Res)>, MmError<GrpcWebMultiUrlReqErr>>
+where
+    Req: prost::Message + Send + 'static,
+    Res: prost::Message + Default + Send + 'static,
+    Url: AsRef<str>,
+{
+    let futures = urls
+        .iter()
+        .map(|url| post_grpc_web::<_, Res>(url.as_ref(), req).map(move |res| (url, res)));
+
+    join_all(futures)
+        .await
+        .into_iter()
+        .map(|(url, response)| {
+            Ok((
+                url,
+                response.mm_err(|err| GrpcWebMultiUrlReqErr {
+                    to_url: url.as_ref().to_string(),
+                    err,
+                })?,
+            ))
+        })
+        .collect()
+}
+
+#[derive(Debug, Display)]
+pub enum ValidateSlpUtxosErrKind {
+    MultiReqErr(GrpcWebMultiUrlReqErr),
+    #[display(fmt = "Expected {} token id, but got {}", expected, actual)]
+    UnexpectedTokenId {
+        expected: H256,
+        actual: H256,
+    },
+    #[display(
+        fmt = "Unexpected validity_result {:?} for unspent {:?}",
+        validity_result,
+        for_unspent
+    )]
+    UnexpectedValidityResultType {
+        for_unspent: SlpUnspent,
+        validity_result: Option<ValidityResultType>,
+    },
+    #[display(fmt = "Unexpected utxo {:?} in response", outpoint)]
+    UnexpectedUtxoInResponse {
+        outpoint: OutPoint,
+    },
+}
+
+#[derive(Debug, Display)]
+#[display(fmt = "Error {} on request to the url {}", kind, to_url)]
+pub struct ValidateSlpUtxosErr {
+    to_url: String,
+    kind: ValidateSlpUtxosErrKind,
+}
+
+impl From<GrpcWebMultiUrlReqErr> for ValidateSlpUtxosErr {
+    fn from(err: GrpcWebMultiUrlReqErr) -> Self {
+        ValidateSlpUtxosErr {
+            to_url: err.to_url.clone(),
+            kind: ValidateSlpUtxosErrKind::MultiReqErr(err),
+        }
+    }
+}
+
+pub async fn validate_slp_utxos(
+    bchd_urls: &[impl AsRef<str>],
+    utxos: &[SlpUnspent],
+    token_id: &H256,
+) -> Result<(), MmError<ValidateSlpUtxosErr>> {
+    let queries = utxos
+        .iter()
+        .map(|utxo| get_slp_trusted_validation_request::Query {
+            prev_out_hash: utxo.bch_unspent.outpoint.hash.take().into(),
+            prev_out_vout: utxo.bch_unspent.outpoint.index,
+            graphsearch_valid_hashes: Vec::new(),
+        })
+        .collect();
+    let request = GetSlpTrustedValidationRequest {
+        queries,
+        include_graphsearch_count: false,
+    };
+
+    let urls: Vec<_> = bchd_urls
+        .iter()
+        .map(|url| url.as_ref().to_owned() + "/pb.bchrpc/GetSlpTrustedValidation")
+        .collect();
+    let responses: Vec<(_, GetSlpTrustedValidationResponse)> = grpc_web_multi_url_request(&urls, &request).await?;
+    for (url, response) in responses {
+        for validation_result in response.results {
+            let actual_token_id = validation_result.token_id.as_slice().into();
+            if actual_token_id != *token_id {
+                return MmError::err(ValidateSlpUtxosErr {
+                    to_url: url.clone(),
+                    kind: ValidateSlpUtxosErrKind::UnexpectedTokenId {
+                        expected: *token_id,
+                        actual: actual_token_id,
+                    },
+                });
+            }
+
+            let outpoint = OutPoint {
+                hash: validation_result.prev_out_hash.as_slice().into(),
+                index: validation_result.prev_out_vout,
+            };
+
+            let initial_unspent = utxos
+                .iter()
+                .find(|unspent| unspent.bch_unspent.outpoint == outpoint)
+                .or_mm_err(|| ValidateSlpUtxosErr {
+                    to_url: url.clone(),
+                    kind: ValidateSlpUtxosErrKind::UnexpectedUtxoInResponse { outpoint },
+                })?;
+
+            match validation_result.validity_result_type {
+                Some(ValidityResultType::V1TokenAmount(slp_amount)) => {
+                    if slp_amount != initial_unspent.slp_amount {
+                        return MmError::err(ValidateSlpUtxosErr {
+                            to_url: url.clone(),
+                            kind: ValidateSlpUtxosErrKind::UnexpectedValidityResultType {
+                                for_unspent: initial_unspent.clone(),
+                                validity_result: validation_result.validity_result_type,
+                            },
+                        });
+                    }
+                },
+                _ => {
+                    return MmError::err(ValidateSlpUtxosErr {
+                        to_url: url.clone(),
+                        kind: ValidateSlpUtxosErrKind::UnexpectedValidityResultType {
+                            for_unspent: initial_unspent.clone(),
+                            validity_result: validation_result.validity_result_type,
+                        },
+                    })
+                },
+            }
+        }
+    }
+    Ok(())
+}
+
+#[derive(Debug, Display)]
+pub enum CheckSlpTransactionErrKind {
+    MultiReqErr(GrpcWebMultiUrlReqErr),
+    #[display(fmt = "Transaction {:?} is not valid with reason {}", transaction, reason)]
+    InvalidTransaction {
+        transaction: Vec<u8>,
+        reason: String,
+    },
+}
+
+#[derive(Debug, Display)]
+#[display(fmt = "Error {} on request to the url {}", kind, to_url)]
+pub struct CheckSlpTransactionErr {
+    to_url: String,
+    kind: CheckSlpTransactionErrKind,
+}
+
+impl From<GrpcWebMultiUrlReqErr> for CheckSlpTransactionErr {
+    fn from(err: GrpcWebMultiUrlReqErr) -> Self {
+        CheckSlpTransactionErr {
+            to_url: err.to_url.clone(),
+            kind: CheckSlpTransactionErrKind::MultiReqErr(err),
+        }
+    }
+}
+
+pub async fn check_slp_transaction(
+    bchd_urls: &[impl AsRef<str>],
+    transaction: Vec<u8>,
+) -> Result<(), MmError<CheckSlpTransactionErr>> {
+    let request = CheckSlpTransactionRequest {
+        transaction,
+        required_slp_burns: Vec::new(),
+        use_spec_validity_judgement: false,
+    };
+
+    let urls: Vec<_> = bchd_urls
+        .iter()
+        .map(|url| url.as_ref().to_owned() + "/pb.bchrpc/CheckSlpTransaction")
+        .collect();
+
+    let responses: Vec<(_, CheckSlpTransactionResponse)> = grpc_web_multi_url_request(&urls, &request).await?;
+    for (url, response) in responses {
+        if !response.is_valid {
+            return MmError::err(CheckSlpTransactionErr {
+                to_url: url.clone(),
+                kind: CheckSlpTransactionErrKind::InvalidTransaction {
+                    transaction: request.transaction,
+                    reason: response.invalid_reason,
+                },
+            });
+        }
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod bchd_grpc_tests {
+    use super::*;
+    use crate::utxo::rpc_clients::UnspentInfo;
+    use common::block_on;
+
+    #[test]
+    fn test_validate_slp_utxos_valid() {
+        let tx_hash = H256::from_reversed_str("0ba1b91abbfceaa0777424165edb2928dace87d59669c913989950da31968032");
+
+        let slp_utxos = [
+            SlpUnspent {
+                bch_unspent: UnspentInfo {
+                    outpoint: OutPoint {
+                        hash: tx_hash,
+                        index: 1,
+                    },
+                    value: 0,
+                    height: None,
+                },
+                slp_amount: 1000,
+            },
+            SlpUnspent {
+                bch_unspent: UnspentInfo {
+                    outpoint: OutPoint {
+                        hash: tx_hash,
+                        index: 2,
+                    },
+                    value: 0,
+                    height: None,
+                },
+                slp_amount: 8999,
+            },
+        ];
+
+        let url = "https://bchd-testnet.electroncash.de:18335";
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        block_on(validate_slp_utxos(&[url], &slp_utxos, &token_id)).unwrap();
+    }
+
+    #[test]
+    fn test_validate_slp_utxos_non_slp_input() {
+        let tx_hash = H256::from_reversed_str("0ba1b91abbfceaa0777424165edb2928dace87d59669c913989950da31968032");
+
+        let slp_utxos = [
+            SlpUnspent {
+                bch_unspent: UnspentInfo {
+                    outpoint: OutPoint {
+                        hash: tx_hash,
+                        index: 1,
+                    },
+                    value: 0,
+                    height: None,
+                },
+                slp_amount: 1000,
+            },
+            SlpUnspent {
+                bch_unspent: UnspentInfo {
+                    outpoint: OutPoint {
+                        hash: tx_hash,
+                        index: 2,
+                    },
+                    value: 0,
+                    height: None,
+                },
+                slp_amount: 8999,
+            },
+            SlpUnspent {
+                bch_unspent: UnspentInfo {
+                    outpoint: OutPoint {
+                        hash: tx_hash,
+                        index: 3,
+                    },
+                    value: 0,
+                    height: None,
+                },
+                slp_amount: 8999,
+            },
+        ];
+
+        let url = "https://bchd-testnet.electroncash.de:18335";
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let err = block_on(validate_slp_utxos(&[url], &slp_utxos, &token_id)).unwrap_err();
+        match err.into_inner().kind {
+            ValidateSlpUtxosErrKind::MultiReqErr { .. } => (),
+            err @ _ => panic!("Unexpected error {:?}", err),
+        }
+    }
+
+    #[test]
+    fn test_validate_slp_utxos_invalid_amount() {
+        let tx_hash = H256::from_reversed_str("0ba1b91abbfceaa0777424165edb2928dace87d59669c913989950da31968032");
+        let invalid_utxo = SlpUnspent {
+            bch_unspent: UnspentInfo {
+                outpoint: OutPoint {
+                    hash: tx_hash,
+                    index: 1,
+                },
+                value: 0,
+                height: None,
+            },
+            slp_amount: 999,
+        };
+
+        let slp_utxos = [invalid_utxo.clone(), SlpUnspent {
+            bch_unspent: UnspentInfo {
+                outpoint: OutPoint {
+                    hash: tx_hash,
+                    index: 2,
+                },
+                value: 0,
+                height: None,
+            },
+            slp_amount: 8999,
+        }];
+
+        let url = "https://bchd-testnet.electroncash.de:18335";
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let err = block_on(validate_slp_utxos(&[url], &slp_utxos, &token_id)).unwrap_err();
+        match err.into_inner().kind {
+            ValidateSlpUtxosErrKind::UnexpectedValidityResultType {
+                for_unspent,
+                validity_result,
+            } => {
+                let expected_validity = Some(ValidityResultType::V1TokenAmount(1000));
+                assert_eq!(invalid_utxo, for_unspent);
+                assert_eq!(expected_validity, validity_result);
+            },
+            err @ _ => panic!("Unexpected error {:?}", err),
+        }
+    }
+
+    #[test]
+    fn test_validate_slp_utxos_unexpected_token_id() {
+        let tx_hash = H256::from_reversed_str("0ba1b91abbfceaa0777424165edb2928dace87d59669c913989950da31968032");
+
+        let slp_utxos = [
+            SlpUnspent {
+                bch_unspent: UnspentInfo {
+                    outpoint: OutPoint {
+                        hash: tx_hash,
+                        index: 1,
+                    },
+                    value: 0,
+                    height: None,
+                },
+                slp_amount: 1000,
+            },
+            SlpUnspent {
+                bch_unspent: UnspentInfo {
+                    outpoint: OutPoint {
+                        hash: tx_hash,
+                        index: 2,
+                    },
+                    value: 0,
+                    height: None,
+                },
+                slp_amount: 8999,
+            },
+        ];
+
+        let url = "https://bchd-testnet.electroncash.de:18335";
+        let valid_token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let invalid_token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb8");
+        let err = block_on(validate_slp_utxos(&[url], &slp_utxos, &invalid_token_id)).unwrap_err();
+        match err.into_inner().kind {
+            ValidateSlpUtxosErrKind::UnexpectedTokenId { expected, actual } => {
+                assert_eq!(invalid_token_id, expected);
+                assert_eq!(valid_token_id, actual);
+            },
+            err @ _ => panic!("Unexpected error {:?}", err),
+        }
+    }
+
+    #[test]
+    fn test_check_slp_transaction_valid() {
+        let url = "https://bchd-testnet.electroncash.de:18335";
+        // https://testnet.simpleledger.info/tx/c5f46ccc5431687154335d5b6526f1b9cfa961c44b97956b7bec77f884f56c73
+        let tx = hex::decode("010000000232809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b020000006a473044022057c88d815fa563eda8ef7d0dd5c522f4501ffa6110df455b151b31609f149c22022048fecfc9b16e983fbfd05b0d2b7c011c3dbec542577fa00cd9bd192b81961f8e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff32809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b030000006a4730440220539e1204d2805c0474111a1f233ff82c0ab06e6e2bfc0cbe4975eacae64a0b1f02200ec83d32c2180f5567d0f760e85f1efc99d9341cfebd86c9a334310f6d4381494121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000002326e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f694801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8983d460").unwrap();
+        block_on(check_slp_transaction(&[url], tx)).unwrap();
+    }
+
+    #[test]
+    fn test_check_slp_transaction_invalid() {
+        let url = "https://bchd-testnet.electroncash.de:18335";
+        // https://www.blockchain.com/bch-testnet/tx/d76723c092b64bc598d5d2ceafd6f0db37dce4032db569d6f26afb35491789a7
+        let tx = hex::decode("010000000190e35c09c83b5818b441c18a2d5ec54734851e5581fb21bde7936e77c6c3dca8030000006b483045022100e6b1415cbd81f2d04360597fba65965bc77ab5a972f5b8f8d5c0f1b1912923c402206a63f305f03e9c49ffba6c71c7a76ef60631f67dce7631f673a0e8485b86898d4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff020000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e82500ae00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac62715161").unwrap();
+        let err = block_on(check_slp_transaction(&[url], tx)).unwrap_err();
+        match err.into_inner().kind {
+            CheckSlpTransactionErrKind::InvalidTransaction { reason, .. } => {
+                println!("{}", reason);
+            },
+            err @ _ => panic!("Unexpected error {:?}", err),
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_tests {
+    use super::*;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn test_check_slp_transaction_valid() {
+        let url = "https://bchd-testnet.electroncash.de:18335";
+        // https://testnet.simpleledger.info/tx/c5f46ccc5431687154335d5b6526f1b9cfa961c44b97956b7bec77f884f56c73
+        let tx = hex::decode("010000000232809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b020000006a473044022057c88d815fa563eda8ef7d0dd5c522f4501ffa6110df455b151b31609f149c22022048fecfc9b16e983fbfd05b0d2b7c011c3dbec542577fa00cd9bd192b81961f8e4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff32809631da50999813c96996d587ceda2829db5e16247477a0eafcbb1ab9a10b030000006a4730440220539e1204d2805c0474111a1f233ff82c0ab06e6e2bfc0cbe4975eacae64a0b1f02200ec83d32c2180f5567d0f760e85f1efc99d9341cfebd86c9a334310f6d4381494121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7080000000000000001080000000000002326e8030000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ace8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac9f694801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8983d460").unwrap();
+        check_slp_transaction(&[url], tx).await.unwrap();
+    }
+}
diff --git a/mm2src/coins/utxo/bchrpc.proto b/mm2src/coins/utxo/bchrpc.proto
new file mode 100644
index 0000000000..aa082f5f00
--- /dev/null
+++ b/mm2src/coins/utxo/bchrpc.proto
@@ -0,0 +1,997 @@
+syntax = "proto3";
+option go_package="github.com/gcash/bchd/bchrpc/pb";
+
+package pb;
+option java_package = "cash.bchd.rpc";
+
+// bchrpc contains a set of RPCs that can be exposed publicly via
+// the command line options. This service could be authenticated or
+// unauthenticated.
+service bchrpc {
+
+  // GetMempoolInfo returns the state of the current mempool.
+  rpc GetMempoolInfo(GetMempoolInfoRequest) returns (GetMempoolInfoResponse) {}
+
+  // GetMempool returns information about all transactions currently in the memory pool.
+  // Offers an option to return full transactions or just transactions hashes.
+  rpc GetMempool(GetMempoolRequest) returns (GetMempoolResponse) {}
+
+  // GetBlockchainInfo returns data about the blockchain including the most recent
+  // block hash and height.
+  rpc GetBlockchainInfo(GetBlockchainInfoRequest) returns (GetBlockchainInfoResponse) {}
+
+  // GetBlockInfo returns metadata and info for a specified block.
+  rpc GetBlockInfo(GetBlockInfoRequest)returns (GetBlockInfoResponse) {}
+
+  // GetBlock returns detailed data for a block.
+  rpc GetBlock(GetBlockRequest) returns (GetBlockResponse) {}
+
+  // GetRawBlock returns a block in a serialized format.
+  rpc GetRawBlock(GetRawBlockRequest) returns (GetRawBlockResponse) {}
+
+  // GetBlockFilter returns the compact filter (cf) of a block as a Golomb-Rice encoded set.
+  //
+  // **Requires CfIndex**
+  rpc GetBlockFilter(GetBlockFilterRequest) returns (GetBlockFilterResponse) {}
+
+  // GetHeaders takes a block locator object and returns a batch of no more than 2000
+  // headers. Upon parsing the block locator, if the server concludes there has been a
+  // fork, it will send headers starting at the fork point, or genesis if no blocks in
+  // the locator are in the best chain. If the locator is already at the tip no headers
+  // will be returned.
+  // see: bchd/bchrpc/documentation/wallet_operation.md
+  rpc GetHeaders(GetHeadersRequest) returns (GetHeadersResponse) {}
+
+  // GetTransaction returns a transaction given a transaction hash.
+  //
+  // **Requires TxIndex**
+  // **Requires SlpIndex for slp related information **
+  rpc GetTransaction(GetTransactionRequest) returns (GetTransactionResponse) {}
+
+  // GetRawTransaction returns a serialized transaction given a transaction hash.
+  //
+  // **Requires TxIndex**
+  rpc GetRawTransaction(GetRawTransactionRequest) returns (GetRawTransactionResponse) {}
+
+  // GetAddressTransactions returns the transactions for the given address. Offers offset,
+  // limit, and from block options.
+  //
+  // **Requires AddressIndex**
+  // **Requires SlpIndex for slp related information **
+  rpc GetAddressTransactions(GetAddressTransactionsRequest) returns (GetAddressTransactionsResponse) {}
+
+  // GetRawAddressTransactions returns the serialized raw transactions for
+  // the given address. Offers offset, limit, and from block options.
+  //
+  // **Requires AddressIndex**
+  rpc GetRawAddressTransactions(GetRawAddressTransactionsRequest) returns (GetRawAddressTransactionsResponse) {}
+
+  // GetAddressUnspentOutputs returns all the unspent transaction outputs
+  // for the given address.
+  //
+  // **Requires AddressIndex**
+  // **Requires SlpIndex for slp related information **
+  rpc GetAddressUnspentOutputs(GetAddressUnspentOutputsRequest) returns (GetAddressUnspentOutputsResponse) {}
+
+  // GetUnspentOutput takes an unspent output in the utxo set and returns
+  // the utxo metadata or not found.
+  //
+  // **Requires SlpIndex for slp related information **
+  rpc GetUnspentOutput(GetUnspentOutputRequest) returns (GetUnspentOutputResponse) {}
+
+  // GetMerkleProof returns a Merkle (SPV) proof for a specific transaction
+  // in the provided block.
+  //
+  // **Requires TxIndex**
+  rpc GetMerkleProof(GetMerkleProofRequest) returns (GetMerkleProofResponse) {}
+
+  // GetSlpTokenMetadata return slp token metadata for one or more tokens.
+  //
+  // **Requires SlpIndex**
+  rpc GetSlpTokenMetadata(GetSlpTokenMetadataRequest) returns (GetSlpTokenMetadataResponse) {}
+
+  // GetSlpParsedScript returns marshalled object from parsing an slp pubKeyScript
+  // using goslp package.  This endpoint does not require SlpIndex.
+  rpc GetSlpParsedScript(GetSlpParsedScriptRequest) returns (GetSlpParsedScriptResponse) {}
+
+  // GetSlpTrustedValidation returns slp validity related information for one or more transactions.
+  //
+  // **Requires SlpIndex**
+  rpc GetSlpTrustedValidation(GetSlpTrustedValidationRequest) returns (GetSlpTrustedValidationResponse) {}
+
+  // GraphSearch returns all the transactions needed for a client to validate an SLP graph
+  //
+  // **Requires SlpIndex and SlpGraphSearch**
+  rpc GetSlpGraphSearch (GetSlpGraphSearchRequest) returns (GetSlpGraphSearchResponse) {}
+
+  // CheckSlpTransaction checks the validity of a supposed slp transaction before it is broadcasted.
+  rpc CheckSlpTransaction(CheckSlpTransactionRequest) returns (CheckSlpTransactionResponse) {}
+
+  // Submit a transaction to all connected peers.
+  rpc SubmitTransaction(SubmitTransactionRequest) returns (SubmitTransactionResponse) {}
+
+  // SubscribeTransactions creates subscription to all relevant transactions based on
+  // the subscription filter.
+  //
+  // This RPC does not use bidirectional streams and therefore can be used
+  // with grpc-web. You will need to close and reopen the stream whenever
+  // you want to update the subscription filter. If you are not using grpc-web
+  // then SubscribeTransactionStream is more appropriate.
+  //
+  // **Requires TxIndex to receive input metadata**
+  // **Requires SlpIndex to receive slp input/output metadata, or SlpTokenMetadata**
+  rpc SubscribeTransactions(SubscribeTransactionsRequest) returns (stream TransactionNotification) {}
+
+  // SubscribeTransactionStream subscribes to relevant transactions based on
+  // the subscription requests. The parameters to filter transactions on can
+  // be updated by sending new SubscribeTransactionsRequest objects on the stream.
+  //
+  // NOTE: Because this RPC is using bi-directional streaming it cannot be used with
+  // grpc-web.
+  //
+  // **Requires TxIndex to receive input metadata**
+  rpc SubscribeTransactionStream(stream SubscribeTransactionsRequest) returns (stream TransactionNotification) {}
+
+  // SubscribeBlocks creates a subscription for notifications of new blocks being
+  // connected to the blockchain or blocks being disconnected.
+  rpc SubscribeBlocks(SubscribeBlocksRequest) returns (stream BlockNotification) {}
+}
+
+
+// RPC MESSAGES
+
+message GetMempoolInfoRequest {}
+message GetMempoolInfoResponse {
+  // The count of transactions in the mempool
+  uint32 size = 1;
+  // The size in bytes of all transactions in the mempool
+  uint32 bytes = 2;
+}
+
+message GetMempoolRequest {
+  // When `full_transactions` is true, full transaction data is provided
+  // instead of just transaction hashes. Default is false.
+  bool full_transactions = 1;
+}
+
+message GetMempoolResponse {
+  message TransactionData {
+    // Either one of the two following is provided, depending on the request.
+    oneof txids_or_txs {
+      // The transaction hash, little-endian.
+      bytes transaction_hash = 1;
+      // The transaction data.
+      Transaction transaction = 2;
+    }
+  }
+
+  // List of unconfirmed transactions.
+  repeated TransactionData transaction_data = 1;
+}
+
+message GetBlockchainInfoRequest {}
+message GetBlockchainInfoResponse {
+
+  // Bitcoin network types
+  enum BitcoinNet {
+
+    // Live public network with monetary value.
+    MAINNET  = 0;
+    // An isolated environment for automated testing.
+    REGTEST  = 1;
+    // A public environment where monetary value is agreed to be zero,
+    // and some checks for transaction conformity are disabled.
+    TESTNET3 = 2;
+    // Private testnets for large scale simulations (or stress testing),
+    // where a specified list of nodes is used, rather than node discovery.
+    SIMNET   = 3;
+  }
+
+  // Which network the node is operating on.
+  BitcoinNet bitcoin_net = 1;
+
+  // The current number of blocks on the longest chain.
+  int32 best_height = 2;
+  // The hash of the best (tip) block in the most-work fully-validated chain, little-endian.
+  bytes best_block_hash = 3;
+  // Threshold for adding new blocks.
+  double difficulty = 4;
+  // Median time of the last 11 blocks.
+  int64 median_time = 5;
+  // When `tx_index` is true, the node has full transaction index enabled.
+  bool tx_index = 6;
+  // When `addr_index` is true, the node has address index enabled and may
+  // be used with call related by address.
+  bool addr_index =7;
+  // When `slp_index` is true, the node has the slp index enabled and may
+  // be used with slp related rpc methods and also causes slp metadata to be added
+  // in some of the existing rpc methods.
+  bool slp_index = 8;
+  // When `slp_graphsearch` is true, the node is able to handle calls to slp graph search
+  bool slp_graphsearch = 9;
+}
+
+message GetBlockInfoRequest {
+  oneof hash_or_height {
+    // The block hash as a byte array or base64 encoded string, little-endian.
+    bytes hash = 1;
+    // The block number.
+    int32 height = 2;
+  }
+}
+message GetBlockInfoResponse {
+  // Marshaled block header data, as well as metadata.
+  BlockInfo info = 1;
+}
+
+message GetBlockRequest {
+  oneof hash_or_height {
+    // The block hash as a byte array or base64 encoded string, little-endian.
+    bytes hash = 1;
+    // The block number.
+    int32 height = 2;
+  }
+  // When `full_transactions` is true, full transactions are returned
+  // instead of just hashes. Default is false.
+  bool full_transactions = 3;
+}
+message GetBlockResponse {
+  // A marshaled block.
+  Block block = 1;
+}
+
+message GetRawBlockRequest {
+  oneof hash_or_height {
+    // The block hash as a byte array or base64 encoded string, little-endian.
+    bytes hash = 1;
+    // The block number.
+    int32 height = 2;
+  }
+}
+message GetRawBlockResponse {
+  // Raw block data (with header) serialized according the the bitcoin block protocol.
+  bytes block = 1;
+}
+
+message GetBlockFilterRequest {
+  oneof hash_or_height {
+    // The block hash as a byte array or base64 encoded string, little-endian.
+    bytes hash = 1;
+    // The block number.
+    int32 height = 2;
+  }
+}
+
+message GetBlockFilterResponse {
+  // A compact filter matching input outpoints and public key scripts contained
+  // in a block (encoded according to BIP158).
+  bytes filter = 1;
+}
+
+// Request headers using a list of known block hashes.
+message GetHeadersRequest {
+  // A list of block hashes known to the client (most recent first) which
+  // is exponentially sparser toward the genesis block (0), little-endian.
+  // Common practice is to include all of the last 10 blocks, and then
+  // 9 blocks for each order of ten thereafter.
+  repeated bytes block_locator_hashes = 1;
+  // hash of the latest desired block header, little-endian; only blocks
+  // occurring before the stop will be returned.
+  bytes stop_hash = 2;
+}
+message GetHeadersResponse {
+  // List of block headers.
+  repeated BlockInfo headers = 1;
+}
+
+// Get a transaction from a transaction hash.
+message GetTransactionRequest {
+  // A transaction hash, little-endian.
+  bytes hash = 1;
+
+  bool include_token_metadata = 2;
+}
+message GetTransactionResponse {
+  // A marshaled transaction.
+  Transaction transaction = 1;
+
+  SlpTokenMetadata token_metadata = 2;
+}
+
+// Get an encoded transaction from a transaction hash.
+message GetRawTransactionRequest {
+  // A transaction hash, little-endian.
+  bytes hash = 1;
+}
+message GetRawTransactionResponse {
+  // Raw transaction in bytes.
+  bytes transaction = 1;
+}
+
+// Get marshaled transactions related to a specific address.
+//
+// RECOMMENDED:
+// Parameters have been provided to query without creating
+//   performance issues on the node or client.
+//
+// - The number of transactions to skip and fetch allow for iterating
+//       over a large set of transactions, if necessary.
+//
+// - A starting block parameter (either `hash` or `height`)
+//       may then be used to filter results to those occurring
+//       after a certain time.
+//
+// This approach will reduce network traffic and response processing
+//   for the client, as well as reduce workload on the node.
+message GetAddressTransactionsRequest {
+  // The address to query transactions, in lowercase cashaddr format.
+  // The network prefix is optional (i.e. "cashaddress:").
+  string address = 1;
+
+  // The number of confirmed transactions to skip, starting with the oldest first.
+  // Does not affect results of unconfirmed transactions.
+  uint32 nb_skip = 2;
+  // Specify the number of transactions to fetch.
+  uint32 nb_fetch = 3;
+
+
+  oneof start_block {
+    // Recommended. Only get transactions after (or within) a
+    // starting block identified by hash, little-endian.
+    bytes hash = 4;
+    // Recommended. Only get transactions after (or within) a
+    // starting block identified by block number.
+    int32 height = 5;
+  }
+}
+message GetAddressTransactionsResponse {
+  // Transactions that have been included in a block.
+  repeated Transaction confirmed_transactions = 1;
+  // Transactions in mempool which have not been included in a block.
+  repeated MempoolTransaction unconfirmed_transactions = 2;
+}
+
+// Get encoded transactions related to a specific address.
+//
+// RECOMMENDED:
+// Parameters have been provided to query without creating
+//   performance issues on the node or client.
+//
+// - The number of transactions to skip and fetch allow for iterating
+//       over a large set of transactions, if necessary.
+//
+// - A starting block parameter (either `hash` or `height`)
+//       may then be used to filter results to those occurring
+//       after a certain time.
+//
+// This approach will reduce network traffic and response processing
+//   for the client, as well as reduce workload on the node.
+message GetRawAddressTransactionsRequest {
+  // The address to query transactions, in lowercase cashaddr format.
+  // The network prefix is optional (i.e. "cashaddress:").
+  string address = 1;
+
+  // The number of confirmed transactions to skip, starting with the oldest first.
+  // Does not affect results of unconfirmed transactions.
+  uint32 nb_skip = 2;
+  // Specify the number of transactions to fetch.
+  uint32 nb_fetch = 3;
+
+  oneof start_block {
+    // Recommended. Only return transactions after some starting block
+    // identified by hash, little-endian.
+    bytes hash = 4;
+    // Recommended. Only return transactions after some starting block
+    // identified by block number.
+    int32 height = 5;
+  }
+}
+message GetRawAddressTransactionsResponse {
+  // Transactions that have been included in a block.
+  repeated bytes confirmed_transactions = 1;
+  // Transactions in mempool which have not been included in a block.
+  repeated bytes unconfirmed_transactions = 2;
+}
+
+message GetAddressUnspentOutputsRequest {
+  // The address to query transactions, in lowercase cashaddr format.
+  // The network identifier is optional (i.e. "cashaddress:").
+  string address = 1;
+  // When `include_mempool` is true, unconfirmed transactions from mempool
+  // are returned. Default is false.
+  bool include_mempool = 2;
+  bool include_token_metadata = 3;
+}
+message GetAddressUnspentOutputsResponse {
+  // List of unspent outputs.
+  repeated UnspentOutput outputs = 1;
+  repeated SlpTokenMetadata token_metadata = 2;
+}
+
+message GetUnspentOutputRequest {
+  // The hash of the transaction, little-endian.
+  bytes hash = 1;
+  // The number of the output, starting from zero.
+  uint32 index = 2;
+  // When include_mempool is true, unconfirmed transactions from mempool
+  // are returned. Default is false.
+  bool include_mempool = 3;
+  bool include_token_metadata = 4;
+}
+message GetUnspentOutputResponse {
+  // A reference to the related input.
+  Transaction.Input.Outpoint outpoint = 1;
+  // Locking script dictating how funds can be spent in the future
+  bytes pubkey_script = 2;
+  // Amount in satoshi.
+  int64 value = 3;
+  // When is_coinbase is true, the transaction was the first in a block,
+  // created by a miner, and used to pay the block reward
+  bool is_coinbase = 4;
+  // The index number of the block containing the transaction creating the output.
+  int32 block_height = 5;
+
+  SlpToken slp_token = 6;
+  SlpTokenMetadata token_metadata = 7;
+}
+
+message GetMerkleProofRequest {
+  // A transaction hash, little-endian.
+  bytes transaction_hash = 1;
+}
+message GetMerkleProofResponse {
+  // Block header information for the corresponding transaction
+  BlockInfo block = 1;
+  // A list containing the transaction hash, the adjacent leaf transaction hash
+  // and the hashes of the highest nodes in the merkle tree not built with the transaction.
+  // Proof hashes are ordered following transaction order, or left to right on the merkle tree
+  repeated bytes hashes = 2;
+  // Binary representing the location of the matching transaction in the full merkle tree,
+  // starting with the root (`1`) at position/level 0, where `1` corresponds
+  // to a left branch and `01` is a right branch.
+  bytes flags = 3;
+}
+
+message SubmitTransactionRequest {
+  // The encoded transaction.
+  bytes transaction = 1;
+  bool skip_slp_validity_check = 2;
+  repeated SlpRequiredBurn required_slp_burns = 3;
+}
+message SubmitTransactionResponse {
+  // Transaction hash, little-endian.
+  bytes hash = 1;
+}
+
+message CheckSlpTransactionRequest {
+  bytes transaction = 1;
+  repeated SlpRequiredBurn required_slp_burns = 2;
+
+  // Using the slp specification as a basis for validity judgement can lead to confusion for new users and
+  // result in accidental token burns.  use_spec_validity_judgement will cause the response's is_valid property
+  // to be returned according to the slp specification.  Therefore, use_spec_validity_judgement is false by
+  // default in order to avoid accidental token burns.  When use_spec_validity_judgement is false we return
+  // invalid in any case which would result in a burned token, unless the burn is explicitly included as an
+  // item in required_slp_burns property.
+  //
+  // When use_spec_validity_judgement is true, there are three cases where the is_valid response property
+  // will be returned as valid, instead of invalid, as per the slp specification.
+  //   1) inputs > outputs
+  //   2) missing transaction outputs
+  //   3) burned inputs from other tokens
+  //
+  // required_slp_burns is not used when use_spec_validity_judgement is set to true.
+  //
+  bool use_spec_validity_judgement = 3;
+}
+
+message CheckSlpTransactionResponse {
+  bool is_valid = 1;
+  string invalid_reason = 2;
+  int32 best_height = 3;
+}
+
+// Request to subscribe or unsubscribe from a stream of transactions.
+message SubscribeTransactionsRequest {
+  // Subscribe to a filter. add items to a filter
+  TransactionFilter subscribe = 1;
+  // Unsubscribe to a filter, remove items from a filter
+  TransactionFilter unsubscribe = 2;
+
+  // When include_mempool is true, new unconfirmed transactions from mempool are
+  // included apart from the ones confirmed in a block.
+  bool include_mempool = 3;
+
+  // When include_in_block is true, transactions are included when they are confirmed.
+  // This notification is sent in addition to any requested mempool notifications.
+  bool include_in_block = 4;
+
+  // When serialize_tx is true, transactions are serialized using
+  // bitcoin protocol encoding. Default is false, transaction will be Marshaled
+  // (see `Transaction`, `MempoolTransaction` and `TransactionNotification`)
+  bool serialize_tx = 5;
+}
+
+// Options to define data structure to be sent by SubscribeBlock stream:
+//
+//  - BlockInfo (block metadata): `BlockInfo`
+//      - SubscribeBlocksRequest {}
+//
+//  - Marshaled Block (with transaction hashes): `Block`
+//      - SubscribeBlocksRequest {
+//            full_block = true
+//        }
+//  - Marshaled Block (with full transaction data): `Block`
+//      - SubscribeBlocksRequest {
+//            full_block = true
+//            full_transactions = true
+//        }
+//  - Serialized Block acccording to bitcoin protocol encoding: `bytes`
+//      - SubscribeBlocksRequest {
+//            serialize_block = true
+//        }
+message SubscribeBlocksRequest {
+  // When full_block is true, a complete marshaled block is sent. See `Block`.
+  // Default is false, block metadata is sent. See `BlockInfo`.
+  bool full_block = 1;
+
+  // When full_transactions is true, provide full transaction info
+  // for a marshaled block.
+  // Default is false, only the transaction hashes are included for
+  // a marshaled block. See `TransactionData`.
+  bool full_transactions = 2;
+
+  // When serialize_block is true, blocks are serialized using bitcoin protocol encoding.
+  // Default is false, block will be Marshaled (see `BlockInfo` and `BlockNotification`)
+  bool serialize_block = 3;
+}
+
+message GetSlpTokenMetadataRequest {
+  repeated bytes token_ids = 1;
+}
+
+message GetSlpTokenMetadataResponse {
+  repeated SlpTokenMetadata token_metadata = 1;
+}
+
+message GetSlpParsedScriptRequest {
+  bytes slp_opreturn_script = 1;
+}
+
+message GetSlpParsedScriptResponse {
+  string parsing_error = 1;
+  bytes token_id = 2;
+  SlpAction slp_action = 3;
+  SlpTokenType token_type = 4;
+  oneof slp_metadata {
+    SlpV1GenesisMetadata v1_genesis = 5;    // NFT1 Group also uses this
+    SlpV1MintMetadata v1_mint = 6;          // NFT1 Group also uses this
+    SlpV1SendMetadata v1_send = 7;          // NFT1 Group also uses this
+    SlpV1Nft1ChildGenesisMetadata v1_nft1_child_genesis = 8;
+    SlpV1Nft1ChildSendMetadata v1_nft1_child_send = 9;
+  }
+}
+
+message GetSlpTrustedValidationRequest {
+  message Query {
+    bytes prev_out_hash = 1;
+    uint32 prev_out_vout = 2;
+    repeated bytes graphsearch_valid_hashes = 3;
+  }
+  repeated Query queries = 1;
+  bool include_graphsearch_count = 2;
+}
+
+message GetSlpTrustedValidationResponse {
+  message ValidityResult {
+    bytes prev_out_hash = 1;
+    uint32 prev_out_vout = 2;
+    bytes token_id = 3;
+    SlpAction slp_action = 4;
+    SlpTokenType token_type = 5;
+    oneof validity_result_type {
+      uint64 v1_token_amount = 6 [jstype = JS_STRING];
+      bool v1_mint_baton = 7;
+    }
+    bytes slp_txn_opreturn = 8;
+    uint32 graphsearch_txn_count = 9;
+  }
+
+  repeated ValidityResult results = 1;
+}
+
+message GetSlpGraphSearchRequest {
+  bytes hash = 1;
+  repeated bytes valid_hashes = 2;
+}
+
+message GetSlpGraphSearchResponse {
+  repeated bytes txdata = 1;
+}
+
+// NOTIFICATIONS
+
+message BlockNotification {
+  // State of the block in relation to the chain.
+  enum Type {
+    CONNECTED = 0;
+    DISCONNECTED = 1;
+  }
+
+  // Whether the block is connected to the chain.
+  Type type = 1;
+  oneof block {
+    // Marshaled block header data, as well as metadata stored by the node.
+    BlockInfo block_info = 2;
+    // A Block.
+    Block marshaled_block = 3;
+    // Binary block, serialized using bitcoin protocol encoding.
+    bytes serialized_block = 4;
+  }
+}
+
+message TransactionNotification {
+  // State of the transaction acceptance.
+  enum Type {
+    // A transaction in mempool.
+    UNCONFIRMED = 0;
+    // A transaction in a block.
+    CONFIRMED   = 1;
+  }
+
+  // Whether or not the transaction has been included in a block.
+  Type type = 1;
+  oneof transaction {
+    // A transaction included in a block.
+    Transaction confirmed_transaction = 2;
+    // A transaction in mempool.
+    MempoolTransaction unconfirmed_transaction = 3;
+    // Binary transaction, serialized using bitcoin protocol encoding.
+    bytes serialized_transaction = 4;
+  }
+}
+
+
+// DATA MESSAGES
+
+// Metadata for identifying and validating a block
+message BlockInfo {
+  // Identification.
+
+  // The double sha256 hash of the six header fields in the first 80 bytes
+  // of the block, when encoded according the bitcoin protocol, little-endian.
+  // sha256(sha256(encoded_header))
+  bytes hash = 1;
+  // The block number, an incremental index for each block mined.
+  int32 height = 2;
+
+  // Block header data.
+
+  // A version number to track software/protocol upgrades.
+  int32 version = 3;
+  // Hash of the previous block, little-endian.
+  bytes previous_block = 4;
+  // The root of the Merkle Tree built from all transactions in the block, little-endian.
+  bytes merkle_root = 5;
+  // When mining of the block started, expressed in seconds since 1970-01-01.
+  int64 timestamp = 6;
+  // Difficulty in Compressed Target Format.
+  uint32 bits = 7;
+  // A random value that was generated during block mining which happened to
+  // result in a computed block hash below the difficulty target at the time.
+  uint32 nonce = 8;
+
+  // Metadata.
+
+  // Number of blocks in a chain, including the block itself upon creation.
+  int32 confirmations = 9;
+  // Difficulty target at time of creation.
+  double difficulty = 10;
+  // Hash of the next block in this chain, little-endian.
+  bytes next_block_hash = 11;
+  // Size of the block in bytes.
+  int32 size = 12;
+  // The median block time of the latest 11 block timestamps.
+  int64 median_time = 13;
+}
+
+message Block {
+  message TransactionData {
+    oneof txids_or_txs {
+      // Just the transaction hash, little-endian.
+      bytes transaction_hash = 1;
+      // A marshaled transaction.
+      Transaction transaction = 2;
+    }
+  }
+  // Block header data, as well as metadata stored by the node.
+  BlockInfo info = 1;
+  // List of transactions or transaction hashes.
+  repeated TransactionData transaction_data = 2;
+}
+
+message Transaction {
+  message Input {
+    message Outpoint {
+      // The hash of the transaction containing the output to be spent, little-endian
+      bytes hash = 1;
+      // The index of specific output on the transaction.
+      uint32 index = 2;
+    }
+    // The number of the input, starting from zero.
+    uint32 index = 1;
+    // The related outpoint.
+    Outpoint outpoint = 2;
+    // An unlocking script asserting a transaction is permitted to spend
+    // the Outpoint (UTXO)
+    bytes signature_script = 3;
+    // As of BIP-68, the sequence number is interpreted as a relative
+    // lock-time for the input.
+    uint32 sequence = 4;
+    // Amount in satoshi.
+    int64 value = 5;
+    // The pubkey_script of the previous output that is being spent.
+    bytes previous_script = 6;
+    // The bitcoin addresses associated with this input.
+    string address = 7;
+    SlpToken slp_token = 8;
+  }
+
+  message Output {
+    // The number of the output, starting from zero.
+    uint32 index = 1;
+    // The number of satoshis to be transferred.
+    int64 value = 2;
+    // The public key script used to pay coins.
+    bytes pubkey_script = 3;
+    // The bitcoin addresses associated with this output.
+    string address = 4;
+    // The type of script.
+    string script_class = 5;
+    // The script expressed in Bitcoin Cash Script.
+    string disassembled_script = 6;
+    SlpToken slp_token = 7;
+  }
+
+  // The double sha256 hash of the encoded transaction, little-endian.
+  // sha256(sha256(encoded_transaction))
+  bytes hash = 1;
+  // The version of the transaction format.
+  int32 version = 2;
+  // List of inputs.
+  repeated Input inputs = 3;
+  // List of outputs.
+  repeated Output outputs = 4;
+  // The block height or timestamp after which this transaction is allowed.
+  // If value is greater than 500 million, it is assumed to be an epoch timestamp,
+  // otherwise it is treated as a block-height. Default is zero, or lock.
+  uint32 lock_time = 5;
+
+  // Metadata
+
+  // The size of the transaction in bytes.
+  int32 size = 8;
+  // When the transaction was included in a block, in epoch time.
+  int64 timestamp = 9;
+  // Number of blocks including proof of the transaction, including
+  // the block it appeared.
+  int32 confirmations = 10;
+  // Number of the block containing the transaction.
+  int32 block_height = 11;
+  // Hash of the block the transaction was recorded in, little-endian.
+  bytes block_hash = 12;
+
+  SlpTransactionInfo slp_transaction_info = 13;
+}
+
+message MempoolTransaction {
+  Transaction transaction = 1;
+  // The time when the transaction was added too the pool.
+  int64 added_time = 2;
+  // The block height when the transaction was added to the pool.
+  int32 added_height = 3;
+  // The total fee in satoshi the transaction pays.
+  int64 fee = 4;
+  // The fee in satoshi per kilobyte the transaction pays.
+  int64 fee_per_kb = 5;
+  // The priority of the transaction when it was added to the pool.
+  double starting_priority = 6;
+}
+
+message UnspentOutput {
+  // A reference to the output given by transaction hash and index.
+  Transaction.Input.Outpoint outpoint = 1;
+  // The public key script used to pay coins.
+  bytes pubkey_script = 2;
+  // The amount in satoshis
+  int64 value = 3;
+  // When is_coinbase is true, the output is the first in the block,
+  // a generation transaction, the result of mining.
+  bool is_coinbase = 4;
+  // The block number containing the UXTO.
+  int32 block_height = 5;
+
+  SlpToken slp_token = 6;
+}
+
+message TransactionFilter {
+  // Filter by address(es)
+  repeated string addresses = 1;
+
+  // Filter by output hash and index.
+  repeated Transaction.Input.Outpoint outpoints = 2;
+
+  // Filter by data elements contained in pubkey scripts.
+  repeated bytes data_elements = 3;
+
+  // Subscribed/Unsubscribe to everything. Other filters
+  // will be ignored.
+  bool all_transactions = 4;
+
+  // Subscribed/Unsubscribe to everything slp. Other filters
+  // will be ignored, except this filter will be overriden by all_transactions=true
+  bool all_slp_transactions = 5;
+
+  // only transactions associated with the included tokenIds
+  repeated bytes slp_token_ids = 6;
+}
+
+// SlpToken info used in transaction inputs / outputs
+//
+// WARNING: Some languages (e.g., JavaScript) may not properly handle the 'uint64'
+// for large amounts. For this reason, an annotation has been added for JS to
+// return a string for the amount field instead of casting uint64 to the JS 'number'
+// type. Other languages may require similar treatment.
+//
+message SlpToken {
+  bytes token_id = 1;
+  uint64 amount = 2 [jstype = JS_STRING];
+  bool is_mint_baton = 3;
+  string address = 4;
+  uint32 decimals = 5;
+  SlpAction slp_action = 6;
+  SlpTokenType token_type = 7;
+}
+
+enum SlpTokenType {
+  VERSION_NOT_SET = 0;
+  V1_FUNGIBLE = 1;
+  V1_NFT1_CHILD = 65;
+  V1_NFT1_GROUP = 129;
+}
+
+// SlpTransactionInfo is used inside the Transaction message type.
+message SlpTransactionInfo {
+  SlpAction slp_action = 1;
+  enum ValidityJudgement {
+    UNKNOWN_OR_INVALID = 0;
+    VALID = 1;
+  }
+  ValidityJudgement validity_judgement = 2;
+  string parse_error = 3;
+  bytes token_id = 4;
+  enum BurnFlags {
+    BURNED_INPUTS_OUTPUTS_TOO_HIGH = 0;
+    BURNED_INPUTS_BAD_OPRETURN = 1;
+    BURNED_INPUTS_OTHER_TOKEN = 2;
+    BURNED_OUTPUTS_MISSING_BCH_VOUT = 3;
+    BURNED_INPUTS_GREATER_THAN_OUTPUTS = 4;
+  }
+  repeated BurnFlags burn_flags = 5;
+  oneof tx_metadata {
+    SlpV1GenesisMetadata v1_genesis = 6;    // NFT1 Group also uses this
+    SlpV1MintMetadata v1_mint = 7;          // NFT1 Group also uses this
+    SlpV1SendMetadata v1_send = 8;          // NFT1 Group also uses this
+    SlpV1Nft1ChildGenesisMetadata v1_nft1_child_genesis = 9;
+    SlpV1Nft1ChildSendMetadata v1_nft1_child_send = 10;
+  }
+}
+
+// SlpV1GenesisMetadata is used to marshal type 1 and NFT1 Group GENESIS OP_RETURN scriptPubKey
+message SlpV1GenesisMetadata {
+  bytes name = 1;
+  bytes ticker = 2;
+  bytes document_url = 3;
+  bytes document_hash = 4;
+  uint32 decimals = 5;
+  uint32 mint_baton_vout = 6;
+  uint64 mint_amount = 7 [jstype = JS_STRING];
+}
+
+// SlpV1MintMetadata is used to marshal type 1 MINT OP_RETURN scriptPubKey
+message SlpV1MintMetadata {
+  uint32 mint_baton_vout = 1;
+  uint64 mint_amount = 2 [jstype = JS_STRING];
+}
+
+// SlpV1SendMetadata is used to marshal type 1 and NFT1 Group SEND OP_RETURN scriptPubKey
+message SlpV1SendMetadata {
+  repeated uint64 amounts = 1 [jstype = JS_STRING];
+}
+
+// SlpV1Nft1ChildGenesisMetadata is used to marshal NFT1 Child GENESIS OP_RETURN scriptPubKey
+message SlpV1Nft1ChildGenesisMetadata {
+  bytes name = 1;
+  bytes ticker = 2;
+  bytes document_url = 3;
+  bytes document_hash = 4;
+  uint32 decimals = 5;
+  bytes group_token_id = 6;
+}
+
+// SlpV1Nft1ChildSendMetadata is used to marshal NFT1 Child SEND OP_RETURN scriptPubKey
+message SlpV1Nft1ChildSendMetadata {
+  bytes group_token_id = 1;
+}
+
+// SlpAction is used to allow clients to identify the type of slp transaction from this single field.
+//
+// NOTE: All enum types except for "NON_SLP" may be annotated with one or more BurnFlags.
+//
+enum SlpAction {
+  NON_SLP = 0;
+  NON_SLP_BURN = 1;
+  SLP_PARSE_ERROR = 2;
+  SLP_UNSUPPORTED_VERSION = 3;
+  SLP_V1_GENESIS = 4;
+  SLP_V1_MINT = 5;
+  SLP_V1_SEND = 6;
+  SLP_V1_NFT1_GROUP_GENESIS = 7;
+  SLP_V1_NFT1_GROUP_MINT = 8;
+  SLP_V1_NFT1_GROUP_SEND = 9;
+  SLP_V1_NFT1_UNIQUE_CHILD_GENESIS = 10;
+  SLP_V1_NFT1_UNIQUE_CHILD_SEND = 11;
+}
+
+// SlpTokenMetadata is used to marshal metadata about a specific TokenID
+message SlpTokenMetadata {
+  bytes token_id = 1;
+  SlpTokenType token_type = 2;
+  oneof type_metadata {
+    V1Fungible v1_fungible = 3;
+    V1NFT1Group v1_nft1_group = 4;
+    V1NFT1Child v1_nft1_child = 5;
+  }
+
+  // V1Fungible is used to marshal metadata specific to Type 1 token IDs
+  message V1Fungible {
+    string token_ticker = 1;
+    string token_name = 2;
+    string token_document_url = 3;
+    bytes token_document_hash = 4;
+    uint32 decimals = 5;
+    bytes mint_baton_hash = 6;
+    uint32 mint_baton_vout = 7;
+  }
+
+  // V1NFT1Group is used to marshal metadata specific to NFT1 Group token IDs
+  message V1NFT1Group {
+    string token_ticker = 1;
+    string token_name = 2;
+    string token_document_url = 3;
+    bytes token_document_hash = 4;
+    uint32 decimals = 5;
+    bytes mint_baton_hash = 6;
+    uint32 mint_baton_vout = 7;
+  }
+
+  // V1NFT1Child is used to marshal metadata specific to NFT1 Child token IDs
+  message V1NFT1Child {
+    string token_ticker = 1;
+    string token_name = 2;
+    string token_document_url = 3;
+    bytes token_document_hash = 4;
+    bytes group_id = 5;
+  }
+}
+
+// SlpRequiredBurn is used by clients to allow token burning
+message SlpRequiredBurn {
+  Transaction.Input.Outpoint outpoint = 1;
+  bytes token_id = 2;
+  SlpTokenType token_type = 3;
+  oneof burn_intention {
+    uint64 amount = 4 [jstype = JS_STRING];
+    uint32 mint_baton_vout = 5;
+  }
+}
diff --git a/mm2src/coins/utxo/pb.rs b/mm2src/coins/utxo/pb.rs
new file mode 100644
index 0000000000..61fb9a7e42
--- /dev/null
+++ b/mm2src/coins/utxo/pb.rs
@@ -0,0 +1,1229 @@
+// RPC MESSAGES
+
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetMempoolInfoRequest {
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetMempoolInfoResponse {
+    /// The count of transactions in the mempool
+    #[prost(uint32, tag="1")]
+    pub size: u32,
+    /// The size in bytes of all transactions in the mempool
+    #[prost(uint32, tag="2")]
+    pub bytes: u32,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetMempoolRequest {
+    /// When `full_transactions` is true, full transaction data is provided
+    /// instead of just transaction hashes. Default is false.
+    #[prost(bool, tag="1")]
+    pub full_transactions: bool,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetMempoolResponse {
+    /// List of unconfirmed transactions.
+    #[prost(message, repeated, tag="1")]
+    pub transaction_data: ::prost::alloc::vec::Vec<get_mempool_response::TransactionData>,
+}
+/// Nested message and enum types in `GetMempoolResponse`.
+pub mod get_mempool_response {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TransactionData {
+        /// Either one of the two following is provided, depending on the request.
+        #[prost(oneof="transaction_data::TxidsOrTxs", tags="1, 2")]
+        pub txids_or_txs: ::core::option::Option<transaction_data::TxidsOrTxs>,
+    }
+    /// Nested message and enum types in `TransactionData`.
+    pub mod transaction_data {
+        /// Either one of the two following is provided, depending on the request.
+        #[derive(Clone, PartialEq, ::prost::Oneof)]
+        pub enum TxidsOrTxs {
+            /// The transaction hash, little-endian.
+            #[prost(bytes, tag="1")]
+            TransactionHash(::prost::alloc::vec::Vec<u8>),
+            /// The transaction data.
+            #[prost(message, tag="2")]
+            Transaction(super::super::Transaction),
+        }
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockchainInfoRequest {
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockchainInfoResponse {
+    /// Which network the node is operating on.
+    #[prost(enumeration="get_blockchain_info_response::BitcoinNet", tag="1")]
+    pub bitcoin_net: i32,
+    /// The current number of blocks on the longest chain.
+    #[prost(int32, tag="2")]
+    pub best_height: i32,
+    /// The hash of the best (tip) block in the most-work fully-validated chain, little-endian.
+    #[prost(bytes="vec", tag="3")]
+    pub best_block_hash: ::prost::alloc::vec::Vec<u8>,
+    /// Threshold for adding new blocks.
+    #[prost(double, tag="4")]
+    pub difficulty: f64,
+    /// Median time of the last 11 blocks.
+    #[prost(int64, tag="5")]
+    pub median_time: i64,
+    /// When `tx_index` is true, the node has full transaction index enabled.
+    #[prost(bool, tag="6")]
+    pub tx_index: bool,
+    /// When `addr_index` is true, the node has address index enabled and may
+    /// be used with call related by address.
+    #[prost(bool, tag="7")]
+    pub addr_index: bool,
+    /// When `slp_index` is true, the node has the slp index enabled and may
+    /// be used with slp related rpc methods and also causes slp metadata to be added
+    /// in some of the existing rpc methods.
+    #[prost(bool, tag="8")]
+    pub slp_index: bool,
+    /// When `slp_graphsearch` is true, the node is able to handle calls to slp graph search
+    #[prost(bool, tag="9")]
+    pub slp_graphsearch: bool,
+}
+/// Nested message and enum types in `GetBlockchainInfoResponse`.
+pub mod get_blockchain_info_response {
+    /// Bitcoin network types
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum BitcoinNet {
+        /// Live public network with monetary value.
+        Mainnet = 0,
+        /// An isolated environment for automated testing.
+        Regtest = 1,
+        /// A public environment where monetary value is agreed to be zero,
+        /// and some checks for transaction conformity are disabled.
+        Testnet3 = 2,
+        /// Private testnets for large scale simulations (or stress testing),
+        /// where a specified list of nodes is used, rather than node discovery.
+        Simnet = 3,
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockInfoRequest {
+    #[prost(oneof="get_block_info_request::HashOrHeight", tags="1, 2")]
+    pub hash_or_height: ::core::option::Option<get_block_info_request::HashOrHeight>,
+}
+/// Nested message and enum types in `GetBlockInfoRequest`.
+pub mod get_block_info_request {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum HashOrHeight {
+        /// The block hash as a byte array or base64 encoded string, little-endian.
+        #[prost(bytes, tag="1")]
+        Hash(::prost::alloc::vec::Vec<u8>),
+        /// The block number.
+        #[prost(int32, tag="2")]
+        Height(i32),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockInfoResponse {
+    /// Marshaled block header data, as well as metadata.
+    #[prost(message, optional, tag="1")]
+    pub info: ::core::option::Option<BlockInfo>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockRequest {
+    /// When `full_transactions` is true, full transactions are returned
+    /// instead of just hashes. Default is false.
+    #[prost(bool, tag="3")]
+    pub full_transactions: bool,
+    #[prost(oneof="get_block_request::HashOrHeight", tags="1, 2")]
+    pub hash_or_height: ::core::option::Option<get_block_request::HashOrHeight>,
+}
+/// Nested message and enum types in `GetBlockRequest`.
+pub mod get_block_request {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum HashOrHeight {
+        /// The block hash as a byte array or base64 encoded string, little-endian.
+        #[prost(bytes, tag="1")]
+        Hash(::prost::alloc::vec::Vec<u8>),
+        /// The block number.
+        #[prost(int32, tag="2")]
+        Height(i32),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockResponse {
+    /// A marshaled block.
+    #[prost(message, optional, tag="1")]
+    pub block: ::core::option::Option<Block>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetRawBlockRequest {
+    #[prost(oneof="get_raw_block_request::HashOrHeight", tags="1, 2")]
+    pub hash_or_height: ::core::option::Option<get_raw_block_request::HashOrHeight>,
+}
+/// Nested message and enum types in `GetRawBlockRequest`.
+pub mod get_raw_block_request {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum HashOrHeight {
+        /// The block hash as a byte array or base64 encoded string, little-endian.
+        #[prost(bytes, tag="1")]
+        Hash(::prost::alloc::vec::Vec<u8>),
+        /// The block number.
+        #[prost(int32, tag="2")]
+        Height(i32),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetRawBlockResponse {
+    /// Raw block data (with header) serialized according the the bitcoin block protocol.
+    #[prost(bytes="vec", tag="1")]
+    pub block: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockFilterRequest {
+    #[prost(oneof="get_block_filter_request::HashOrHeight", tags="1, 2")]
+    pub hash_or_height: ::core::option::Option<get_block_filter_request::HashOrHeight>,
+}
+/// Nested message and enum types in `GetBlockFilterRequest`.
+pub mod get_block_filter_request {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum HashOrHeight {
+        /// The block hash as a byte array or base64 encoded string, little-endian.
+        #[prost(bytes, tag="1")]
+        Hash(::prost::alloc::vec::Vec<u8>),
+        /// The block number.
+        #[prost(int32, tag="2")]
+        Height(i32),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetBlockFilterResponse {
+    /// A compact filter matching input outpoints and public key scripts contained
+    /// in a block (encoded according to BIP158).
+    #[prost(bytes="vec", tag="1")]
+    pub filter: ::prost::alloc::vec::Vec<u8>,
+}
+/// Request headers using a list of known block hashes.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetHeadersRequest {
+    /// A list of block hashes known to the client (most recent first) which
+    /// is exponentially sparser toward the genesis block (0), little-endian.
+    /// Common practice is to include all of the last 10 blocks, and then
+    /// 9 blocks for each order of ten thereafter.
+    #[prost(bytes="vec", repeated, tag="1")]
+    pub block_locator_hashes: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// hash of the latest desired block header, little-endian; only blocks
+    /// occurring before the stop will be returned.
+    #[prost(bytes="vec", tag="2")]
+    pub stop_hash: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetHeadersResponse {
+    /// List of block headers.
+    #[prost(message, repeated, tag="1")]
+    pub headers: ::prost::alloc::vec::Vec<BlockInfo>,
+}
+/// Get a transaction from a transaction hash.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetTransactionRequest {
+    /// A transaction hash, little-endian.
+    #[prost(bytes="vec", tag="1")]
+    pub hash: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bool, tag="2")]
+    pub include_token_metadata: bool,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetTransactionResponse {
+    /// A marshaled transaction.
+    #[prost(message, optional, tag="1")]
+    pub transaction: ::core::option::Option<Transaction>,
+    #[prost(message, optional, tag="2")]
+    pub token_metadata: ::core::option::Option<SlpTokenMetadata>,
+}
+/// Get an encoded transaction from a transaction hash.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetRawTransactionRequest {
+    /// A transaction hash, little-endian.
+    #[prost(bytes="vec", tag="1")]
+    pub hash: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetRawTransactionResponse {
+    /// Raw transaction in bytes.
+    #[prost(bytes="vec", tag="1")]
+    pub transaction: ::prost::alloc::vec::Vec<u8>,
+}
+/// Get marshaled transactions related to a specific address.
+///
+/// RECOMMENDED:
+/// Parameters have been provided to query without creating
+///   performance issues on the node or client.
+///
+/// - The number of transactions to skip and fetch allow for iterating
+///       over a large set of transactions, if necessary.
+///
+/// - A starting block parameter (either `hash` or `height`)
+///       may then be used to filter results to those occurring
+///       after a certain time.
+///
+/// This approach will reduce network traffic and response processing
+///   for the client, as well as reduce workload on the node.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetAddressTransactionsRequest {
+    /// The address to query transactions, in lowercase cashaddr format.
+    /// The network prefix is optional (i.e. "cashaddress:").
+    #[prost(string, tag="1")]
+    pub address: ::prost::alloc::string::String,
+    /// The number of confirmed transactions to skip, starting with the oldest first.
+    /// Does not affect results of unconfirmed transactions.
+    #[prost(uint32, tag="2")]
+    pub nb_skip: u32,
+    /// Specify the number of transactions to fetch.
+    #[prost(uint32, tag="3")]
+    pub nb_fetch: u32,
+    #[prost(oneof="get_address_transactions_request::StartBlock", tags="4, 5")]
+    pub start_block: ::core::option::Option<get_address_transactions_request::StartBlock>,
+}
+/// Nested message and enum types in `GetAddressTransactionsRequest`.
+pub mod get_address_transactions_request {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum StartBlock {
+        /// Recommended. Only get transactions after (or within) a
+        /// starting block identified by hash, little-endian.
+        #[prost(bytes, tag="4")]
+        Hash(::prost::alloc::vec::Vec<u8>),
+        /// Recommended. Only get transactions after (or within) a
+        /// starting block identified by block number.
+        #[prost(int32, tag="5")]
+        Height(i32),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetAddressTransactionsResponse {
+    /// Transactions that have been included in a block.
+    #[prost(message, repeated, tag="1")]
+    pub confirmed_transactions: ::prost::alloc::vec::Vec<Transaction>,
+    /// Transactions in mempool which have not been included in a block.
+    #[prost(message, repeated, tag="2")]
+    pub unconfirmed_transactions: ::prost::alloc::vec::Vec<MempoolTransaction>,
+}
+/// Get encoded transactions related to a specific address.
+///
+/// RECOMMENDED:
+/// Parameters have been provided to query without creating
+///   performance issues on the node or client.
+///
+/// - The number of transactions to skip and fetch allow for iterating
+///       over a large set of transactions, if necessary.
+///
+/// - A starting block parameter (either `hash` or `height`)
+///       may then be used to filter results to those occurring
+///       after a certain time.
+///
+/// This approach will reduce network traffic and response processing
+///   for the client, as well as reduce workload on the node.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetRawAddressTransactionsRequest {
+    /// The address to query transactions, in lowercase cashaddr format.
+    /// The network prefix is optional (i.e. "cashaddress:").
+    #[prost(string, tag="1")]
+    pub address: ::prost::alloc::string::String,
+    /// The number of confirmed transactions to skip, starting with the oldest first.
+    /// Does not affect results of unconfirmed transactions.
+    #[prost(uint32, tag="2")]
+    pub nb_skip: u32,
+    /// Specify the number of transactions to fetch.
+    #[prost(uint32, tag="3")]
+    pub nb_fetch: u32,
+    #[prost(oneof="get_raw_address_transactions_request::StartBlock", tags="4, 5")]
+    pub start_block: ::core::option::Option<get_raw_address_transactions_request::StartBlock>,
+}
+/// Nested message and enum types in `GetRawAddressTransactionsRequest`.
+pub mod get_raw_address_transactions_request {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum StartBlock {
+        /// Recommended. Only return transactions after some starting block
+        /// identified by hash, little-endian.
+        #[prost(bytes, tag="4")]
+        Hash(::prost::alloc::vec::Vec<u8>),
+        /// Recommended. Only return transactions after some starting block
+        /// identified by block number.
+        #[prost(int32, tag="5")]
+        Height(i32),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetRawAddressTransactionsResponse {
+    /// Transactions that have been included in a block.
+    #[prost(bytes="vec", repeated, tag="1")]
+    pub confirmed_transactions: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// Transactions in mempool which have not been included in a block.
+    #[prost(bytes="vec", repeated, tag="2")]
+    pub unconfirmed_transactions: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetAddressUnspentOutputsRequest {
+    /// The address to query transactions, in lowercase cashaddr format.
+    /// The network identifier is optional (i.e. "cashaddress:").
+    #[prost(string, tag="1")]
+    pub address: ::prost::alloc::string::String,
+    /// When `include_mempool` is true, unconfirmed transactions from mempool
+    /// are returned. Default is false.
+    #[prost(bool, tag="2")]
+    pub include_mempool: bool,
+    #[prost(bool, tag="3")]
+    pub include_token_metadata: bool,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetAddressUnspentOutputsResponse {
+    /// List of unspent outputs.
+    #[prost(message, repeated, tag="1")]
+    pub outputs: ::prost::alloc::vec::Vec<UnspentOutput>,
+    #[prost(message, repeated, tag="2")]
+    pub token_metadata: ::prost::alloc::vec::Vec<SlpTokenMetadata>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetUnspentOutputRequest {
+    /// The hash of the transaction, little-endian.
+    #[prost(bytes="vec", tag="1")]
+    pub hash: ::prost::alloc::vec::Vec<u8>,
+    /// The number of the output, starting from zero.
+    #[prost(uint32, tag="2")]
+    pub index: u32,
+    /// When include_mempool is true, unconfirmed transactions from mempool
+    /// are returned. Default is false.
+    #[prost(bool, tag="3")]
+    pub include_mempool: bool,
+    #[prost(bool, tag="4")]
+    pub include_token_metadata: bool,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetUnspentOutputResponse {
+    /// A reference to the related input.
+    #[prost(message, optional, tag="1")]
+    pub outpoint: ::core::option::Option<transaction::input::Outpoint>,
+    /// Locking script dictating how funds can be spent in the future
+    #[prost(bytes="vec", tag="2")]
+    pub pubkey_script: ::prost::alloc::vec::Vec<u8>,
+    /// Amount in satoshi.
+    #[prost(int64, tag="3")]
+    pub value: i64,
+    /// When is_coinbase is true, the transaction was the first in a block,
+    /// created by a miner, and used to pay the block reward
+    #[prost(bool, tag="4")]
+    pub is_coinbase: bool,
+    /// The index number of the block containing the transaction creating the output.
+    #[prost(int32, tag="5")]
+    pub block_height: i32,
+    #[prost(message, optional, tag="6")]
+    pub slp_token: ::core::option::Option<SlpToken>,
+    #[prost(message, optional, tag="7")]
+    pub token_metadata: ::core::option::Option<SlpTokenMetadata>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetMerkleProofRequest {
+    /// A transaction hash, little-endian.
+    #[prost(bytes="vec", tag="1")]
+    pub transaction_hash: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetMerkleProofResponse {
+    /// Block header information for the corresponding transaction
+    #[prost(message, optional, tag="1")]
+    pub block: ::core::option::Option<BlockInfo>,
+    /// A list containing the transaction hash, the adjacent leaf transaction hash
+    /// and the hashes of the highest nodes in the merkle tree not built with the transaction.
+    /// Proof hashes are ordered following transaction order, or left to right on the merkle tree
+    #[prost(bytes="vec", repeated, tag="2")]
+    pub hashes: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// Binary representing the location of the matching transaction in the full merkle tree,
+    /// starting with the root (`1`) at position/level 0, where `1` corresponds
+    /// to a left branch and `01` is a right branch.
+    #[prost(bytes="vec", tag="3")]
+    pub flags: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SubmitTransactionRequest {
+    /// The encoded transaction.
+    #[prost(bytes="vec", tag="1")]
+    pub transaction: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bool, tag="2")]
+    pub skip_slp_validity_check: bool,
+    #[prost(message, repeated, tag="3")]
+    pub required_slp_burns: ::prost::alloc::vec::Vec<SlpRequiredBurn>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SubmitTransactionResponse {
+    /// Transaction hash, little-endian.
+    #[prost(bytes="vec", tag="1")]
+    pub hash: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct CheckSlpTransactionRequest {
+    #[prost(bytes="vec", tag="1")]
+    pub transaction: ::prost::alloc::vec::Vec<u8>,
+    #[prost(message, repeated, tag="2")]
+    pub required_slp_burns: ::prost::alloc::vec::Vec<SlpRequiredBurn>,
+    /// Using the slp specification as a basis for validity judgement can lead to confusion for new users and
+    /// result in accidental token burns.  use_spec_validity_judgement will cause the response's is_valid property
+    /// to be returned according to the slp specification.  Therefore, use_spec_validity_judgement is false by
+    /// default in order to avoid accidental token burns.  When use_spec_validity_judgement is false we return
+    /// invalid in any case which would result in a burned token, unless the burn is explicitly included as an
+    /// item in required_slp_burns property.
+    ///
+    /// When use_spec_validity_judgement is true, there are three cases where the is_valid response property
+    /// will be returned as valid, instead of invalid, as per the slp specification.
+    ///   1) inputs > outputs
+    ///   2) missing transaction outputs
+    ///   3) burned inputs from other tokens
+    ///
+    /// required_slp_burns is not used when use_spec_validity_judgement is set to true.
+    ///
+    #[prost(bool, tag="3")]
+    pub use_spec_validity_judgement: bool,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct CheckSlpTransactionResponse {
+    #[prost(bool, tag="1")]
+    pub is_valid: bool,
+    #[prost(string, tag="2")]
+    pub invalid_reason: ::prost::alloc::string::String,
+    #[prost(int32, tag="3")]
+    pub best_height: i32,
+}
+/// Request to subscribe or unsubscribe from a stream of transactions.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SubscribeTransactionsRequest {
+    /// Subscribe to a filter. add items to a filter
+    #[prost(message, optional, tag="1")]
+    pub subscribe: ::core::option::Option<TransactionFilter>,
+    /// Unsubscribe to a filter, remove items from a filter
+    #[prost(message, optional, tag="2")]
+    pub unsubscribe: ::core::option::Option<TransactionFilter>,
+    /// When include_mempool is true, new unconfirmed transactions from mempool are
+    /// included apart from the ones confirmed in a block.
+    #[prost(bool, tag="3")]
+    pub include_mempool: bool,
+    /// When include_in_block is true, transactions are included when they are confirmed.
+    /// This notification is sent in addition to any requested mempool notifications.
+    #[prost(bool, tag="4")]
+    pub include_in_block: bool,
+    /// When serialize_tx is true, transactions are serialized using
+    /// bitcoin protocol encoding. Default is false, transaction will be Marshaled
+    /// (see `Transaction`, `MempoolTransaction` and `TransactionNotification`)
+    #[prost(bool, tag="5")]
+    pub serialize_tx: bool,
+}
+/// Options to define data structure to be sent by SubscribeBlock stream:
+///
+///  - BlockInfo (block metadata): `BlockInfo`
+///      - SubscribeBlocksRequest {}
+///
+///  - Marshaled Block (with transaction hashes): `Block`
+///      - SubscribeBlocksRequest {
+///            full_block = true
+///        }
+///  - Marshaled Block (with full transaction data): `Block`
+///      - SubscribeBlocksRequest {
+///            full_block = true
+///            full_transactions = true
+///        }
+///  - Serialized Block acccording to bitcoin protocol encoding: `bytes`
+///      - SubscribeBlocksRequest {
+///            serialize_block = true
+///        }
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SubscribeBlocksRequest {
+    /// When full_block is true, a complete marshaled block is sent. See `Block`.
+    /// Default is false, block metadata is sent. See `BlockInfo`.
+    #[prost(bool, tag="1")]
+    pub full_block: bool,
+    /// When full_transactions is true, provide full transaction info
+    /// for a marshaled block.
+    /// Default is false, only the transaction hashes are included for
+    /// a marshaled block. See `TransactionData`.
+    #[prost(bool, tag="2")]
+    pub full_transactions: bool,
+    /// When serialize_block is true, blocks are serialized using bitcoin protocol encoding.
+    /// Default is false, block will be Marshaled (see `BlockInfo` and `BlockNotification`)
+    #[prost(bool, tag="3")]
+    pub serialize_block: bool,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpTokenMetadataRequest {
+    #[prost(bytes="vec", repeated, tag="1")]
+    pub token_ids: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpTokenMetadataResponse {
+    #[prost(message, repeated, tag="1")]
+    pub token_metadata: ::prost::alloc::vec::Vec<SlpTokenMetadata>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpParsedScriptRequest {
+    #[prost(bytes="vec", tag="1")]
+    pub slp_opreturn_script: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpParsedScriptResponse {
+    #[prost(string, tag="1")]
+    pub parsing_error: ::prost::alloc::string::String,
+    #[prost(bytes="vec", tag="2")]
+    pub token_id: ::prost::alloc::vec::Vec<u8>,
+    #[prost(enumeration="SlpAction", tag="3")]
+    pub slp_action: i32,
+    #[prost(enumeration="SlpTokenType", tag="4")]
+    pub token_type: i32,
+    #[prost(oneof="get_slp_parsed_script_response::SlpMetadata", tags="5, 6, 7, 8, 9")]
+    pub slp_metadata: ::core::option::Option<get_slp_parsed_script_response::SlpMetadata>,
+}
+/// Nested message and enum types in `GetSlpParsedScriptResponse`.
+pub mod get_slp_parsed_script_response {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum SlpMetadata {
+        /// NFT1 Group also uses this
+        #[prost(message, tag="5")]
+        V1Genesis(super::SlpV1GenesisMetadata),
+        /// NFT1 Group also uses this
+        #[prost(message, tag="6")]
+        V1Mint(super::SlpV1MintMetadata),
+        /// NFT1 Group also uses this
+        #[prost(message, tag="7")]
+        V1Send(super::SlpV1SendMetadata),
+        #[prost(message, tag="8")]
+        V1Nft1ChildGenesis(super::SlpV1Nft1ChildGenesisMetadata),
+        #[prost(message, tag="9")]
+        V1Nft1ChildSend(super::SlpV1Nft1ChildSendMetadata),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpTrustedValidationRequest {
+    #[prost(message, repeated, tag="1")]
+    pub queries: ::prost::alloc::vec::Vec<get_slp_trusted_validation_request::Query>,
+    #[prost(bool, tag="2")]
+    pub include_graphsearch_count: bool,
+}
+/// Nested message and enum types in `GetSlpTrustedValidationRequest`.
+pub mod get_slp_trusted_validation_request {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct Query {
+        #[prost(bytes="vec", tag="1")]
+        pub prev_out_hash: ::prost::alloc::vec::Vec<u8>,
+        #[prost(uint32, tag="2")]
+        pub prev_out_vout: u32,
+        #[prost(bytes="vec", repeated, tag="3")]
+        pub graphsearch_valid_hashes: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpTrustedValidationResponse {
+    #[prost(message, repeated, tag="1")]
+    pub results: ::prost::alloc::vec::Vec<get_slp_trusted_validation_response::ValidityResult>,
+}
+/// Nested message and enum types in `GetSlpTrustedValidationResponse`.
+pub mod get_slp_trusted_validation_response {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct ValidityResult {
+        #[prost(bytes="vec", tag="1")]
+        pub prev_out_hash: ::prost::alloc::vec::Vec<u8>,
+        #[prost(uint32, tag="2")]
+        pub prev_out_vout: u32,
+        #[prost(bytes="vec", tag="3")]
+        pub token_id: ::prost::alloc::vec::Vec<u8>,
+        #[prost(enumeration="super::SlpAction", tag="4")]
+        pub slp_action: i32,
+        #[prost(enumeration="super::SlpTokenType", tag="5")]
+        pub token_type: i32,
+        #[prost(bytes="vec", tag="8")]
+        pub slp_txn_opreturn: ::prost::alloc::vec::Vec<u8>,
+        #[prost(uint32, tag="9")]
+        pub graphsearch_txn_count: u32,
+        #[prost(oneof="validity_result::ValidityResultType", tags="6, 7")]
+        pub validity_result_type: ::core::option::Option<validity_result::ValidityResultType>,
+    }
+    /// Nested message and enum types in `ValidityResult`.
+    pub mod validity_result {
+        #[derive(Clone, PartialEq, ::prost::Oneof)]
+        pub enum ValidityResultType {
+            #[prost(uint64, tag="6")]
+            V1TokenAmount(u64),
+            #[prost(bool, tag="7")]
+            V1MintBaton(bool),
+        }
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpGraphSearchRequest {
+    #[prost(bytes="vec", tag="1")]
+    pub hash: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes="vec", repeated, tag="2")]
+    pub valid_hashes: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetSlpGraphSearchResponse {
+    #[prost(bytes="vec", repeated, tag="1")]
+    pub txdata: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+}
+// NOTIFICATIONS
+
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BlockNotification {
+    /// Whether the block is connected to the chain.
+    #[prost(enumeration="block_notification::Type", tag="1")]
+    pub r#type: i32,
+    #[prost(oneof="block_notification::Block", tags="2, 3, 4")]
+    pub block: ::core::option::Option<block_notification::Block>,
+}
+/// Nested message and enum types in `BlockNotification`.
+pub mod block_notification {
+    /// State of the block in relation to the chain.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum Type {
+        Connected = 0,
+        Disconnected = 1,
+    }
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Block {
+        /// Marshaled block header data, as well as metadata stored by the node.
+        #[prost(message, tag="2")]
+        BlockInfo(super::BlockInfo),
+        /// A Block.
+        #[prost(message, tag="3")]
+        MarshaledBlock(super::Block),
+        /// Binary block, serialized using bitcoin protocol encoding.
+        #[prost(bytes, tag="4")]
+        SerializedBlock(::prost::alloc::vec::Vec<u8>),
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TransactionNotification {
+    /// Whether or not the transaction has been included in a block.
+    #[prost(enumeration="transaction_notification::Type", tag="1")]
+    pub r#type: i32,
+    #[prost(oneof="transaction_notification::Transaction", tags="2, 3, 4")]
+    pub transaction: ::core::option::Option<transaction_notification::Transaction>,
+}
+/// Nested message and enum types in `TransactionNotification`.
+pub mod transaction_notification {
+    /// State of the transaction acceptance.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum Type {
+        /// A transaction in mempool.
+        Unconfirmed = 0,
+        /// A transaction in a block.
+        Confirmed = 1,
+    }
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Transaction {
+        /// A transaction included in a block.
+        #[prost(message, tag="2")]
+        ConfirmedTransaction(super::Transaction),
+        /// A transaction in mempool.
+        #[prost(message, tag="3")]
+        UnconfirmedTransaction(super::MempoolTransaction),
+        /// Binary transaction, serialized using bitcoin protocol encoding.
+        #[prost(bytes, tag="4")]
+        SerializedTransaction(::prost::alloc::vec::Vec<u8>),
+    }
+}
+// DATA MESSAGES
+
+/// Metadata for identifying and validating a block
+///
+/// Identification.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BlockInfo {
+    /// The double sha256 hash of the six header fields in the first 80 bytes
+    /// of the block, when encoded according the bitcoin protocol, little-endian.
+    /// sha256(sha256(encoded_header))
+    #[prost(bytes="vec", tag="1")]
+    pub hash: ::prost::alloc::vec::Vec<u8>,
+    /// The block number, an incremental index for each block mined.
+    #[prost(int32, tag="2")]
+    pub height: i32,
+    // Block header data.
+
+    /// A version number to track software/protocol upgrades.
+    #[prost(int32, tag="3")]
+    pub version: i32,
+    /// Hash of the previous block, little-endian.
+    #[prost(bytes="vec", tag="4")]
+    pub previous_block: ::prost::alloc::vec::Vec<u8>,
+    /// The root of the Merkle Tree built from all transactions in the block, little-endian.
+    #[prost(bytes="vec", tag="5")]
+    pub merkle_root: ::prost::alloc::vec::Vec<u8>,
+    /// When mining of the block started, expressed in seconds since 1970-01-01.
+    #[prost(int64, tag="6")]
+    pub timestamp: i64,
+    /// Difficulty in Compressed Target Format.
+    #[prost(uint32, tag="7")]
+    pub bits: u32,
+    /// A random value that was generated during block mining which happened to
+    /// result in a computed block hash below the difficulty target at the time.
+    #[prost(uint32, tag="8")]
+    pub nonce: u32,
+    // Metadata.
+
+    /// Number of blocks in a chain, including the block itself upon creation.
+    #[prost(int32, tag="9")]
+    pub confirmations: i32,
+    /// Difficulty target at time of creation.
+    #[prost(double, tag="10")]
+    pub difficulty: f64,
+    /// Hash of the next block in this chain, little-endian.
+    #[prost(bytes="vec", tag="11")]
+    pub next_block_hash: ::prost::alloc::vec::Vec<u8>,
+    /// Size of the block in bytes.
+    #[prost(int32, tag="12")]
+    pub size: i32,
+    /// The median block time of the latest 11 block timestamps.
+    #[prost(int64, tag="13")]
+    pub median_time: i64,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Block {
+    /// Block header data, as well as metadata stored by the node.
+    #[prost(message, optional, tag="1")]
+    pub info: ::core::option::Option<BlockInfo>,
+    /// List of transactions or transaction hashes.
+    #[prost(message, repeated, tag="2")]
+    pub transaction_data: ::prost::alloc::vec::Vec<block::TransactionData>,
+}
+/// Nested message and enum types in `Block`.
+pub mod block {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TransactionData {
+        #[prost(oneof="transaction_data::TxidsOrTxs", tags="1, 2")]
+        pub txids_or_txs: ::core::option::Option<transaction_data::TxidsOrTxs>,
+    }
+    /// Nested message and enum types in `TransactionData`.
+    pub mod transaction_data {
+        #[derive(Clone, PartialEq, ::prost::Oneof)]
+        pub enum TxidsOrTxs {
+            /// Just the transaction hash, little-endian.
+            #[prost(bytes, tag="1")]
+            TransactionHash(::prost::alloc::vec::Vec<u8>),
+            /// A marshaled transaction.
+            #[prost(message, tag="2")]
+            Transaction(super::super::Transaction),
+        }
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Transaction {
+    /// The double sha256 hash of the encoded transaction, little-endian.
+    /// sha256(sha256(encoded_transaction))
+    #[prost(bytes="vec", tag="1")]
+    pub hash: ::prost::alloc::vec::Vec<u8>,
+    /// The version of the transaction format.
+    #[prost(int32, tag="2")]
+    pub version: i32,
+    /// List of inputs.
+    #[prost(message, repeated, tag="3")]
+    pub inputs: ::prost::alloc::vec::Vec<transaction::Input>,
+    /// List of outputs.
+    #[prost(message, repeated, tag="4")]
+    pub outputs: ::prost::alloc::vec::Vec<transaction::Output>,
+    /// The block height or timestamp after which this transaction is allowed.
+    /// If value is greater than 500 million, it is assumed to be an epoch timestamp,
+    /// otherwise it is treated as a block-height. Default is zero, or lock.
+    #[prost(uint32, tag="5")]
+    pub lock_time: u32,
+    // Metadata
+
+    /// The size of the transaction in bytes.
+    #[prost(int32, tag="8")]
+    pub size: i32,
+    /// When the transaction was included in a block, in epoch time.
+    #[prost(int64, tag="9")]
+    pub timestamp: i64,
+    /// Number of blocks including proof of the transaction, including
+    /// the block it appeared.
+    #[prost(int32, tag="10")]
+    pub confirmations: i32,
+    /// Number of the block containing the transaction.
+    #[prost(int32, tag="11")]
+    pub block_height: i32,
+    /// Hash of the block the transaction was recorded in, little-endian.
+    #[prost(bytes="vec", tag="12")]
+    pub block_hash: ::prost::alloc::vec::Vec<u8>,
+    #[prost(message, optional, tag="13")]
+    pub slp_transaction_info: ::core::option::Option<SlpTransactionInfo>,
+}
+/// Nested message and enum types in `Transaction`.
+pub mod transaction {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct Input {
+        /// The number of the input, starting from zero.
+        #[prost(uint32, tag="1")]
+        pub index: u32,
+        /// The related outpoint.
+        #[prost(message, optional, tag="2")]
+        pub outpoint: ::core::option::Option<input::Outpoint>,
+        /// An unlocking script asserting a transaction is permitted to spend
+        /// the Outpoint (UTXO)
+        #[prost(bytes="vec", tag="3")]
+        pub signature_script: ::prost::alloc::vec::Vec<u8>,
+        /// As of BIP-68, the sequence number is interpreted as a relative
+        /// lock-time for the input.
+        #[prost(uint32, tag="4")]
+        pub sequence: u32,
+        /// Amount in satoshi.
+        #[prost(int64, tag="5")]
+        pub value: i64,
+        /// The pubkey_script of the previous output that is being spent.
+        #[prost(bytes="vec", tag="6")]
+        pub previous_script: ::prost::alloc::vec::Vec<u8>,
+        /// The bitcoin addresses associated with this input.
+        #[prost(string, tag="7")]
+        pub address: ::prost::alloc::string::String,
+        #[prost(message, optional, tag="8")]
+        pub slp_token: ::core::option::Option<super::SlpToken>,
+    }
+    /// Nested message and enum types in `Input`.
+    pub mod input {
+        #[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct Outpoint {
+            /// The hash of the transaction containing the output to be spent, little-endian
+            #[prost(bytes="vec", tag="1")]
+            pub hash: ::prost::alloc::vec::Vec<u8>,
+            /// The index of specific output on the transaction.
+            #[prost(uint32, tag="2")]
+            pub index: u32,
+        }
+    }
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct Output {
+        /// The number of the output, starting from zero.
+        #[prost(uint32, tag="1")]
+        pub index: u32,
+        /// The number of satoshis to be transferred.
+        #[prost(int64, tag="2")]
+        pub value: i64,
+        /// The public key script used to pay coins.
+        #[prost(bytes="vec", tag="3")]
+        pub pubkey_script: ::prost::alloc::vec::Vec<u8>,
+        /// The bitcoin addresses associated with this output.
+        #[prost(string, tag="4")]
+        pub address: ::prost::alloc::string::String,
+        /// The type of script.
+        #[prost(string, tag="5")]
+        pub script_class: ::prost::alloc::string::String,
+        /// The script expressed in Bitcoin Cash Script.
+        #[prost(string, tag="6")]
+        pub disassembled_script: ::prost::alloc::string::String,
+        #[prost(message, optional, tag="7")]
+        pub slp_token: ::core::option::Option<super::SlpToken>,
+    }
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MempoolTransaction {
+    #[prost(message, optional, tag="1")]
+    pub transaction: ::core::option::Option<Transaction>,
+    /// The time when the transaction was added too the pool.
+    #[prost(int64, tag="2")]
+    pub added_time: i64,
+    /// The block height when the transaction was added to the pool.
+    #[prost(int32, tag="3")]
+    pub added_height: i32,
+    /// The total fee in satoshi the transaction pays.
+    #[prost(int64, tag="4")]
+    pub fee: i64,
+    /// The fee in satoshi per kilobyte the transaction pays.
+    #[prost(int64, tag="5")]
+    pub fee_per_kb: i64,
+    /// The priority of the transaction when it was added to the pool.
+    #[prost(double, tag="6")]
+    pub starting_priority: f64,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct UnspentOutput {
+    /// A reference to the output given by transaction hash and index.
+    #[prost(message, optional, tag="1")]
+    pub outpoint: ::core::option::Option<transaction::input::Outpoint>,
+    /// The public key script used to pay coins.
+    #[prost(bytes="vec", tag="2")]
+    pub pubkey_script: ::prost::alloc::vec::Vec<u8>,
+    /// The amount in satoshis
+    #[prost(int64, tag="3")]
+    pub value: i64,
+    /// When is_coinbase is true, the output is the first in the block,
+    /// a generation transaction, the result of mining.
+    #[prost(bool, tag="4")]
+    pub is_coinbase: bool,
+    /// The block number containing the UXTO.
+    #[prost(int32, tag="5")]
+    pub block_height: i32,
+    #[prost(message, optional, tag="6")]
+    pub slp_token: ::core::option::Option<SlpToken>,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TransactionFilter {
+    /// Filter by address(es)
+    #[prost(string, repeated, tag="1")]
+    pub addresses: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    /// Filter by output hash and index.
+    #[prost(message, repeated, tag="2")]
+    pub outpoints: ::prost::alloc::vec::Vec<transaction::input::Outpoint>,
+    /// Filter by data elements contained in pubkey scripts.
+    #[prost(bytes="vec", repeated, tag="3")]
+    pub data_elements: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// Subscribed/Unsubscribe to everything. Other filters
+    /// will be ignored.
+    #[prost(bool, tag="4")]
+    pub all_transactions: bool,
+    /// Subscribed/Unsubscribe to everything slp. Other filters
+    /// will be ignored, except this filter will be overriden by all_transactions=true
+    #[prost(bool, tag="5")]
+    pub all_slp_transactions: bool,
+    /// only transactions associated with the included tokenIds
+    #[prost(bytes="vec", repeated, tag="6")]
+    pub slp_token_ids: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+}
+/// SlpToken info used in transaction inputs / outputs
+///
+/// WARNING: Some languages (e.g., JavaScript) may not properly handle the 'uint64'
+/// for large amounts. For this reason, an annotation has been added for JS to
+/// return a string for the amount field instead of casting uint64 to the JS 'number'
+/// type. Other languages may require similar treatment.
+///
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpToken {
+    #[prost(bytes="vec", tag="1")]
+    pub token_id: ::prost::alloc::vec::Vec<u8>,
+    #[prost(uint64, tag="2")]
+    pub amount: u64,
+    #[prost(bool, tag="3")]
+    pub is_mint_baton: bool,
+    #[prost(string, tag="4")]
+    pub address: ::prost::alloc::string::String,
+    #[prost(uint32, tag="5")]
+    pub decimals: u32,
+    #[prost(enumeration="SlpAction", tag="6")]
+    pub slp_action: i32,
+    #[prost(enumeration="SlpTokenType", tag="7")]
+    pub token_type: i32,
+}
+/// SlpTransactionInfo is used inside the Transaction message type.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpTransactionInfo {
+    #[prost(enumeration="SlpAction", tag="1")]
+    pub slp_action: i32,
+    #[prost(enumeration="slp_transaction_info::ValidityJudgement", tag="2")]
+    pub validity_judgement: i32,
+    #[prost(string, tag="3")]
+    pub parse_error: ::prost::alloc::string::String,
+    #[prost(bytes="vec", tag="4")]
+    pub token_id: ::prost::alloc::vec::Vec<u8>,
+    #[prost(enumeration="slp_transaction_info::BurnFlags", repeated, tag="5")]
+    pub burn_flags: ::prost::alloc::vec::Vec<i32>,
+    #[prost(oneof="slp_transaction_info::TxMetadata", tags="6, 7, 8, 9, 10")]
+    pub tx_metadata: ::core::option::Option<slp_transaction_info::TxMetadata>,
+}
+/// Nested message and enum types in `SlpTransactionInfo`.
+pub mod slp_transaction_info {
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum ValidityJudgement {
+        UnknownOrInvalid = 0,
+        Valid = 1,
+    }
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum BurnFlags {
+        BurnedInputsOutputsTooHigh = 0,
+        BurnedInputsBadOpreturn = 1,
+        BurnedInputsOtherToken = 2,
+        BurnedOutputsMissingBchVout = 3,
+        BurnedInputsGreaterThanOutputs = 4,
+    }
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum TxMetadata {
+        /// NFT1 Group also uses this
+        #[prost(message, tag="6")]
+        V1Genesis(super::SlpV1GenesisMetadata),
+        /// NFT1 Group also uses this
+        #[prost(message, tag="7")]
+        V1Mint(super::SlpV1MintMetadata),
+        /// NFT1 Group also uses this
+        #[prost(message, tag="8")]
+        V1Send(super::SlpV1SendMetadata),
+        #[prost(message, tag="9")]
+        V1Nft1ChildGenesis(super::SlpV1Nft1ChildGenesisMetadata),
+        #[prost(message, tag="10")]
+        V1Nft1ChildSend(super::SlpV1Nft1ChildSendMetadata),
+    }
+}
+/// SlpV1GenesisMetadata is used to marshal type 1 and NFT1 Group GENESIS OP_RETURN scriptPubKey
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpV1GenesisMetadata {
+    #[prost(bytes="vec", tag="1")]
+    pub name: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes="vec", tag="2")]
+    pub ticker: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes="vec", tag="3")]
+    pub document_url: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes="vec", tag="4")]
+    pub document_hash: ::prost::alloc::vec::Vec<u8>,
+    #[prost(uint32, tag="5")]
+    pub decimals: u32,
+    #[prost(uint32, tag="6")]
+    pub mint_baton_vout: u32,
+    #[prost(uint64, tag="7")]
+    pub mint_amount: u64,
+}
+/// SlpV1MintMetadata is used to marshal type 1 MINT OP_RETURN scriptPubKey
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpV1MintMetadata {
+    #[prost(uint32, tag="1")]
+    pub mint_baton_vout: u32,
+    #[prost(uint64, tag="2")]
+    pub mint_amount: u64,
+}
+/// SlpV1SendMetadata is used to marshal type 1 and NFT1 Group SEND OP_RETURN scriptPubKey
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpV1SendMetadata {
+    #[prost(uint64, repeated, packed="false", tag="1")]
+    pub amounts: ::prost::alloc::vec::Vec<u64>,
+}
+/// SlpV1Nft1ChildGenesisMetadata is used to marshal NFT1 Child GENESIS OP_RETURN scriptPubKey
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpV1Nft1ChildGenesisMetadata {
+    #[prost(bytes="vec", tag="1")]
+    pub name: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes="vec", tag="2")]
+    pub ticker: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes="vec", tag="3")]
+    pub document_url: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes="vec", tag="4")]
+    pub document_hash: ::prost::alloc::vec::Vec<u8>,
+    #[prost(uint32, tag="5")]
+    pub decimals: u32,
+    #[prost(bytes="vec", tag="6")]
+    pub group_token_id: ::prost::alloc::vec::Vec<u8>,
+}
+/// SlpV1Nft1ChildSendMetadata is used to marshal NFT1 Child SEND OP_RETURN scriptPubKey
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpV1Nft1ChildSendMetadata {
+    #[prost(bytes="vec", tag="1")]
+    pub group_token_id: ::prost::alloc::vec::Vec<u8>,
+}
+/// SlpTokenMetadata is used to marshal metadata about a specific TokenID
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpTokenMetadata {
+    #[prost(bytes="vec", tag="1")]
+    pub token_id: ::prost::alloc::vec::Vec<u8>,
+    #[prost(enumeration="SlpTokenType", tag="2")]
+    pub token_type: i32,
+    #[prost(oneof="slp_token_metadata::TypeMetadata", tags="3, 4, 5")]
+    pub type_metadata: ::core::option::Option<slp_token_metadata::TypeMetadata>,
+}
+/// Nested message and enum types in `SlpTokenMetadata`.
+pub mod slp_token_metadata {
+    /// V1Fungible is used to marshal metadata specific to Type 1 token IDs
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct V1Fungible {
+        #[prost(string, tag="1")]
+        pub token_ticker: ::prost::alloc::string::String,
+        #[prost(string, tag="2")]
+        pub token_name: ::prost::alloc::string::String,
+        #[prost(string, tag="3")]
+        pub token_document_url: ::prost::alloc::string::String,
+        #[prost(bytes="vec", tag="4")]
+        pub token_document_hash: ::prost::alloc::vec::Vec<u8>,
+        #[prost(uint32, tag="5")]
+        pub decimals: u32,
+        #[prost(bytes="vec", tag="6")]
+        pub mint_baton_hash: ::prost::alloc::vec::Vec<u8>,
+        #[prost(uint32, tag="7")]
+        pub mint_baton_vout: u32,
+    }
+    /// V1NFT1Group is used to marshal metadata specific to NFT1 Group token IDs
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct V1nft1Group {
+        #[prost(string, tag="1")]
+        pub token_ticker: ::prost::alloc::string::String,
+        #[prost(string, tag="2")]
+        pub token_name: ::prost::alloc::string::String,
+        #[prost(string, tag="3")]
+        pub token_document_url: ::prost::alloc::string::String,
+        #[prost(bytes="vec", tag="4")]
+        pub token_document_hash: ::prost::alloc::vec::Vec<u8>,
+        #[prost(uint32, tag="5")]
+        pub decimals: u32,
+        #[prost(bytes="vec", tag="6")]
+        pub mint_baton_hash: ::prost::alloc::vec::Vec<u8>,
+        #[prost(uint32, tag="7")]
+        pub mint_baton_vout: u32,
+    }
+    /// V1NFT1Child is used to marshal metadata specific to NFT1 Child token IDs
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct V1nft1Child {
+        #[prost(string, tag="1")]
+        pub token_ticker: ::prost::alloc::string::String,
+        #[prost(string, tag="2")]
+        pub token_name: ::prost::alloc::string::String,
+        #[prost(string, tag="3")]
+        pub token_document_url: ::prost::alloc::string::String,
+        #[prost(bytes="vec", tag="4")]
+        pub token_document_hash: ::prost::alloc::vec::Vec<u8>,
+        #[prost(bytes="vec", tag="5")]
+        pub group_id: ::prost::alloc::vec::Vec<u8>,
+    }
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum TypeMetadata {
+        #[prost(message, tag="3")]
+        V1Fungible(V1Fungible),
+        #[prost(message, tag="4")]
+        V1Nft1Group(V1nft1Group),
+        #[prost(message, tag="5")]
+        V1Nft1Child(V1nft1Child),
+    }
+}
+/// SlpRequiredBurn is used by clients to allow token burning
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SlpRequiredBurn {
+    #[prost(message, optional, tag="1")]
+    pub outpoint: ::core::option::Option<transaction::input::Outpoint>,
+    #[prost(bytes="vec", tag="2")]
+    pub token_id: ::prost::alloc::vec::Vec<u8>,
+    #[prost(enumeration="SlpTokenType", tag="3")]
+    pub token_type: i32,
+    #[prost(oneof="slp_required_burn::BurnIntention", tags="4, 5")]
+    pub burn_intention: ::core::option::Option<slp_required_burn::BurnIntention>,
+}
+/// Nested message and enum types in `SlpRequiredBurn`.
+pub mod slp_required_burn {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum BurnIntention {
+        #[prost(uint64, tag="4")]
+        Amount(u64),
+        #[prost(uint32, tag="5")]
+        MintBatonVout(u32),
+    }
+}
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum SlpTokenType {
+    VersionNotSet = 0,
+    V1Fungible = 1,
+    V1Nft1Child = 65,
+    V1Nft1Group = 129,
+}
+/// SlpAction is used to allow clients to identify the type of slp transaction from this single field.
+///
+/// NOTE: All enum types except for "NON_SLP" may be annotated with one or more BurnFlags.
+///
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum SlpAction {
+    NonSlp = 0,
+    NonSlpBurn = 1,
+    SlpParseError = 2,
+    SlpUnsupportedVersion = 3,
+    SlpV1Genesis = 4,
+    SlpV1Mint = 5,
+    SlpV1Send = 6,
+    SlpV1Nft1GroupGenesis = 7,
+    SlpV1Nft1GroupMint = 8,
+    SlpV1Nft1GroupSend = 9,
+    SlpV1Nft1UniqueChildGenesis = 10,
+    SlpV1Nft1UniqueChildSend = 11,
+}
diff --git a/mm2src/coins/utxo/qtum.rs b/mm2src/coins/utxo/qtum.rs
index 6aebfa629d..cd9ba229af 100644
--- a/mm2src/coins/utxo/qtum.rs
+++ b/mm2src/coins/utxo/qtum.rs
@@ -1,14 +1,62 @@
 use super::*;
-use crate::{eth, CanRefundHtlc, CoinBalance, NegotiateSwapContractAddrErr, SwapOps, TradePreimageValue,
-            ValidateAddressResult, WithdrawFut};
+use crate::coin_balance::{self, EnableCoinBalanceError, HDAccountBalance, HDAddressBalance, HDWalletBalance,
+                          HDWalletBalanceOps};
+use crate::hd_pubkey::{ExtractExtendedPubkey, HDExtractPubkeyError, HDXPubExtractor};
+use crate::hd_wallet::{self, AccountUpdatingError, AddressDerivingError, GetNewHDAddressParams,
+                       GetNewHDAddressResponse, HDAccountMut, HDWalletRpcError, HDWalletRpcOps,
+                       NewAccountCreatingError};
+use crate::hd_wallet_storage::HDWalletCoinWithStorageOps;
+use crate::rpc_command::account_balance::{self, AccountBalanceParams, AccountBalanceRpcOps, HDAccountBalanceResponse};
+use crate::rpc_command::hd_account_balance_rpc_error::HDAccountBalanceRpcError;
+use crate::rpc_command::init_create_account::{self, CreateNewAccountParams, InitCreateHDAccountRpcOps};
+use crate::rpc_command::init_scan_for_new_addresses::{self, InitScanAddressesRpcOps, ScanAddressesParams,
+                                                      ScanAddressesResponse};
+use crate::rpc_command::init_withdraw::{InitWithdrawCoin, WithdrawTaskHandle};
+use crate::utxo::utxo_builder::{MergeUtxoArcOps, UtxoCoinBuildError, UtxoCoinBuilder, UtxoCoinBuilderCommonOps,
+                                UtxoFieldsWithHardwareWalletBuilder, UtxoFieldsWithIguanaPrivKeyBuilder};
+use crate::{eth, CanRefundHtlc, CoinBalance, CoinWithDerivationMethod, DelegationError, DelegationFut,
+            GetWithdrawSenderAddress, NegotiateSwapContractAddrErr, PrivKeyBuildPolicy, SearchForSwapTxSpendInput,
+            SignatureResult, StakingInfosFut, SwapOps, TradePreimageValue, TransactionFut, UnexpectedDerivationMethod,
+            ValidateAddressResult, ValidatePaymentInput, VerificationResult, WithdrawFut, WithdrawSenderAddress};
 use common::mm_metrics::MetricsArc;
-use common::mm_number::MmNumber;
+use crypto::trezor::utxo::TrezorUtxoCoin;
+use crypto::Bip44Chain;
 use ethereum_types::H160;
 use futures::{FutureExt, TryFutureExt};
+use keys::AddressHashEnum;
+use mm2_number::MmNumber;
+use serde::Serialize;
 use serialization::CoinVariant;
+use utxo_signer::UtxoSignerOps;
 
-pub const QTUM_STANDARD_DUST: u64 = 1000;
+#[derive(Debug, Display)]
+pub enum Qrc20AddressError {
+    UnexpectedDerivationMethod(String),
+    ScriptHashTypeNotSupported { script_hash_type: String },
+}
+
+impl From<UnexpectedDerivationMethod> for Qrc20AddressError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { Qrc20AddressError::UnexpectedDerivationMethod(e.to_string()) }
+}
+
+impl From<ScriptHashTypeNotSupported> for Qrc20AddressError {
+    fn from(e: ScriptHashTypeNotSupported) -> Self {
+        Qrc20AddressError::ScriptHashTypeNotSupported {
+            script_hash_type: e.script_hash_type,
+        }
+    }
+}
 
+#[derive(Debug, Display)]
+pub struct ScriptHashTypeNotSupported {
+    pub script_hash_type: String,
+}
+
+impl From<ScriptHashTypeNotSupported> for WithdrawError {
+    fn from(e: ScriptHashTypeNotSupported) -> Self { WithdrawError::InvalidAddress(e.to_string()) }
+}
+
+#[path = "qtum_delegation.rs"] mod qtum_delegation;
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "format")]
 pub enum QtumAddressFormat {
@@ -21,28 +69,25 @@ pub enum QtumAddressFormat {
     Contract,
 }
 
-#[async_trait]
-pub trait QtumBasedCoin: AsRef<UtxoCoinFields> + UtxoCommonOps + MarketCoinOps {
-    async fn qtum_balance(&self) -> BalanceResult<CoinBalance> {
-        let balance = self
-            .as_ref()
-            .rpc_client
-            .display_balance(self.as_ref().my_address.clone(), self.as_ref().decimals)
-            .compat()
-            .await?;
+pub trait QtumDelegationOps {
+    fn add_delegation(&self, request: QtumDelegationRequest) -> DelegationFut;
 
-        let unspendable = utxo_common::my_unspendable_balance(self, &balance).await?;
-        let spendable = &balance - &unspendable;
-        Ok(CoinBalance { spendable, unspendable })
-    }
+    fn get_delegation_infos(&self) -> StakingInfosFut;
 
+    fn remove_delegation(&self) -> DelegationFut;
+
+    fn generate_pod(&self, addr_hash: AddressHashEnum) -> Result<keys::Signature, MmError<DelegationError>>;
+}
+
+#[async_trait]
+pub trait QtumBasedCoin: UtxoCommonOps + MarketCoinOps {
     fn convert_to_address(&self, from: &str, to_address_format: Json) -> Result<String, String> {
         let to_address_format: QtumAddressFormat =
             json::from_value(to_address_format).map_err(|e| ERRL!("Error on parse Qtum address format {:?}", e))?;
         let from_address = try_s!(self.utxo_address_from_any_format(from));
         match to_address_format {
             QtumAddressFormat::Wallet => Ok(from_address.to_string()),
-            QtumAddressFormat::Contract => Ok(display_as_contract_address(from_address)),
+            QtumAddressFormat::Contract => Ok(try_s!(display_as_contract_address(from_address))),
         }
     }
 
@@ -62,8 +107,8 @@ pub trait QtumBasedCoin: AsRef<UtxoCoinFields> + UtxoCommonOps + MarketCoinOps {
         let utxo_segwit_err = match Address::from_segwitaddress(
             from,
             self.as_ref().conf.checksum_type,
-            self.as_ref().my_address.prefix,
-            self.as_ref().my_address.t_addr_prefix,
+            self.as_ref().conf.pub_addr_prefix,
+            self.as_ref().conf.pub_t_addr_prefix,
         ) {
             Ok(addr) => {
                 let is_segwit =
@@ -92,24 +137,27 @@ pub trait QtumBasedCoin: AsRef<UtxoCoinFields> + UtxoCommonOps + MarketCoinOps {
         Address {
             prefix: utxo.conf.pub_addr_prefix,
             t_addr_prefix: utxo.conf.pub_t_addr_prefix,
-            hash: address.0.into(),
+            hash: AddressHashEnum::AddressHash(address.0.into()),
             checksum_type: utxo.conf.checksum_type,
             hrp: utxo.conf.bech32_hrp.clone(),
-            addr_format: utxo.my_address.addr_format.clone(),
+            addr_format: self.addr_format().clone(),
         }
     }
 
-    fn my_addr_as_contract_addr(&self) -> H160 { contract_addr_from_utxo_addr(self.as_ref().my_address.clone()) }
+    fn my_addr_as_contract_addr(&self) -> MmResult<H160, Qrc20AddressError> {
+        let my_address = self.as_ref().derivation_method.iguana_or_err()?.clone();
+        contract_addr_from_utxo_addr(my_address).mm_err(Qrc20AddressError::from)
+    }
 
     fn utxo_address_from_contract_addr(&self, address: H160) -> Address {
         let utxo = self.as_ref();
         Address {
             prefix: utxo.conf.pub_addr_prefix,
             t_addr_prefix: utxo.conf.pub_t_addr_prefix,
-            hash: address.0.into(),
+            hash: AddressHashEnum::AddressHash(address.0.into()),
             checksum_type: utxo.conf.checksum_type,
             hrp: utxo.conf.bech32_hrp.clone(),
-            addr_format: utxo.my_address.addr_format.clone(),
+            addr_format: self.addr_format().clone(),
         }
     }
 
@@ -121,9 +169,10 @@ pub trait QtumBasedCoin: AsRef<UtxoCoinFields> + UtxoCommonOps + MarketCoinOps {
             utxo.conf.pub_t_addr_prefix,
             utxo.conf.checksum_type,
             utxo.conf.bech32_hrp.clone(),
-            utxo.my_address.addr_format.clone()
+            self.addr_format().clone()
         ));
-        Ok(qtum::contract_addr_from_utxo_addr(qtum_address))
+        let contract_addr = try_s!(contract_addr_from_utxo_addr(qtum_address));
+        Ok(contract_addr)
     }
 
     fn is_qtum_unspent_mature(&self, output: &RpcTransaction) -> bool {
@@ -133,6 +182,69 @@ pub trait QtumBasedCoin: AsRef<UtxoCoinFields> + UtxoCommonOps + MarketCoinOps {
     }
 }
 
+pub struct QtumCoinBuilder<'a> {
+    ctx: &'a MmArc,
+    ticker: &'a str,
+    conf: &'a Json,
+    activation_params: &'a UtxoActivationParams,
+    priv_key_policy: PrivKeyBuildPolicy<'a>,
+}
+
+#[async_trait]
+impl<'a> UtxoCoinBuilderCommonOps for QtumCoinBuilder<'a> {
+    fn ctx(&self) -> &MmArc { self.ctx }
+
+    fn conf(&self) -> &Json { self.conf }
+
+    fn activation_params(&self) -> &UtxoActivationParams { self.activation_params }
+
+    fn ticker(&self) -> &str { self.ticker }
+
+    fn check_utxo_maturity(&self) -> bool { self.activation_params().check_utxo_maturity.unwrap_or(true) }
+}
+
+impl<'a> UtxoFieldsWithIguanaPrivKeyBuilder for QtumCoinBuilder<'a> {}
+
+impl<'a> UtxoFieldsWithHardwareWalletBuilder for QtumCoinBuilder<'a> {}
+
+#[async_trait]
+impl<'a> UtxoCoinBuilder for QtumCoinBuilder<'a> {
+    type ResultCoin = QtumCoin;
+    type Error = UtxoCoinBuildError;
+
+    fn priv_key_policy(&self) -> PrivKeyBuildPolicy<'_> { self.priv_key_policy.clone() }
+
+    async fn build(self) -> MmResult<Self::ResultCoin, Self::Error> {
+        let utxo = self.build_utxo_fields().await?;
+        let utxo_arc = UtxoArc::new(utxo);
+        let utxo_weak = utxo_arc.downgrade();
+        let result_coin = QtumCoin::from(utxo_arc);
+
+        self.spawn_merge_utxo_loop_if_required(utxo_weak, QtumCoin::from);
+        Ok(result_coin)
+    }
+}
+
+impl<'a> MergeUtxoArcOps<QtumCoin> for QtumCoinBuilder<'a> {}
+
+impl<'a> QtumCoinBuilder<'a> {
+    pub fn new(
+        ctx: &'a MmArc,
+        ticker: &'a str,
+        conf: &'a Json,
+        activation_params: &'a UtxoActivationParams,
+        priv_key_policy: PrivKeyBuildPolicy<'a>,
+    ) -> Self {
+        QtumCoinBuilder {
+            ctx,
+            ticker,
+            conf,
+            activation_params,
+            priv_key_policy,
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct QtumCoin {
     utxo_arc: UtxoArc,
@@ -150,25 +262,118 @@ impl From<QtumCoin> for UtxoArc {
     fn from(coin: QtumCoin) -> Self { coin.utxo_arc }
 }
 
-pub async fn qtum_coin_from_conf_and_request(
+pub async fn qtum_coin_with_priv_key(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
-    req: &Json,
+    activation_params: &UtxoActivationParams,
     priv_key: &[u8],
 ) -> Result<QtumCoin, String> {
-    let coin: QtumCoin = try_s!(utxo_common::utxo_arc_from_conf_and_request(ctx, ticker, conf, req, priv_key).await);
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    let coin = try_s!(
+        QtumCoinBuilder::new(ctx, ticker, conf, activation_params, priv_key_policy)
+            .build()
+            .await
+    );
     Ok(coin)
 }
 
 impl QtumBasedCoin for QtumCoin {}
 
+#[derive(Clone, Debug, Deserialize)]
+pub struct QtumDelegationRequest {
+    pub address: String,
+    pub fee: Option<u64>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct QtumStakingInfosDetails {
+    pub amount: BigDecimal,
+    pub staker: Option<String>,
+    pub am_i_staking: bool,
+    pub is_staking_supported: bool,
+}
+
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
 #[async_trait]
 #[cfg_attr(test, mockable)]
-impl UtxoCommonOps for QtumCoin {
-    async fn get_tx_fee(&self) -> Result<ActualTxFee, JsonRpcError> { utxo_common::get_tx_fee(&self.utxo_arc).await }
+impl UtxoTxBroadcastOps for QtumCoin {
+    async fn broadcast_tx(&self, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>> {
+        utxo_common::broadcast_tx(self, tx).await
+    }
+}
 
-    async fn get_htlc_spend_fee(&self) -> UtxoRpcResult<u64> { utxo_common::get_htlc_spend_fee(self).await }
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoTxGenerationOps for QtumCoin {
+    async fn get_tx_fee(&self) -> UtxoRpcResult<ActualTxFee> { utxo_common::get_tx_fee(&self.utxo_arc).await }
+
+    async fn calc_interest_if_required(
+        &self,
+        unsigned: TransactionInputSigner,
+        data: AdditionalTxData,
+        my_script_pub: Bytes,
+    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
+        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl GetUtxoListOps for QtumCoin {
+    async fn get_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_unspent_ordered_list(self, address).await
+    }
+
+    async fn get_all_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_all_unspent_ordered_list(self, address).await
+    }
+
+    async fn get_mature_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(MatureUnspentList, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_mature_unspent_ordered_list(self, address).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl GetUtxoMapOps for QtumCoin {
+    async fn get_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_unspent_ordered_map(self, addresses).await
+    }
+
+    async fn get_all_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_all_unspent_ordered_map(self, addresses).await
+    }
+
+    async fn get_mature_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(MatureUnspentMap, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_mature_unspent_ordered_map(self, addresses).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoCommonOps for QtumCoin {
+    async fn get_htlc_spend_fee(&self, tx_size: u64) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size).await
+    }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
         utxo_common::addresses_from_script(self, script)
@@ -176,10 +381,12 @@ impl UtxoCommonOps for QtumCoin {
 
     fn denominate_satoshis(&self, satoshi: i64) -> f64 { utxo_common::denominate_satoshis(&self.utxo_arc, satoshi) }
 
-    fn my_public_key(&self) -> &Public { self.utxo_arc.key_pair.public() }
+    fn my_public_key(&self) -> Result<&Public, MmError<UnexpectedDerivationMethod>> {
+        utxo_common::my_public_key(self.as_ref())
+    }
 
     fn address_from_str(&self, address: &str) -> Result<Address, String> {
-        utxo_common::checked_address_from_str(&self.utxo_arc, address)
+        utxo_common::checked_address_from_str(self, address)
     }
 
     async fn get_current_mtp(&self) -> UtxoRpcResult<u32> {
@@ -188,26 +395,6 @@ impl UtxoCommonOps for QtumCoin {
 
     fn is_unspent_mature(&self, output: &RpcTransaction) -> bool { self.is_qtum_unspent_mature(output) }
 
-    async fn generate_transaction(
-        &self,
-        utxos: Vec<UnspentInfo>,
-        outputs: Vec<TransactionOutput>,
-        fee_policy: FeePolicy,
-        fee: Option<ActualTxFee>,
-        gas_fee: Option<u64>,
-    ) -> GenerateTxResult {
-        utxo_common::generate_transaction(self, utxos, outputs, fee_policy, fee, gas_fee).await
-    }
-
-    async fn calc_interest_if_required(
-        &self,
-        unsigned: TransactionInputSigner,
-        data: AdditionalTxData,
-        my_script_pub: Bytes,
-    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
-        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
-    }
-
     async fn calc_interest_of_tx(
         &self,
         _tx: &UtxoTx,
@@ -226,54 +413,19 @@ impl UtxoCommonOps for QtumCoin {
         utxo_common::get_mut_verbose_transaction_from_map_or_rpc(self, tx_hash, utxo_tx_map).await
     }
 
-    async fn p2sh_spending_tx(
-        &self,
-        prev_transaction: UtxoTx,
-        redeem_script: Bytes,
-        outputs: Vec<TransactionOutput>,
-        script_data: Script,
-        sequence: u32,
-        lock_time: u32,
-    ) -> Result<UtxoTx, String> {
-        utxo_common::p2sh_spending_tx(
-            self,
-            prev_transaction,
-            redeem_script,
-            outputs,
-            script_data,
-            sequence,
-            lock_time,
-        )
-        .await
+    async fn p2sh_spending_tx(&self, input: utxo_common::P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String> {
+        utxo_common::p2sh_spending_tx(self, input).await
     }
 
-    async fn ordered_mature_unspents<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::ordered_mature_unspents(self, address).await
-    }
-
-    fn get_verbose_transaction_from_cache_or_rpc(
+    fn get_verbose_transactions_from_cache_or_rpc(
         &self,
-        txid: H256Json,
-    ) -> Box<dyn Future<Item = VerboseTransactionFrom, Error = String> + Send> {
+        tx_ids: HashSet<H256Json>,
+    ) -> UtxoRpcFut<HashMap<H256Json, VerboseTransactionFrom>> {
         let selfi = self.clone();
-        let fut = async move { utxo_common::get_verbose_transaction_from_cache_or_rpc(&selfi.utxo_arc, txid).await };
+        let fut = async move { utxo_common::get_verbose_transactions_from_cache_or_rpc(&selfi.utxo_arc, tx_ids).await };
         Box::new(fut.boxed().compat())
     }
 
-    async fn cache_transaction_if_possible(&self, tx: &RpcTransaction) -> Result<(), String> {
-        utxo_common::cache_transaction_if_possible(&self.utxo_arc, tx).await
-    }
-
-    async fn list_unspent_ordered<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::ordered_mature_unspents(self, address).await
-    }
-
     async fn preimage_trade_fee_required_to_send_outputs(
         &self,
         outputs: Vec<TransactionOutput>,
@@ -281,7 +433,15 @@ impl UtxoCommonOps for QtumCoin {
         gas_fee: Option<u64>,
         stage: &FeeApproxStage,
     ) -> TradePreimageResult<BigDecimal> {
-        utxo_common::preimage_trade_fee_required_to_send_outputs(self, outputs, fee_policy, gas_fee, stage).await
+        utxo_common::preimage_trade_fee_required_to_send_outputs(
+            self,
+            self.ticker(),
+            outputs,
+            fee_policy,
+            gas_fee,
+            stage,
+        )
+        .await
     }
 
     fn increase_dynamic_fee_by_stage(&self, dynamic_fee: u64, stage: &FeeApproxStage) -> u64 {
@@ -292,9 +452,23 @@ impl UtxoCommonOps for QtumCoin {
         utxo_common::p2sh_tx_locktime(self, &self.utxo_arc.conf.ticker, htlc_locktime).await
     }
 
+    fn addr_format(&self) -> &UtxoAddressFormat { utxo_common::addr_format(self) }
+
     fn addr_format_for_standard_scripts(&self) -> UtxoAddressFormat {
         utxo_common::addr_format_for_standard_scripts(self)
     }
+
+    fn address_from_pubkey(&self, pubkey: &Public) -> Address {
+        let conf = &self.utxo_arc.conf;
+        utxo_common::address_from_pubkey(
+            pubkey,
+            conf.pub_addr_prefix,
+            conf.pub_t_addr_prefix,
+            conf.checksum_type,
+            conf.bech32_hrp.clone(),
+            self.addr_format().clone(),
+        )
+    }
 }
 
 #[async_trait]
@@ -320,8 +494,9 @@ impl UtxoStandardOps for QtumCoin {
     }
 }
 
+#[async_trait]
 impl SwapOps for QtumCoin {
-    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal) -> TransactionFut {
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
         utxo_common::send_taker_fee(self.clone(), fee_addr, amount)
     }
 
@@ -332,8 +507,16 @@ impl SwapOps for QtumCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_maker_payment(self.clone(), time_lock, taker_pub, secret_hash, amount)
+        utxo_common::send_maker_payment(
+            self.clone(),
+            time_lock,
+            taker_pub,
+            secret_hash,
+            amount,
+            swap_unique_data,
+        )
     }
 
     fn send_taker_payment(
@@ -343,52 +526,92 @@ impl SwapOps for QtumCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_taker_payment(self.clone(), time_lock, maker_pub, secret_hash, amount)
+        utxo_common::send_taker_payment(
+            self.clone(),
+            time_lock,
+            maker_pub,
+            secret_hash,
+            amount,
+            swap_unique_data,
+        )
     }
 
     fn send_maker_spends_taker_payment(
         &self,
-        taker_payment_tx: &[u8],
+        taker_tx: &[u8],
         time_lock: u32,
         taker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_maker_spends_taker_payment(self.clone(), taker_payment_tx, time_lock, taker_pub, secret)
+        utxo_common::send_maker_spends_taker_payment(
+            self.clone(),
+            taker_tx,
+            time_lock,
+            taker_pub,
+            secret,
+            swap_unique_data,
+        )
     }
 
     fn send_taker_spends_maker_payment(
         &self,
-        maker_payment_tx: &[u8],
+        maker_tx: &[u8],
         time_lock: u32,
         maker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_taker_spends_maker_payment(self.clone(), maker_payment_tx, time_lock, maker_pub, secret)
+        utxo_common::send_taker_spends_maker_payment(
+            self.clone(),
+            maker_tx,
+            time_lock,
+            maker_pub,
+            secret,
+            swap_unique_data,
+        )
     }
 
     fn send_taker_refunds_payment(
         &self,
-        taker_payment_tx: &[u8],
+        taker_tx: &[u8],
         time_lock: u32,
         maker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_taker_refunds_payment(self.clone(), taker_payment_tx, time_lock, maker_pub, secret_hash)
+        utxo_common::send_taker_refunds_payment(
+            self.clone(),
+            taker_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
     }
 
     fn send_maker_refunds_payment(
         &self,
-        maker_payment_tx: &[u8],
+        maker_tx: &[u8],
         time_lock: u32,
         taker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_maker_refunds_payment(self.clone(), maker_payment_tx, time_lock, taker_pub, secret_hash)
+        utxo_common::send_maker_refunds_payment(
+            self.clone(),
+            maker_tx,
+            time_lock,
+            taker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
     }
 
     fn validate_fee(
@@ -398,6 +621,7 @@ impl SwapOps for QtumCoin {
         fee_addr: &[u8],
         amount: &BigDecimal,
         min_block_number: u64,
+        _uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let tx = match fee_tx {
             TransactionEnum::UtxoTx(tx) => tx.clone(),
@@ -414,28 +638,12 @@ impl SwapOps for QtumCoin {
         )
     }
 
-    fn validate_maker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        utxo_common::validate_maker_payment(self, payment_tx, time_lock, maker_pub, priv_bn_hash, amount)
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_maker_payment(self, input)
     }
 
-    fn validate_taker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        utxo_common::validate_taker_payment(self, payment_tx, time_lock, taker_pub, priv_bn_hash, amount)
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_taker_payment(self, input)
     }
 
     fn check_if_my_payment_sent(
@@ -445,48 +653,23 @@ impl SwapOps for QtumCoin {
         secret_hash: &[u8],
         _search_from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
-        utxo_common::check_if_my_payment_sent(self.clone(), time_lock, other_pub, secret_hash)
+        utxo_common::check_if_my_payment_sent(self.clone(), time_lock, other_pub, secret_hash, swap_unique_data)
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_my(
-            &self.utxo_arc,
-            time_lock,
-            other_pub,
-            secret_hash,
-            tx,
-            utxo_common::DEFAULT_SWAP_VOUT,
-            search_from_block,
-        )
+        utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_other(
-            &self.utxo_arc,
-            time_lock,
-            other_pub,
-            secret_hash,
-            tx,
-            utxo_common::DEFAULT_SWAP_VOUT,
-            search_from_block,
-        )
+        utxo_common::search_for_swap_tx_spend_other(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
     fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
@@ -508,6 +691,10 @@ impl SwapOps for QtumCoin {
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
         Ok(None)
     }
+
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
+    }
 }
 
 impl MarketCoinOps for QtumCoin {
@@ -515,18 +702,39 @@ impl MarketCoinOps for QtumCoin {
 
     fn my_address(&self) -> Result<String, String> { utxo_common::my_address(self) }
 
-    fn my_balance(&self) -> BalanceFut<CoinBalance> {
-        let selfi = self.clone();
-        let fut = async move { selfi.qtum_balance().await };
-        Box::new(fut.boxed().compat())
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        let pubkey = utxo_common::my_public_key(&self.utxo_arc)?;
+        Ok(pubkey.to_string())
     }
 
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
+        utxo_common::sign_message_hash(self.as_ref(), message)
+    }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        utxo_common::sign_message(self.as_ref(), message)
+    }
+
+    fn verify_message(&self, signature_base64: &str, message: &str, address: &str) -> VerificationResult<bool> {
+        utxo_common::verify_message(self, signature_base64, message, address)
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> { utxo_common::my_balance(self.clone()) }
+
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> { utxo_common::base_coin_balance(self) }
 
+    fn platform_ticker(&self) -> &str { self.ticker() }
+
+    #[inline(always)]
     fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
         utxo_common::send_raw_tx(&self.utxo_arc, tx)
     }
 
+    #[inline(always)]
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        utxo_common::send_raw_tx_bytes(&self.utxo_arc, tx)
+    }
+
     fn wait_for_confirmations(
         &self,
         tx: &[u8],
@@ -569,16 +777,21 @@ impl MarketCoinOps for QtumCoin {
         utxo_common::current_block(&self.utxo_arc)
     }
 
-    fn display_priv_key(&self) -> String { utxo_common::display_priv_key(&self.utxo_arc) }
+    fn display_priv_key(&self) -> Result<String, String> { utxo_common::display_priv_key(&self.utxo_arc) }
 
     fn min_tx_amount(&self) -> BigDecimal { utxo_common::min_tx_amount(self.as_ref()) }
 
     fn min_trading_vol(&self) -> MmNumber { utxo_common::min_trading_vol(self.as_ref()) }
 }
 
+#[async_trait]
 impl MmCoin for QtumCoin {
     fn is_asset_chain(&self) -> bool { utxo_common::is_asset_chain(&self.utxo_arc) }
 
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
+    }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
         Box::new(utxo_common::withdraw(self.clone(), req).boxed().compat())
     }
@@ -607,20 +820,24 @@ impl MmCoin for QtumCoin {
         utxo_common::get_trade_fee(self.clone())
     }
 
-    fn get_sender_trade_fee(&self, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
-        utxo_common::get_sender_trade_fee(self.clone(), value, stage)
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        utxo_common::get_sender_trade_fee(self, value, stage).await
     }
 
     fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         utxo_common::get_receiver_trade_fee(self.clone())
     }
 
-    fn get_fee_to_send_taker_fee(
+    async fn get_fee_to_send_taker_fee(
         &self,
         dex_fee_amount: BigDecimal,
         stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee> {
-        utxo_common::get_fee_to_send_taker_fee(self.clone(), dex_fee_amount, stage)
+    ) -> TradePreimageResult<TradeFee> {
+        utxo_common::get_fee_to_send_taker_fee(self, dex_fee_amount, stage).await
     }
 
     fn required_confirmations(&self) -> u64 { utxo_common::required_confirmations(&self.utxo_arc) }
@@ -639,10 +856,213 @@ impl MmCoin for QtumCoin {
 
     fn mature_confirmations(&self) -> Option<u32> { Some(self.utxo_arc.conf.mature_confirmations) }
 
-    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(&self.utxo_arc) }
+    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(self) }
 
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
-        utxo_common::is_coin_protocol_supported(&self.utxo_arc, info)
+        utxo_common::is_coin_protocol_supported(self, info)
+    }
+}
+
+#[async_trait]
+impl GetWithdrawSenderAddress for QtumCoin {
+    type Address = Address;
+    type Pubkey = Public;
+
+    async fn get_withdraw_sender_address(
+        &self,
+        req: &WithdrawRequest,
+    ) -> MmResult<WithdrawSenderAddress<Self::Address, Self::Pubkey>, WithdrawError> {
+        utxo_common::get_withdraw_from_address(self, req).await
+    }
+}
+
+#[async_trait]
+impl InitWithdrawCoin for QtumCoin {
+    async fn init_withdraw(
+        &self,
+        ctx: MmArc,
+        req: WithdrawRequest,
+        task_handle: &WithdrawTaskHandle,
+    ) -> Result<TransactionDetails, MmError<WithdrawError>> {
+        utxo_common::init_withdraw(ctx, self.clone(), req, task_handle).await
+    }
+}
+
+impl UtxoSignerOps for QtumCoin {
+    type TxGetter = UtxoRpcClientEnum;
+
+    fn trezor_coin(&self) -> UtxoSignTxResult<TrezorUtxoCoin> {
+        self.utxo_arc
+            .conf
+            .trezor_coin
+            .or_mm_err(|| UtxoSignTxError::CoinNotSupportedWithTrezor {
+                coin: self.utxo_arc.conf.ticker.clone(),
+            })
+    }
+
+    fn fork_id(&self) -> u32 { self.utxo_arc.conf.fork_id }
+
+    fn branch_id(&self) -> u32 { self.utxo_arc.conf.consensus_branch_id }
+
+    fn tx_provider(&self) -> Self::TxGetter { self.utxo_arc.rpc_client.clone() }
+}
+
+impl CoinWithDerivationMethod for QtumCoin {
+    type Address = Address;
+    type HDWallet = UtxoHDWallet;
+
+    fn derivation_method(&self) -> &DerivationMethod<Self::Address, Self::HDWallet> {
+        utxo_common::derivation_method(self.as_ref())
+    }
+}
+
+#[async_trait]
+impl ExtractExtendedPubkey for QtumCoin {
+    type ExtendedPublicKey = Secp256k1ExtendedPublicKey;
+
+    async fn extract_extended_pubkey<XPubExtractor>(
+        &self,
+        xpub_extractor: &XPubExtractor,
+        derivation_path: DerivationPath,
+    ) -> MmResult<Self::ExtendedPublicKey, HDExtractPubkeyError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        utxo_common::extract_extended_pubkey(&self.utxo_arc.conf, xpub_extractor, derivation_path).await
+    }
+}
+
+#[async_trait]
+impl HDWalletCoinOps for QtumCoin {
+    type Address = Address;
+    type Pubkey = Public;
+    type HDWallet = UtxoHDWallet;
+    type HDAccount = UtxoHDAccount;
+
+    fn derive_address(
+        &self,
+        hd_account: &Self::HDAccount,
+        chain: Bip44Chain,
+        address_id: u32,
+    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, AddressDerivingError> {
+        utxo_common::derive_address(self, hd_account, chain, address_id)
+    }
+
+    async fn create_new_account<'a, XPubExtractor>(
+        &self,
+        hd_wallet: &'a Self::HDWallet,
+        xpub_extractor: &XPubExtractor,
+    ) -> MmResult<HDAccountMut<'a, Self::HDAccount>, NewAccountCreatingError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        utxo_common::create_new_account(self, hd_wallet, xpub_extractor).await
+    }
+
+    async fn set_known_addresses_number(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        chain: Bip44Chain,
+        new_known_addresses_number: u32,
+    ) -> MmResult<(), AccountUpdatingError> {
+        utxo_common::set_known_addresses_number(self, hd_wallet, hd_account, chain, new_known_addresses_number).await
+    }
+}
+
+#[async_trait]
+impl HDWalletBalanceOps for QtumCoin {
+    type HDAddressScanner = UtxoAddressScanner;
+
+    async fn produce_hd_address_scanner(&self) -> BalanceResult<Self::HDAddressScanner> {
+        utxo_common::produce_hd_address_scanner(self).await
+    }
+
+    async fn enable_hd_wallet<XPubExtractor>(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        xpub_extractor: &XPubExtractor,
+        scan_policy: EnableCoinScanPolicy,
+    ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        coin_balance::common_impl::enable_hd_wallet(self, hd_wallet, xpub_extractor, scan_policy).await
+    }
+
+    async fn scan_for_new_addresses(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        address_scanner: &Self::HDAddressScanner,
+        gap_limit: u32,
+    ) -> BalanceResult<Vec<HDAddressBalance>> {
+        utxo_common::scan_for_new_addresses(self, hd_wallet, hd_account, address_scanner, gap_limit).await
+    }
+
+    async fn all_known_addresses_balances(&self, hd_account: &Self::HDAccount) -> BalanceResult<Vec<HDAddressBalance>> {
+        utxo_common::all_known_addresses_balances(self, hd_account).await
+    }
+
+    async fn known_address_balance(&self, address: &Self::Address) -> BalanceResult<CoinBalance> {
+        utxo_common::address_balance(self, address).await
+    }
+
+    async fn known_addresses_balances(
+        &self,
+        addresses: Vec<Self::Address>,
+    ) -> BalanceResult<Vec<(Self::Address, CoinBalance)>> {
+        utxo_common::addresses_balances(self, addresses).await
+    }
+}
+
+impl HDWalletCoinWithStorageOps for QtumCoin {
+    fn hd_wallet_storage<'a>(&self, hd_wallet: &'a Self::HDWallet) -> &'a HDWalletCoinStorage {
+        &hd_wallet.hd_wallet_storage
+    }
+}
+
+#[async_trait]
+impl HDWalletRpcOps for QtumCoin {
+    async fn get_new_address_rpc(
+        &self,
+        params: GetNewHDAddressParams,
+    ) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError> {
+        hd_wallet::common_impl::get_new_address_rpc(self, params).await
+    }
+}
+
+#[async_trait]
+impl AccountBalanceRpcOps for QtumCoin {
+    async fn account_balance_rpc(
+        &self,
+        params: AccountBalanceParams,
+    ) -> MmResult<HDAccountBalanceResponse, HDAccountBalanceRpcError> {
+        account_balance::common_impl::account_balance_rpc(self, params).await
+    }
+}
+
+#[async_trait]
+impl InitScanAddressesRpcOps for QtumCoin {
+    async fn init_scan_for_new_addresses_rpc(
+        &self,
+        params: ScanAddressesParams,
+    ) -> MmResult<ScanAddressesResponse, HDAccountBalanceRpcError> {
+        init_scan_for_new_addresses::common_impl::scan_for_new_addresses_rpc(self, params).await
+    }
+}
+
+#[async_trait]
+impl InitCreateHDAccountRpcOps for QtumCoin {
+    async fn init_create_account_rpc<XPubExtractor>(
+        &self,
+        params: CreateNewAccountParams,
+        xpub_extractor: &XPubExtractor,
+    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        init_create_account::common_impl::init_create_new_account_rpc(self, params, xpub_extractor).await
     }
 }
 
@@ -650,9 +1070,16 @@ impl MmCoin for QtumCoin {
 /// Qtum Contract addresses have another checksum verification algorithm, because of this do not use [`eth::valid_addr_from_str`].
 pub fn contract_addr_from_str(addr: &str) -> Result<H160, String> { eth::addr_from_str(addr) }
 
-pub fn contract_addr_from_utxo_addr(address: Address) -> H160 { address.hash.take().into() }
+pub fn contract_addr_from_utxo_addr(address: Address) -> MmResult<H160, ScriptHashTypeNotSupported> {
+    match address.hash {
+        AddressHashEnum::AddressHash(h) => Ok(h.take().into()),
+        AddressHashEnum::WitnessScriptHash(_) => MmError::err(ScriptHashTypeNotSupported {
+            script_hash_type: "Witness".to_owned(),
+        }),
+    }
+}
 
-pub fn display_as_contract_address(address: Address) -> String {
-    let address = qtum::contract_addr_from_utxo_addr(address);
-    format!("{:#02x}", address)
+pub fn display_as_contract_address(address: Address) -> MmResult<String, ScriptHashTypeNotSupported> {
+    let address = qtum::contract_addr_from_utxo_addr(address)?;
+    Ok(format!("{:#02x}", address))
 }
diff --git a/mm2src/coins/utxo/qtum_delegation.rs b/mm2src/coins/utxo/qtum_delegation.rs
new file mode 100644
index 0000000000..4a532a3716
--- /dev/null
+++ b/mm2src/coins/utxo/qtum_delegation.rs
@@ -0,0 +1,386 @@
+use crate::qrc20::rpc_clients::Qrc20ElectrumOps;
+use crate::qrc20::script_pubkey::generate_contract_call_script_pubkey;
+use crate::qrc20::{contract_addr_into_rpc_format, ContractCallOutput, GenerateQrc20TxResult, Qrc20AbiError,
+                   Qrc20FeeDetails, OUTPUT_QTUM_AMOUNT, QRC20_DUST, QRC20_GAS_LIMIT_DEFAULT, QRC20_GAS_PRICE_DEFAULT};
+use crate::utxo::qtum::{QtumBasedCoin, QtumCoin, QtumDelegationOps, QtumDelegationRequest, QtumStakingInfosDetails};
+use crate::utxo::rpc_clients::UtxoRpcClientEnum;
+use crate::utxo::utxo_common::{big_decimal_from_sat_unsigned, UtxoTxBuilder};
+use crate::utxo::{qtum, utxo_common, Address, GetUtxoListOps, UtxoCommonOps};
+use crate::utxo::{PrivKeyNotAllowed, UTXO_LOCK};
+use crate::{DelegationError, DelegationFut, DelegationResult, MarketCoinOps, StakingInfos, StakingInfosError,
+            StakingInfosFut, StakingInfosResult, TransactionDetails, TransactionType};
+use bitcrypto::dhash256;
+use common::now_ms;
+use derive_more::Display;
+use ethabi::{Contract, Token};
+use ethereum_types::H160;
+use futures::compat::Future01CompatExt;
+use futures::{FutureExt, TryFutureExt};
+use keys::{AddressHashEnum, Signature};
+use mm2_err_handle::prelude::*;
+use mm2_number::bigdecimal::{BigDecimal, Zero};
+use rpc::v1::types::ToTxHash;
+use script::Builder as ScriptBuilder;
+use serialization::serialize;
+use std::convert::TryInto;
+use std::str::FromStr;
+use utxo_signer::with_key_pair::sign_tx;
+
+pub const QTUM_DELEGATION_STANDARD_FEE: u64 = 10;
+pub const QTUM_LOWER_BOUND_DELEGATION_AMOUNT: f64 = 100.0;
+pub const QRC20_GAS_LIMIT_DELEGATION: u64 = 2_250_000;
+pub const QTUM_ADD_DELEGATION_TOPIC: &str = "a23803f3b2b56e71f2921c22b23c32ef596a439dbe03f7250e6b58a30eb910b5";
+pub const QTUM_REMOVE_DELEGATION_TOPIC: &str = "7fe28d2d0b16cf95b5ea93f4305f89133b3892543e616381a1336fc1e7a01fa0";
+const QTUM_DELEGATE_CONTRACT_ABI: &str = r#"[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_staker","type":"address"},{"indexed":true,"internalType":"address","name":"_delegate","type":"address"},{"indexed":false,"internalType":"uint8","name":"fee","type":"uint8"},{"indexed":false,"internalType":"uint256","name":"blockHeight","type":"uint256"},{"indexed":false,"internalType":"bytes","name":"PoD","type":"bytes"}],"name":"AddDelegation","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_staker","type":"address"},{"indexed":true,"internalType":"address","name":"_delegate","type":"address"}],"name":"RemoveDelegation","type":"event"},{"constant":false,"inputs":[{"internalType":"address","name":"_staker","type":"address"},{"internalType":"uint8","name":"_fee","type":"uint8"},{"internalType":"bytes","name":"_PoD","type":"bytes"}],"name":"addDelegation","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"delegations","outputs":[{"internalType":"address","name":"staker","type":"address"},{"internalType":"uint8","name":"fee","type":"uint8"},{"internalType":"uint256","name":"blockHeight","type":"uint256"},{"internalType":"bytes","name":"PoD","type":"bytes"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"removeDelegation","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]"#;
+
+lazy_static! {
+    pub static ref QTUM_DELEGATE_CONTRACT: Contract = Contract::load(QTUM_DELEGATE_CONTRACT_ABI.as_bytes()).unwrap();
+    pub static ref QTUM_DELEGATE_CONTRACT_ADDRESS: H160 =
+        H160::from_str("0000000000000000000000000000000000000086").unwrap();
+}
+
+pub type QtumStakingAbiResult<T> = Result<T, MmError<QtumStakingAbiError>>;
+
+#[derive(Debug, Display)]
+pub enum QtumStakingAbiError {
+    #[display(fmt = "Invalid QRC20 ABI params: {}", _0)]
+    InvalidParams(String),
+    #[display(fmt = "QRC20 ABI error: {}", _0)]
+    AbiError(String),
+    #[display(fmt = "Qtum POD error: {}", _0)]
+    PodSigningError(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<Qrc20AbiError> for QtumStakingAbiError {
+    fn from(e: Qrc20AbiError) -> Self {
+        match e {
+            Qrc20AbiError::InvalidParams(e) => QtumStakingAbiError::InvalidParams(e),
+            Qrc20AbiError::AbiError(e) => QtumStakingAbiError::AbiError(e),
+        }
+    }
+}
+
+impl From<QtumStakingAbiError> for DelegationError {
+    fn from(e: QtumStakingAbiError) -> Self { DelegationError::CannotInteractWithSmartContract(e.to_string()) }
+}
+
+impl From<ethabi::Error> for QtumStakingAbiError {
+    fn from(e: ethabi::Error) -> QtumStakingAbiError { QtumStakingAbiError::AbiError(e.to_string()) }
+}
+
+impl From<ethabi::Error> for DelegationError {
+    fn from(e: ethabi::Error) -> Self { DelegationError::from(QtumStakingAbiError::from(e)) }
+}
+
+impl From<Qrc20AbiError> for DelegationError {
+    fn from(e: Qrc20AbiError) -> Self { DelegationError::from(QtumStakingAbiError::from(e)) }
+}
+
+impl From<PrivKeyNotAllowed> for QtumStakingAbiError {
+    fn from(e: PrivKeyNotAllowed) -> Self { QtumStakingAbiError::Internal(e.to_string()) }
+}
+
+impl QtumDelegationOps for QtumCoin {
+    fn add_delegation(&self, request: QtumDelegationRequest) -> DelegationFut {
+        let coin = self.clone();
+        let fut = async move { coin.add_delegation_impl(request).await };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn get_delegation_infos(&self) -> StakingInfosFut {
+        let coin = self.clone();
+        let fut = async move { coin.get_delegation_infos_impl().await };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn remove_delegation(&self) -> DelegationFut {
+        let coin = self.clone();
+        let fut = async move { coin.remove_delegation_impl().await };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn generate_pod(&self, addr_hash: AddressHashEnum) -> Result<Signature, MmError<DelegationError>> {
+        let mut buffer = b"\x15Qtum Signed Message:\n\x28".to_vec();
+        buffer.append(&mut addr_hash.to_string().into_bytes());
+        let hashed = dhash256(&buffer);
+        let key_pair = self.as_ref().priv_key_policy.key_pair_or_err()?;
+        let signature = key_pair
+            .private()
+            .sign_compact(&hashed)
+            .map_to_mm(|e| QtumStakingAbiError::PodSigningError(e.to_string()))?;
+        Ok(signature)
+    }
+}
+
+impl QtumCoin {
+    async fn remove_delegation_impl(&self) -> DelegationResult {
+        if self.addr_format().is_segwit() {
+            return MmError::err(DelegationError::DelegationOpsNotSupported {
+                reason: "Qtum doesn't support delegation for segwit".to_string(),
+            });
+        }
+        let delegation_output = self.remove_delegation_output(QRC20_GAS_LIMIT_DEFAULT, QRC20_GAS_PRICE_DEFAULT)?;
+        let outputs = vec![delegation_output];
+        let my_address = self.my_address().map_to_mm(DelegationError::InternalError)?;
+        self.generate_delegation_transaction(
+            outputs,
+            my_address,
+            QRC20_GAS_LIMIT_DEFAULT,
+            TransactionType::RemoveDelegation,
+        )
+        .await
+    }
+
+    async fn am_i_currently_staking(&self) -> Result<Option<String>, MmError<StakingInfosError>> {
+        let utxo = self.as_ref();
+        let contract_address = contract_addr_into_rpc_format(&QTUM_DELEGATE_CONTRACT_ADDRESS);
+        let client = match &utxo.rpc_client {
+            UtxoRpcClientEnum::Native(_) => {
+                return MmError::err(StakingInfosError::Internal("Native not supported".to_string()))
+            },
+            UtxoRpcClientEnum::Electrum(electrum) => electrum,
+        };
+        let address = self.my_addr_as_contract_addr()?;
+        let address_rpc = contract_addr_into_rpc_format(&address);
+        let add_delegation_history = client
+            .blockchain_contract_event_get_history(&address_rpc, &contract_address, QTUM_ADD_DELEGATION_TOPIC)
+            .compat()
+            .await
+            .map_to_mm(|e| StakingInfosError::Transport(e.to_string()))?;
+        let remove_delegation_history = client
+            .blockchain_contract_event_get_history(&address_rpc, &contract_address, QTUM_REMOVE_DELEGATION_TOPIC)
+            .compat()
+            .await
+            .map_to_mm(|e| StakingInfosError::Transport(e.to_string()))?;
+        let am_i_staking = add_delegation_history.len() > remove_delegation_history.len();
+        if am_i_staking {
+            let last_tx_add = match add_delegation_history.last() {
+                Some(last_tx_add) => last_tx_add,
+                None => return Ok(None),
+            };
+            let res = &client
+                .blockchain_transaction_get_receipt(&last_tx_add.tx_hash)
+                .compat()
+                .await
+                .map_to_mm(|e| StakingInfosError::Transport(e.to_string()))?;
+            // there is only 3 topics for an add_delegation
+            // the first entry is the operation (add_delegation / remove_delegation),
+            // the second entry is always the staker as hexadecimal 32 byte padded
+            // by trimming the start we retrieve the standard hex hash format
+            // https://testnet.qtum.info/tx/c62d707b67267a13a53b5910ffbf393c47f00734cff1c73aae6e05d24258372f
+            // topic[0] -> a23803f3b2b56e71f2921c22b23c32ef596a439dbe03f7250e6b58a30eb910b5 -> add_delegation_topic
+            // topic[1] -> 000000000000000000000000d4ea77298fdac12c657a18b222adc8b307e18127 -> staker_address
+            // topic[2] -> 0000000000000000000000006d9d2b554d768232320587df75c4338ecc8bf37d
+
+            return if let Some(raw) = res
+                .iter()
+                .find(|receipt| {
+                    receipt
+                        .log
+                        .iter()
+                        .any(|e| !e.topics.is_empty() && e.topics[0] == QTUM_ADD_DELEGATION_TOPIC)
+                })
+                .and_then(|receipt| {
+                    receipt
+                        .log
+                        .get(0)
+                        .and_then(|log_entry| log_entry.topics.get(1))
+                        .map(|padded_staker_address_hex| padded_staker_address_hex.trim_start_matches('0'))
+                }) {
+                let hash = H160::from_str(raw).map_to_mm(|e| StakingInfosError::Internal(e.to_string()))?;
+                let address = self.utxo_address_from_contract_addr(hash);
+                Ok(Some(address.to_string()))
+            } else {
+                Ok(None)
+            };
+        }
+        Ok(None)
+    }
+
+    async fn get_delegation_infos_impl(&self) -> StakingInfosResult {
+        let coin = self.as_ref();
+        let my_address = coin.derivation_method.iguana_or_err()?;
+
+        let staker = self.am_i_currently_staking().await?;
+        let (unspents, _) = self.get_unspent_ordered_list(my_address).await?;
+        let lower_bound = QTUM_LOWER_BOUND_DELEGATION_AMOUNT
+            .try_into()
+            .expect("Conversion should succeed");
+        let mut amount = BigDecimal::zero();
+        if staker.is_some() {
+            amount = unspents
+                .iter()
+                .map(|unspent| big_decimal_from_sat_unsigned(unspent.value, coin.decimals))
+                .filter(|unspent_value| unspent_value >= &lower_bound)
+                .fold(BigDecimal::zero(), |total, unspent_value| total + unspent_value);
+        }
+        let am_i_staking = staker.is_some();
+        let infos = StakingInfos {
+            staking_infos_details: QtumStakingInfosDetails {
+                amount,
+                staker,
+                am_i_staking,
+                is_staking_supported: !my_address.addr_format.is_segwit(),
+            }
+            .into(),
+        };
+        Ok(infos)
+    }
+
+    async fn add_delegation_impl(&self, request: QtumDelegationRequest) -> DelegationResult {
+        if self.addr_format().is_segwit() {
+            return MmError::err(DelegationError::DelegationOpsNotSupported {
+                reason: "Qtum doesn't support delegation for segwit".to_string(),
+            });
+        }
+        if let Some(staking_addr) = self.am_i_currently_staking().await? {
+            return MmError::err(DelegationError::AlreadyDelegating(staking_addr));
+        }
+        let to_addr =
+            Address::from_str(request.address.as_str()).map_to_mm(|e| DelegationError::AddressError(e.to_string()))?;
+        let fee = request.fee.unwrap_or(QTUM_DELEGATION_STANDARD_FEE);
+        let _utxo_lock = UTXO_LOCK.lock();
+        let staker_address_hex = qtum::contract_addr_from_utxo_addr(to_addr.clone())?;
+        let delegation_output = self.add_delegation_output(
+            staker_address_hex,
+            to_addr.hash,
+            fee,
+            QRC20_GAS_LIMIT_DELEGATION,
+            QRC20_GAS_PRICE_DEFAULT,
+        )?;
+
+        let outputs = vec![delegation_output];
+        let my_address = self.my_address().map_to_mm(DelegationError::InternalError)?;
+        self.generate_delegation_transaction(
+            outputs,
+            my_address,
+            QRC20_GAS_LIMIT_DELEGATION,
+            TransactionType::StakingDelegation,
+        )
+        .await
+    }
+
+    async fn generate_delegation_transaction(
+        &self,
+        contract_outputs: Vec<ContractCallOutput>,
+        to_address: String,
+        gas_limit: u64,
+        transaction_type: TransactionType,
+    ) -> DelegationResult {
+        let utxo = self.as_ref();
+
+        let key_pair = utxo.priv_key_policy.key_pair_or_err()?;
+        let my_address = utxo.derivation_method.iguana_or_err()?;
+
+        let (unspents, _) = self.get_unspent_ordered_list(my_address).await?;
+        let mut gas_fee = 0;
+        let mut outputs = Vec::with_capacity(contract_outputs.len());
+        for output in contract_outputs {
+            gas_fee += output.gas_limit * output.gas_price;
+            outputs.push(output.into());
+        }
+
+        let (unsigned, data) = UtxoTxBuilder::new(self)
+            .add_available_inputs(unspents)
+            .add_outputs(outputs)
+            .with_gas_fee(gas_fee)
+            .with_dust(QRC20_DUST)
+            .build()
+            .await
+            .mm_err(|gen_tx_error| {
+                DelegationError::from_generate_tx_error(gen_tx_error, self.ticker().to_string(), utxo.decimals)
+            })?;
+
+        let prev_script = ScriptBuilder::build_p2pkh(&my_address.hash);
+        let signed = sign_tx(
+            unsigned,
+            key_pair,
+            prev_script,
+            utxo.conf.signature_version,
+            utxo.conf.fork_id,
+        )?;
+
+        let miner_fee = data.fee_amount + data.unused_change.unwrap_or_default();
+        let generated_tx = GenerateQrc20TxResult {
+            signed,
+            miner_fee,
+            gas_fee,
+        };
+
+        let fee_details = Qrc20FeeDetails {
+            // QRC20 fees are paid in base platform currency (in particular Qtum)
+            coin: self.ticker().to_string(),
+            miner_fee: utxo_common::big_decimal_from_sat(generated_tx.miner_fee as i64, utxo.decimals),
+            gas_limit,
+            gas_price: QRC20_GAS_PRICE_DEFAULT,
+            total_gas_fee: utxo_common::big_decimal_from_sat(generated_tx.gas_fee as i64, utxo.decimals),
+        };
+        let my_address_string = self.my_address().map_to_mm(DelegationError::InternalError)?;
+
+        let spent_by_me = utxo_common::big_decimal_from_sat(data.spent_by_me as i64, utxo.decimals);
+        let qtum_amount = spent_by_me.clone();
+        let received_by_me = utxo_common::big_decimal_from_sat(data.received_by_me as i64, utxo.decimals);
+        let my_balance_change = &received_by_me - &spent_by_me;
+
+        Ok(TransactionDetails {
+            tx_hex: serialize(&generated_tx.signed).into(),
+            tx_hash: generated_tx.signed.hash().reversed().to_vec().to_tx_hash(),
+            from: vec![my_address_string],
+            to: vec![to_address],
+            total_amount: qtum_amount,
+            spent_by_me,
+            received_by_me,
+            my_balance_change,
+            block_height: 0,
+            timestamp: now_ms() / 1000,
+            fee_details: Some(fee_details.into()),
+            coin: self.ticker().to_string(),
+            internal_id: vec![].into(),
+            kmd_rewards: None,
+            transaction_type,
+        })
+    }
+
+    fn remove_delegation_output(&self, gas_limit: u64, gas_price: u64) -> QtumStakingAbiResult<ContractCallOutput> {
+        let function: &ethabi::Function = QTUM_DELEGATE_CONTRACT.function("removeDelegation")?;
+        let params = function.encode_input(&[])?;
+        let script_pubkey =
+            generate_contract_call_script_pubkey(&params, gas_limit, gas_price, &QTUM_DELEGATE_CONTRACT_ADDRESS)?
+                .to_bytes();
+        Ok(ContractCallOutput {
+            value: OUTPUT_QTUM_AMOUNT,
+            script_pubkey,
+            gas_limit,
+            gas_price,
+        })
+    }
+
+    fn add_delegation_output(
+        &self,
+        to_addr: H160,
+        addr_hash: AddressHashEnum,
+        fee: u64,
+        gas_limit: u64,
+        gas_price: u64,
+    ) -> Result<ContractCallOutput, MmError<DelegationError>> {
+        let function: &ethabi::Function = QTUM_DELEGATE_CONTRACT.function("addDelegation")?;
+        let pod = self.generate_pod(addr_hash)?;
+        let params = function.encode_input(&[
+            Token::Address(to_addr),
+            Token::Uint(fee.into()),
+            Token::Bytes(pod.into()),
+        ])?;
+
+        let script_pubkey =
+            generate_contract_call_script_pubkey(&params, gas_limit, gas_price, &QTUM_DELEGATE_CONTRACT_ADDRESS)?
+                .to_bytes();
+        Ok(ContractCallOutput {
+            value: OUTPUT_QTUM_AMOUNT,
+            script_pubkey,
+            gas_limit,
+            gas_price,
+        })
+    }
+}
diff --git a/mm2src/coins/utxo/rpc_clients.rs b/mm2src/coins/utxo/rpc_clients.rs
index 6482d61189..dac1d3712f 100644
--- a/mm2src/coins/utxo/rpc_clients.rs
+++ b/mm2src/coins/utxo/rpc_clients.rs
@@ -2,17 +2,16 @@
 #![cfg_attr(target_arch = "wasm32", allow(dead_code))]
 
 use crate::utxo::{output_script, sat_from_big_decimal};
-use crate::{NumConversError, RpcTransportEventHandler, RpcTransportEventHandlerShared};
-use bigdecimal::BigDecimal;
-use chain::{BlockHeader, OutPoint, Transaction as UtxoTx};
+use crate::{big_decimal_from_sat_unsigned, NumConversError, RpcTransportEventHandler, RpcTransportEventHandlerShared};
+use async_trait::async_trait;
+use chain::{BlockHeader, BlockHeaderBits, BlockHeaderNonce, OutPoint, Transaction as UtxoTx};
 use common::custom_futures::{select_ok_sequential, FutureTimerExt};
+use common::custom_iter::{CollectInto, TryIntoGroupMap};
 use common::executor::{spawn, Timer};
-use common::jsonrpc_client::{JsonRpcClient, JsonRpcError, JsonRpcErrorType, JsonRpcMultiClient, JsonRpcRemoteAddr,
-                             JsonRpcRequest, JsonRpcResponse, JsonRpcResponseFut, RpcRes};
+use common::jsonrpc_client::{JsonRpcBatchClient, JsonRpcBatchResponse, JsonRpcClient, JsonRpcError, JsonRpcErrorType,
+                             JsonRpcId, JsonRpcMultiClient, JsonRpcRemoteAddr, JsonRpcRequest, JsonRpcRequestEnum,
+                             JsonRpcResponse, JsonRpcResponseEnum, JsonRpcResponseFut, RpcRes};
 use common::log::{error, info, warn};
-use common::mm_error::prelude::*;
-use common::mm_number::MmNumber;
-use common::wio::slurp_req;
 use common::{median, now_float, now_ms, OrdRange};
 use derive_more::Display;
 use futures::channel::oneshot as async_oneshot;
@@ -23,17 +22,20 @@ use futures::{select, StreamExt};
 use futures01::future::select_ok;
 use futures01::sync::{mpsc, oneshot};
 use futures01::{Future, Sink, Stream};
-use http::header::AUTHORIZATION;
 use http::Uri;
-use http::{Request, StatusCode};
+use itertools::Itertools;
+use keys::hash::H256;
 use keys::{Address, Type as ScriptType};
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, BigInt, MmNumber};
 #[cfg(test)] use mocktopus::macros::*;
 use rpc::v1::types::{Bytes as BytesJson, Transaction as RpcTransaction, H256 as H256Json};
 use serde_json::{self as json, Value as Json};
-use serialization::{deserialize, serialize, serialize_with_flags, CoinVariant, CompactInteger, Reader,
-                    SERIALIZE_TRANSACTION_WITNESS};
+use serialization::{coin_variant_by_ticker, deserialize, serialize, serialize_with_flags, CoinVariant, CompactInteger,
+                    Reader, SERIALIZE_TRANSACTION_WITNESS};
 use sha2::{Digest, Sha256};
-use std::collections::hash_map::{Entry, HashMap};
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
 use std::fmt;
 use std::io;
 use std::net::{SocketAddr, ToSocketAddrs};
@@ -46,18 +48,31 @@ use std::time::Duration;
 cfg_native! {
     use futures::future::Either;
     use futures::io::Error;
+    use http::header::AUTHORIZATION;
+    use http::{Request, StatusCode};
+    use rustls::client::ServerCertVerified;
+    use rustls::{Certificate, ClientConfig, ServerName, OwnedTrustAnchor, RootCertStore};
+    use std::convert::TryFrom;
     use std::pin::Pin;
     use std::task::{Context, Poll};
+    use std::time::SystemTime;
     use tokio::io::{AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader, ReadBuf};
     use tokio::net::TcpStream;
     use tokio_rustls::{client::TlsStream, TlsConnector};
-    use tokio_rustls::webpki::DNSNameRef;
+    use tokio_rustls::webpki::DnsNameRef;
     use webpki_roots::TLS_SERVER_ROOTS;
 }
 
 pub type AddressesByLabelResult = HashMap<String, AddressPurpose>;
+pub type JsonRpcPendingRequestsShared = Arc<AsyncMutex<JsonRpcPendingRequests>>;
+pub type JsonRpcPendingRequests = HashMap<JsonRpcId, async_oneshot::Sender<JsonRpcResponseEnum>>;
+pub type UnspentMap = HashMap<Address, Vec<UnspentInfo>>;
+
+type ElectrumScriptHash = String;
+type ScriptHashUnspents = Vec<ElectrumUnspent>;
 
 #[derive(Debug, Deserialize)]
+#[allow(dead_code)]
 pub struct AddressPurpose {
     purpose: String,
 }
@@ -66,15 +81,17 @@ pub struct AddressPurpose {
 pub struct NoCertificateVerification {}
 
 #[cfg(not(target_arch = "wasm32"))]
-impl rustls::ServerCertVerifier for NoCertificateVerification {
+impl rustls::client::ServerCertVerifier for NoCertificateVerification {
     fn verify_server_cert(
         &self,
-        _roots: &rustls::RootCertStore,
-        _presented_certs: &[rustls::Certificate],
-        _dns_name: DNSNameRef<'_>,
-        _ocsp: &[u8],
-    ) -> Result<rustls::ServerCertVerified, rustls::TLSError> {
-        Ok(rustls::ServerCertVerified::assertion())
+        _: &Certificate,
+        _: &[Certificate],
+        _: &ServerName,
+        _: &mut dyn Iterator<Item = &[u8]>,
+        _: &[u8],
+        _: SystemTime,
+    ) -> Result<ServerCertVerified, rustls::Error> {
+        Ok(rustls::client::ServerCertVerified::assertion())
     }
 }
 
@@ -114,13 +131,13 @@ impl Clone for UtxoRpcClientEnum {
 impl UtxoRpcClientEnum {
     pub fn wait_for_confirmations(
         &self,
-        tx: &UtxoTx,
+        tx_hash: H256Json,
+        expiry_height: u32,
         confirmations: u32,
         requires_notarization: bool,
         wait_until: u64,
         check_every: u64,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let tx = tx.clone();
         let selfi = self.clone();
         let fut = async move {
             loop {
@@ -128,16 +145,12 @@ impl UtxoRpcClientEnum {
                     return ERR!(
                         "Waited too long until {} for transaction {:?} to be confirmed {} times",
                         wait_until,
-                        tx,
+                        tx_hash,
                         confirmations
                     );
                 }
 
-                match selfi
-                    .get_verbose_transaction(tx.hash().reversed().into())
-                    .compat()
-                    .await
-                {
+                match selfi.get_verbose_transaction(&tx_hash).compat().await {
                     Ok(t) => {
                         let tx_confirmations = if requires_notarization {
                             t.confirmations
@@ -149,18 +162,30 @@ impl UtxoRpcClientEnum {
                         } else {
                             info!(
                                 "Waiting for tx {:?} confirmations, now {}, required {}, requires_notarization {}",
-                                tx.hash().reversed(),
-                                tx_confirmations,
-                                confirmations,
-                                requires_notarization
+                                tx_hash, tx_confirmations, confirmations, requires_notarization
                             )
                         }
                     },
-                    Err(e) => error!(
-                        "Error {:?} getting the transaction {:?}, retrying in 10 seconds",
-                        e,
-                        tx.hash().reversed()
-                    ),
+                    Err(e) => {
+                        if expiry_height > 0 {
+                            let block = match selfi.get_block_count().compat().await {
+                                Ok(b) => b,
+                                Err(e) => {
+                                    error!("Error {} getting block number, retrying in 10 seconds", e);
+                                    Timer::sleep(check_every as f64).await;
+                                    continue;
+                                },
+                            };
+
+                            if block > expiry_height as u64 {
+                                return ERR!("The transaction {:?} has expired, current block {}", tx_hash, block);
+                            }
+                        }
+                        error!(
+                            "Error {:?} getting the transaction {:?}, retrying in 10 seconds",
+                            e, tx_hash
+                        )
+                    },
                 }
 
                 Timer::sleep(check_every as f64).await;
@@ -168,6 +193,14 @@ impl UtxoRpcClientEnum {
         };
         Box::new(fut.boxed().compat())
     }
+
+    #[inline]
+    pub fn is_native(&self) -> bool {
+        match self {
+            UtxoRpcClientEnum::Native(_) => true,
+            UtxoRpcClientEnum::Electrum(_) => false,
+        }
+    }
 }
 
 /// Generic unspent info required to build transactions, we need this separate type because native
@@ -194,6 +227,23 @@ impl From<ElectrumUnspent> for UnspentInfo {
     }
 }
 
+#[derive(Debug, PartialEq)]
+pub enum BlockHashOrHeight {
+    Height(i64),
+    Hash(H256Json),
+}
+
+#[derive(Debug, PartialEq)]
+pub struct SpentOutputInfo {
+    // The transaction spending the output
+    pub spending_tx: UtxoTx,
+    // The input index that spends the output
+    pub input_index: usize,
+    // The block hash or height the includes the spending transaction
+    // For electrum clients the block height will be returned, for native clients the block hash will be returned
+    pub spent_in_block: BlockHashOrHeight,
+}
+
 pub type UtxoRpcResult<T> = Result<T, MmError<UtxoRpcError>>;
 pub type UtxoRpcFut<T> = Box<dyn Future<Item = T, Error = MmError<UtxoRpcError>> + Send + 'static>;
 
@@ -208,6 +258,7 @@ pub enum UtxoRpcError {
 impl From<JsonRpcError> for UtxoRpcError {
     fn from(e: JsonRpcError) -> Self {
         match e.error {
+            JsonRpcErrorType::InvalidRequest(_) => UtxoRpcError::Internal(e.to_string()),
             JsonRpcErrorType::Transport(_) => UtxoRpcError::Transport(e),
             JsonRpcErrorType::Parse(_, _) | JsonRpcErrorType::Response(_, _) => UtxoRpcError::ResponseParseError(e),
         }
@@ -223,38 +274,59 @@ impl From<NumConversError> for UtxoRpcError {
 }
 
 /// Common operations that both types of UTXO clients have but implement them differently
+#[async_trait]
 pub trait UtxoRpcClientOps: fmt::Debug + Send + Sync + 'static {
+    /// Returns available unspents for the given `address`.
     fn list_unspent(&self, address: &Address, decimals: u8) -> UtxoRpcFut<Vec<UnspentInfo>>;
 
-    fn send_transaction(&self, tx: &UtxoTx) -> Box<dyn Future<Item = H256Json, Error = String> + Send + 'static>;
+    /// Returns available unspents for every given `addresses`.
+    fn list_unspent_group(&self, addresses: Vec<Address>, decimals: u8) -> UtxoRpcFut<UnspentMap>;
+
+    /// Submits the given `tx` transaction to blockchain network.
+    fn send_transaction(&self, tx: &UtxoTx) -> UtxoRpcFut<H256Json>;
 
+    /// Submits the raw `tx` transaction (serialized, hex-encoded) to blockchain network.
     fn send_raw_transaction(&self, tx: BytesJson) -> UtxoRpcFut<H256Json>;
 
-    fn get_transaction_bytes(&self, txid: H256Json) -> UtxoRpcFut<BytesJson>;
+    /// Returns raw transaction (serialized, hex-encoded) by the given `txid`.
+    fn get_transaction_bytes(&self, txid: &H256Json) -> UtxoRpcFut<BytesJson>;
+
+    /// Returns verbose transaction by the given `txid`.
+    fn get_verbose_transaction(&self, txid: &H256Json) -> UtxoRpcFut<RpcTransaction>;
 
-    fn get_verbose_transaction(&self, txid: H256Json) -> RpcRes<RpcTransaction>;
+    /// Returns verbose transactions in the same order they were requested.
+    fn get_verbose_transactions(&self, tx_ids: &[H256Json]) -> UtxoRpcFut<Vec<RpcTransaction>>;
 
+    /// Returns the height of the most-work fully-validated chain.
     fn get_block_count(&self) -> UtxoRpcFut<u64>;
 
+    /// Requests balance of the given `address`.
     fn display_balance(&self, address: Address, decimals: u8) -> RpcRes<BigDecimal>;
 
-    /// returns fee estimation per KByte in satoshis
+    /// Requests balances of the given `addresses`.
+    /// The pairs `(Address, BigDecimal)` are guaranteed to be in the same order in which they were requested.
+    fn display_balances(&self, addresses: Vec<Address>, decimals: u8) -> UtxoRpcFut<Vec<(Address, BigDecimal)>>;
+
+    /// Returns fee estimation per KByte in satoshis.
     fn estimate_fee_sat(
         &self,
         decimals: u8,
         fee_method: &EstimateFeeMethod,
         mode: &Option<EstimateFeeMode>,
         n_blocks: u32,
-    ) -> RpcRes<u64>;
+    ) -> UtxoRpcFut<u64>;
 
+    /// Returns the minimum fee a low-priority transaction must pay in order to be accepted to the daemon’s memory pool.
     fn get_relay_fee(&self) -> RpcRes<BigDecimal>;
 
+    /// Tries to find a transaction that spends the specified `vout` output of the `tx_hash` transaction.
     fn find_output_spend(
         &self,
-        tx: &UtxoTx,
+        tx_hash: H256,
+        script_pubkey: &[u8],
         vout: usize,
-        from_block: u64,
-    ) -> Box<dyn Future<Item = Option<UtxoTx>, Error = String> + Send>;
+        from_block: BlockHashOrHeight,
+    ) -> Box<dyn Future<Item = Option<SpentOutputInfo>, Error = String> + Send>;
 
     /// Get median time past for `count` blocks in the past including `starting_block`
     fn get_median_time_past(
@@ -263,9 +335,13 @@ pub trait UtxoRpcClientOps: fmt::Debug + Send + Sync + 'static {
         count: NonZeroU64,
         coin_variant: CoinVariant,
     ) -> UtxoRpcFut<u32>;
+
+    /// Returns block time in seconds since epoch (Jan 1 1970 GMT).
+    async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<UtxoRpcError>>;
 }
 
 #[derive(Clone, Deserialize, Debug)]
+#[cfg_attr(test, derive(Default))]
 pub struct NativeUnspent {
     pub txid: H256Json,
     pub vout: u32,
@@ -297,6 +373,7 @@ pub struct ValidateAddressRes {
 }
 
 #[derive(Clone, Debug, Deserialize)]
+#[cfg_attr(test, derive(Default))]
 pub struct ListTransactionsItem {
     pub account: Option<String>,
     #[serde(default)]
@@ -347,10 +424,12 @@ pub struct EstimateSmartFeeRes {
 pub struct ListSinceBlockRes {
     transactions: Vec<ListTransactionsItem>,
     #[serde(rename = "lastblock")]
+    #[allow(dead_code)]
     last_block: H256Json,
 }
 
 #[derive(Clone, Debug, Deserialize)]
+#[allow(dead_code)]
 pub struct NetworkInfoLocalAddress {
     address: String,
     port: u16,
@@ -358,6 +437,7 @@ pub struct NetworkInfoLocalAddress {
 }
 
 #[derive(Clone, Debug, Deserialize)]
+#[allow(dead_code)]
 pub struct NetworkInfoNetwork {
     name: String,
     limited: bool,
@@ -367,6 +447,7 @@ pub struct NetworkInfoNetwork {
 }
 
 #[derive(Clone, Debug, Deserialize)]
+#[allow(dead_code)]
 pub struct NetworkInfo {
     connections: u64,
     #[serde(rename = "localaddresses")]
@@ -448,6 +529,8 @@ pub struct VerboseBlock {
     pub previousblockhash: Option<H256Json>,
     /// Hash of next block
     pub nextblockhash: Option<H256Json>,
+    #[serde(rename = "finalsaplingroot")]
+    pub final_sapling_root: Option<H256Json>,
 }
 
 pub type RpcReqSub<T> = async_oneshot::Sender<Result<T, JsonRpcError>>;
@@ -518,7 +601,17 @@ impl JsonRpcClient for NativeClientImpl {
 
     fn client_info(&self) -> String { UtxoJsonRpcClientInfo::client_info(self) }
 
-    fn transport(&self, request: JsonRpcRequest) -> JsonRpcResponseFut {
+    #[cfg(target_arch = "wasm32")]
+    fn transport(&self, _request: JsonRpcRequestEnum) -> JsonRpcResponseFut {
+        Box::new(futures01::future::err(ERRL!(
+            "'NativeClientImpl' must be used in native mode only"
+        )))
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn transport(&self, request: JsonRpcRequestEnum) -> JsonRpcResponseFut {
+        use mm2_net::transport::slurp_req;
+
         let request_body = try_fus!(json::to_string(&request));
         // measure now only body length, because the `hyper` crate doesn't allow to get total HTTP packet length
         self.event_handlers.on_outgoing_request(request_body.as_bytes());
@@ -533,7 +626,7 @@ impl JsonRpcClient for NativeClientImpl {
 
         let event_handles = self.event_handlers.clone();
         Box::new(slurp_req(http_request).boxed().compat().then(
-            move |result| -> Result<(JsonRpcRemoteAddr, JsonRpcResponse), String> {
+            move |result| -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String> {
                 let res = try_s!(result);
                 // measure now only body length, because the `hyper` crate doesn't allow to get total HTTP packet length
                 event_handles.on_incoming_response(&res.2);
@@ -556,6 +649,10 @@ impl JsonRpcClient for NativeClientImpl {
     }
 }
 
+impl JsonRpcBatchClient for NativeClientImpl {}
+
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
+#[async_trait]
 #[cfg_attr(test, mockable)]
 impl UtxoRpcClientOps for NativeClient {
     fn list_unspent(&self, address: &Address, decimals: u8) -> UtxoRpcFut<Vec<UnspentInfo>> {
@@ -581,13 +678,52 @@ impl UtxoRpcClientOps for NativeClient {
         Box::new(fut)
     }
 
-    fn send_transaction(&self, tx: &UtxoTx) -> Box<dyn Future<Item = H256Json, Error = String> + Send + 'static> {
+    fn list_unspent_group(&self, addresses: Vec<Address>, decimals: u8) -> UtxoRpcFut<UnspentMap> {
+        let mut addresses_str = Vec::with_capacity(addresses.len());
+        let mut addresses_map = HashMap::with_capacity(addresses.len());
+        for addr in addresses {
+            let addr_str = addr.to_string();
+            addresses_str.push(addr_str.clone());
+            addresses_map.insert(addr_str, addr);
+        }
+
+        let fut = self
+            .list_unspent_impl(0, std::i32::MAX, addresses_str)
+            .map_to_mm_fut(UtxoRpcError::from)
+            .and_then(move |unspents| {
+                unspents
+                    .into_iter()
+                    // Convert `Vec<NativeUnspent>` into `UnspentMap`.
+                    .map(|unspent| {
+                        let orig_address = addresses_map
+                            .get(&unspent.address)
+                            .or_mm_err(|| {
+                                UtxoRpcError::InvalidResponse(format!("Unexpected address '{}'", unspent.address))
+                            })?
+                            .clone();
+                        let unspent_info = UnspentInfo {
+                            outpoint: OutPoint {
+                                hash: unspent.txid.reversed().into(),
+                                index: unspent.vout,
+                            },
+                            value: sat_from_big_decimal(&unspent.amount.to_decimal(), decimals)?,
+                            height: None,
+                        };
+                        Ok((orig_address, unspent_info))
+                    })
+                    // Collect `(Address, UnspentInfo)` items into `HashMap<Address, Vec<UnspentInfo>>` grouped by the addresses.
+                    .try_into_group_map()
+            });
+        Box::new(fut)
+    }
+
+    fn send_transaction(&self, tx: &UtxoTx) -> UtxoRpcFut<H256Json> {
         let tx_bytes = if tx.has_witness() {
             BytesJson::from(serialize_with_flags(tx, SERIALIZE_TRANSACTION_WITNESS))
         } else {
             BytesJson::from(serialize(tx))
         };
-        Box::new(self.send_raw_transaction(tx_bytes).map_err(|e| ERRL!("{}", e)))
+        Box::new(self.send_raw_transaction(tx_bytes))
     }
 
     /// https://developer.bitcoin.org/reference/rpc/sendrawtransaction
@@ -595,12 +731,19 @@ impl UtxoRpcClientOps for NativeClient {
         Box::new(rpc_func!(self, "sendrawtransaction", tx).map_to_mm_fut(UtxoRpcError::from))
     }
 
-    fn get_transaction_bytes(&self, txid: H256Json) -> UtxoRpcFut<BytesJson> {
+    fn get_transaction_bytes(&self, txid: &H256Json) -> UtxoRpcFut<BytesJson> {
         Box::new(self.get_raw_transaction_bytes(txid).map_to_mm_fut(UtxoRpcError::from))
     }
 
-    fn get_verbose_transaction(&self, txid: H256Json) -> RpcRes<RpcTransaction> {
-        self.get_raw_transaction_verbose(txid)
+    fn get_verbose_transaction(&self, txid: &H256Json) -> UtxoRpcFut<RpcTransaction> {
+        Box::new(self.get_raw_transaction_verbose(txid).map_to_mm_fut(UtxoRpcError::from))
+    }
+
+    fn get_verbose_transactions(&self, tx_ids: &[H256Json]) -> UtxoRpcFut<Vec<RpcTransaction>> {
+        Box::new(
+            self.get_raw_transaction_verbose_batch(tx_ids)
+                .map_to_mm_fut(UtxoRpcError::from),
+        )
     }
 
     fn get_block_count(&self) -> UtxoRpcFut<u64> {
@@ -618,13 +761,29 @@ impl UtxoRpcClientOps for NativeClient {
         )
     }
 
+    fn display_balances(&self, addresses: Vec<Address>, decimals: u8) -> UtxoRpcFut<Vec<(Address, BigDecimal)>> {
+        let this = self.clone();
+        let fut = async move {
+            let unspent_map = this.list_unspent_group(addresses.clone(), decimals).compat().await?;
+            let balances = addresses
+                .into_iter()
+                .map(|address| {
+                    let balance = address_balance_from_unspent_map(&address, &unspent_map, decimals);
+                    (address, balance)
+                })
+                .collect();
+            Ok(balances)
+        };
+        Box::new(fut.boxed().compat())
+    }
+
     fn estimate_fee_sat(
         &self,
         decimals: u8,
         fee_method: &EstimateFeeMethod,
         mode: &Option<EstimateFeeMode>,
         n_blocks: u32,
-    ) -> RpcRes<u64> {
+    ) -> UtxoRpcFut<u64> {
         match fee_method {
             EstimateFeeMethod::Standard => Box::new(self.estimate_fee(n_blocks).map(move |fee| {
                 if fee > 0.00001 {
@@ -647,27 +806,34 @@ impl UtxoRpcClientOps for NativeClient {
 
     fn find_output_spend(
         &self,
-        tx: &UtxoTx,
+        tx_hash: H256,
+        _script_pubkey: &[u8],
         vout: usize,
-        from_block: u64,
-    ) -> Box<dyn Future<Item = Option<UtxoTx>, Error = String> + Send> {
+        from_block: BlockHashOrHeight,
+    ) -> Box<dyn Future<Item = Option<SpentOutputInfo>, Error = String> + Send> {
         let selfi = self.clone();
-        let tx = tx.clone();
         let fut = async move {
-            let from_block_hash = try_s!(selfi.get_block_hash(from_block).compat().await);
+            let from_block_hash = match from_block {
+                BlockHashOrHeight::Height(h) => try_s!(selfi.get_block_hash(h as u64).compat().await),
+                BlockHashOrHeight::Hash(h) => h,
+            };
             let list_since_block: ListSinceBlockRes = try_s!(selfi.list_since_block(from_block_hash).compat().await);
             for transaction in list_since_block
                 .transactions
                 .into_iter()
                 .filter(|tx| !tx.is_conflicting())
             {
-                let maybe_spend_tx_bytes = try_s!(selfi.get_raw_transaction_bytes(transaction.txid).compat().await);
+                let maybe_spend_tx_bytes = try_s!(selfi.get_raw_transaction_bytes(&transaction.txid).compat().await);
                 let maybe_spend_tx: UtxoTx =
                     try_s!(deserialize(maybe_spend_tx_bytes.as_slice()).map_err(|e| ERRL!("{:?}", e)));
 
-                for input in maybe_spend_tx.inputs.iter() {
-                    if input.previous_output.hash == tx.hash() && input.previous_output.index == vout as u32 {
-                        return Ok(Some(maybe_spend_tx));
+                for (index, input) in maybe_spend_tx.inputs.iter().enumerate() {
+                    if input.previous_output.hash == tx_hash && input.previous_output.index == vout as u32 {
+                        return Ok(Some(SpentOutputInfo {
+                            spending_tx: maybe_spend_tx,
+                            input_index: index,
+                            spent_in_block: BlockHashOrHeight::Hash(transaction.blockhash),
+                        }));
                     }
                 }
             }
@@ -706,6 +872,11 @@ impl UtxoRpcClientOps for NativeClient {
         };
         Box::new(fut.boxed().compat())
     }
+
+    async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<UtxoRpcError>> {
+        let block = self.get_block_by_height(height).await?;
+        Ok(block.time as u64)
+    }
 }
 
 #[cfg_attr(test, mockable)]
@@ -727,6 +898,32 @@ impl NativeClient {
         let fut = async move { arc.list_unspent_concurrent_map.wrap_request(args, request_fut).await };
         Box::new(fut.boxed().compat())
     }
+
+    pub fn list_all_transactions(&self, step: u64) -> RpcRes<Vec<ListTransactionsItem>> {
+        let selfi = self.clone();
+        let fut = async move {
+            let mut from = 0;
+            let mut transaction_list = Vec::new();
+
+            loop {
+                let transactions = selfi.list_transactions(step, from).compat().await?;
+                if transactions.is_empty() {
+                    return Ok(transaction_list);
+                }
+
+                transaction_list.extend(transactions.into_iter());
+                from += step;
+            }
+        };
+        Box::new(fut.boxed().compat())
+    }
+}
+
+impl NativeClient {
+    pub async fn get_block_by_height(&self, height: u64) -> UtxoRpcResult<VerboseBlock> {
+        let block_hash = self.get_block_hash(height).compat().await?;
+        self.get_block(block_hash).compat().await
+    }
 }
 
 #[cfg_attr(test, mockable)]
@@ -746,7 +943,7 @@ impl NativeClientImpl {
         txid: H256Json,
         index: usize,
     ) -> Box<dyn Future<Item = u64, Error = String> + Send + 'static> {
-        let fut = self.get_raw_transaction_bytes(txid).map_err(|e| ERRL!("{}", e));
+        let fut = self.get_raw_transaction_bytes(&txid).map_err(|e| ERRL!("{}", e));
         Box::new(fut.and_then(move |bytes| {
             let tx: UtxoTx = try_s!(deserialize(bytes.as_slice()).map_err(|e| ERRL!(
                 "Error {:?} trying to deserialize the transaction {:?}",
@@ -759,27 +956,39 @@ impl NativeClientImpl {
 
     /// https://developer.bitcoin.org/reference/rpc/getblock.html
     /// Always returns verbose block
-    pub fn get_block(&self, hash: H256Json) -> RpcRes<VerboseBlock> {
+    pub fn get_block(&self, hash: H256Json) -> UtxoRpcFut<VerboseBlock> {
         let verbose = true;
-        rpc_func!(self, "getblock", hash, verbose)
+        Box::new(rpc_func!(self, "getblock", hash, verbose).map_to_mm_fut(UtxoRpcError::from))
     }
 
     /// https://developer.bitcoin.org/reference/rpc/getblockhash.html
-    pub fn get_block_hash(&self, height: u64) -> RpcRes<H256Json> { rpc_func!(self, "getblockhash", height) }
+    pub fn get_block_hash(&self, height: u64) -> UtxoRpcFut<H256Json> {
+        Box::new(rpc_func!(self, "getblockhash", height).map_to_mm_fut(UtxoRpcError::from))
+    }
 
     /// https://developer.bitcoin.org/reference/rpc/getblockcount.html
     pub fn get_block_count(&self) -> RpcRes<u64> { rpc_func!(self, "getblockcount") }
 
     /// https://developer.bitcoin.org/reference/rpc/getrawtransaction.html
     /// Always returns verbose transaction
-    fn get_raw_transaction_verbose(&self, txid: H256Json) -> RpcRes<RpcTransaction> {
+    fn get_raw_transaction_verbose(&self, txid: &H256Json) -> RpcRes<RpcTransaction> {
         let verbose = 1;
         rpc_func!(self, "getrawtransaction", txid, verbose)
     }
 
+    /// https://developer.bitcoin.org/reference/rpc/getrawtransaction.html
+    /// Always returns verbose transactions in the same order they were requested.
+    fn get_raw_transaction_verbose_batch(&self, tx_ids: &[H256Json]) -> RpcRes<Vec<RpcTransaction>> {
+        let verbose = 1;
+        let requests = tx_ids
+            .iter()
+            .map(|txid| rpc_req!(self, "getrawtransaction", txid, verbose));
+        self.batch_rpc(requests)
+    }
+
     /// https://developer.bitcoin.org/reference/rpc/getrawtransaction.html
     /// Always returns transaction bytes
-    pub fn get_raw_transaction_bytes(&self, txid: H256Json) -> RpcRes<BytesJson> {
+    pub fn get_raw_transaction_bytes(&self, txid: &H256Json) -> RpcRes<BytesJson> {
         let verbose = 0;
         rpc_func!(self, "getrawtransaction", txid, verbose)
     }
@@ -788,16 +997,18 @@ impl NativeClientImpl {
     /// It is recommended to set n_blocks as low as possible.
     /// However, in some cases, n_blocks = 1 leads to an unreasonably high fee estimation.
     /// https://github.com/KomodoPlatform/atomicDEX-API/issues/656#issuecomment-743759659
-    fn estimate_fee(&self, n_blocks: u32) -> RpcRes<f64> { rpc_func!(self, "estimatefee", n_blocks) }
+    pub fn estimate_fee(&self, n_blocks: u32) -> UtxoRpcFut<f64> {
+        Box::new(rpc_func!(self, "estimatefee", n_blocks).map_to_mm_fut(UtxoRpcError::from))
+    }
 
     /// https://developer.bitcoin.org/reference/rpc/estimatesmartfee.html
     /// It is recommended to set n_blocks as low as possible.
     /// However, in some cases, n_blocks = 1 leads to an unreasonably high fee estimation.
     /// https://github.com/KomodoPlatform/atomicDEX-API/issues/656#issuecomment-743759659
-    pub fn estimate_smart_fee(&self, mode: &Option<EstimateFeeMode>, n_blocks: u32) -> RpcRes<EstimateSmartFeeRes> {
+    pub fn estimate_smart_fee(&self, mode: &Option<EstimateFeeMode>, n_blocks: u32) -> UtxoRpcFut<EstimateSmartFeeRes> {
         match mode {
-            Some(m) => rpc_func!(self, "estimatesmartfee", n_blocks, m),
-            None => rpc_func!(self, "estimatesmartfee", n_blocks),
+            Some(m) => Box::new(rpc_func!(self, "estimatesmartfee", n_blocks, m).map_to_mm_fut(UtxoRpcError::from)),
+            None => Box::new(rpc_func!(self, "estimatesmartfee", n_blocks).map_to_mm_fut(UtxoRpcError::from)),
         }
     }
 
@@ -882,6 +1093,12 @@ impl NativeClientImpl {
     pub fn get_address_info(&self, address: &str) -> RpcRes<GetAddressInfoRes> {
         rpc_func!(self, "getaddressinfo", address)
     }
+
+    /// https://developer.bitcoin.org/reference/rpc/getblockheader.html
+    pub fn get_block_header_bytes(&self, block_hash: H256Json) -> RpcRes<BytesJson> {
+        let verbose = 0;
+        rpc_func!(self, "getblockheader", block_hash, verbose)
+    }
 }
 
 impl NativeClientImpl {
@@ -908,46 +1125,124 @@ pub struct ElectrumUnspent {
     pub value: u64,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize)]
 #[serde(untagged)]
 pub enum ElectrumNonce {
     Number(u64),
     Hash(H256Json),
 }
 
+#[allow(clippy::from_over_into)]
+impl Into<BlockHeaderNonce> for ElectrumNonce {
+    fn into(self) -> BlockHeaderNonce {
+        match self {
+            ElectrumNonce::Number(n) => BlockHeaderNonce::U32(n as u32),
+            ElectrumNonce::Hash(h) => BlockHeaderNonce::H256(h.into()),
+        }
+    }
+}
+
 #[derive(Debug, Deserialize)]
 pub struct ElectrumBlockHeadersRes {
-    count: u64,
+    pub count: u64,
     pub hex: BytesJson,
+    #[allow(dead_code)]
     max: u64,
 }
 
 /// The block header compatible with Electrum 1.2
-#[derive(Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize)]
 pub struct ElectrumBlockHeaderV12 {
-    bits: u64,
-    block_height: u64,
-    merkle_root: H256Json,
-    nonce: ElectrumNonce,
-    prev_block_hash: H256Json,
-    timestamp: u64,
-    version: u64,
+    pub bits: u64,
+    pub block_height: u64,
+    pub merkle_root: H256Json,
+    pub nonce: ElectrumNonce,
+    pub prev_block_hash: H256Json,
+    pub timestamp: u64,
+    pub version: u64,
+}
+
+impl ElectrumBlockHeaderV12 {
+    fn as_block_header(&self) -> BlockHeader {
+        BlockHeader {
+            version: self.version as u32,
+            previous_header_hash: self.prev_block_hash.into(),
+            merkle_root_hash: self.merkle_root.into(),
+            claim_trie_root: None,
+            hash_final_sapling_root: None,
+            time: self.timestamp as u32,
+            bits: BlockHeaderBits::U32(self.bits as u32),
+            nonce: self.nonce.clone().into(),
+            solution: None,
+            aux_pow: None,
+            prog_pow: None,
+            mtp_pow: None,
+            is_verus: false,
+            hash_state_root: None,
+            hash_utxo_root: None,
+            prevout_stake: None,
+            vch_block_sig_dlgt: None,
+            n_height: None,
+            n_nonce_u64: None,
+            mix_hash: None,
+        }
+    }
+
+    #[inline]
+    pub fn as_hex(&self) -> String {
+        let block_header = self.as_block_header();
+        let serialized = serialize(&block_header);
+        hex::encode(serialized)
+    }
+
+    #[inline]
+    pub fn hash(&self) -> H256Json {
+        let block_header = self.as_block_header();
+        BlockHeader::hash(&block_header).into()
+    }
 }
 
 /// The block header compatible with Electrum 1.4
-#[derive(Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize)]
 pub struct ElectrumBlockHeaderV14 {
-    height: u64,
-    hex: BytesJson,
+    pub height: u64,
+    pub hex: BytesJson,
 }
 
-#[derive(Debug, Deserialize)]
+impl ElectrumBlockHeaderV14 {
+    pub fn hash(&self) -> H256Json { self.hex.clone().into_vec()[..].into() }
+}
+
+#[derive(Clone, Debug, Deserialize)]
 #[serde(untagged)]
 pub enum ElectrumBlockHeader {
     V12(ElectrumBlockHeaderV12),
     V14(ElectrumBlockHeaderV14),
 }
 
+/// The merkle branch of a confirmed transaction
+#[derive(Clone, Debug, Deserialize)]
+pub struct TxMerkleBranch {
+    pub merkle: Vec<H256Json>,
+    pub block_height: u64,
+    pub pos: usize,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct BestBlock {
+    pub height: u64,
+    pub hash: H256Json,
+}
+
+impl From<ElectrumBlockHeader> for BestBlock {
+    fn from(block_header: ElectrumBlockHeader) -> Self {
+        BestBlock {
+            height: block_header.block_height(),
+            hash: block_header.block_hash(),
+        }
+    }
+}
+
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Debug, Deserialize, Serialize)]
 pub enum EstimateFeeMode {
@@ -957,12 +1252,19 @@ pub enum EstimateFeeMode {
 }
 
 impl ElectrumBlockHeader {
-    fn block_height(&self) -> u64 {
+    pub fn block_height(&self) -> u64 {
         match self {
             ElectrumBlockHeader::V12(h) => h.block_height,
             ElectrumBlockHeader::V14(h) => h.height,
         }
     }
+
+    fn block_hash(&self) -> H256Json {
+        match self {
+            ElectrumBlockHeader::V12(h) => h.hash(),
+            ElectrumBlockHeader::V14(h) => h.hash(),
+        }
+    }
 }
 
 #[derive(Debug, Deserialize)]
@@ -974,16 +1276,26 @@ pub struct ElectrumTxHistoryItem {
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct ElectrumBalance {
-    confirmed: i64,
-    unconfirmed: i64,
+    pub(crate) confirmed: i128,
+    pub(crate) unconfirmed: i128,
+}
+
+impl ElectrumBalance {
+    #[inline]
+    pub fn to_big_decimal(&self, decimals: u8) -> BigDecimal {
+        let balance_sat = BigInt::from(self.confirmed) + BigInt::from(self.unconfirmed);
+        BigDecimal::from(balance_sat) / BigDecimal::from(10u64.pow(decimals as u32))
+    }
 }
 
+#[inline]
 fn sha_256(input: &[u8]) -> Vec<u8> {
     let mut sha = Sha256::new();
-    sha.input(input);
-    sha.result().to_vec()
+    sha.update(input);
+    sha.finalize().to_vec()
 }
 
+#[inline]
 pub fn electrum_script_hash(script: &[u8]) -> Vec<u8> {
     let mut result = sha_256(script);
     result.reverse();
@@ -991,7 +1303,7 @@ pub fn electrum_script_hash(script: &[u8]) -> Vec<u8> {
 }
 
 #[allow(clippy::upper_case_acronyms)]
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 /// Deserializable Electrum protocol representation for RPC
 pub enum ElectrumProtocol {
     /// TCP
@@ -1022,7 +1334,7 @@ pub struct ElectrumProtocolVersion {
     pub protocol_version: String,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 /// Electrum request RPC representation
 pub struct ElectrumRpcRequest {
     pub url: String,
@@ -1075,7 +1387,7 @@ pub fn spawn_electrum(
                 .ok_or(ERRL!("Couldn't retrieve host from addr {}", req.url))?;
 
             // check the dns name
-            try_s!(DNSNameRef::try_from_ascii_str(host));
+            try_s!(DnsNameRef::try_from_ascii_str(host));
 
             ElectrumConfig::SSL {
                 dns_name: host.into(),
@@ -1131,13 +1443,14 @@ pub struct ElectrumConnection {
     /// The client connected to this SocketAddr
     addr: String,
     /// Configuration
+    #[allow(dead_code)]
     config: ElectrumConfig,
     /// The Sender forwarding requests to writing part of underlying stream
     tx: Arc<AsyncMutex<Option<mpsc::Sender<Vec<u8>>>>>,
     /// The Sender used to shutdown the background connection loop when ElectrumConnection is dropped
     shutdown_tx: Option<oneshot::Sender<()>>,
     /// Responses are stored here
-    responses: Arc<AsyncMutex<HashMap<String, async_oneshot::Sender<JsonRpcResponse>>>>,
+    responses: JsonRpcPendingRequestsShared,
     /// Selected protocol version. The value is initialized after the server.version RPC call.
     protocol_version: AsyncMutex<Option<f32>>,
 }
@@ -1230,8 +1543,8 @@ pub struct ElectrumClientImpl {
 
 async fn electrum_request_multi(
     client: ElectrumClient,
-    request: JsonRpcRequest,
-) -> Result<(JsonRpcRemoteAddr, JsonRpcResponse), String> {
+    request: JsonRpcRequestEnum,
+) -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String> {
     let mut futures = vec![];
     let connections = client.connections.lock().await;
     for (i, connection) in connections.iter().enumerate() {
@@ -1254,31 +1567,32 @@ async fn electrum_request_multi(
     if futures.is_empty() {
         return ERR!("All electrums are currently disconnected");
     }
-    if request.method != "server.ping" {
-        match select_ok_sequential(futures).compat().await {
-            Ok((res, no_of_failed_requests)) => {
-                client.clone().rotate_servers(no_of_failed_requests).await;
-                Ok(res)
-            },
-            Err(e) => return ERR!("{:?}", e),
-        }
-    } else {
-        // server.ping must be sent to all servers to keep all connections alive
-        Ok(try_s!(
-            select_ok(futures)
+
+    match request {
+        JsonRpcRequestEnum::Single(single) if single.method == "server.ping" => {
+            // server.ping must be sent to all servers to keep all connections alive
+            return select_ok(futures)
                 .map(|(result, _)| result)
                 .map_err(|e| ERRL!("{:?}", e))
                 .compat()
-                .await
-        ))
+                .await;
+        },
+        _ => (),
     }
+
+    let (res, no_of_failed_requests) = select_ok_sequential(futures)
+        .compat()
+        .await
+        .map_err(|e| ERRL!("{:?}", e))?;
+    client.rotate_servers(no_of_failed_requests).await;
+    Ok(res)
 }
 
 async fn electrum_request_to(
     client: ElectrumClient,
-    request: JsonRpcRequest,
+    request: JsonRpcRequestEnum,
     to_addr: String,
-) -> Result<(JsonRpcRemoteAddr, JsonRpcResponse), String> {
+) -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String> {
     let (tx, responses) = {
         let connections = client.connections.lock().await;
         let connection = connections
@@ -1387,13 +1701,15 @@ impl JsonRpcClient for ElectrumClient {
 
     fn client_info(&self) -> String { UtxoJsonRpcClientInfo::client_info(self) }
 
-    fn transport(&self, request: JsonRpcRequest) -> JsonRpcResponseFut {
+    fn transport(&self, request: JsonRpcRequestEnum) -> JsonRpcResponseFut {
         Box::new(electrum_request_multi(self.clone(), request).boxed().compat())
     }
 }
 
+impl JsonRpcBatchClient for ElectrumClient {}
+
 impl JsonRpcMultiClient for ElectrumClient {
-    fn transport_exact(&self, to_addr: String, request: JsonRpcRequest) -> JsonRpcResponseFut {
+    fn transport_exact(&self, to_addr: String, request: JsonRpcRequestEnum) -> JsonRpcResponseFut {
         Box::new(electrum_request_to(self.clone(), request, to_addr).boxed().compat())
     }
 }
@@ -1422,7 +1738,7 @@ impl ElectrumClient {
                 let mut map: HashMap<(H256Json, u32), bool> = HashMap::new();
                 let unspents = unspents
                     .into_iter()
-                    .filter(|unspent| match map.entry((unspent.tx_hash.clone(), unspent.tx_pos)) {
+                    .filter(|unspent| match map.entry((unspent.tx_hash, unspent.tx_pos)) {
                         Entry::Occupied(_) => false,
                         Entry::Vacant(e) => {
                             e.insert(true);
@@ -1439,6 +1755,27 @@ impl ElectrumClient {
         Box::new(fut.boxed().compat())
     }
 
+    /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-scripthash-listunspent
+    /// It can return duplicates sometimes: https://github.com/artemii235/SuperNET/issues/269
+    /// We should remove them to build valid transactions.
+    /// Please note the function returns `ScriptHashUnspents` elements in the same order in which they were requested.
+    pub fn scripthash_list_unspent_batch(&self, hashes: Vec<ElectrumScriptHash>) -> RpcRes<Vec<ScriptHashUnspents>> {
+        let requests = hashes
+            .iter()
+            .map(|hash| rpc_req!(self, "blockchain.scripthash.listunspent", hash));
+        Box::new(self.batch_rpc(requests).map(move |unspents: Vec<ScriptHashUnspents>| {
+            unspents
+                .into_iter()
+                .map(|hash_unspents| {
+                    hash_unspents
+                        .into_iter()
+                        .unique_by(|unspent| (unspent.tx_hash, unspent.tx_pos))
+                        .collect::<Vec<_>>()
+                })
+                .collect()
+        }))
+    }
+
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-scripthash-get-history
     pub fn scripthash_get_history(&self, hash: &str) -> RpcRes<Vec<ElectrumTxHistoryItem>> {
         rpc_func!(self, "blockchain.scripthash.get_history", hash)
@@ -1455,13 +1792,25 @@ impl ElectrumClient {
         Box::new(fut.boxed().compat())
     }
 
+    /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-scripthash-gethistory
+    /// Requests balances in a batch and returns them in the same order they were requested.
+    pub fn scripthash_get_balances<I>(&self, hashes: I) -> RpcRes<Vec<ElectrumBalance>>
+    where
+        I: IntoIterator<Item = String>,
+    {
+        let requests = hashes
+            .into_iter()
+            .map(|hash| rpc_req!(self, "blockchain.scripthash.get_balance", &hash));
+        self.batch_rpc(requests)
+    }
+
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-headers-subscribe
     pub fn blockchain_headers_subscribe(&self) -> RpcRes<ElectrumBlockHeader> {
         rpc_func!(self, "blockchain.headers.subscribe")
     }
 
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-transaction-broadcast
-    fn blockchain_transaction_broadcast(&self, tx: BytesJson) -> RpcRes<H256Json> {
+    pub fn blockchain_transaction_broadcast(&self, tx: BytesJson) -> RpcRes<H256Json> {
         rpc_func!(self, "blockchain.transaction.broadcast", tx)
     }
 
@@ -1469,19 +1818,78 @@ impl ElectrumClient {
     /// It is recommended to set n_blocks as low as possible.
     /// However, in some cases, n_blocks = 1 leads to an unreasonably high fee estimation.
     /// https://github.com/KomodoPlatform/atomicDEX-API/issues/656#issuecomment-743759659
-    fn estimate_fee(&self, mode: &Option<EstimateFeeMode>, n_blocks: u32) -> RpcRes<f64> {
+    pub fn estimate_fee(&self, mode: &Option<EstimateFeeMode>, n_blocks: u32) -> UtxoRpcFut<f64> {
         match mode {
-            Some(m) => rpc_func!(self, "blockchain.estimatefee", n_blocks, m),
-            None => rpc_func!(self, "blockchain.estimatefee", n_blocks),
+            Some(m) => {
+                Box::new(rpc_func!(self, "blockchain.estimatefee", n_blocks, m).map_to_mm_fut(UtxoRpcError::from))
+            },
+            None => Box::new(rpc_func!(self, "blockchain.estimatefee", n_blocks).map_to_mm_fut(UtxoRpcError::from)),
         }
     }
 
+    /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-block-header
+    pub fn blockchain_block_header(&self, height: u64) -> RpcRes<BytesJson> {
+        rpc_func!(self, "blockchain.block.header", height)
+    }
+
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-block-headers
     pub fn blockchain_block_headers(&self, start_height: u64, count: NonZeroU64) -> RpcRes<ElectrumBlockHeadersRes> {
         rpc_func!(self, "blockchain.block.headers", start_height, count)
     }
+
+    pub fn retrieve_last_headers(
+        &self,
+        blocks_limit_to_check: NonZeroU64,
+        block_height: u64,
+    ) -> UtxoRpcFut<(HashMap<u64, BlockHeader>, Vec<BlockHeader>)> {
+        let coin_name = self.coin_ticker.clone();
+        let (from, count) = {
+            let from = if block_height < blocks_limit_to_check.get() {
+                0
+            } else {
+                block_height - blocks_limit_to_check.get()
+            };
+            (from, blocks_limit_to_check)
+        };
+        Box::new(
+            self.blockchain_block_headers(from, count)
+                .map_to_mm_fut(UtxoRpcError::from)
+                .and_then(move |headers| {
+                    let (block_registry, block_headers) = {
+                        if headers.count == 0 {
+                            return MmError::err(UtxoRpcError::Internal("No headers available".to_string()));
+                        }
+                        let len = CompactInteger::from(headers.count);
+                        let mut serialized = serialize(&len).take();
+                        serialized.extend(headers.hex.0.into_iter());
+                        let coin_variant = coin_variant_by_ticker(&coin_name);
+                        let mut reader = Reader::new_with_coin_variant(serialized.as_slice(), coin_variant);
+                        let maybe_block_headers = reader.read_list::<BlockHeader>();
+                        let block_headers = match maybe_block_headers {
+                            Ok(headers) => headers,
+                            Err(e) => return MmError::err(UtxoRpcError::InvalidResponse(format!("{:?}", e))),
+                        };
+                        let mut block_registry: HashMap<u64, BlockHeader> = HashMap::new();
+                        let mut starting_height = from;
+                        for block_header in &block_headers {
+                            block_registry.insert(starting_height, block_header.clone());
+                            starting_height += 1;
+                        }
+                        (block_registry, block_headers)
+                    };
+                    Ok((block_registry, block_headers))
+                }),
+        )
+    }
+
+    /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-transaction-get-merkle
+    pub fn blockchain_transaction_get_merkle(&self, txid: H256Json, height: u64) -> RpcRes<TxMerkleBranch> {
+        rpc_func!(self, "blockchain.transaction.get_merkle", txid, height)
+    }
 }
 
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
+#[async_trait]
 #[cfg_attr(test, mockable)]
 impl UtxoRpcClientOps for ElectrumClient {
     fn list_unspent(&self, address: &Address, _decimals: u8) -> UtxoRpcFut<Vec<UnspentInfo>> {
@@ -1506,13 +1914,43 @@ impl UtxoRpcClientOps for ElectrumClient {
         )
     }
 
-    fn send_transaction(&self, tx: &UtxoTx) -> Box<dyn Future<Item = H256Json, Error = String> + Send + 'static> {
+    fn list_unspent_group(&self, addresses: Vec<Address>, _decimals: u8) -> UtxoRpcFut<UnspentMap> {
+        let script_hashes = addresses
+            .iter()
+            .map(|addr| {
+                let script = output_script(addr, ScriptType::P2PKH);
+                let script_hash = electrum_script_hash(&script);
+                hex::encode(script_hash)
+            })
+            .collect();
+
+        let this = self.clone();
+        let fut = async move {
+            let unspents = this.scripthash_list_unspent_batch(script_hashes).compat().await?;
+
+            let unspent_map = addresses
+                .into_iter()
+                // `scripthash_list_unspent_batch` returns `ScriptHashUnspents` elements in the same order in which they were requested.
+                // So we can zip `addresses` and `unspents` into one iterator.
+                .zip(unspents)
+                // Map `(Address, Vec<ElectrumUnspent>)` pairs into `(Address, Vec<UnspentInfo>)`.
+                .map(|(address, electrum_unspents)| (address, electrum_unspents.collect_into()))
+                .collect();
+            Ok(unspent_map)
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn send_transaction(&self, tx: &UtxoTx) -> UtxoRpcFut<H256Json> {
         let bytes = if tx.has_witness() {
             BytesJson::from(serialize_with_flags(tx, SERIALIZE_TRANSACTION_WITNESS))
         } else {
             BytesJson::from(serialize(tx))
         };
-        Box::new(self.blockchain_transaction_broadcast(bytes).map_err(|e| ERRL!("{}", e)))
+        Box::new(
+            self.blockchain_transaction_broadcast(bytes)
+                .map_to_mm_fut(UtxoRpcError::from),
+        )
     }
 
     fn send_raw_transaction(&self, tx: BytesJson) -> UtxoRpcFut<H256Json> {
@@ -1524,16 +1962,26 @@ impl UtxoRpcClientOps for ElectrumClient {
 
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-transaction-get
     /// returns transaction bytes by default
-    fn get_transaction_bytes(&self, txid: H256Json) -> UtxoRpcFut<BytesJson> {
+    fn get_transaction_bytes(&self, txid: &H256Json) -> UtxoRpcFut<BytesJson> {
         let verbose = false;
         Box::new(rpc_func!(self, "blockchain.transaction.get", txid, verbose).map_to_mm_fut(UtxoRpcError::from))
     }
 
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-transaction-get
     /// returns verbose transaction by default
-    fn get_verbose_transaction(&self, txid: H256Json) -> RpcRes<RpcTransaction> {
+    fn get_verbose_transaction(&self, txid: &H256Json) -> UtxoRpcFut<RpcTransaction> {
         let verbose = true;
-        rpc_func!(self, "blockchain.transaction.get", txid, verbose)
+        Box::new(rpc_func!(self, "blockchain.transaction.get", txid, verbose).map_to_mm_fut(UtxoRpcError::from))
+    }
+
+    /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-transaction-get
+    /// Returns verbose transactions in a batch.
+    fn get_verbose_transactions(&self, tx_ids: &[H256Json]) -> UtxoRpcFut<Vec<RpcTransaction>> {
+        let verbose = true;
+        let requests = tx_ids
+            .iter()
+            .map(|txid| rpc_req!(self, "blockchain.transaction.get", txid, verbose));
+        Box::new(self.batch_rpc(requests).map_to_mm_fut(UtxoRpcError::from))
     }
 
     fn get_block_count(&self) -> UtxoRpcFut<u64> {
@@ -1547,9 +1995,32 @@ impl UtxoRpcClientOps for ElectrumClient {
     fn display_balance(&self, address: Address, decimals: u8) -> RpcRes<BigDecimal> {
         let hash = electrum_script_hash(&output_script(&address, ScriptType::P2PKH));
         let hash_str = hex::encode(hash);
-        Box::new(self.scripthash_get_balance(&hash_str).map(move |result| {
-            BigDecimal::from(result.confirmed + result.unconfirmed) / BigDecimal::from(10u64.pow(decimals as u32))
-        }))
+        Box::new(
+            self.scripthash_get_balance(&hash_str)
+                .map(move |electrum_balance| electrum_balance.to_big_decimal(decimals)),
+        )
+    }
+
+    fn display_balances(&self, addresses: Vec<Address>, decimals: u8) -> UtxoRpcFut<Vec<(Address, BigDecimal)>> {
+        let this = self.clone();
+        let fut = async move {
+            let hashes = addresses.iter().map(|address| {
+                let hash = electrum_script_hash(&output_script(address, ScriptType::P2PKH));
+                hex::encode(hash)
+            });
+
+            let electrum_balances = this.scripthash_get_balances(hashes).compat().await?;
+            let balances = electrum_balances
+                .into_iter()
+                // `scripthash_get_balances` returns `ElectrumBalance` elements in the same order in which they were requested.
+                // So we can zip `addresses` and the balances into one iterator.
+                .zip(addresses)
+                .map(|(electrum_balance, address)| (address, electrum_balance.to_big_decimal(decimals)))
+                .collect();
+            Ok(balances)
+        };
+
+        Box::new(fut.boxed().compat())
     }
 
     fn estimate_fee_sat(
@@ -1558,7 +2029,7 @@ impl UtxoRpcClientOps for ElectrumClient {
         _fee_method: &EstimateFeeMethod,
         mode: &Option<EstimateFeeMode>,
         n_blocks: u32,
-    ) -> RpcRes<u64> {
+    ) -> UtxoRpcFut<u64> {
         Box::new(self.estimate_fee(mode, n_blocks).map(move |fee| {
             if fee > 0.00001 {
                 (fee * 10.0_f64.powf(decimals as f64)) as u64
@@ -1572,13 +2043,13 @@ impl UtxoRpcClientOps for ElectrumClient {
 
     fn find_output_spend(
         &self,
-        tx: &UtxoTx,
+        tx_hash: H256,
+        script_pubkey: &[u8],
         vout: usize,
-        _from_block: u64,
-    ) -> Box<dyn Future<Item = Option<UtxoTx>, Error = String> + Send> {
+        _from_block: BlockHashOrHeight,
+    ) -> Box<dyn Future<Item = Option<SpentOutputInfo>, Error = String> + Send> {
         let selfi = self.clone();
-        let script_hash = hex::encode(electrum_script_hash(&tx.outputs[vout].script_pubkey));
-        let tx = tx.clone();
+        let script_hash = hex::encode(electrum_script_hash(script_pubkey));
         let fut = async move {
             let history = try_s!(selfi.scripthash_get_history(&script_hash).compat().await);
 
@@ -1587,13 +2058,17 @@ impl UtxoRpcClientOps for ElectrumClient {
             }
 
             for item in history.iter() {
-                let transaction = try_s!(selfi.get_transaction_bytes(item.tx_hash.clone()).compat().await);
+                let transaction = try_s!(selfi.get_transaction_bytes(&item.tx_hash).compat().await);
 
                 let maybe_spend_tx: UtxoTx = try_s!(deserialize(transaction.as_slice()).map_err(|e| ERRL!("{:?}", e)));
 
-                for input in maybe_spend_tx.inputs.iter() {
-                    if input.previous_output.hash == tx.hash() && input.previous_output.index == vout as u32 {
-                        return Ok(Some(maybe_spend_tx));
+                for (index, input) in maybe_spend_tx.inputs.iter().enumerate() {
+                    if input.previous_output.hash == tx_hash && input.previous_output.index == vout as u32 {
+                        return Ok(Some(SpentOutputInfo {
+                            spending_tx: maybe_spend_tx,
+                            input_index: index,
+                            spent_in_block: BlockHashOrHeight::Height(item.height),
+                        }));
                     }
                 }
             }
@@ -1631,6 +2106,13 @@ impl UtxoRpcClientOps for ElectrumClient {
                 }),
         )
     }
+
+    async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<UtxoRpcError>> {
+        let header_bytes = self.blockchain_block_header(height).compat().await?;
+        let header: BlockHeader =
+            deserialize(header_bytes.0.as_slice()).map_to_mm(|e| UtxoRpcError::InvalidResponse(format!("{:?}", e)))?;
+        Ok(header.time as u64)
+    }
 }
 
 #[cfg_attr(test, mockable)]
@@ -1666,62 +2148,56 @@ fn rx_to_stream(rx: mpsc::Receiver<Vec<u8>>) -> impl Stream<Item = Vec<u8>, Erro
     rx.map_err(|_| panic!("errors not possible on rx"))
 }
 
-async fn electrum_process_json(
-    raw_json: Json,
-    arc: &Arc<AsyncMutex<HashMap<String, async_oneshot::Sender<JsonRpcResponse>>>>,
-) {
+async fn electrum_process_json(raw_json: Json, arc: &JsonRpcPendingRequestsShared) {
     // detect if we got standard JSONRPC response or subscription response as JSONRPC request
-    if raw_json["method"].is_null() && raw_json["params"].is_null() {
-        let response: JsonRpcResponse = match json::from_value(raw_json) {
-            Ok(res) => res,
-            Err(e) => {
-                error!("{}", e);
-                return;
-            },
-        };
-        let mut resp = arc.lock().await;
-        // the corresponding sender may not exist, receiver may be dropped
-        // these situations are not considered as errors so we just silently skip them
-        if let Some(tx) = resp.remove(&response.id.to_string()) {
-            tx.send(response).unwrap_or(())
-        }
-        drop(resp);
-    } else {
-        let request: JsonRpcRequest = match json::from_value(raw_json) {
-            Ok(res) => res,
-            Err(e) => {
-                error!("{}", e);
-                return;
-            },
-        };
-        let id = match request.method.as_ref() {
-            BLOCKCHAIN_HEADERS_SUB_ID => BLOCKCHAIN_HEADERS_SUB_ID,
-            _ => {
-                error!("Couldn't get id of request {:?}", request);
-                return;
-            },
-        };
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum ElectrumRpcResponseEnum {
+        /// The standard JSONRPC single response.
+        SingleResponse(JsonRpcResponse),
+        /// The batch of standard JSONRPC responses.
+        BatchResponses(JsonRpcBatchResponse),
+        /// The subscription response as JSONRPC request.
+        SubscriptionNotification(JsonRpcRequest),
+    }
+
+    let response: ElectrumRpcResponseEnum = match json::from_value(raw_json) {
+        Ok(res) => res,
+        Err(e) => {
+            error!("{}", e);
+            return;
+        },
+    };
 
-        let response = JsonRpcResponse {
-            id: id.into(),
-            jsonrpc: "2.0".into(),
-            result: request.params[0].clone(),
-            error: Json::Null,
-        };
-        let mut resp = arc.lock().await;
-        // the corresponding sender may not exist, receiver may be dropped
-        // these situations are not considered as errors so we just silently skip them
-        if let Some(tx) = resp.remove(&response.id.to_string()) {
-            tx.send(response).unwrap_or(())
-        }
-        drop(resp);
+    let response = match response {
+        ElectrumRpcResponseEnum::SingleResponse(single) => JsonRpcResponseEnum::Single(single),
+        ElectrumRpcResponseEnum::BatchResponses(batch) => JsonRpcResponseEnum::Batch(batch),
+        ElectrumRpcResponseEnum::SubscriptionNotification(req) => {
+            let id = match req.method.as_ref() {
+                BLOCKCHAIN_HEADERS_SUB_ID => BLOCKCHAIN_HEADERS_SUB_ID,
+                _ => {
+                    error!("Couldn't get id of request {:?}", req);
+                    return;
+                },
+            };
+            JsonRpcResponseEnum::Single(JsonRpcResponse {
+                id: id.into(),
+                jsonrpc: "2.0".into(),
+                result: req.params[0].clone(),
+                error: Json::Null,
+            })
+        },
+    };
+
+    // the corresponding sender may not exist, receiver may be dropped
+    // these situations are not considered as errors so we just silently skip them
+    let mut pending = arc.lock().await;
+    if let Some(tx) = pending.remove(&response.rpc_id()) {
+        tx.send(response).ok();
     }
 }
 
-async fn electrum_process_chunk(
-    chunk: &[u8],
-    arc: &Arc<AsyncMutex<HashMap<String, async_oneshot::Sender<JsonRpcResponse>>>>,
-) {
+async fn electrum_process_chunk(chunk: &[u8], arc: &JsonRpcPendingRequestsShared) {
     // we should split the received chunk because we can get several responses in 1 chunk.
     let split = chunk.split(|item| *item == b'\n');
     for chunk in split {
@@ -1826,11 +2302,41 @@ async fn electrum_last_chunk_loop(last_chunk: Arc<AtomicU64>) {
     }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+fn rustls_client_config(unsafe_conf: bool) -> Arc<ClientConfig> {
+    let mut cert_store = RootCertStore::empty();
+
+    cert_store.add_server_trust_anchors(
+        TLS_SERVER_ROOTS
+            .0
+            .iter()
+            .map(|ta| OwnedTrustAnchor::from_subject_spki_name_constraints(ta.subject, ta.spki, ta.name_constraints)),
+    );
+
+    let mut tls_config = rustls::ClientConfig::builder()
+        .with_safe_defaults()
+        .with_root_certificates(cert_store)
+        .with_no_client_auth();
+
+    if unsafe_conf {
+        tls_config
+            .dangerous()
+            .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
+    }
+    Arc::new(tls_config)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+lazy_static! {
+    static ref SAFE_TLS_CONFIG: Arc<ClientConfig> = rustls_client_config(false);
+    static ref UNSAFE_TLS_CONFIG: Arc<ClientConfig> = rustls_client_config(true);
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 async fn connect_loop(
     config: ElectrumConfig,
     addr: String,
-    responses: Arc<AsyncMutex<HashMap<String, async_oneshot::Sender<JsonRpcResponse>>>>,
+    responses: JsonRpcPendingRequestsShared,
     connection_tx: Arc<AsyncMutex<Option<mpsc::Sender<Vec<u8>>>>>,
     event_handlers: Vec<RpcTransportEventHandlerShared>,
 ) -> Result<(), ()> {
@@ -1850,19 +2356,16 @@ async fn connect_loop(
                 dns_name,
                 skip_validation,
             } => {
-                let mut ssl_config = rustls::ClientConfig::new();
-                ssl_config.root_store.add_server_trust_anchors(&TLS_SERVER_ROOTS);
-                if skip_validation {
-                    ssl_config
-                        .dangerous()
-                        .set_certificate_verifier(Arc::new(NoCertificateVerification {}));
-                }
-                let tls_connector = TlsConnector::from(Arc::new(ssl_config));
+                let tls_connector = if skip_validation {
+                    TlsConnector::from(UNSAFE_TLS_CONFIG.clone())
+                } else {
+                    TlsConnector::from(SAFE_TLS_CONFIG.clone())
+                };
 
                 Either::Right(TcpStream::connect(&socket_addr).and_then(move |stream| {
                     // Can use `unwrap` cause `dns_name` is pre-checked.
-                    let dns = DNSNameRef::try_from_ascii_str(&dns_name)
-                        .map_err(|e| fomat!([e]))
+                    let dns = ServerName::try_from(dns_name.as_str())
+                        .map_err(|e| format!("{:?}", e))
                         .unwrap();
                     tls_connector.connect(dns, stream).map_ok(ElectrumStream::Tls)
                 }))
@@ -1951,7 +2454,7 @@ async fn connect_loop(
 async fn connect_loop(
     _config: ElectrumConfig,
     addr: String,
-    responses: Arc<AsyncMutex<HashMap<String, async_oneshot::Sender<JsonRpcResponse>>>>,
+    responses: JsonRpcPendingRequestsShared,
     connection_tx: Arc<AsyncMutex<Option<mpsc::Sender<Vec<u8>>>>>,
     event_handlers: Vec<RpcTransportEventHandlerShared>,
 ) -> Result<(), ()> {
@@ -1961,7 +2464,7 @@ async fn connect_loop(
         static ref CONN_IDX: Arc<AtomicUsize> = Arc::new(AtomicUsize::new(0));
     }
 
-    use common::wasm_ws::ws_transport;
+    use mm2_net::wasm_ws::ws_transport;
 
     let delay = Arc::new(AtomicU64::new(0));
     loop {
@@ -2058,7 +2561,7 @@ fn electrum_connect(
     event_handlers: Vec<RpcTransportEventHandlerShared>,
 ) -> ElectrumConnection {
     let (shutdown_tx, shutdown_rx) = oneshot::channel::<()>();
-    let responses = Arc::new(AsyncMutex::new(HashMap::new()));
+    let responses = Arc::new(AsyncMutex::new(JsonRpcPendingRequests::default()));
     let tx = Arc::new(AsyncMutex::new(None));
 
     let connect_loop = connect_loop(
@@ -2082,11 +2585,11 @@ fn electrum_connect(
 }
 
 fn electrum_request(
-    request: JsonRpcRequest,
+    request: JsonRpcRequestEnum,
     tx: mpsc::Sender<Vec<u8>>,
-    responses: Arc<AsyncMutex<HashMap<String, async_oneshot::Sender<JsonRpcResponse>>>>,
+    responses: JsonRpcPendingRequestsShared,
     timeout: u64,
-) -> Box<dyn Future<Item = JsonRpcResponse, Error = String> + Send + 'static> {
+) -> Box<dyn Future<Item = JsonRpcResponseEnum, Error = String> + Send + 'static> {
     let send_fut = async move {
         let mut json = try_s!(json::to_string(&request));
         #[cfg(not(target_arch = "wasm"))]
@@ -2096,12 +2599,11 @@ fn electrum_request(
             json.push('\n');
         }
 
-        let request_id = request.get_id().to_string();
         let (req_tx, resp_rx) = async_oneshot::channel();
-        responses.lock().await.insert(request_id, req_tx);
+        responses.lock().await.insert(request.rpc_id(), req_tx);
         try_s!(tx.send(json.into_bytes()).compat().await);
-        let response = try_s!(resp_rx.await);
-        Ok(response)
+        let resps = try_s!(resp_rx.await);
+        Ok(resps)
     };
     let send_fut = send_fut
         .boxed()
@@ -2114,3 +2616,15 @@ fn electrum_request(
         .map_err(|e| ERRL!("{}", e));
     Box::new(send_fut)
 }
+
+fn address_balance_from_unspent_map(address: &Address, unspent_map: &UnspentMap, decimals: u8) -> BigDecimal {
+    let unspents = match unspent_map.get(address) {
+        Some(unspents) => unspents,
+        // If `balances` doesn't contain `address`, there are no unspents related to the address.
+        // Consider the balance of that address equal to 0.
+        None => return BigDecimal::from(0),
+    };
+    unspents.iter().fold(BigDecimal::from(0), |sum, unspent| {
+        sum + big_decimal_from_sat_unsigned(unspent.value, decimals)
+    })
+}
diff --git a/mm2src/coins/utxo/slp.rs b/mm2src/coins/utxo/slp.rs
index a7769e7557..9ed15d4843 100644
--- a/mm2src/coins/utxo/slp.rs
+++ b/mm2src/coins/utxo/slp.rs
@@ -1,40 +1,61 @@
-use super::p2pkh_spend;
-use super::utxo_standard::UtxoStandardCoin;
-
-use crate::utxo::rpc_clients::{UnspentInfo, UtxoRpcClientEnum, UtxoRpcError};
-use crate::utxo::utxo_common::{self, big_decimal_from_sat_unsigned, generate_transaction, p2sh_spend, payment_script};
-use crate::utxo::{generate_and_send_tx, sat_from_big_decimal, FeePolicy, GenerateTxError, RecentlySpentOutPoints,
-                  UtxoCommonOps, UtxoTx};
-use crate::{BalanceError, BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps,
-            MmCoin, NegotiateSwapContractAddrErr, NumConversError, SwapOps, TradeFee, TradePreimageFut,
-            TradePreimageValue, TransactionEnum, TransactionFut, ValidateAddressResult, WithdrawFut, WithdrawRequest};
-
-use bitcoin_cash_slp::{slp_send_output, SlpTokenType, TokenId};
+//! The module implementing Simple Ledger Protocol (SLP) support.
+//! It's a custom token format mostly used on the Bitcoin Cash blockchain.
+//! Tracking issue: https://github.com/KomodoPlatform/atomicDEX-API/issues/701
+//! More info about the protocol and implementation guides can be found at https://slp.dev/
+
+use crate::my_tx_history_v2::CoinWithTxHistoryV2;
+use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
+use crate::utxo::bch::BchCoin;
+use crate::utxo::bchd_grpc::{check_slp_transaction, validate_slp_utxos, ValidateSlpUtxosErr};
+use crate::utxo::rpc_clients::{UnspentInfo, UtxoRpcClientEnum, UtxoRpcError, UtxoRpcResult};
+use crate::utxo::utxo_common::{self, big_decimal_from_sat_unsigned, payment_script, UtxoTxBuilder};
+use crate::utxo::{generate_and_send_tx, sat_from_big_decimal, ActualTxFee, AdditionalTxData, BroadcastTxErr,
+                  FeePolicy, GenerateTxError, RecentlySpentOutPointsGuard, UtxoCoinConf, UtxoCoinFields,
+                  UtxoCommonOps, UtxoTx, UtxoTxBroadcastOps, UtxoTxGenerationOps};
+use crate::{BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps, MmCoin,
+            NegotiateSwapContractAddrErr, NumConversError, PrivKeyNotAllowed, RawTransactionFut,
+            RawTransactionRequest, SearchForSwapTxSpendInput, SignatureResult, SwapOps, TradeFee, TradePreimageError,
+            TradePreimageFut, TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum,
+            TransactionErr, TransactionFut, TxFeeDetails, UnexpectedDerivationMethod, ValidateAddressResult,
+            ValidatePaymentInput, VerificationError, VerificationResult, WithdrawError, WithdrawFee, WithdrawFut,
+            WithdrawRequest};
+use async_trait::async_trait;
 use bitcrypto::dhash160;
 use chain::constants::SEQUENCE_FINAL;
 use chain::{OutPoint, TransactionOutput};
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
-use common::mm_number::{BigDecimal, MmNumber};
+use common::log::warn;
+use common::now_ms;
 use derive_more::Display;
 use futures::compat::Future01CompatExt;
-use futures::lock::MutexGuard as AsyncMutexGuard;
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
-use keys::Public;
+use hex::FromHexError;
+use keys::hash::H160;
+use keys::{AddressHashEnum, CashAddrType, CashAddress, CompactSignature, KeyPair, NetworkPrefix as CashAddrPrefix,
+           Public};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
 use primitives::hash::H256;
-use rpc::v1::types::Bytes as BytesJson;
+use rpc::v1::types::{Bytes as BytesJson, ToTxHash, H256 as H256Json};
 use script::bytes::Bytes;
-use script::{Builder as ScriptBuilder, Opcode, Script};
+use script::{Builder as ScriptBuilder, Opcode, Script, TransactionInputSigner};
 use serde_json::Value as Json;
 use serialization::{deserialize, serialize, Deserializable, Error, Reader};
 use serialization_derive::Deserializable;
 use std::convert::TryInto;
-use std::sync::atomic::AtomicU64;
+use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering};
 use std::sync::Arc;
+use utxo_signer::with_key_pair::{p2pkh_spend, p2sh_spend, sign_tx, UtxoSignWithKeyPairError};
 
 const SLP_SWAP_VOUT: usize = 1;
 const SLP_FEE_VOUT: usize = 1;
+const SLP_HTLC_SPEND_SIZE: u64 = 555;
+const SLP_LOKAD_ID: &str = "SLP\x00";
+const SLP_FUNGIBLE: u8 = 1;
+const SLP_SEND: &str = "SEND";
+const SLP_MINT: &str = "MINT";
+const SLP_GENESIS: &str = "GENESIS";
 
 #[derive(Debug)]
 pub struct SlpTokenConf {
@@ -44,29 +65,37 @@ pub struct SlpTokenConf {
     required_confirmations: AtomicU64,
 }
 
+/// Minimalistic info that is used to be stored outside of the token's context
+/// E.g. in the platform BCHCoin
+#[derive(Debug)]
+pub struct SlpTokenInfo {
+    pub token_id: H256,
+    pub decimals: u8,
+}
+
 #[derive(Clone, Debug)]
 pub struct SlpToken {
     conf: Arc<SlpTokenConf>,
-    platform_utxo: UtxoStandardCoin,
+    platform_coin: BchCoin,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct SlpUnspent {
     pub bch_unspent: UnspentInfo,
     pub slp_amount: u64,
 }
 
 #[derive(Clone, Debug)]
-struct SlpOutput {
-    amount: u64,
-    script_pubkey: Bytes,
+pub struct SlpOutput {
+    pub amount: u64,
+    pub script_pubkey: Bytes,
 }
 
 /// The SLP transaction preimage
-struct SlpTxPreimage<'a> {
-    inputs: Vec<UnspentInfo>,
+struct SlpTxPreimage {
+    slp_inputs: Vec<SlpUnspent>,
+    available_bch_inputs: Vec<UnspentInfo>,
     outputs: Vec<TransactionOutput>,
-    recently_spent: AsyncMutexGuard<'a, RecentlySpentOutPoints>,
 }
 
 #[derive(Debug, Display)]
@@ -75,21 +104,36 @@ enum ValidateHtlcError {
     #[display(fmt = "TxParseError: {:?}", _0)]
     TxParseError(Error),
     #[display(fmt = "OpReturnParseError: {:?}", _0)]
-    OpReturnParseError(Error),
+    OpReturnParseError(ParseSlpScriptError),
     InvalidSlpDetails,
+    InvalidSlpUtxo(ValidateSlpUtxosErr),
     NumConversionErr(NumConversError),
     ValidatePaymentError(String),
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+    OtherPubInvalid(keys::Error),
 }
 
 impl From<NumConversError> for ValidateHtlcError {
     fn from(err: NumConversError) -> ValidateHtlcError { ValidateHtlcError::NumConversionErr(err) }
 }
 
+impl From<ParseSlpScriptError> for ValidateHtlcError {
+    fn from(err: ParseSlpScriptError) -> Self { ValidateHtlcError::OpReturnParseError(err) }
+}
+
+impl From<ValidateSlpUtxosErr> for ValidateHtlcError {
+    fn from(err: ValidateSlpUtxosErr) -> Self { ValidateHtlcError::InvalidSlpUtxo(err) }
+}
+
+impl From<UnexpectedDerivationMethod> for ValidateHtlcError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { ValidateHtlcError::UnexpectedDerivationMethod(e) }
+}
+
 #[derive(Debug, Display)]
 enum ValidateDexFeeError {
     TxLackOfOutputs,
     #[display(fmt = "OpReturnParseError: {:?}", _0)]
-    OpReturnParseError(Error),
+    OpReturnParseError(ParseSlpScriptError),
     InvalidSlpDetails,
     NumConversionErr(NumConversError),
     ValidatePaymentError(String),
@@ -99,12 +143,18 @@ impl From<NumConversError> for ValidateDexFeeError {
     fn from(err: NumConversError) -> ValidateDexFeeError { ValidateDexFeeError::NumConversionErr(err) }
 }
 
-#[allow(clippy::upper_case_acronyms)]
+impl From<ParseSlpScriptError> for ValidateDexFeeError {
+    fn from(err: ParseSlpScriptError) -> Self { ValidateDexFeeError::OpReturnParseError(err) }
+}
+
+#[allow(clippy::upper_case_acronyms, clippy::large_enum_variant)]
 #[derive(Debug, Display)]
 pub enum SpendP2SHError {
     GenerateTxErr(GenerateTxError),
     Rpc(UtxoRpcError),
-    GetUnspentsErr(SlpUnspentsErr),
+    SignTxErr(UtxoSignWithKeyPairError),
+    PrivKeyNotAllowed(PrivKeyNotAllowed),
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
     String(String),
 }
 
@@ -116,8 +166,16 @@ impl From<UtxoRpcError> for SpendP2SHError {
     fn from(err: UtxoRpcError) -> SpendP2SHError { SpendP2SHError::Rpc(err) }
 }
 
-impl From<SlpUnspentsErr> for SpendP2SHError {
-    fn from(err: SlpUnspentsErr) -> SpendP2SHError { SpendP2SHError::GetUnspentsErr(err) }
+impl From<UtxoSignWithKeyPairError> for SpendP2SHError {
+    fn from(sign: UtxoSignWithKeyPairError) -> SpendP2SHError { SpendP2SHError::SignTxErr(sign) }
+}
+
+impl From<PrivKeyNotAllowed> for SpendP2SHError {
+    fn from(e: PrivKeyNotAllowed) -> Self { SpendP2SHError::PrivKeyNotAllowed(e) }
+}
+
+impl From<UnexpectedDerivationMethod> for SpendP2SHError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { SpendP2SHError::UnexpectedDerivationMethod(e) }
 }
 
 impl From<String> for SpendP2SHError {
@@ -136,6 +194,12 @@ pub enum SpendHtlcError {
     RpcErr(UtxoRpcError),
     #[allow(clippy::upper_case_acronyms)]
     SpendP2SHErr(SpendP2SHError),
+    OpReturnParseError(ParseSlpScriptError),
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+}
+
+impl From<UnexpectedDerivationMethod> for SpendHtlcError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { SpendHtlcError::UnexpectedDerivationMethod(e) }
 }
 
 impl From<NumConversError> for SpendHtlcError {
@@ -158,12 +222,86 @@ impl From<UtxoRpcError> for SpendHtlcError {
     fn from(err: UtxoRpcError) -> SpendHtlcError { SpendHtlcError::RpcErr(err) }
 }
 
+impl From<ParseSlpScriptError> for SpendHtlcError {
+    fn from(err: ParseSlpScriptError) -> Self { SpendHtlcError::OpReturnParseError(err) }
+}
+
+fn slp_send_output(token_id: &H256, amounts: &[u64]) -> TransactionOutput {
+    let mut script_builder = ScriptBuilder::default()
+        .push_opcode(Opcode::OP_RETURN)
+        .push_data(SLP_LOKAD_ID.as_bytes())
+        .push_data(&[SLP_FUNGIBLE])
+        .push_data(SLP_SEND.as_bytes())
+        .push_data(token_id.as_slice());
+    for amount in amounts {
+        script_builder = script_builder.push_data(&amount.to_be_bytes());
+    }
+    TransactionOutput {
+        value: 0,
+        script_pubkey: script_builder.into_bytes(),
+    }
+}
+
+pub fn slp_genesis_output(
+    ticker: &str,
+    name: &str,
+    token_document_url: Option<&str>,
+    token_document_hash: Option<H256>,
+    decimals: u8,
+    mint_baton_vout: Option<u8>,
+    initial_token_mint_quantity: u64,
+) -> TransactionOutput {
+    let mut script_builder = ScriptBuilder::default()
+        .push_opcode(Opcode::OP_RETURN)
+        .push_data(SLP_LOKAD_ID.as_bytes())
+        .push_data(&[SLP_FUNGIBLE])
+        .push_data(SLP_GENESIS.as_bytes())
+        .push_data(ticker.as_bytes())
+        .push_data(name.as_bytes());
+
+    script_builder = match token_document_url {
+        Some(url) => script_builder.push_data(url.as_bytes()),
+        None => script_builder
+            .push_opcode(Opcode::OP_PUSHDATA1)
+            .push_opcode(Opcode::OP_0),
+    };
+
+    script_builder = match token_document_hash {
+        Some(hash) => script_builder.push_data(hash.as_slice()),
+        None => script_builder
+            .push_opcode(Opcode::OP_PUSHDATA1)
+            .push_opcode(Opcode::OP_0),
+    };
+
+    script_builder = script_builder.push_data(&[decimals]);
+    script_builder = match mint_baton_vout {
+        Some(vout) => script_builder.push_data(&[vout]),
+        None => script_builder
+            .push_opcode(Opcode::OP_PUSHDATA1)
+            .push_opcode(Opcode::OP_0),
+    };
+
+    script_builder = script_builder.push_data(&initial_token_mint_quantity.to_be_bytes());
+    TransactionOutput {
+        value: 0,
+        script_pubkey: script_builder.into_bytes(),
+    }
+}
+
+#[derive(Debug)]
+pub struct SlpProtocolConf {
+    pub platform_coin_ticker: String,
+    pub token_id: H256,
+    pub decimals: u8,
+    pub required_confirmations: Option<u64>,
+}
+
 impl SlpToken {
     pub fn new(
         decimals: u8,
         ticker: String,
         token_id: H256,
-        platform_utxo: UtxoStandardCoin,
+        platform_coin: BchCoin,
         required_confirmations: u64,
     ) -> SlpToken {
         let conf = Arc::new(SlpTokenConf {
@@ -172,95 +310,39 @@ impl SlpToken {
             token_id,
             required_confirmations: AtomicU64::new(required_confirmations),
         });
-        SlpToken { conf, platform_utxo }
+        SlpToken { conf, platform_coin }
     }
 
-    fn rpc(&self) -> &UtxoRpcClientEnum { &self.platform_utxo.as_ref().rpc_client }
+    /// Returns the OP_RETURN output for SLP Send transaction
+    fn send_op_return_output(&self, amounts: &[u64]) -> TransactionOutput {
+        slp_send_output(&self.conf.token_id, amounts)
+    }
+
+    fn rpc(&self) -> &UtxoRpcClientEnum { &self.platform_coin.as_ref().rpc_client }
 
     /// Returns unspents of the SLP token plus plain BCH UTXOs plus RecentlySpentOutPoints mutex guard
-    async fn slp_unspents(
+    async fn slp_unspents_for_spend(
         &self,
-    ) -> Result<
-        (
-            Vec<SlpUnspent>,
-            Vec<UnspentInfo>,
-            AsyncMutexGuard<'_, RecentlySpentOutPoints>,
-        ),
-        MmError<SlpUnspentsErr>,
-    > {
-        let (unspents, recently_spent) = self
-            .platform_utxo
-            .list_unspent_ordered(&self.platform_utxo.as_ref().my_address)
-            .await?;
-
-        let mut slp_unspents = vec![];
-        let mut bch_unspents = vec![];
-
-        for unspent in unspents {
-            let prev_tx_bytes = self
-                .rpc()
-                .get_transaction_bytes(unspent.outpoint.hash.reversed().into())
-                .compat()
-                .await?;
-            let prev_tx: UtxoTx = deserialize(prev_tx_bytes.0.as_slice())?;
-            match parse_slp_script(&prev_tx.outputs[0].script_pubkey) {
-                Ok(slp_data) => match slp_data.transaction {
-                    SlpTransaction::Send { token_id, amounts } => {
-                        if token_id == self.token_id() && unspent.outpoint.index > 0 {
-                            match amounts.get(unspent.outpoint.index as usize - 1) {
-                                Some(slp_amount) => slp_unspents.push(SlpUnspent {
-                                    bch_unspent: unspent,
-                                    slp_amount: *slp_amount,
-                                }),
-                                None => bch_unspents.push(unspent),
-                            }
-                        }
-                    },
-                    SlpTransaction::Genesis {
-                        initial_token_mint_quantity,
-                        ..
-                    } => {
-                        if prev_tx.hash().reversed() == self.token_id()
-                            && initial_token_mint_quantity.len() == 8
-                            && unspent.outpoint.index == 1
-                        {
-                            let slp_amount = u64::from_be_bytes(initial_token_mint_quantity.try_into().unwrap());
-                            slp_unspents.push(SlpUnspent {
-                                bch_unspent: unspent,
-                                slp_amount,
-                            });
-                        } else {
-                            bch_unspents.push(unspent)
-                        }
-                    },
-                    SlpTransaction::Mint {
-                        token_id,
-                        additional_token_quantity,
-                        ..
-                    } => {
-                        if token_id == self.token_id() && additional_token_quantity.len() == 8 {
-                            let slp_amount = u64::from_be_bytes(additional_token_quantity.try_into().unwrap());
-                            slp_unspents.push(SlpUnspent {
-                                bch_unspent: unspent,
-                                slp_amount,
-                            });
-                        }
-                    },
-                },
-                Err(_) => bch_unspents.push(unspent),
-            }
-        }
+    ) -> UtxoRpcResult<(Vec<SlpUnspent>, Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        self.platform_coin.get_token_utxos_for_spend(&self.conf.token_id).await
+    }
 
-        slp_unspents.sort_by(|a, b| a.slp_amount.cmp(&b.slp_amount));
-        Ok((slp_unspents, bch_unspents, recently_spent))
+    async fn slp_unspents_for_display(&self) -> UtxoRpcResult<(Vec<SlpUnspent>, Vec<UnspentInfo>)> {
+        self.platform_coin
+            .get_token_utxos_for_display(&self.conf.token_id)
+            .await
     }
 
     /// Generates the tx preimage that spends the SLP from my address to the desired destinations (script pubkeys)
     async fn generate_slp_tx_preimage(
         &self,
         slp_outputs: Vec<SlpOutput>,
-    ) -> Result<SlpTxPreimage<'_>, MmError<GenSlpSpendErr>> {
-        let (slp_unspents, bch_unspents, recently_spent) = self.slp_unspents().await?;
+    ) -> Result<(SlpTxPreimage, RecentlySpentOutPointsGuard<'_>), MmError<GenSlpSpendErr>> {
+        // the limit is 19, but we may require the change to be added
+        if slp_outputs.len() > 18 {
+            return MmError::err(GenSlpSpendErr::TooManyOutputs);
+        }
+        let (slp_unspents, bch_unspents, recently_spent) = self.slp_unspents_for_spend().await?;
         let total_slp_output = slp_outputs.iter().fold(0, |cur, slp_out| cur + slp_out.amount);
         let mut total_slp_input = 0;
 
@@ -271,91 +353,108 @@ impl SlpToken {
             }
 
             total_slp_input += slp_utxo.slp_amount;
-            inputs.push(slp_utxo.bch_unspent);
+            inputs.push(slp_utxo);
         }
 
         if total_slp_input < total_slp_output {
-            return MmError::err(GenSlpSpendErr::InsufficientSlpBalance);
+            return MmError::err(GenSlpSpendErr::InsufficientSlpBalance {
+                coin: self.ticker().into(),
+                required: big_decimal_from_sat_unsigned(total_slp_output, self.decimals()),
+                available: big_decimal_from_sat_unsigned(total_slp_input, self.decimals()),
+            });
         }
         let change = total_slp_input - total_slp_output;
 
-        inputs.extend(bch_unspents);
-
         let mut amounts_for_op_return: Vec<_> = slp_outputs.iter().map(|spend_to| spend_to.amount).collect();
         if change > 0 {
             amounts_for_op_return.push(change);
         }
 
-        // TODO generate the script in MM2 instead of using the external library
-        let op_return_out = slp_send_output(
-            SlpTokenType::Fungible,
-            &TokenId::from_slice(self.token_id().as_slice()).unwrap(),
-            &amounts_for_op_return,
-        );
-        let op_return_out_mm = TransactionOutput {
-            value: 0,
-            script_pubkey: op_return_out.script.serialize().unwrap().to_vec().into(),
-        };
+        let op_return_out_mm = self.send_op_return_output(&amounts_for_op_return);
         let mut outputs = vec![op_return_out_mm];
 
         outputs.extend(slp_outputs.into_iter().map(|spend_to| TransactionOutput {
-            value: self.dust(),
+            value: self.platform_dust(),
             script_pubkey: spend_to.script_pubkey,
         }));
 
         if change > 0 {
+            let my_public_key = self.platform_coin.my_public_key()?;
             let slp_change_out = TransactionOutput {
-                value: self.dust(),
-                script_pubkey: ScriptBuilder::build_p2pkh(&self.platform_utxo.my_public_key().address_hash())
-                    .to_bytes(),
+                value: self.platform_dust(),
+                script_pubkey: ScriptBuilder::build_p2pkh(&my_public_key.address_hash().into()).to_bytes(),
             };
             outputs.push(slp_change_out);
         }
 
-        Ok(SlpTxPreimage {
-            inputs,
+        validate_slp_utxos(self.platform_coin.bchd_urls(), &inputs, self.token_id()).await?;
+        let preimage = SlpTxPreimage {
+            slp_inputs: inputs,
+            available_bch_inputs: bch_unspents,
             outputs,
+        };
+        Ok((preimage, recently_spent))
+    }
+
+    pub async fn send_slp_outputs(&self, slp_outputs: Vec<SlpOutput>) -> Result<UtxoTx, TransactionErr> {
+        let (preimage, recently_spent) = try_tx_s!(self.generate_slp_tx_preimage(slp_outputs).await);
+        generate_and_send_tx(
+            self,
+            preimage.available_bch_inputs,
+            Some(preimage.slp_inputs.into_iter().map(|slp| slp.bch_unspent).collect()),
+            FeePolicy::SendExact,
             recently_spent,
-        })
+            preimage.outputs,
+        )
+        .await
     }
 
     async fn send_htlc(
         &self,
+        my_pub: &Public,
         other_pub: &Public,
         time_lock: u32,
         secret_hash: &[u8],
         amount: u64,
-    ) -> Result<UtxoTx, String> {
-        let payment_script = payment_script(time_lock, secret_hash, self.platform_utxo.my_public_key(), other_pub);
-        let script_pubkey = ScriptBuilder::build_p2sh(&dhash160(&payment_script)).to_bytes();
+    ) -> Result<UtxoTx, TransactionErr> {
+        let payment_script = payment_script(time_lock, secret_hash, my_pub, other_pub);
+        let script_pubkey = ScriptBuilder::build_p2sh(&dhash160(&payment_script).into()).to_bytes();
         let slp_out = SlpOutput { amount, script_pubkey };
-        let preimage = try_s!(self.generate_slp_tx_preimage(vec![slp_out]).await);
+        let (preimage, recently_spent) = try_tx_s!(self.generate_slp_tx_preimage(vec![slp_out]).await);
         generate_and_send_tx(
-            &self.platform_utxo,
-            preimage.inputs,
-            preimage.outputs,
+            self,
+            preimage.available_bch_inputs,
+            Some(preimage.slp_inputs.into_iter().map(|slp| slp.bch_unspent).collect()),
             FeePolicy::SendExact,
-            preimage.recently_spent,
+            recently_spent,
+            preimage.outputs,
         )
         .await
     }
 
-    async fn validate_htlc(
-        &self,
-        tx: &[u8],
-        other_pub: &Public,
-        time_lock: u32,
-        secret_hash: &[u8],
-        amount: BigDecimal,
-    ) -> Result<(), MmError<ValidateHtlcError>> {
-        let mut tx: UtxoTx = deserialize(tx).map_to_mm(ValidateHtlcError::TxParseError)?;
-        tx.tx_hash_algo = self.platform_utxo.as_ref().tx_hash_algo;
+    async fn validate_htlc(&self, input: ValidatePaymentInput) -> Result<(), MmError<ValidateHtlcError>> {
+        let mut tx: UtxoTx = deserialize(input.payment_tx.as_slice()).map_to_mm(ValidateHtlcError::TxParseError)?;
+        tx.tx_hash_algo = self.platform_coin.as_ref().tx_hash_algo;
         if tx.outputs.len() < 2 {
             return MmError::err(ValidateHtlcError::TxLackOfOutputs);
         }
 
-        let slp_tx: SlpTxDetails =
-            deserialize(tx.outputs[0].script_pubkey.as_slice()).map_to_mm(ValidateHtlcError::OpReturnParseError)?;
+        let slp_satoshis = sat_from_big_decimal(&input.amount, self.decimals())?;
+
+        let slp_unspent = SlpUnspent {
+            bch_unspent: UnspentInfo {
+                outpoint: OutPoint {
+                    hash: tx.hash(),
+                    index: 1,
+                },
+                value: 0,
+                height: None,
+            },
+            slp_amount: slp_satoshis,
+        };
+        validate_slp_utxos(self.platform_coin.bchd_urls(), &[slp_unspent], self.token_id()).await?;
+
+        let slp_tx: SlpTxDetails = parse_slp_script(tx.outputs[0].script_pubkey.as_slice())?;
 
         match slp_tx.transaction {
             SlpTransaction::Send { token_id, amounts } => {
@@ -367,25 +466,25 @@ impl SlpToken {
                     return MmError::err(ValidateHtlcError::InvalidSlpDetails);
                 }
 
-                let expected = sat_from_big_decimal(&amount, self.decimals())?;
-
-                if amounts[0] != expected {
+                if amounts[0] != slp_satoshis {
                     return MmError::err(ValidateHtlcError::InvalidSlpDetails);
                 }
             },
             _ => return MmError::err(ValidateHtlcError::InvalidSlpDetails),
         }
 
-        let dust_decimal = big_decimal_from_sat_unsigned(self.dust(), self.platform_utxo.decimals());
+        let htlc_keypair = self.derive_htlc_key_pair(&input.unique_swap_data);
         let validate_fut = utxo_common::validate_payment(
-            self.platform_utxo.clone(),
+            self.platform_coin.clone(),
             tx,
             SLP_SWAP_VOUT,
-            other_pub,
-            self.platform_utxo.my_public_key(),
-            secret_hash,
-            dust_decimal,
-            time_lock,
+            &Public::from_slice(&input.other_pub).map_to_mm(ValidateHtlcError::OtherPubInvalid)?,
+            htlc_keypair.public(),
+            &input.secret_hash,
+            self.platform_dust_dec(),
+            input.time_lock,
+            now_ms() / 1000 + 60,
+            input.confirmations,
         );
 
         validate_fut
@@ -402,16 +501,18 @@ impl SlpToken {
         other_pub: &Public,
         time_lock: u32,
         secret_hash: &[u8],
+        htlc_keypair: &KeyPair,
     ) -> Result<UtxoTx, MmError<SpendHtlcError>> {
         let tx: UtxoTx = deserialize(htlc_tx)?;
         if tx.outputs.is_empty() {
             return MmError::err(SpendHtlcError::TxLackOfOutputs);
         }
 
-        let slp_tx: SlpTxDetails = deserialize(tx.outputs[0].script_pubkey.as_slice())?;
+        let slp_tx: SlpTxDetails = parse_slp_script(tx.outputs[0].script_pubkey.as_slice())?;
 
         let other_pub = Public::from_slice(other_pub)?;
-        let redeem_script = payment_script(time_lock, secret_hash, self.platform_utxo.my_public_key(), &other_pub);
+        let my_public_key = self.platform_coin.my_public_key()?;
+        let redeem_script = payment_script(time_lock, secret_hash, my_public_key, &other_pub);
 
         let slp_amount = match slp_tx.transaction {
             SlpTransaction::Send { token_id, amounts } => {
@@ -434,10 +535,17 @@ impl SlpToken {
             slp_amount,
         };
 
-        let tx_locktime = self.platform_utxo.p2sh_tx_locktime(time_lock).await?;
+        let tx_locktime = self.platform_coin.p2sh_tx_locktime(time_lock).await?;
         let script_data = ScriptBuilder::default().push_opcode(Opcode::OP_1).into_script();
         let tx = self
-            .spend_p2sh(slp_utxo, tx_locktime, SEQUENCE_FINAL - 1, script_data, redeem_script)
+            .spend_p2sh(
+                slp_utxo,
+                tx_locktime,
+                SEQUENCE_FINAL - 1,
+                script_data,
+                redeem_script,
+                htlc_keypair,
+            )
             .await?;
         Ok(tx)
     }
@@ -448,17 +556,13 @@ impl SlpToken {
         other_pub: &Public,
         time_lock: u32,
         secret: &[u8],
+        keypair: &KeyPair,
     ) -> Result<UtxoTx, MmError<SpendHtlcError>> {
         let tx: UtxoTx = deserialize(htlc_tx)?;
         let slp_tx: SlpTxDetails = deserialize(tx.outputs[0].script_pubkey.as_slice())?;
 
         let other_pub = Public::from_slice(other_pub)?;
-        let redeem_script = payment_script(
-            time_lock,
-            &*dhash160(secret),
-            &other_pub,
-            self.platform_utxo.my_public_key(),
-        );
+        let redeem = payment_script(time_lock, &*dhash160(secret), &other_pub, keypair.public());
 
         let slp_amount = match slp_tx.transaction {
             SlpTransaction::Send { token_id, amounts } => {
@@ -481,13 +585,13 @@ impl SlpToken {
             slp_amount,
         };
 
-        let tx_locktime = self.platform_utxo.p2sh_tx_locktime(time_lock).await?;
+        let tx_locktime = self.platform_coin.p2sh_tx_locktime(time_lock).await?;
         let script_data = ScriptBuilder::default()
             .push_data(secret)
             .push_opcode(Opcode::OP_0)
             .into_script();
         let tx = self
-            .spend_p2sh(slp_utxo, tx_locktime, SEQUENCE_FINAL, script_data, redeem_script)
+            .spend_p2sh(slp_utxo, tx_locktime, SEQUENCE_FINAL, script_data, redeem, keypair)
             .await?;
         Ok(tx)
     }
@@ -499,49 +603,40 @@ impl SlpToken {
         input_sequence: u32,
         script_data: Script,
         redeem_script: Script,
+        htlc_keypair: &KeyPair,
     ) -> Result<UtxoTx, MmError<SpendP2SHError>> {
-        let op_return = slp_send_output(
-            SlpTokenType::Fungible,
-            &TokenId::from_slice(self.token_id().as_slice()).unwrap(),
-            &[p2sh_utxo.slp_amount],
-        );
-        let op_return_out_mm = TransactionOutput {
-            value: 0,
-            script_pubkey: op_return.script.serialize().unwrap().to_vec().into(),
-        };
+        let op_return_out_mm = self.send_op_return_output(&[p2sh_utxo.slp_amount]);
         let mut outputs = Vec::with_capacity(3);
         outputs.push(op_return_out_mm);
 
-        let my_script_pubkey = ScriptBuilder::build_p2pkh(&self.platform_utxo.my_public_key().address_hash());
+        let my_public_key = self.platform_coin.my_public_key()?;
+        let my_script_pubkey = ScriptBuilder::build_p2pkh(&my_public_key.address_hash().into());
         let slp_output = TransactionOutput {
-            value: self.dust(),
+            value: self.platform_dust(),
             script_pubkey: my_script_pubkey.to_bytes(),
         };
         outputs.push(slp_output);
 
-        let (_, mut bch_inputs, _recently_spent) = self.slp_unspents().await?;
-        bch_inputs.insert(0, p2sh_utxo.bch_unspent);
-        let (mut unsigned, _) = generate_transaction(
-            &self.platform_utxo,
-            bch_inputs,
-            outputs,
-            FeePolicy::SendExact,
-            None,
-            None,
-        )
-        .await?;
+        let (_, bch_inputs, _recently_spent) = self.slp_unspents_for_spend().await?;
+        let (mut unsigned, _) = UtxoTxBuilder::new(&self.platform_coin)
+            .add_required_inputs(std::iter::once(p2sh_utxo.bch_unspent))
+            .add_available_inputs(bch_inputs)
+            .add_outputs(outputs)
+            .build()
+            .await?;
 
         unsigned.lock_time = tx_locktime;
         unsigned.inputs[0].sequence = input_sequence;
 
+        let my_key_pair = self.platform_coin.as_ref().priv_key_policy.key_pair_or_err()?;
         let signed_p2sh_input = p2sh_spend(
             &unsigned,
             0,
-            &self.platform_utxo.as_ref().key_pair,
+            htlc_keypair,
             script_data,
             redeem_script,
-            self.platform_utxo.as_ref().conf.signature_version,
-            self.platform_utxo.as_ref().conf.fork_id,
+            self.platform_coin.as_ref().conf.signature_version,
+            self.platform_coin.as_ref().conf.fork_id,
         )?;
 
         let signed_inputs: Result<Vec<_>, _> = unsigned
@@ -553,10 +648,10 @@ impl SlpToken {
                 p2pkh_spend(
                     &unsigned,
                     i,
-                    &self.platform_utxo.as_ref().key_pair,
-                    &my_script_pubkey,
-                    self.platform_utxo.as_ref().conf.signature_version,
-                    self.platform_utxo.as_ref().conf.fork_id,
+                    my_key_pair,
+                    my_script_pubkey.clone(),
+                    self.platform_coin.as_ref().conf.signature_version,
+                    self.platform_coin.as_ref().conf.fork_id,
                 )
             })
             .collect();
@@ -583,7 +678,7 @@ impl SlpToken {
             binding_sig: Default::default(),
             zcash: unsigned.zcash,
             str_d_zeel: unsigned.str_d_zeel,
-            tx_hash_algo: self.platform_utxo.as_ref().tx_hash_algo,
+            tx_hash_algo: self.platform_coin.as_ref().tx_hash_algo,
         };
 
         let _broadcast = self
@@ -606,8 +701,7 @@ impl SlpToken {
             return MmError::err(ValidateDexFeeError::TxLackOfOutputs);
         }
 
-        let slp_tx: SlpTxDetails =
-            deserialize(tx.outputs[0].script_pubkey.as_slice()).map_to_mm(ValidateDexFeeError::OpReturnParseError)?;
+        let slp_tx: SlpTxDetails = parse_slp_script(tx.outputs[0].script_pubkey.as_slice())?;
 
         match slp_tx.transaction {
             SlpTransaction::Send { token_id, amounts } => {
@@ -628,13 +722,12 @@ impl SlpToken {
             _ => return MmError::err(ValidateDexFeeError::InvalidSlpDetails),
         }
 
-        let dust_decimal = big_decimal_from_sat_unsigned(self.dust(), self.platform_utxo.decimals());
         let validate_fut = utxo_common::validate_fee(
-            self.platform_utxo.clone(),
+            self.platform_coin.clone(),
             tx,
             SLP_FEE_VOUT,
             expected_sender,
-            &dust_decimal,
+            &self.platform_dust_dec(),
             min_block_number,
             fee_addr,
         );
@@ -647,36 +740,80 @@ impl SlpToken {
         Ok(())
     }
 
-    pub fn dust(&self) -> u64 { self.platform_utxo.as_ref().dust_amount }
+    pub fn platform_dust(&self) -> u64 { self.platform_coin.as_ref().dust_amount }
+
+    pub fn platform_decimals(&self) -> u8 { self.platform_coin.as_ref().decimals }
+
+    pub fn platform_dust_dec(&self) -> BigDecimal {
+        big_decimal_from_sat_unsigned(self.platform_dust(), self.platform_decimals())
+    }
 
     pub fn decimals(&self) -> u8 { self.conf.decimals }
 
     pub fn token_id(&self) -> &H256 { &self.conf.token_id }
+
+    fn platform_conf(&self) -> &UtxoCoinConf { &self.platform_coin.as_ref().conf }
+
+    async fn my_balance_sat(&self) -> UtxoRpcResult<u64> {
+        let (slp_unspents, _) = self.slp_unspents_for_display().await?;
+        let satoshi = slp_unspents.iter().fold(0, |cur, unspent| cur + unspent.slp_amount);
+        Ok(satoshi)
+    }
+
+    pub async fn my_coin_balance(&self) -> UtxoRpcResult<CoinBalance> {
+        let balance_sat = self.my_balance_sat().await?;
+        let spendable = big_decimal_from_sat_unsigned(balance_sat, self.decimals());
+        Ok(CoinBalance {
+            spendable,
+            unspendable: 0.into(),
+        })
+    }
+
+    fn slp_prefix(&self) -> &CashAddrPrefix { self.platform_coin.slp_prefix() }
+
+    pub fn get_info(&self) -> SlpTokenInfo {
+        SlpTokenInfo {
+            token_id: self.conf.token_id,
+            decimals: self.conf.decimals,
+        }
+    }
+}
+
+#[derive(Debug, Eq, PartialEq)]
+pub struct SlpGenesisParams {
+    pub(super) token_ticker: String,
+    token_name: String,
+    token_document_url: String,
+    token_document_hash: Vec<u8>,
+    pub(super) decimals: Vec<u8>,
+    pub(super) mint_baton_vout: Option<u8>,
+    pub(super) initial_token_mint_quantity: u64,
 }
 
 /// https://slp.dev/specs/slp-token-type-1/#transaction-detail
 #[derive(Debug, Eq, PartialEq)]
-enum SlpTransaction {
+pub enum SlpTransaction {
     /// https://slp.dev/specs/slp-token-type-1/#genesis-token-genesis-transaction
-    Genesis {
-        token_ticker: String,
-        token_name: String,
-        token_document_url: String,
-        token_document_hash: Vec<u8>,
-        decimals: Vec<u8>,
-        mint_baton_vout: Vec<u8>,
-        initial_token_mint_quantity: Vec<u8>,
-    },
+    Genesis(SlpGenesisParams),
     /// https://slp.dev/specs/slp-token-type-1/#mint-extended-minting-transaction
     Mint {
         token_id: H256,
-        mint_baton_vout: Vec<u8>,
-        additional_token_quantity: Vec<u8>,
+        mint_baton_vout: Option<u8>,
+        additional_token_quantity: u64,
     },
     /// https://slp.dev/specs/slp-token-type-1/#send-spend-transaction
     Send { token_id: H256, amounts: Vec<u64> },
 }
 
+impl SlpTransaction {
+    pub fn token_id(&self) -> Option<H256> {
+        match self {
+            SlpTransaction::Send { token_id, .. } | SlpTransaction::Mint { token_id, .. } => Some(*token_id),
+            SlpTransaction::Genesis(_) => None,
+        }
+    }
+}
+
 impl Deserializable for SlpTransaction {
     fn deserialize<T>(reader: &mut Reader<T>) -> Result<Self, Error>
     where
@@ -685,7 +822,7 @@ impl Deserializable for SlpTransaction {
     {
         let transaction_type: String = reader.read()?;
         match transaction_type.as_str() {
-            "GENESIS" => {
+            SLP_GENESIS => {
                 let token_ticker = reader.read()?;
                 let token_name = reader.read()?;
                 let maybe_push_op_code: u8 = reader.read()?;
@@ -708,15 +845,18 @@ impl Deserializable for SlpTransaction {
                 let decimals = reader.read_list()?;
                 let maybe_push_op_code: u8 = reader.read()?;
                 let mint_baton_vout = if maybe_push_op_code == Opcode::OP_PUSHDATA1 as u8 {
-                    reader.read_list()?
+                    let _zero: u8 = reader.read()?;
+                    None
                 } else {
-                    let mut baton = vec![0; maybe_push_op_code as usize];
-                    reader.read_slice(&mut baton)?;
-                    baton
+                    Some(reader.read()?)
                 };
-                let initial_token_mint_quantity = reader.read_list()?;
+                let bytes: Vec<u8> = reader.read_list()?;
+                if bytes.len() != 8 {
+                    return Err(Error::Custom(format!("Expected 8 bytes, got {}", bytes.len())));
+                }
+                let initial_token_mint_quantity = u64::from_be_bytes(bytes.try_into().expect("length is 8 bytes"));
 
-                Ok(SlpTransaction::Genesis {
+                Ok(SlpTransaction::Genesis(SlpGenesisParams {
                     token_ticker,
                     token_name,
                     token_document_url,
@@ -724,21 +864,35 @@ impl Deserializable for SlpTransaction {
                     decimals,
                     mint_baton_vout,
                     initial_token_mint_quantity,
-                })
+                }))
             },
-            "MINT" => {
+            SLP_MINT => {
                 let maybe_id: Vec<u8> = reader.read_list()?;
                 if maybe_id.len() != 32 {
                     return Err(Error::Custom(format!("Unexpected token id length {}", maybe_id.len())));
                 }
 
+                let maybe_push_op_code: u8 = reader.read()?;
+                let mint_baton_vout = if maybe_push_op_code == Opcode::OP_PUSHDATA1 as u8 {
+                    let _zero: u8 = reader.read()?;
+                    None
+                } else {
+                    Some(reader.read()?)
+                };
+
+                let bytes: Vec<u8> = reader.read_list()?;
+                if bytes.len() != 8 {
+                    return Err(Error::Custom(format!("Expected 8 bytes, got {}", bytes.len())));
+                }
+                let additional_token_quantity = u64::from_be_bytes(bytes.try_into().expect("length is 8 bytes"));
+
                 Ok(SlpTransaction::Mint {
                     token_id: H256::from(maybe_id.as_slice()),
-                    mint_baton_vout: reader.read_list()?,
-                    additional_token_quantity: reader.read_list()?,
+                    mint_baton_vout,
+                    additional_token_quantity,
                 })
             },
-            "SEND" => {
+            SLP_SEND => {
                 let maybe_id: Vec<u8> = reader.read_list()?;
                 if maybe_id.len() != 32 {
                     return Err(Error::Custom(format!("Unexpected token id length {}", maybe_id.len())));
@@ -755,6 +909,12 @@ impl Deserializable for SlpTransaction {
                     amounts.push(amount)
                 }
 
+                if amounts.len() > 19 {
+                    return Err(Error::Custom(format!(
+                        "Expected at most 19 token amounts, got {}",
+                        amounts.len()
+                    )));
+                }
                 Ok(SlpTransaction::Send { token_id, amounts })
             },
             _ => Err(Error::Custom(format!(
@@ -766,16 +926,20 @@ impl Deserializable for SlpTransaction {
 }
 
 #[derive(Debug, Deserializable)]
-struct SlpTxDetails {
+pub struct SlpTxDetails {
     op_code: u8,
     lokad_id: String,
-    token_type: String,
-    transaction: SlpTransaction,
+    token_type: Vec<u8>,
+    pub transaction: SlpTransaction,
 }
 
-#[derive(Debug)]
-enum ParseSlpScriptError {
+#[derive(Debug, Display, PartialEq)]
+pub enum ParseSlpScriptError {
     NotOpReturn,
+    UnexpectedLokadId(String),
+    #[display(fmt = "UnexpectedTokenType: {:?}", _0)]
+    UnexpectedTokenType(Vec<u8>),
+    #[display(fmt = "DeserializeFailed: {:?}", _0)]
     DeserializeFailed(Error),
 }
 
@@ -783,74 +947,183 @@ impl From<Error> for ParseSlpScriptError {
     fn from(err: Error) -> ParseSlpScriptError { ParseSlpScriptError::DeserializeFailed(err) }
 }
 
-fn parse_slp_script(script: &[u8]) -> Result<SlpTxDetails, MmError<ParseSlpScriptError>> {
-    let details: SlpTxDetails = deserialize(script).map_to_mm(ParseSlpScriptError::from)?;
+pub fn parse_slp_script(script: &[u8]) -> Result<SlpTxDetails, MmError<ParseSlpScriptError>> {
+    let details: SlpTxDetails = deserialize(script)?;
     if Opcode::from_u8(details.op_code) != Some(Opcode::OP_RETURN) {
         return MmError::err(ParseSlpScriptError::NotOpReturn);
     }
+
+    if details.lokad_id != SLP_LOKAD_ID {
+        return MmError::err(ParseSlpScriptError::UnexpectedLokadId(details.lokad_id));
+    }
+
+    if details.token_type.first() != Some(&SLP_FUNGIBLE) {
+        return MmError::err(ParseSlpScriptError::UnexpectedTokenType(details.token_type));
+    }
+
     Ok(details)
 }
 
 #[derive(Debug, Display)]
-pub enum SlpUnspentsErr {
+enum GenSlpSpendErr {
     RpcError(UtxoRpcError),
-    #[display(fmt = "TxDeserializeError: {:?}", _0)]
-    TxDeserializeError(Error),
+    TooManyOutputs,
+    #[display(
+        fmt = "Not enough {} to generate SLP spend: available {}, required at least {}",
+        coin,
+        available,
+        required
+    )]
+    InsufficientSlpBalance {
+        coin: String,
+        available: BigDecimal,
+        required: BigDecimal,
+    },
+    InvalidSlpUtxos(ValidateSlpUtxosErr),
+    Internal(String),
+}
+
+impl From<UtxoRpcError> for GenSlpSpendErr {
+    fn from(err: UtxoRpcError) -> GenSlpSpendErr { GenSlpSpendErr::RpcError(err) }
 }
 
-impl From<UtxoRpcError> for SlpUnspentsErr {
-    fn from(err: UtxoRpcError) -> SlpUnspentsErr { SlpUnspentsErr::RpcError(err) }
+impl From<ValidateSlpUtxosErr> for GenSlpSpendErr {
+    fn from(err: ValidateSlpUtxosErr) -> GenSlpSpendErr { GenSlpSpendErr::InvalidSlpUtxos(err) }
 }
 
-impl From<Error> for SlpUnspentsErr {
-    fn from(err: Error) -> SlpUnspentsErr { SlpUnspentsErr::TxDeserializeError(err) }
+impl From<UnexpectedDerivationMethod> for GenSlpSpendErr {
+    fn from(e: UnexpectedDerivationMethod) -> Self { GenSlpSpendErr::Internal(e.to_string()) }
 }
 
-impl From<SlpUnspentsErr> for BalanceError {
-    fn from(err: SlpUnspentsErr) -> BalanceError {
+impl From<GenSlpSpendErr> for WithdrawError {
+    fn from(err: GenSlpSpendErr) -> WithdrawError {
         match err {
-            SlpUnspentsErr::RpcError(e) => BalanceError::Transport(e.to_string()),
-            SlpUnspentsErr::TxDeserializeError(e) => BalanceError::Internal(format!("{:?}", e)),
+            GenSlpSpendErr::RpcError(e) => e.into(),
+            GenSlpSpendErr::TooManyOutputs | GenSlpSpendErr::InvalidSlpUtxos(_) => {
+                WithdrawError::InternalError(err.to_string())
+            },
+            GenSlpSpendErr::InsufficientSlpBalance {
+                coin,
+                available,
+                required,
+            } => WithdrawError::NotSufficientBalance {
+                coin,
+                available,
+                required,
+            },
+            GenSlpSpendErr::Internal(internal) => WithdrawError::InternalError(internal),
         }
     }
 }
 
-#[derive(Debug, Display)]
-enum GenSlpSpendErr {
-    GetUnspentsErr(SlpUnspentsErr),
-    InsufficientSlpBalance,
+impl AsRef<UtxoCoinFields> for SlpToken {
+    fn as_ref(&self) -> &UtxoCoinFields { self.platform_coin.as_ref() }
+}
+
+#[async_trait]
+impl UtxoTxBroadcastOps for SlpToken {
+    async fn broadcast_tx(&self, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>> {
+        let tx_bytes = serialize(tx);
+        check_slp_transaction(self.platform_coin.bchd_urls(), tx_bytes.clone().take())
+            .await
+            .mm_err(|e| BroadcastTxErr::Other(e.to_string()))?;
+
+        let hash = self.rpc().send_raw_transaction(tx_bytes.into()).compat().await?;
+
+        Ok(hash)
+    }
 }
 
-impl From<SlpUnspentsErr> for GenSlpSpendErr {
-    fn from(err: SlpUnspentsErr) -> GenSlpSpendErr { GenSlpSpendErr::GetUnspentsErr(err) }
+#[async_trait]
+impl UtxoTxGenerationOps for SlpToken {
+    async fn get_tx_fee(&self) -> UtxoRpcResult<ActualTxFee> { self.platform_coin.get_tx_fee().await }
+
+    async fn calc_interest_if_required(
+        &self,
+        unsigned: TransactionInputSigner,
+        data: AdditionalTxData,
+        my_script_pub: Bytes,
+    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
+        self.platform_coin
+            .calc_interest_if_required(unsigned, data, my_script_pub)
+            .await
+    }
 }
 
 impl MarketCoinOps for SlpToken {
     fn ticker(&self) -> &str { &self.conf.ticker }
 
-    fn my_address(&self) -> Result<String, String> { unimplemented!() }
+    fn my_address(&self) -> Result<String, String> {
+        let my_address = try_s!(self.as_ref().derivation_method.iguana_or_err());
+        let slp_address = try_s!(self.platform_coin.slp_address(my_address));
+        slp_address.encode()
+    }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        let pubkey = utxo_common::my_public_key(self.platform_coin.as_ref())?;
+        Ok(pubkey.to_string())
+    }
+
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
+        utxo_common::sign_message_hash(self.as_ref(), message)
+    }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        utxo_common::sign_message(self.as_ref(), message)
+    }
+
+    fn verify_message(&self, signature: &str, message: &str, address: &str) -> VerificationResult<bool> {
+        let message_hash = self
+            .sign_message_hash(message)
+            .ok_or(VerificationError::PrefixNotFound)?;
+        let signature = CompactSignature::from(base64::decode(signature)?);
+        let pubkey = Public::recover_compact(&H256::from(message_hash), &signature)?;
+        let address_from_pubkey = self.platform_coin.address_from_pubkey(&pubkey);
+        let slp_address = self
+            .platform_coin
+            .slp_address(&address_from_pubkey)
+            .map_err(VerificationError::InternalError)?
+            .encode()
+            .map_err(VerificationError::InternalError)?;
+        Ok(slp_address == address)
+    }
 
     fn my_balance(&self) -> BalanceFut<CoinBalance> {
         let coin = self.clone();
-        let fut = async move {
-            let (slp_unspents, _, _) = coin.slp_unspents().await?;
-            let spendable_sat = slp_unspents.iter().fold(0, |cur, unspent| cur + unspent.slp_amount);
-            let spendable = big_decimal_from_sat_unsigned(spendable_sat, coin.decimals());
-            Ok(CoinBalance {
-                spendable,
-                unspendable: 0.into(),
-            })
-        };
+        let fut = async move { Ok(coin.my_coin_balance().await?) };
         Box::new(fut.boxed().compat())
     }
 
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> {
-        Box::new(self.platform_utxo.my_balance().map(|res| res.spendable))
+        Box::new(self.platform_coin.my_balance().map(|res| res.spendable))
     }
 
+    fn platform_ticker(&self) -> &str { self.platform_coin.ticker() }
+
     /// Receives raw transaction bytes in hexadecimal format as input and returns tx hash in hexadecimal format
     fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
-        self.platform_utxo.send_raw_tx(tx)
+        let selfi = self.clone();
+        let tx = tx.to_owned();
+        let fut = async move {
+            let bytes = hex::decode(tx).map_to_mm(|e| e).map_err(|e| format!("{:?}", e))?;
+            let tx = try_s!(deserialize(bytes.as_slice()));
+            let hash = selfi.broadcast_tx(&tx).await.map_err(|e| format!("{:?}", e))?;
+            Ok(format!("{:?}", hash))
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        let selfi = self.clone();
+        let bytes = tx.to_owned();
+        let fut = async move {
+            let tx = try_s!(deserialize(bytes.as_slice()));
+            let hash = selfi.broadcast_tx(&tx).await.map_err(|e| format!("{:?}", e))?;
+            Ok(format!("{:?}", hash))
+        };
+
+        Box::new(fut.boxed().compat())
     }
 
     fn wait_for_confirmations(
@@ -861,7 +1134,7 @@ impl MarketCoinOps for SlpToken {
         wait_until: u64,
         check_every: u64,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        self.platform_utxo
+        self.platform_coin
             .wait_for_confirmations(tx, confirmations, requires_nota, wait_until, check_every)
     }
 
@@ -873,7 +1146,7 @@ impl MarketCoinOps for SlpToken {
         _swap_contract_address: &Option<BytesJson>,
     ) -> TransactionFut {
         utxo_common::wait_for_output_spend(
-            self.platform_utxo.as_ref(),
+            self.platform_coin.as_ref(),
             transaction,
             SLP_SWAP_VOUT,
             from_block,
@@ -882,34 +1155,36 @@ impl MarketCoinOps for SlpToken {
     }
 
     fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
-        self.platform_utxo.tx_enum_from_bytes(bytes)
+        self.platform_coin.tx_enum_from_bytes(bytes)
     }
 
-    fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { self.platform_utxo.current_block() }
+    fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { self.platform_coin.current_block() }
 
-    fn display_priv_key(&self) -> String { self.platform_utxo.display_priv_key() }
+    fn display_priv_key(&self) -> Result<String, String> { self.platform_coin.display_priv_key() }
 
     fn min_tx_amount(&self) -> BigDecimal { big_decimal_from_sat_unsigned(1, self.decimals()) }
 
     fn min_trading_vol(&self) -> MmNumber { big_decimal_from_sat_unsigned(1, self.decimals()).into() }
 }
 
+#[async_trait]
 impl SwapOps for SlpToken {
-    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal) -> TransactionFut {
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
         let coin = self.clone();
-        let fee_pubkey = try_fus!(Public::from_slice(fee_addr));
-        let script_pubkey = ScriptBuilder::build_p2pkh(&fee_pubkey.address_hash()).into();
-        let amount = try_fus!(sat_from_big_decimal(&amount, self.decimals()));
+        let fee_pubkey = try_tx_fus!(Public::from_slice(fee_addr));
+        let script_pubkey = ScriptBuilder::build_p2pkh(&fee_pubkey.address_hash().into()).into();
+        let amount = try_tx_fus!(sat_from_big_decimal(&amount, self.decimals()));
 
         let fut = async move {
             let slp_out = SlpOutput { amount, script_pubkey };
-            let preimage = try_s!(coin.generate_slp_tx_preimage(vec![slp_out]).await);
+            let (preimage, recently_spent) = try_tx_s!(coin.generate_slp_tx_preimage(vec![slp_out]).await);
             generate_and_send_tx(
-                &coin.platform_utxo,
-                preimage.inputs,
-                preimage.outputs,
+                &coin,
+                preimage.available_bch_inputs,
+                Some(preimage.slp_inputs.into_iter().map(|slp| slp.bch_unspent).collect()),
                 FeePolicy::SendExact,
-                preimage.recently_spent,
+                recently_spent,
+                preimage.outputs,
             )
             .await
         };
@@ -923,14 +1198,19 @@ impl SwapOps for SlpToken {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let taker_pub = try_fus!(Public::from_slice(taker_pub));
-        let amount = try_fus!(sat_from_big_decimal(&amount, self.decimals()));
+        let taker_pub = try_tx_fus!(Public::from_slice(taker_pub));
+        let amount = try_tx_fus!(sat_from_big_decimal(&amount, self.decimals()));
         let secret_hash = secret_hash.to_owned();
+        let maker_htlc_keypair = self.derive_htlc_key_pair(swap_unique_data);
 
         let coin = self.clone();
         let fut = async move {
-            let tx = try_s!(coin.send_htlc(&taker_pub, time_lock, &secret_hash, amount).await);
+            let tx = try_tx_s!(
+                coin.send_htlc(maker_htlc_keypair.public(), &taker_pub, time_lock, &secret_hash, amount)
+                    .await
+            );
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -943,14 +1223,20 @@ impl SwapOps for SlpToken {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let maker_pub = try_fus!(Public::from_slice(maker_pub));
-        let amount = try_fus!(sat_from_big_decimal(&amount, self.decimals()));
+        let maker_pub = try_tx_fus!(Public::from_slice(maker_pub));
+        let amount = try_tx_fus!(sat_from_big_decimal(&amount, self.decimals()));
         let secret_hash = secret_hash.to_owned();
 
+        let taker_htlc_keypair = self.derive_htlc_key_pair(swap_unique_data);
+
         let coin = self.clone();
         let fut = async move {
-            let tx = try_s!(coin.send_htlc(&maker_pub, time_lock, &secret_hash, amount).await);
+            let tx = try_tx_s!(
+                coin.send_htlc(taker_htlc_keypair.public(), &maker_pub, time_lock, &secret_hash, amount)
+                    .await
+            );
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -963,14 +1249,19 @@ impl SwapOps for SlpToken {
         taker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
         let tx = taker_payment_tx.to_owned();
-        let taker_pub = try_fus!(Public::from_slice(taker_pub));
+        let taker_pub = try_tx_fus!(Public::from_slice(taker_pub));
         let secret = secret.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(swap_unique_data);
         let coin = self.clone();
 
         let fut = async move {
-            let tx = try_s!(coin.spend_htlc(&tx, &taker_pub, time_lock, &secret).await);
+            let tx = try_tx_s!(
+                coin.spend_htlc(&tx, &taker_pub, time_lock, &secret, &htlc_keypair)
+                    .await
+            );
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -983,14 +1274,19 @@ impl SwapOps for SlpToken {
         maker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
         let tx = maker_payment_tx.to_owned();
-        let maker_pub = try_fus!(Public::from_slice(maker_pub));
+        let maker_pub = try_tx_fus!(Public::from_slice(maker_pub));
         let secret = secret.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(swap_unique_data);
         let coin = self.clone();
 
         let fut = async move {
-            let tx = try_s!(coin.spend_htlc(&tx, &maker_pub, time_lock, &secret).await);
+            let tx = try_tx_s!(
+                coin.spend_htlc(&tx, &maker_pub, time_lock, &secret, &htlc_keypair)
+                    .await
+            );
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -1003,17 +1299,22 @@ impl SwapOps for SlpToken {
         maker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
         let tx = taker_payment_tx.to_owned();
-        let maker_pub = try_fus!(Public::from_slice(maker_pub));
+        let maker_pub = try_tx_fus!(Public::from_slice(maker_pub));
         let secret_hash = secret_hash.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(swap_unique_data);
         let coin = self.clone();
 
         let fut = async move {
-            let tx = try_s!(coin.refund_htlc(&tx, &maker_pub, time_lock, &secret_hash).await);
+            let tx = try_s!(
+                coin.refund_htlc(&tx, &maker_pub, time_lock, &secret_hash, &htlc_keypair)
+                    .await
+            );
             Ok(tx.into())
         };
-        Box::new(fut.boxed().compat())
+        Box::new(fut.boxed().compat().map_err(TransactionErr::Plain))
     }
 
     fn send_maker_refunds_payment(
@@ -1023,14 +1324,19 @@ impl SwapOps for SlpToken {
         taker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
         let tx = maker_payment_tx.to_owned();
-        let taker_pub = try_fus!(Public::from_slice(taker_pub));
+        let taker_pub = try_tx_fus!(Public::from_slice(taker_pub));
         let secret_hash = secret_hash.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(swap_unique_data);
         let coin = self.clone();
 
         let fut = async move {
-            let tx = try_s!(coin.refund_htlc(&tx, &taker_pub, time_lock, &secret_hash).await);
+            let tx = try_tx_s!(
+                coin.refund_htlc(&tx, &taker_pub, time_lock, &secret_hash, &htlc_keypair)
+                    .await
+            );
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -1043,6 +1349,7 @@ impl SwapOps for SlpToken {
         fee_addr: &[u8],
         amount: &BigDecimal,
         min_block_number: u64,
+        _uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let tx = match fee_tx {
             TransactionEnum::UtxoTx(tx) => tx.clone(),
@@ -1063,47 +1370,19 @@ impl SwapOps for SlpToken {
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_maker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        secret_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let maker_pub = try_fus!(Public::from_slice(maker_pub));
-        let tx = payment_tx.to_owned();
-        let secret_hash = secret_hash.to_owned();
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let coin = self.clone();
         let fut = async move {
-            try_s!(
-                coin.validate_htlc(&tx, &maker_pub, time_lock, &secret_hash, amount)
-                    .await
-            );
+            try_s!(coin.validate_htlc(input).await);
             Ok(())
         };
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_taker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        secret_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let taker_pub = try_fus!(Public::from_slice(taker_pub));
-        let tx = payment_tx.to_owned();
-        let secret_hash = secret_hash.to_owned();
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let coin = self.clone();
         let fut = async move {
-            try_s!(
-                coin.validate_htlc(&tx, &taker_pub, time_lock, &secret_hash, amount)
-                    .await
-            );
+            try_s!(coin.validate_htlc(input).await);
             Ok(())
         };
         Box::new(fut.boxed().compat())
@@ -1116,48 +1395,29 @@ impl SwapOps for SlpToken {
         secret_hash: &[u8],
         _search_from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
-        utxo_common::check_if_my_payment_sent(self.platform_utxo.clone(), time_lock, other_pub, secret_hash)
-    }
-
-    fn search_for_swap_tx_spend_my(
-        &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_my(
-            self.platform_utxo.as_ref(),
+        utxo_common::check_if_my_payment_sent(
+            self.platform_coin.clone(),
             time_lock,
             other_pub,
             secret_hash,
-            tx,
-            SLP_SWAP_VOUT,
-            search_from_block,
+            swap_unique_data,
         )
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_other(
-            self.platform_utxo.as_ref(),
-            time_lock,
-            other_pub,
-            secret_hash,
-            tx,
-            SLP_SWAP_VOUT,
-            search_from_block,
-        )
+        utxo_common::search_for_swap_tx_spend_my(&self.platform_coin, input, SLP_SWAP_VOUT).await
+    }
+
+    async fn search_for_swap_tx_spend_other(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        utxo_common::search_for_swap_tx_spend_other(&self.platform_coin, input, SLP_SWAP_VOUT).await
     }
 
     fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
@@ -1170,64 +1430,354 @@ impl SwapOps for SlpToken {
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
         Ok(None)
     }
+
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        utxo_common::derive_htlc_key_pair(self.platform_coin.as_ref(), swap_unique_data)
+    }
+}
+
+impl From<GenSlpSpendErr> for TradePreimageError {
+    fn from(slp: GenSlpSpendErr) -> TradePreimageError {
+        match slp {
+            GenSlpSpendErr::InsufficientSlpBalance {
+                coin,
+                available,
+                required,
+            } => TradePreimageError::NotSufficientBalance {
+                coin,
+                available,
+                required,
+            },
+            GenSlpSpendErr::RpcError(e) => e.into(),
+            GenSlpSpendErr::TooManyOutputs | GenSlpSpendErr::InvalidSlpUtxos(_) => {
+                TradePreimageError::InternalError(slp.to_string())
+            },
+            GenSlpSpendErr::Internal(internal) => TradePreimageError::InternalError(internal),
+        }
+    }
 }
 
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct SlpFeeDetails {
+    pub amount: BigDecimal,
+    pub coin: String,
+}
+
+impl From<SlpFeeDetails> for TxFeeDetails {
+    fn from(slp: SlpFeeDetails) -> TxFeeDetails { TxFeeDetails::Slp(slp) }
+}
+
+#[async_trait]
 impl MmCoin for SlpToken {
     fn is_asset_chain(&self) -> bool { false }
 
-    fn withdraw(&self, _req: WithdrawRequest) -> WithdrawFut { unimplemented!() }
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(
+            utxo_common::get_raw_transaction(self.platform_coin.as_ref(), req)
+                .boxed()
+                .compat(),
+        )
+    }
+
+    fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
+        let coin = self.clone();
+        let fut = async move {
+            let my_address = coin.platform_coin.as_ref().derivation_method.iguana_or_err()?;
+            let key_pair = coin.platform_coin.as_ref().priv_key_policy.key_pair_or_err()?;
+
+            let address = CashAddress::decode(&req.to).map_to_mm(WithdrawError::InvalidAddress)?;
+            if address.prefix != *coin.slp_prefix() {
+                return MmError::err(WithdrawError::InvalidAddress(format!(
+                    "Expected {} address prefix, not {}",
+                    coin.slp_prefix(),
+                    address.prefix
+                )));
+            };
+            let amount = if req.max {
+                coin.my_balance_sat().await?
+            } else {
+                sat_from_big_decimal(&req.amount, coin.decimals())?
+            };
+
+            if address.hash.len() != 20 {
+                return MmError::err(WithdrawError::InvalidAddress(format!(
+                    "Expected 20 address hash len, not {}",
+                    address.hash.len()
+                )));
+            }
+
+            // TODO clarify with community whether we should support withdrawal to SLP P2SH addresses
+            let script_pubkey = match address.address_type {
+                CashAddrType::P2PKH => {
+                    ScriptBuilder::build_p2pkh(&AddressHashEnum::AddressHash(address.hash.as_slice().into())).to_bytes()
+                },
+                CashAddrType::P2SH => {
+                    return MmError::err(WithdrawError::InvalidAddress(
+                        "Withdrawal to P2SH is not supported".into(),
+                    ))
+                },
+            };
+            let slp_output = SlpOutput { amount, script_pubkey };
+            let (slp_preimage, _) = coin.generate_slp_tx_preimage(vec![slp_output]).await?;
+            let mut tx_builder = UtxoTxBuilder::new(&coin.platform_coin)
+                .add_required_inputs(slp_preimage.slp_inputs.into_iter().map(|slp| slp.bch_unspent))
+                .add_available_inputs(slp_preimage.available_bch_inputs)
+                .add_outputs(slp_preimage.outputs);
+
+            let platform_decimals = coin.platform_decimals();
+            match req.fee {
+                Some(WithdrawFee::UtxoFixed { amount }) => {
+                    let fixed = sat_from_big_decimal(&amount, platform_decimals)?;
+                    tx_builder = tx_builder.with_fee(ActualTxFee::FixedPerKb(fixed))
+                },
+                Some(WithdrawFee::UtxoPerKbyte { amount }) => {
+                    let dynamic = sat_from_big_decimal(&amount, platform_decimals)?;
+                    tx_builder = tx_builder.with_fee(ActualTxFee::Dynamic(dynamic));
+                },
+                Some(fee_policy) => {
+                    let error = format!(
+                        "Expected 'UtxoFixed' or 'UtxoPerKbyte' fee types, found {:?}",
+                        fee_policy
+                    );
+                    return MmError::err(WithdrawError::InvalidFeePolicy(error));
+                },
+                None => (),
+            };
+
+            let (unsigned, tx_data) = tx_builder.build().await.mm_err(|gen_tx_error| {
+                WithdrawError::from_generate_tx_error(gen_tx_error, coin.platform_ticker().into(), platform_decimals)
+            })?;
+
+            let prev_script = ScriptBuilder::build_p2pkh(&my_address.hash);
+            let signed = sign_tx(
+                unsigned,
+                key_pair,
+                prev_script,
+                coin.platform_conf().signature_version,
+                coin.platform_conf().fork_id,
+            )?;
+            let fee_details = SlpFeeDetails {
+                amount: big_decimal_from_sat_unsigned(tx_data.fee_amount, coin.platform_decimals()),
+                coin: coin.platform_coin.ticker().into(),
+            };
+            let my_address_string = coin.my_address().map_to_mm(WithdrawError::InternalError)?;
+            let to_address = address.encode().map_to_mm(WithdrawError::InternalError)?;
+
+            let total_amount = big_decimal_from_sat_unsigned(amount, coin.decimals());
+            let spent_by_me = total_amount.clone();
+            let (received_by_me, my_balance_change) = if my_address_string == to_address {
+                (total_amount.clone(), 0.into())
+            } else {
+                (0.into(), &total_amount * &BigDecimal::from(-1))
+            };
+
+            let tx_hash: BytesJson = signed.hash().reversed().take().to_vec().into();
+            let details = TransactionDetails {
+                tx_hex: serialize(&signed).into(),
+                internal_id: tx_hash.clone(),
+                tx_hash: tx_hash.to_tx_hash(),
+                from: vec![my_address_string],
+                to: vec![to_address],
+                total_amount,
+                spent_by_me,
+                received_by_me,
+                my_balance_change,
+                block_height: 0,
+                timestamp: now_ms() / 1000,
+                fee_details: Some(fee_details.into()),
+                coin: coin.ticker().into(),
+                kmd_rewards: None,
+                transaction_type: Default::default(),
+            };
+            Ok(details)
+        };
+        Box::new(fut.boxed().compat())
+    }
 
     fn decimals(&self) -> u8 { self.decimals() }
 
-    fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> { unimplemented!() }
+    fn convert_to_address(&self, from: &str, to_address_format: Json) -> Result<String, String> {
+        utxo_common::convert_to_address(&self.platform_coin, from, to_address_format)
+    }
 
-    fn validate_address(&self, _address: &str) -> ValidateAddressResult { unimplemented!() }
+    fn validate_address(&self, address: &str) -> ValidateAddressResult {
+        let cash_address = match CashAddress::decode(address) {
+            Ok(a) => a,
+            Err(e) => {
+                return ValidateAddressResult {
+                    is_valid: false,
+                    reason: Some(format!("Error {} on parsing the {} as cash address", e, address)),
+                }
+            },
+        };
 
-    fn process_history_loop(&self, _ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> { unimplemented!() }
+        if cash_address.prefix == *self.slp_prefix() {
+            ValidateAddressResult {
+                is_valid: true,
+                reason: None,
+            }
+        } else {
+            ValidateAddressResult {
+                is_valid: false,
+                reason: Some(format!(
+                    "Address {} has invalid prefix {}, expected {}",
+                    address,
+                    cash_address.prefix,
+                    self.slp_prefix()
+                )),
+            }
+        }
+    }
 
-    fn history_sync_status(&self) -> HistorySyncState { unimplemented!() }
+    fn process_history_loop(&self, _ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> {
+        warn!("process_history_loop is not implemented for SLP yet!");
+        Box::new(futures01::future::err(()))
+    }
+
+    fn history_sync_status(&self) -> HistorySyncState { self.platform_coin.history_sync_status() }
 
     /// Get fee to be paid per 1 swap transaction
-    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> { unimplemented!() }
+    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> {
+        utxo_common::get_trade_fee(self.platform_coin.clone())
+    }
 
-    fn get_sender_trade_fee(&self, _value: TradePreimageValue, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
-        unimplemented!()
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        let slp_amount = match value {
+            TradePreimageValue::Exact(decimal) | TradePreimageValue::UpperBound(decimal) => {
+                sat_from_big_decimal(&decimal, self.decimals())?
+            },
+        };
+        // can use dummy P2SH script_pubkey here
+        let script_pubkey = ScriptBuilder::build_p2sh(&H160::default().into()).into();
+        let slp_out = SlpOutput {
+            amount: slp_amount,
+            script_pubkey,
+        };
+        let (preimage, _) = self.generate_slp_tx_preimage(vec![slp_out]).await?;
+        let fee = utxo_common::preimage_trade_fee_required_to_send_outputs(
+            &self.platform_coin,
+            self.platform_ticker(),
+            preimage.outputs,
+            FeePolicy::SendExact,
+            None,
+            &stage,
+        )
+        .await?;
+        Ok(TradeFee {
+            coin: self.platform_coin.ticker().into(),
+            amount: fee.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
+    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        let coin = self.clone();
 
-    fn get_fee_to_send_taker_fee(
+        let fut = async move {
+            let htlc_fee = coin.platform_coin.get_htlc_spend_fee(SLP_HTLC_SPEND_SIZE).await?;
+            let amount =
+                (big_decimal_from_sat_unsigned(htlc_fee, coin.platform_decimals()) + coin.platform_dust_dec()).into();
+            Ok(TradeFee {
+                coin: coin.platform_coin.ticker().into(),
+                amount,
+                paid_from_trading_vol: false,
+            })
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    async fn get_fee_to_send_taker_fee(
         &self,
-        _dex_fee_amount: BigDecimal,
-        _stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee> {
-        unimplemented!()
+        dex_fee_amount: BigDecimal,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        let slp_amount = sat_from_big_decimal(&dex_fee_amount, self.decimals())?;
+        // can use dummy P2PKH script_pubkey here
+        let script_pubkey = ScriptBuilder::build_p2pkh(&H160::default().into()).into();
+        let slp_out = SlpOutput {
+            amount: slp_amount,
+            script_pubkey,
+        };
+        let (preimage, _) = self.generate_slp_tx_preimage(vec![slp_out]).await?;
+        let fee = utxo_common::preimage_trade_fee_required_to_send_outputs(
+            &self.platform_coin,
+            self.platform_ticker(),
+            preimage.outputs,
+            FeePolicy::SendExact,
+            None,
+            &stage,
+        )
+        .await?;
+        Ok(TradeFee {
+            coin: self.platform_coin.ticker().into(),
+            amount: fee.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
-    fn required_confirmations(&self) -> u64 { 1 }
+    fn required_confirmations(&self) -> u64 { self.conf.required_confirmations.load(AtomicOrdering::Relaxed) }
 
     fn requires_notarization(&self) -> bool { false }
 
-    fn set_required_confirmations(&self, _confirmations: u64) { unimplemented!() }
+    fn set_required_confirmations(&self, confirmations: u64) {
+        self.conf
+            .required_confirmations
+            .store(confirmations, AtomicOrdering::Relaxed);
+    }
 
-    fn set_requires_notarization(&self, _requires_nota: bool) { unimplemented!() }
+    fn set_requires_notarization(&self, _requires_nota: bool) {
+        warn!("set_requires_notarization has no effect on SLPTOKEN!")
+    }
 
     fn swap_contract_address(&self) -> Option<BytesJson> { None }
 
-    fn mature_confirmations(&self) -> Option<u32> { self.platform_utxo.mature_confirmations() }
+    fn mature_confirmations(&self) -> Option<u32> { self.platform_coin.mature_confirmations() }
+
+    fn coin_protocol_info(&self) -> Vec<u8> { Vec::new() }
+
+    fn is_coin_protocol_supported(&self, _info: &Option<Vec<u8>>) -> bool { true }
+}
 
-    fn coin_protocol_info(&self) -> Vec<u8> { unimplemented!() }
+impl CoinWithTxHistoryV2 for SlpToken {
+    fn history_wallet_id(&self) -> WalletId { WalletId::new(self.platform_ticker().to_owned()) }
 
-    fn is_coin_protocol_supported(&self, _info: &Option<Vec<u8>>) -> bool { unimplemented!() }
+    fn get_tx_history_filters(&self) -> GetTxHistoryFilters {
+        GetTxHistoryFilters::new().with_token_id(self.token_id().to_string())
+    }
+}
+
+#[derive(Debug, Display)]
+pub enum SlpAddrFromPubkeyErr {
+    InvalidHex(hex::FromHexError),
+    CashAddrError(String),
+    EncodeError(String),
+}
+
+impl From<hex::FromHexError> for SlpAddrFromPubkeyErr {
+    fn from(err: FromHexError) -> SlpAddrFromPubkeyErr { SlpAddrFromPubkeyErr::InvalidHex(err) }
+}
+
+pub fn slp_addr_from_pubkey_str(pubkey: &str, prefix: &str) -> Result<String, MmError<SlpAddrFromPubkeyErr>> {
+    let pubkey_bytes = hex::decode(pubkey)?;
+    let hash = dhash160(&pubkey_bytes);
+    let addr =
+        CashAddress::new(prefix, hash.to_vec(), CashAddrType::P2PKH).map_to_mm(SlpAddrFromPubkeyErr::CashAddrError)?;
+    addr.encode().map_to_mm(SlpAddrFromPubkeyErr::EncodeError)
 }
 
 #[cfg(test)]
 mod slp_tests {
     use super::*;
-    use crate::utxo::utxo_standard::utxo_standard_coin_from_conf_and_request;
-    use common::mm_ctx::MmCtxBuilder;
-    use common::privkey::key_pair_from_seed;
-    use common::{block_on, now_ms};
+    use crate::utxo::GetUtxoListOps;
+    use crate::{utxo::bch::tbch_coin_for_test, TransactionErr};
+    use common::block_on;
+    use mocktopus::mocking::{MockResult, Mockable};
+    use std::mem::discriminant;
 
     // https://slp.dev/specs/slp-token-type-1/#examples
     #[test]
@@ -1250,16 +1800,16 @@ mod slp_tests {
                 .unwrap();
         let slp_data = parse_slp_script(&script).unwrap();
         assert_eq!(slp_data.lokad_id, "SLP\0");
-        let initial_token_mint_quantity = 1000_0000_0000u64.to_be_bytes().to_vec();
-        let expected_transaction = SlpTransaction::Genesis {
+        let initial_token_mint_quantity = 1000_0000_0000u64;
+        let expected_transaction = SlpTransaction::Genesis(SlpGenesisParams {
             token_ticker: "ADEX".to_string(),
             token_name: "ADEX".to_string(),
             token_document_url: "".to_string(),
             token_document_hash: vec![],
             decimals: vec![8],
-            mint_baton_vout: vec![],
+            mint_baton_vout: None,
             initial_token_mint_quantity,
-        };
+        });
 
         assert_eq!(expected_transaction, slp_data.transaction);
 
@@ -1268,17 +1818,17 @@ mod slp_tests {
             hex::decode("6a04534c500001010747454e45534953045553445423546574686572204c74642e20555320646f6c6c6172206261636b656420746f6b656e734168747470733a2f2f7465746865722e746f2f77702d636f6e74656e742f75706c6f6164732f323031362f30362f546574686572576869746550617065722e70646620db4451f11eda33950670aaf59e704da90117ff7057283b032cfaec77793139160108010208002386f26fc10000").unwrap();
         let slp_data = parse_slp_script(&script).unwrap();
         assert_eq!(slp_data.lokad_id, "SLP\0");
-        let initial_token_mint_quantity = 10000000000000000u64.to_be_bytes().to_vec();
-        let expected_transaction = SlpTransaction::Genesis {
+        let initial_token_mint_quantity = 10000000000000000u64;
+        let expected_transaction = SlpTransaction::Genesis(SlpGenesisParams {
             token_ticker: "USDT".to_string(),
             token_name: "Tether Ltd. US dollar backed tokens".to_string(),
             token_document_url: "https://tether.to/wp-content/uploads/2016/06/TetherWhitePaper.pdf".to_string(),
             token_document_hash: hex::decode("db4451f11eda33950670aaf59e704da90117ff7057283b032cfaec7779313916")
                 .unwrap(),
             decimals: vec![8],
-            mint_baton_vout: vec![2],
+            mint_baton_vout: Some(2),
             initial_token_mint_quantity,
-        };
+        });
 
         assert_eq!(expected_transaction, slp_data.transaction);
 
@@ -1289,12 +1839,13 @@ mod slp_tests {
         assert_eq!(slp_data.lokad_id, "SLP\0");
         let expected_transaction = SlpTransaction::Mint {
             token_id: "550d19eb820e616a54b8a73372c4420b5a0567d8dc00f613b71c5234dc884b35".into(),
-            mint_baton_vout: vec![2],
-            additional_token_quantity: hex::decode("002386f26fc10000").unwrap(),
+            mint_baton_vout: Some(2),
+            additional_token_quantity: 10000000000000000,
         };
 
         assert_eq!(expected_transaction, slp_data.transaction);
 
+        // SEND with 3 outputs
         let script = hex::decode("6a04534c500001010453454e4420550d19eb820e616a54b8a73372c4420b5a0567d8dc00f613b71c5234dc884b350800000000000003e80800000000000003e90800000000000003ea").unwrap();
         let token_id = "550d19eb820e616a54b8a73372c4420b5a0567d8dc00f613b71c5234dc884b35".into();
 
@@ -1305,131 +1856,286 @@ mod slp_tests {
             amounts: vec![1000, 1001, 1002],
         };
         assert_eq!(expected_transaction, slp_data.transaction);
+
+        // NFT Genesis, unsupported token type
+        // https://explorer.bitcoin.com/bch/tx/3dc17770ff832726aace53d305e087601d8b27cf881089d7849173736995f43e
+        let script = hex::decode("6a04534c500001410747454e45534953055357454443174573736b65657469742043617264204e6f2e20313136302b68747470733a2f2f636f6c6c65637469626c652e73776565742e696f2f7365726965732f35382f313136302040f8d39b6fc8725d9c766d66643d8ec644363ba32391c1d9a89a3edbdea8866a01004c00080000000000000001").unwrap();
+
+        let actual_err = parse_slp_script(&script).unwrap_err().into_inner();
+        let expected_err = ParseSlpScriptError::UnexpectedTokenType(vec![0x41]);
+        assert_eq!(expected_err, actual_err);
     }
 
     #[test]
-    #[ignore]
-    fn send_and_spend_htlc_on_testnet() {
-        let ctx = MmCtxBuilder::default().into_mm_arc();
-        let keypair = key_pair_from_seed("BCH SLP test").unwrap();
-
-        let conf = json!({"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id":"0x40","protocol":{"type":"UTXO"},
-         "address_format":{"format":"cashaddress","network":"bchtest"}});
-        let req = json!({
-            "method": "electrum",
-            "coin": "BCH",
-            "servers": [{"url":"blackie.c3-soft.com:60001"},{"url":"testnet.imaginary.cash:50001"}],
-        });
-        let bch = block_on(utxo_standard_coin_from_conf_and_request(
-            &ctx,
-            "BCH",
-            &conf,
-            &req,
-            &*keypair.private().secret,
-        ))
-        .unwrap();
+    fn test_slp_send_output() {
+        // Send single output
+        let expected_script = hex::decode("6a04534c500001010453454e4420e73b2b28c14db8ebbf97749988b539508990e1708021067f206f49d55807dbf4080000000005f5e100").unwrap();
+        let expected_output = TransactionOutput {
+            value: 0,
+            script_pubkey: expected_script.into(),
+        };
 
-        let balance = bch.my_balance().wait().unwrap();
-        println!("{}", balance.spendable);
+        let actual_output = slp_send_output(
+            &"e73b2b28c14db8ebbf97749988b539508990e1708021067f206f49d55807dbf4".into(),
+            &[100000000],
+        );
 
-        let address = bch.my_address().unwrap();
-        println!("{}", address);
+        assert_eq!(expected_output, actual_output);
 
-        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
-        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch, 0);
+        let expected_script = hex::decode("6a04534c500001010453454e4420550d19eb820e616a54b8a73372c4420b5a0567d8dc00f613b71c5234dc884b350800005af3107a40000800232bff5f46c000").unwrap();
+        let expected_output = TransactionOutput {
+            value: 0,
+            script_pubkey: expected_script.into(),
+        };
 
-        let fusd_balance = fusd.my_balance().wait().unwrap();
-        println!("FUSD {}", fusd_balance.spendable);
+        let actual_output = slp_send_output(
+            &"550d19eb820e616a54b8a73372c4420b5a0567d8dc00f613b71c5234dc884b35".into(),
+            &[100000000000000, 9900000000000000],
+        );
 
-        let secret = [0; 32];
-        let secret_hash = dhash160(&secret);
-        let time_lock = (now_ms() / 1000) as u32;
-        let amount: BigDecimal = "0.1".parse().unwrap();
+        assert_eq!(expected_output, actual_output);
+    }
 
-        let tx = fusd
-            .send_taker_payment(time_lock, &*keypair.public(), &*secret_hash, amount.clone(), &None)
-            .wait()
-            .unwrap();
-        println!("{}", hex::encode(tx.tx_hex()));
+    #[test]
+    fn test_slp_genesis_output() {
+        let expected_script =
+            hex::decode("6a04534c500001010747454e45534953044144455804414445584c004c0001084c0008000000174876e800")
+                .unwrap();
+        let expected_output = TransactionOutput {
+            value: 0,
+            script_pubkey: expected_script.into(),
+        };
 
-        fusd.validate_taker_payment(
-            &tx.tx_hex(),
-            time_lock,
-            &*keypair.public(),
-            &*secret_hash,
-            amount,
-            &None,
-        )
-        .wait()
-        .unwrap();
+        let actual_output = slp_genesis_output("ADEX", "ADEX", None, None, 8, None, 1000_0000_0000);
+        assert_eq!(expected_output, actual_output);
 
-        let spending_tx = fusd
-            .send_maker_spends_taker_payment(&tx.tx_hex(), time_lock, &*keypair.public(), &secret, &None)
-            .wait()
-            .unwrap();
-        println!("spend hex {}", hex::encode(spending_tx.tx_hex()));
-        println!("spend hash {}", hex::encode(spending_tx.tx_hash().0));
+        let expected_script =
+            hex::decode("6a04534c500001010747454e45534953045553445423546574686572204c74642e20555320646f6c6c6172206261636b656420746f6b656e734168747470733a2f2f7465746865722e746f2f77702d636f6e74656e742f75706c6f6164732f323031362f30362f546574686572576869746550617065722e70646620db4451f11eda33950670aaf59e704da90117ff7057283b032cfaec77793139160108010208002386f26fc10000")
+                .unwrap();
+        let expected_output = TransactionOutput {
+            value: 0,
+            script_pubkey: expected_script.into(),
+        };
 
-        let wait_for_spend = fusd
-            .wait_for_tx_spend(&tx.tx_hex(), (now_ms() / 1000) + 60, 0, &None)
-            .wait()
-            .unwrap();
-        println!("spend hex {}", hex::encode(wait_for_spend.tx_hex()));
-        println!("spend hash {}", hex::encode(wait_for_spend.tx_hash().0));
+        let actual_output = slp_genesis_output(
+            "USDT",
+            "Tether Ltd. US dollar backed tokens",
+            Some("https://tether.to/wp-content/uploads/2016/06/TetherWhitePaper.pdf"),
+            Some("db4451f11eda33950670aaf59e704da90117ff7057283b032cfaec7779313916".into()),
+            8,
+            Some(2),
+            10000000000000000,
+        );
+        assert_eq!(expected_output, actual_output);
+    }
 
-        let secret = fusd.extract_secret(&*secret_hash, &wait_for_spend.tx_hex()).unwrap();
-        println!("{:?}", secret);
+    #[test]
+    fn test_slp_address() {
+        let bch = tbch_coin_for_test();
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch, 0);
+
+        let slp_address = fusd.my_address().unwrap();
+        assert_eq!("slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8", slp_address);
     }
 
     #[test]
-    #[ignore]
-    fn send_and_refund_htlc_on_testnet() {
-        let ctx = MmCtxBuilder::default().into_mm_arc();
-        let keypair = key_pair_from_seed("BCH SLP test").unwrap();
-
-        let conf = json!({"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id":"0x40","protocol":{"type":"UTXO"},
-         "address_format":{"format":"cashaddress","network":"bchtest"}});
-        let req = json!({
-            "method": "electrum",
-            "coin": "BCH",
-            "servers": [{"url":"blackie.c3-soft.com:60001"},{"url":"testnet.imaginary.cash:50001"}],
+    fn test_validate_htlc_valid() {
+        let bch = tbch_coin_for_test();
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch, 0);
+
+        // https://testnet.simpleledger.info/tx/e935160bfb5b45007a0fc6f8fbe8da618f28df6573731f1ffb54d9560abb49b2
+        let payment_tx = hex::decode("0100000002736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5020000006a47304402206be99fe56a98e7a8c2ffe6f2d05c5c1f46a6577064b84d27d45fe0e959f6e77402201c512629313b48cd4df873222aa49046ae9a3a6e34e359d10d4308cb40438fba4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5030000006a473044022020d774d045bbe3dce5b04af836f6a5629c6c4ce75b0b5ba8a1da0ae9a4ecc0530220522f86d20c9e4142e40f9a9c8d25db16fde91d4a0ad6f6ff2107e201386131b64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001f3ee80300000000000017a914b0ca1fea17cf522c7e858416093fc6d95e55824087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accf614801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8c83d460").unwrap();
+
+        let other_pub = hex::decode("036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c").unwrap();
+
+        utxo_common::validate_payment::<BchCoin>.mock_safe(|coin, tx, out_i, pub0, _, h, a, lock, spv, conf| {
+            // replace the second public because payment was sent with privkey that is currently unknown
+            let my_pub = hex::decode("03c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3ed").unwrap();
+            let my_pub = Box::leak(Box::new(Public::from_slice(&my_pub).unwrap()));
+            MockResult::Continue((coin, tx, out_i, pub0, my_pub, h, a, lock, spv, conf))
         });
-        let bch = block_on(utxo_standard_coin_from_conf_and_request(
-            &ctx,
-            "BCH",
-            &conf,
-            &req,
-            &*keypair.private().secret,
+
+        let lock_time = 1624547837;
+        let secret_hash = hex::decode("5d9e149ad9ccb20e9f931a69b605df2ffde60242").unwrap();
+        let amount: BigDecimal = "0.1".parse().unwrap();
+        let input = ValidatePaymentInput {
+            payment_tx,
+            other_pub,
+            time_lock: lock_time,
+            secret_hash,
+            amount,
+            confirmations: 1,
+            try_spv_proof_until: now_ms() / 1000 + 60,
+            unique_swap_data: Vec::new(),
+            swap_contract_address: None,
+        };
+        block_on(fusd.validate_htlc(input)).unwrap();
+    }
+
+    #[test]
+    fn construct_and_send_invalid_slp_htlc_should_fail() {
+        let bch = tbch_coin_for_test();
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch.clone(), 0);
+
+        let bch_address = bch.as_ref().derivation_method.unwrap_iguana();
+        let (unspents, recently_spent) = block_on(bch.get_unspent_ordered_list(bch_address)).unwrap();
+
+        let secret_hash = hex::decode("5d9e149ad9ccb20e9f931a69b605df2ffde60242").unwrap();
+        let other_pub = hex::decode("036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c").unwrap();
+        let other_pub = Public::from_slice(&other_pub).unwrap();
+
+        let my_public_key = bch.my_public_key().unwrap();
+        let htlc_script = payment_script(1624547837, &secret_hash, &other_pub, my_public_key);
+
+        let slp_send_op_return_out = slp_send_output(&token_id, &[1000]);
+
+        let invalid_slp_send_out = TransactionOutput {
+            value: 1000,
+            script_pubkey: ScriptBuilder::build_p2sh(&dhash160(&htlc_script).into()).into(),
+        };
+
+        let tx_err = block_on(generate_and_send_tx(
+            &fusd,
+            unspents,
+            None,
+            FeePolicy::SendExact,
+            recently_spent,
+            vec![slp_send_op_return_out, invalid_slp_send_out],
         ))
-        .unwrap();
+        .unwrap_err();
+
+        let err = match tx_err.clone() {
+            TransactionErr::TxRecoverable(_tx, err) => err,
+            TransactionErr::Plain(err) => err,
+        };
 
-        let balance = bch.my_balance().wait().unwrap();
-        println!("{}", balance.spendable);
+        println!("{:?}", err);
+        assert!(err.contains("is not valid with reason outputs greater than inputs"));
+
+        // this is invalid tx bytes generated by one of this test runs, ensure that FUSD won't broadcast it using
+        // different methods
+        let tx_bytes: &[u8] = &[
+            1, 0, 0, 0, 1, 105, 91, 221, 196, 250, 138, 113, 118, 165, 149, 181, 70, 15, 224, 124, 67, 133, 237, 31,
+            88, 125, 178, 69, 166, 27, 211, 32, 54, 1, 238, 134, 102, 2, 0, 0, 0, 106, 71, 48, 68, 2, 32, 103, 105,
+            238, 187, 198, 194, 7, 162, 250, 17, 240, 45, 93, 168, 223, 35, 92, 23, 84, 70, 193, 234, 183, 130, 114,
+            49, 198, 118, 69, 22, 128, 118, 2, 32, 127, 44, 73, 98, 217, 254, 44, 181, 87, 175, 114, 138, 223, 173,
+            201, 168, 38, 198, 49, 23, 9, 101, 50, 154, 55, 236, 126, 253, 37, 114, 111, 218, 65, 33, 3, 104, 121, 223,
+            35, 6, 99, 219, 76, 208, 131, 200, 238, 176, 242, 147, 244, 106, 188, 70, 10, 211, 194, 153, 176, 8, 155,
+            114, 230, 212, 114, 32, 44, 255, 255, 255, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 55, 106, 4, 83, 76, 80, 0, 1, 1,
+            4, 83, 69, 78, 68, 32, 187, 48, 158, 72, 147, 6, 113, 88, 43, 234, 80, 143, 154, 29, 155, 73, 30, 73, 182,
+            155, 227, 214, 243, 114, 220, 8, 218, 42, 198, 233, 14, 183, 8, 0, 0, 0, 0, 0, 0, 3, 232, 232, 3, 0, 0, 0,
+            0, 0, 0, 23, 169, 20, 149, 59, 57, 9, 255, 106, 162, 105, 248, 93, 163, 76, 19, 42, 146, 66, 68, 64, 225,
+            142, 135, 205, 228, 173, 0, 0, 0, 0, 0, 25, 118, 169, 20, 140, 255, 252, 36, 9, 208, 99, 67, 125, 106, 168,
+            183, 90, 0, 155, 155, 165, 27, 113, 252, 136, 172, 216, 36, 92, 97,
+        ];
+
+        let tx_bytes_str = hex::encode(tx_bytes);
+        let err = fusd.send_raw_tx(&tx_bytes_str).wait().unwrap_err();
+        println!("{:?}", err);
+        assert!(err.contains("is not valid with reason outputs greater than inputs"));
+
+        let err2 = fusd.send_raw_tx_bytes(tx_bytes).wait().unwrap_err();
+        println!("{:?}", err2);
+        assert!(err2.contains("is not valid with reason outputs greater than inputs"));
+        assert_eq!(err, err2);
+
+        let utxo_tx: UtxoTx = deserialize(tx_bytes).unwrap();
+        let err = block_on(fusd.broadcast_tx(&utxo_tx)).unwrap_err();
+        match err.into_inner() {
+            BroadcastTxErr::Other(err) => assert!(err.contains("is not valid with reason outputs greater than inputs")),
+            e @ _ => panic!("Unexpected err {:?}", e),
+        };
 
-        let address = bch.my_address().unwrap();
-        println!("{}", address);
+        // The error variant should equal to `TxRecoverable`
+        assert_eq!(
+            discriminant(&tx_err),
+            discriminant(&TransactionErr::TxRecoverable(
+                TransactionEnum::from(utxo_tx),
+                String::new()
+            ))
+        );
+    }
 
+    #[test]
+    fn test_validate_htlc_invalid_slp_utxo() {
+        let bch = tbch_coin_for_test();
         let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
-        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch, 0);
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch.clone(), 0);
 
-        let fusd_balance = fusd.my_balance().wait().unwrap();
-        println!("FUSD {}", fusd_balance.spendable);
+        // https://www.blockchain.com/ru/bch-testnet/tx/6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69
+        let payment_tx = hex::decode("0100000001ce59a734f33811afcc00c19dcb12202ed00067a50efed80424fabd2b723678c0020000006b483045022100ec1fecff9c60fb7e821b9a412bd8c4ce4a757c68287f9cf9e0f461165492d6530220222f020dd05d65ba35cddd0116c99255612ec90d63019bb1cea45e2cf09a62a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914953b3909ff6aa269f85da34c132a92424440e18e879decad00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd1215c61").unwrap();
 
-        let secret = [0; 32];
-        let secret_hash = dhash160(&secret);
-        let time_lock = (now_ms() / 1000) as u32 - 7200;
+        let other_pub_bytes =
+            hex::decode("036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c").unwrap();
+        let other_pub = Public::from_slice(&other_pub_bytes).unwrap();
 
-        let tx = fusd
-            .send_taker_payment(time_lock, &[1; 33], &*secret_hash, 1.into(), &None)
-            .wait()
-            .unwrap();
-        println!("{}", hex::encode(tx.tx_hex()));
+        let lock_time = 1624547837;
+        let secret_hash = hex::decode("5d9e149ad9ccb20e9f931a69b605df2ffde60242").unwrap();
+        let amount: BigDecimal = "0.1".parse().unwrap();
+        let my_pub = bch.my_public_key().unwrap();
+
+        // standard BCH validation should pass as the output itself is correct
+        utxo_common::validate_payment(
+            bch.clone(),
+            deserialize(payment_tx.as_slice()).unwrap(),
+            SLP_SWAP_VOUT,
+            my_pub,
+            &other_pub,
+            &secret_hash,
+            fusd.platform_dust_dec(),
+            lock_time,
+            now_ms() / 1000 + 60,
+            1,
+        )
+        .wait()
+        .unwrap();
+
+        let input = ValidatePaymentInput {
+            payment_tx,
+            other_pub: other_pub_bytes,
+            time_lock: lock_time,
+            secret_hash,
+            amount,
+            swap_contract_address: None,
+            try_spv_proof_until: now_ms() / 1000 + 60,
+            confirmations: 1,
+            unique_swap_data: Vec::new(),
+        };
+        let validity_err = block_on(fusd.validate_htlc(input)).unwrap_err();
+        match validity_err.into_inner() {
+            ValidateHtlcError::InvalidSlpUtxo(e) => println!("{:?}", e),
+            err @ _ => panic!("Unexpected err {:?}", err),
+        };
+    }
 
-        let refund_tx = fusd
-            .send_taker_refunds_payment(&tx.tx_hex(), time_lock, &[1; 33], &*secret_hash, &None)
-            .wait()
+    #[test]
+    fn test_sign_message() {
+        let bch = tbch_coin_for_test();
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch, 0);
+        let signature = fusd.sign_message("test").unwrap();
+        assert_eq!(
+            signature,
+            "ILuePKMsycXwJiNDOT7Zb7TfIlUW7Iq+5ylKd15AK72vGVYXbnf7Gj9Lk9MFV+6Ub955j7MiAkp0wQjvuIoRPPA="
+        );
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_verify_message() {
+        let bch = tbch_coin_for_test();
+        let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch, 0);
+        let is_valid = fusd
+            .verify_message(
+                "ILuePKMsycXwJiNDOT7Zb7TfIlUW7Iq+5ylKd15AK72vGVYXbnf7Gj9Lk9MFV+6Ub955j7MiAkp0wQjvuIoRPPA=",
+                "test",
+                "slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8",
+            )
             .unwrap();
-        println!("refund hex {}", hex::encode(refund_tx.tx_hex()));
-        println!("refund hash {}", hex::encode(refund_tx.tx_hash().0));
+        assert!(is_valid);
     }
 }
diff --git a/mm2src/coins/utxo/tx_cache.rs b/mm2src/coins/utxo/tx_cache.rs
deleted file mode 100644
index 83d7bc9521..0000000000
--- a/mm2src/coins/utxo/tx_cache.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use common::safe_slurp;
-use futures::lock::Mutex as AsyncMutex;
-use rpc::v1::types::{Transaction as RpcTransaction, H256 as H256Json};
-use std::path::{Path, PathBuf};
-
-lazy_static! {
-    static ref TX_CACHE_LOCK: AsyncMutex<()> = AsyncMutex::new(());
-}
-
-/// Try load transaction from cache.
-/// Note: tx.confirmations can be out-of-date.
-pub async fn load_transaction_from_cache(
-    tx_cache_path: &Path,
-    txid: &H256Json,
-) -> Result<Option<RpcTransaction>, String> {
-    let _lock = TX_CACHE_LOCK.lock().await;
-
-    let path = cached_transaction_path(tx_cache_path, txid);
-    let data = try_s!(safe_slurp(&path));
-    if data.is_empty() {
-        // couldn't find corresponding file
-        return Ok(None);
-    }
-
-    let data = try_s!(String::from_utf8(data));
-    serde_json::from_str(&data).map(Some).map_err(|e| ERRL!("{}", e))
-}
-
-/// Upload transaction to cache.
-pub async fn cache_transaction(tx_cache_path: &Path, tx: &RpcTransaction) -> Result<(), String> {
-    let _lock = TX_CACHE_LOCK.lock().await;
-    let path = cached_transaction_path(tx_cache_path, &tx.txid);
-    let tmp_path = format!("{}.tmp", path.display());
-
-    let content = try_s!(serde_json::to_string(tx));
-
-    try_s!(std::fs::write(&tmp_path, content));
-    try_s!(std::fs::rename(tmp_path, path));
-    Ok(())
-}
-
-fn cached_transaction_path(tx_cache_path: &Path, txid: &H256Json) -> PathBuf {
-    tx_cache_path.join(format!("{:?}", txid))
-}
diff --git a/mm2src/coins/utxo/tx_cache/dummy_tx_cache.rs b/mm2src/coins/utxo/tx_cache/dummy_tx_cache.rs
new file mode 100644
index 0000000000..e18244ca39
--- /dev/null
+++ b/mm2src/coins/utxo/tx_cache/dummy_tx_cache.rs
@@ -0,0 +1,20 @@
+use crate::utxo::tx_cache::{TxCacheResult, UtxoVerboseCacheOps};
+use async_trait::async_trait;
+use rpc::v1::types::{Transaction as RpcTransaction, H256 as H256Json};
+use std::collections::{HashMap, HashSet};
+
+/// The dummy TX cache.
+#[derive(Debug, Default)]
+pub struct DummyVerboseCache;
+
+#[async_trait]
+impl UtxoVerboseCacheOps for DummyVerboseCache {
+    async fn load_transactions_from_cache_concurrently(
+        &self,
+        tx_ids: HashSet<H256Json>,
+    ) -> HashMap<H256Json, TxCacheResult<Option<RpcTransaction>>> {
+        tx_ids.into_iter().map(|txid| (txid, Ok(None))).collect()
+    }
+
+    async fn cache_transactions_concurrently(&self, _txs: &HashMap<H256Json, RpcTransaction>) {}
+}
diff --git a/mm2src/coins/utxo/tx_cache/fs_tx_cache.rs b/mm2src/coins/utxo/tx_cache/fs_tx_cache.rs
new file mode 100644
index 0000000000..9327bd5163
--- /dev/null
+++ b/mm2src/coins/utxo/tx_cache/fs_tx_cache.rs
@@ -0,0 +1,111 @@
+use crate::utxo::tx_cache::{TxCacheError, TxCacheResult, UtxoVerboseCacheOps};
+use async_trait::async_trait;
+use common::log::LogOnError;
+use futures::lock::Mutex as AsyncMutex;
+use futures::FutureExt;
+use mm2_err_handle::prelude::*;
+use mm2_io::fs::{read_json, write_json, FsJsonError};
+use parking_lot::Mutex as PaMutex;
+use rpc::v1::types::{Transaction as RpcTransaction, H256 as H256Json};
+use std::collections::hash_map::RawEntryMut;
+use std::collections::{HashMap, HashSet};
+use std::path::PathBuf;
+use std::sync::Arc;
+
+lazy_static! {
+    static ref TX_CACHE_LOCK: TxCacheLock = TxCacheLock::default();
+}
+
+impl From<FsJsonError> for TxCacheError {
+    fn from(e: FsJsonError) -> Self {
+        match e {
+            FsJsonError::IoReading(loading) => TxCacheError::ErrorLoading(loading.to_string()),
+            FsJsonError::IoWriting(writing) => TxCacheError::ErrorSaving(writing.to_string()),
+            FsJsonError::Serializing(ser) => TxCacheError::ErrorSerializing(ser.to_string()),
+            FsJsonError::Deserializing(de) => TxCacheError::ErrorDeserializing(de.to_string()),
+        }
+    }
+}
+
+/// The cache lock is used to avoid reading and writing the same files at the same time.
+#[derive(Default)]
+struct TxCacheLock {
+    /// The collection of `Ticker -> Mutex` pairs.
+    mutexes: PaMutex<HashMap<String, Arc<AsyncMutex<()>>>>,
+}
+
+impl TxCacheLock {
+    /// Get the mutex corresponding to the specified `ticker`.
+    pub fn mutex_by_ticker(&self, ticker: &str) -> Arc<AsyncMutex<()>> {
+        let mut locks = self.mutexes.lock();
+
+        match locks.raw_entry_mut().from_key(ticker) {
+            RawEntryMut::Occupied(mutex) => mutex.get().clone(),
+            RawEntryMut::Vacant(vacant_mutex) => {
+                let (_key, mutex) = vacant_mutex.insert(ticker.to_owned(), Arc::new(AsyncMutex::new(())));
+                mutex.clone()
+            },
+        }
+    }
+}
+
+/// The cache instance that assigned to a specified coin.
+///
+/// Please note [`UtxoVerboseCache::ticker`] may not equal to [`Coin::ticker`].
+/// In particular, `QRC20` tokens have the same transactions as `Qtum` coin,
+/// so [`Qrc20Coin::platform_ticker`] is used as [`UtxoVerboseCache::ticker`].
+#[derive(Debug)]
+pub struct FsVerboseCache {
+    ticker: String,
+    tx_cache_path: PathBuf,
+}
+
+#[async_trait]
+impl UtxoVerboseCacheOps for FsVerboseCache {
+    async fn load_transactions_from_cache_concurrently(
+        &self,
+        tx_ids: HashSet<H256Json>,
+    ) -> HashMap<H256Json, TxCacheResult<Option<RpcTransaction>>> {
+        let mutex = TX_CACHE_LOCK.mutex_by_ticker(&self.ticker);
+        let _lock = mutex.lock().await;
+
+        let it = tx_ids
+            .into_iter()
+            .map(|txid| self.load_transaction_from_cache(txid).map(move |res| (txid, res)));
+        futures::future::join_all(it).await.into_iter().collect()
+    }
+
+    async fn cache_transactions_concurrently(&self, txs: &HashMap<H256Json, RpcTransaction>) {
+        let mutex = TX_CACHE_LOCK.mutex_by_ticker(&self.ticker);
+        let _lock = mutex.lock().await;
+
+        let it = txs.iter().map(|(_txid, tx)| self.cache_transaction(tx));
+        futures::future::join_all(it)
+            .await
+            .into_iter()
+            .for_each(|tx| tx.error_log());
+    }
+}
+
+impl FsVerboseCache {
+    #[inline]
+    pub fn new(ticker: String, tx_cache_path: PathBuf) -> FsVerboseCache { FsVerboseCache { ticker, tx_cache_path } }
+
+    /// Tries to load transaction from cache.
+    /// Note: `tx.confirmations` can be out-of-date.
+    async fn load_transaction_from_cache(&self, txid: H256Json) -> TxCacheResult<Option<RpcTransaction>> {
+        let path = self.cached_transaction_path(&txid);
+        read_json(&path).await.mm_err(TxCacheError::from)
+    }
+
+    /// Uploads transaction to cache.
+    async fn cache_transaction(&self, tx: &RpcTransaction) -> TxCacheResult<()> {
+        const USE_TMP_FILE: bool = true;
+
+        let path = self.cached_transaction_path(&tx.txid);
+        write_json(tx, &path, USE_TMP_FILE).await.mm_err(TxCacheError::from)
+    }
+
+    #[inline]
+    fn cached_transaction_path(&self, txid: &H256Json) -> PathBuf { self.tx_cache_path.join(format!("{:?}", txid)) }
+}
diff --git a/mm2src/coins/utxo/tx_cache/mod.rs b/mm2src/coins/utxo/tx_cache/mod.rs
new file mode 100644
index 0000000000..32d6e67ee7
--- /dev/null
+++ b/mm2src/coins/utxo/tx_cache/mod.rs
@@ -0,0 +1,47 @@
+use async_trait::async_trait;
+use derive_more::Display;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::{Transaction as RpcTransaction, H256 as H256Json};
+use std::collections::{HashMap, HashSet};
+use std::fmt;
+use std::sync::Arc;
+
+pub mod dummy_tx_cache;
+#[cfg(not(target_arch = "wasm32"))] pub mod fs_tx_cache;
+
+#[cfg(target_arch = "wasm32")]
+pub mod wasm_tx_cache {
+    pub type WasmVerboseCache = crate::utxo::tx_cache::dummy_tx_cache::DummyVerboseCache;
+}
+
+pub type TxCacheResult<T> = MmResult<T, TxCacheError>;
+pub type UtxoVerboseCacheShared = Arc<dyn UtxoVerboseCacheOps + Send + Sync + 'static>;
+
+#[derive(Debug, Display)]
+pub enum TxCacheError {
+    ErrorLoading(String),
+    ErrorSaving(String),
+    ErrorDeserializing(String),
+    ErrorSerializing(String),
+}
+
+#[async_trait]
+pub trait UtxoVerboseCacheOps: fmt::Debug {
+    #[inline]
+    fn into_shared(self) -> UtxoVerboseCacheShared
+    where
+        Self: Sized + Send + Sync + 'static,
+    {
+        Arc::new(self)
+    }
+
+    /// Tries to load transactions from cache concurrently.
+    /// Please note `tx.confirmations` can be out-of-date.
+    async fn load_transactions_from_cache_concurrently(
+        &self,
+        tx_ids: HashSet<H256Json>,
+    ) -> HashMap<H256Json, TxCacheResult<Option<RpcTransaction>>>;
+
+    /// Uploads transactions to cache concurrently.
+    async fn cache_transactions_concurrently(&self, txs: &HashMap<H256Json, RpcTransaction>);
+}
diff --git a/mm2src/coins/utxo/utxo_block_header_storage.rs b/mm2src/coins/utxo/utxo_block_header_storage.rs
new file mode 100644
index 0000000000..925a0c80c3
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_block_header_storage.rs
@@ -0,0 +1,151 @@
+use crate::utxo::rpc_clients::ElectrumBlockHeader;
+#[cfg(target_arch = "wasm32")]
+use crate::utxo::utxo_indexedb_block_header_storage::IndexedDBBlockHeadersStorage;
+#[cfg(not(target_arch = "wasm32"))]
+use crate::utxo::utxo_sql_block_header_storage::SqliteBlockHeadersStorage;
+use crate::utxo::UtxoBlockHeaderVerificationParams;
+use async_trait::async_trait;
+use chain::BlockHeader;
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use std::collections::HashMap;
+use std::fmt::{Debug, Formatter};
+
+#[derive(Debug, Display)]
+pub enum BlockHeaderStorageError {
+    #[display(fmt = "Can't add to the storage for {} - reason: {}", ticker, reason)]
+    AddToStorageError { ticker: String, reason: String },
+    #[display(fmt = "Can't get from the storage for {} - reason: {}", ticker, reason)]
+    GetFromStorageError { ticker: String, reason: String },
+    #[display(
+        fmt = "Can't retrieve the table from the storage for {} - reason: {}",
+        ticker,
+        reason
+    )]
+    CantRetrieveTableError { ticker: String, reason: String },
+    #[display(fmt = "Can't query from the storage - query: {} - reason: {}", query, reason)]
+    QueryError { query: String, reason: String },
+    #[display(fmt = "Can't init from the storage - ticker: {} - reason: {}", ticker, reason)]
+    InitializationError { ticker: String, reason: String },
+    #[display(fmt = "Can't decode/deserialize from storage for {} - reason: {}", ticker, reason)]
+    DecodeError { ticker: String, reason: String },
+}
+
+pub struct BlockHeaderStorage {
+    pub inner: Box<dyn BlockHeaderStorageOps>,
+    pub params: UtxoBlockHeaderVerificationParams,
+}
+
+impl Debug for BlockHeaderStorage {
+    fn fmt(&self, _f: &mut Formatter<'_>) -> std::fmt::Result { Ok(()) }
+}
+
+pub trait InitBlockHeaderStorageOps: Send + Sync + 'static {
+    fn new_from_ctx(ctx: MmArc, params: UtxoBlockHeaderVerificationParams) -> Option<BlockHeaderStorage>
+    where
+        Self: Sized;
+}
+
+#[async_trait]
+pub trait BlockHeaderStorageOps: Send + Sync + 'static {
+    /// Initializes collection/tables in storage for a specified coin
+    async fn init(&self, for_coin: &str) -> Result<(), MmError<BlockHeaderStorageError>>;
+
+    async fn is_initialized_for(&self, for_coin: &str) -> Result<bool, MmError<BlockHeaderStorageError>>;
+
+    // Adds multiple block headers to the selected coin's header storage
+    // Should store it as `TICKER_HEIGHT=hex_string`
+    // use this function for headers that comes from `blockchain_headers_subscribe`
+    async fn add_electrum_block_headers_to_storage(
+        &self,
+        for_coin: &str,
+        headers: Vec<ElectrumBlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>>;
+
+    // Adds multiple block headers to the selected coin's header storage
+    // Should store it as `TICKER_HEIGHT=hex_string`
+    // use this function for headers that comes from `blockchain_block_headers`
+    async fn add_block_headers_to_storage(
+        &self,
+        for_coin: &str,
+        headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>>;
+
+    /// Gets the block header by height from the selected coin's storage as BlockHeader
+    async fn get_block_header(
+        &self,
+        for_coin: &str,
+        height: u64,
+    ) -> Result<Option<BlockHeader>, MmError<BlockHeaderStorageError>>;
+
+    /// Gets the block header by height from the selected coin's storage as hex
+    async fn get_block_header_raw(
+        &self,
+        for_coin: &str,
+        height: u64,
+    ) -> Result<Option<String>, MmError<BlockHeaderStorageError>>;
+}
+
+impl InitBlockHeaderStorageOps for BlockHeaderStorage {
+    #[cfg(not(target_arch = "wasm32"))]
+    fn new_from_ctx(ctx: MmArc, params: UtxoBlockHeaderVerificationParams) -> Option<BlockHeaderStorage> {
+        ctx.sqlite_connection.as_option().map(|connection| BlockHeaderStorage {
+            inner: Box::new(SqliteBlockHeadersStorage(connection.clone())),
+            params,
+        })
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    fn new_from_ctx(_ctx: MmArc, params: UtxoBlockHeaderVerificationParams) -> Option<BlockHeaderStorage> {
+        Some(BlockHeaderStorage {
+            inner: Box::new(IndexedDBBlockHeadersStorage {}),
+            params,
+        })
+    }
+}
+
+#[async_trait]
+impl BlockHeaderStorageOps for BlockHeaderStorage {
+    async fn init(&self, for_coin: &str) -> Result<(), MmError<BlockHeaderStorageError>> {
+        self.inner.init(for_coin).await
+    }
+
+    async fn is_initialized_for(&self, for_coin: &str) -> Result<bool, MmError<BlockHeaderStorageError>> {
+        self.inner.is_initialized_for(for_coin).await
+    }
+
+    async fn add_electrum_block_headers_to_storage(
+        &self,
+        for_coin: &str,
+        headers: Vec<ElectrumBlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>> {
+        self.inner
+            .add_electrum_block_headers_to_storage(for_coin, headers)
+            .await
+    }
+
+    async fn add_block_headers_to_storage(
+        &self,
+        for_coin: &str,
+        headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>> {
+        self.inner.add_block_headers_to_storage(for_coin, headers).await
+    }
+
+    async fn get_block_header(
+        &self,
+        for_coin: &str,
+        height: u64,
+    ) -> Result<Option<BlockHeader>, MmError<BlockHeaderStorageError>> {
+        self.inner.get_block_header(for_coin, height).await
+    }
+
+    async fn get_block_header_raw(
+        &self,
+        for_coin: &str,
+        height: u64,
+    ) -> Result<Option<String>, MmError<BlockHeaderStorageError>> {
+        self.inner.get_block_header_raw(for_coin, height).await
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_builder/mod.rs b/mm2src/coins/utxo/utxo_builder/mod.rs
new file mode 100644
index 0000000000..9c1cf135d0
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_builder/mod.rs
@@ -0,0 +1,9 @@
+mod utxo_arc_builder;
+mod utxo_coin_builder;
+mod utxo_conf_builder;
+
+pub use utxo_arc_builder::{MergeUtxoArcOps, UtxoArcBuilder};
+pub use utxo_coin_builder::{UtxoCoinBuildError, UtxoCoinBuildResult, UtxoCoinBuilder, UtxoCoinBuilderCommonOps,
+                            UtxoCoinWithIguanaPrivKeyBuilder, UtxoFieldsWithHardwareWalletBuilder,
+                            UtxoFieldsWithIguanaPrivKeyBuilder};
+pub use utxo_conf_builder::{UtxoConfBuilder, UtxoConfError, UtxoConfResult};
diff --git a/mm2src/coins/utxo/utxo_builder/utxo_arc_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_arc_builder.rs
new file mode 100644
index 0000000000..d4964b12c4
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_builder/utxo_arc_builder.rs
@@ -0,0 +1,163 @@
+use crate::utxo::utxo_block_header_storage::BlockHeaderStorage;
+use crate::utxo::utxo_builder::{UtxoCoinBuildError, UtxoCoinBuilder, UtxoCoinBuilderCommonOps,
+                                UtxoFieldsWithHardwareWalletBuilder, UtxoFieldsWithIguanaPrivKeyBuilder};
+use crate::utxo::utxo_common::{block_header_utxo_loop, merge_utxo_loop};
+use crate::utxo::{GetUtxoListOps, UtxoArc, UtxoCommonOps, UtxoWeak};
+use crate::{PrivKeyBuildPolicy, UtxoActivationParams};
+use async_trait::async_trait;
+use common::executor::spawn;
+use common::log::info;
+use futures::future::{abortable, AbortHandle};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+
+pub struct UtxoArcBuilder<'a, F, T>
+where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static,
+{
+    ctx: &'a MmArc,
+    ticker: &'a str,
+    conf: &'a Json,
+    activation_params: &'a UtxoActivationParams,
+    priv_key_policy: PrivKeyBuildPolicy<'a>,
+    constructor: F,
+}
+
+impl<'a, F, T> UtxoArcBuilder<'a, F, T>
+where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static,
+{
+    pub fn new(
+        ctx: &'a MmArc,
+        ticker: &'a str,
+        conf: &'a Json,
+        activation_params: &'a UtxoActivationParams,
+        priv_key_policy: PrivKeyBuildPolicy<'a>,
+        constructor: F,
+    ) -> UtxoArcBuilder<'a, F, T> {
+        UtxoArcBuilder {
+            ctx,
+            ticker,
+            conf,
+            activation_params,
+            priv_key_policy,
+            constructor,
+        }
+    }
+}
+
+#[async_trait]
+impl<'a, F, T> UtxoCoinBuilderCommonOps for UtxoArcBuilder<'a, F, T>
+where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static,
+{
+    fn ctx(&self) -> &MmArc { self.ctx }
+
+    fn conf(&self) -> &Json { self.conf }
+
+    fn activation_params(&self) -> &UtxoActivationParams { self.activation_params }
+
+    fn ticker(&self) -> &str { self.ticker }
+}
+
+impl<'a, F, T> UtxoFieldsWithIguanaPrivKeyBuilder for UtxoArcBuilder<'a, F, T> where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static
+{
+}
+
+impl<'a, F, T> UtxoFieldsWithHardwareWalletBuilder for UtxoArcBuilder<'a, F, T> where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static
+{
+}
+
+#[async_trait]
+impl<'a, F, T> UtxoCoinBuilder for UtxoArcBuilder<'a, F, T>
+where
+    F: Fn(UtxoArc) -> T + Clone + Send + Sync + 'static,
+    T: UtxoCommonOps + GetUtxoListOps,
+{
+    type ResultCoin = T;
+    type Error = UtxoCoinBuildError;
+
+    fn priv_key_policy(&self) -> PrivKeyBuildPolicy<'_> { self.priv_key_policy.clone() }
+
+    async fn build(self) -> MmResult<Self::ResultCoin, Self::Error> {
+        let utxo = self.build_utxo_fields().await?;
+        let utxo_arc = UtxoArc::new(utxo);
+        let utxo_weak = utxo_arc.downgrade();
+        let result_coin = (self.constructor)(utxo_arc);
+
+        self.spawn_merge_utxo_loop_if_required(utxo_weak.clone(), self.constructor.clone());
+        if let Some(abort_handler) = self.spawn_block_header_utxo_loop_if_required(
+            utxo_weak,
+            &result_coin.as_ref().block_headers_storage,
+            self.constructor.clone(),
+        ) {
+            self.ctx.abort_handlers.lock().unwrap().push(abort_handler);
+        }
+        Ok(result_coin)
+    }
+}
+
+impl<'a, F, T> MergeUtxoArcOps<T> for UtxoArcBuilder<'a, F, T>
+where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static,
+    T: UtxoCommonOps + GetUtxoListOps,
+{
+}
+
+impl<'a, F, T> BlockHeaderUtxoArcOps<T> for UtxoArcBuilder<'a, F, T>
+where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static,
+    T: UtxoCommonOps,
+{
+}
+
+pub trait MergeUtxoArcOps<T: UtxoCommonOps + GetUtxoListOps>: UtxoCoinBuilderCommonOps {
+    fn spawn_merge_utxo_loop_if_required<F>(&self, weak: UtxoWeak, constructor: F)
+    where
+        F: Fn(UtxoArc) -> T + Send + Sync + 'static,
+    {
+        if let Some(ref merge_params) = self.activation_params().utxo_merge_params {
+            let fut = merge_utxo_loop(
+                weak,
+                merge_params.merge_at,
+                merge_params.check_every,
+                merge_params.max_merge_at_once,
+                constructor,
+            );
+            info!("Starting UTXO merge loop for coin {}", self.ticker());
+            spawn(fut);
+        }
+    }
+}
+
+pub trait BlockHeaderUtxoArcOps<T>: UtxoCoinBuilderCommonOps {
+    fn spawn_block_header_utxo_loop_if_required<F>(
+        &self,
+        weak: UtxoWeak,
+        maybe_storage: &Option<BlockHeaderStorage>,
+        constructor: F,
+    ) -> Option<AbortHandle>
+    where
+        F: Fn(UtxoArc) -> T + Send + Sync + 'static,
+        T: UtxoCommonOps,
+    {
+        if maybe_storage.is_some() {
+            let ticker = self.ticker().to_owned();
+            let (fut, abort_handle) = abortable(block_header_utxo_loop(weak, constructor));
+            info!("Starting UTXO block header loop for coin {}", ticker);
+            spawn(async move {
+                if let Err(e) = fut.await {
+                    info!(
+                        "spawn_block_header_utxo_loop_if_required stopped for {}, reason {}",
+                        ticker, e
+                    );
+                }
+            });
+            return Some(abort_handle);
+        }
+        None
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs
new file mode 100644
index 0000000000..dac910db93
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs
@@ -0,0 +1,756 @@
+use crate::hd_wallet::{HDAccountsMap, HDAccountsMutex};
+use crate::hd_wallet_storage::{HDWalletCoinStorage, HDWalletStorageError};
+use crate::utxo::rpc_clients::{ElectrumClient, ElectrumClientImpl, ElectrumRpcRequest, EstimateFeeMethod,
+                               UtxoRpcClientEnum};
+use crate::utxo::tx_cache::{UtxoVerboseCacheOps, UtxoVerboseCacheShared};
+use crate::utxo::utxo_block_header_storage::{BlockHeaderStorage, InitBlockHeaderStorageOps};
+use crate::utxo::utxo_builder::utxo_conf_builder::{UtxoConfBuilder, UtxoConfError, UtxoConfResult};
+use crate::utxo::{output_script, utxo_common, ElectrumBuilderArgs, ElectrumProtoVerifier, RecentlySpentOutPoints,
+                  TxFee, UtxoCoinConf, UtxoCoinFields, UtxoHDAccount, UtxoHDWallet, UtxoRpcMode, DEFAULT_GAP_LIMIT,
+                  UTXO_DUST_AMOUNT};
+use crate::{BlockchainNetwork, CoinTransportMetrics, DerivationMethod, HistorySyncState, PrivKeyBuildPolicy,
+            PrivKeyPolicy, RpcClientType, UtxoActivationParams};
+use async_trait::async_trait;
+use chain::TxHashAlgo;
+use common::executor::{spawn, Timer};
+use common::log::{error, info};
+use common::small_rng;
+use crypto::{Bip32DerPathError, Bip44DerPathError, Bip44PathToCoin, CryptoCtx, CryptoInitError, HwWalletType};
+use derive_more::Display;
+use futures::channel::mpsc;
+use futures::compat::Future01CompatExt;
+use futures::lock::Mutex as AsyncMutex;
+use futures::StreamExt;
+use keys::bytes::Bytes;
+pub use keys::{Address, AddressFormat as UtxoAddressFormat, AddressHashEnum, KeyPair, Private, Public, Secret,
+               Type as ScriptType};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use primitives::hash::H256;
+use rand::seq::SliceRandom;
+use serde_json::{self as json, Value as Json};
+use std::sync::{Arc, Mutex, Weak};
+
+cfg_native! {
+    use crate::utxo::coin_daemon_data_dir;
+    use crate::utxo::rpc_clients::{ConcurrentRequestMap, NativeClient, NativeClientImpl};
+    use dirs::home_dir;
+    use std::path::{Path, PathBuf};
+}
+
+pub type UtxoCoinBuildResult<T> = Result<T, MmError<UtxoCoinBuildError>>;
+
+#[derive(Debug, Display)]
+pub enum UtxoCoinBuildError {
+    ConfError(UtxoConfError),
+    #[display(fmt = "Native RPC client is only supported in native mode")]
+    NativeRpcNotSupportedInWasm,
+    ErrorReadingNativeModeConf(String),
+    #[display(fmt = "Rpc port is not set neither in `coins` file nor in native daemon config")]
+    RpcPortIsNotSet,
+    ErrorDetectingFeeMethod(String),
+    ErrorDetectingDecimals(String),
+    InvalidBlockchainNetwork(String),
+    #[display(
+        fmt = "Failed to connect to at least 1 of {:?} in {} seconds.",
+        electrum_servers,
+        seconds
+    )]
+    FailedToConnectToElectrums {
+        electrum_servers: Vec<ElectrumRpcRequest>,
+        seconds: u64,
+    },
+    ElectrumProtocolVersionCheckError(String),
+    #[display(fmt = "Can not detect the user home directory")]
+    CantDetectUserHome,
+    #[display(fmt = "Unexpected derivation method: {}", _0)]
+    UnexpectedDerivationMethod(String),
+    #[display(fmt = "Hardware Wallet context is not initialized")]
+    HwContextNotInitialized,
+    HDWalletStorageError(HDWalletStorageError),
+    #[display(
+        fmt = "Coin should be activated with Hardware Wallet. Please consider using `\"priv_key_policy\": \"Trezor\"` in the activation request"
+    )]
+    CoinShouldBeActivatedWithHw,
+    #[display(
+        fmt = "Coin doesn't support Trezor hardware wallet. Please consider adding the 'trezor_coin' field to the coins config"
+    )]
+    CoinDoesntSupportTrezor,
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<UtxoConfError> for UtxoCoinBuildError {
+    fn from(e: UtxoConfError) -> Self { UtxoCoinBuildError::ConfError(e) }
+}
+
+impl From<CryptoInitError> for UtxoCoinBuildError {
+    /// `CryptoCtx` is expected to be initialized already.
+    fn from(crypto_err: CryptoInitError) -> Self { UtxoCoinBuildError::Internal(crypto_err.to_string()) }
+}
+
+impl From<Bip32DerPathError> for UtxoCoinBuildError {
+    fn from(e: Bip32DerPathError) -> Self { UtxoCoinBuildError::Internal(Bip44DerPathError::from(e).to_string()) }
+}
+
+impl From<HDWalletStorageError> for UtxoCoinBuildError {
+    fn from(e: HDWalletStorageError) -> Self { UtxoCoinBuildError::HDWalletStorageError(e) }
+}
+
+#[async_trait]
+pub trait UtxoCoinBuilder: UtxoFieldsWithIguanaPrivKeyBuilder + UtxoFieldsWithHardwareWalletBuilder {
+    type ResultCoin;
+    type Error: NotMmError;
+
+    fn priv_key_policy(&self) -> PrivKeyBuildPolicy<'_>;
+
+    async fn build(self) -> MmResult<Self::ResultCoin, Self::Error>;
+
+    async fn build_utxo_fields(&self) -> UtxoCoinBuildResult<UtxoCoinFields> {
+        match self.priv_key_policy() {
+            PrivKeyBuildPolicy::IguanaPrivKey(priv_key) => self.build_utxo_fields_with_iguana_priv_key(priv_key).await,
+            PrivKeyBuildPolicy::Trezor => self.build_utxo_fields_with_trezor().await,
+        }
+    }
+}
+
+#[async_trait]
+pub trait UtxoCoinWithIguanaPrivKeyBuilder: UtxoFieldsWithIguanaPrivKeyBuilder {
+    type ResultCoin;
+    type Error: NotMmError;
+
+    fn priv_key(&self) -> &[u8];
+
+    async fn build(self) -> MmResult<Self::ResultCoin, Self::Error>;
+}
+
+#[async_trait]
+pub trait UtxoFieldsWithIguanaPrivKeyBuilder: UtxoCoinBuilderCommonOps {
+    async fn build_utxo_fields_with_iguana_priv_key(&self, priv_key: &[u8]) -> UtxoCoinBuildResult<UtxoCoinFields> {
+        let conf = UtxoConfBuilder::new(self.conf(), self.activation_params(), self.ticker()).build()?;
+
+        if self.is_hw_coin(&conf) {
+            return MmError::err(UtxoCoinBuildError::CoinShouldBeActivatedWithHw);
+        }
+
+        let private = Private {
+            prefix: conf.wif_prefix,
+            secret: H256::from(priv_key),
+            compressed: true,
+            checksum_type: conf.checksum_type,
+        };
+        let key_pair = KeyPair::from_private(private).map_to_mm(|e| UtxoCoinBuildError::Internal(e.to_string()))?;
+        let addr_format = self.address_format()?;
+        let my_address = Address {
+            prefix: conf.pub_addr_prefix,
+            t_addr_prefix: conf.pub_t_addr_prefix,
+            hash: AddressHashEnum::AddressHash(key_pair.public().address_hash()),
+            checksum_type: conf.checksum_type,
+            hrp: conf.bech32_hrp.clone(),
+            addr_format,
+        };
+
+        let my_script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
+        let derivation_method = DerivationMethod::Iguana(my_address);
+        let priv_key_policy = PrivKeyPolicy::KeyPair(key_pair);
+
+        let rpc_client = self.rpc_client().await?;
+        let tx_fee = self.tx_fee(&rpc_client).await?;
+        let decimals = self.decimals(&rpc_client).await?;
+        let dust_amount = self.dust_amount();
+
+        let initial_history_state = self.initial_history_state();
+        let tx_hash_algo = self.tx_hash_algo();
+        let check_utxo_maturity = self.check_utxo_maturity();
+        let tx_cache = self.tx_cache();
+        let block_headers_storage = self.block_headers_storage()?;
+
+        let coin = UtxoCoinFields {
+            conf,
+            decimals,
+            dust_amount,
+            rpc_client,
+            priv_key_policy,
+            derivation_method,
+            history_sync_state: Mutex::new(initial_history_state),
+            tx_cache,
+            block_headers_storage,
+            recently_spent_outpoints: AsyncMutex::new(RecentlySpentOutPoints::new(my_script_pubkey)),
+            tx_fee,
+            tx_hash_algo,
+            check_utxo_maturity,
+        };
+        Ok(coin)
+    }
+}
+
+#[async_trait]
+pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
+    async fn build_utxo_fields_with_trezor(&self) -> UtxoCoinBuildResult<UtxoCoinFields> {
+        let ticker = self.ticker().to_owned();
+        let conf = UtxoConfBuilder::new(self.conf(), self.activation_params(), &ticker).build()?;
+
+        if !self.supports_trezor(&conf) {
+            return MmError::err(UtxoCoinBuildError::CoinDoesntSupportTrezor);
+        }
+        self.check_if_trezor_is_initialized()?;
+
+        // For now, use a default script pubkey.
+        // TODO change the type of `recently_spent_outpoints` to `AsyncMutex<HashMap<Bytes, RecentlySpentOutPoints>>`
+        let my_script_pubkey = Bytes::new();
+        let recently_spent_outpoints = AsyncMutex::new(RecentlySpentOutPoints::new(my_script_pubkey));
+
+        let address_format = self.address_format()?;
+        let derivation_path = self.derivation_path()?;
+
+        let hd_wallet_storage = HDWalletCoinStorage::init(self.ctx(), ticker).await?;
+
+        let accounts = self
+            .load_hd_wallet_accounts(&hd_wallet_storage, &derivation_path)
+            .await?;
+        let gap_limit = self.gap_limit();
+        let hd_wallet = UtxoHDWallet {
+            hd_wallet_storage,
+            address_format,
+            derivation_path,
+            accounts: HDAccountsMutex::new(accounts),
+            gap_limit,
+        };
+
+        let rpc_client = self.rpc_client().await?;
+        let tx_fee = self.tx_fee(&rpc_client).await?;
+        let decimals = self.decimals(&rpc_client).await?;
+        let dust_amount = self.dust_amount();
+
+        let initial_history_state = self.initial_history_state();
+        let tx_hash_algo = self.tx_hash_algo();
+        let check_utxo_maturity = self.check_utxo_maturity();
+        let tx_cache = self.tx_cache();
+        let block_headers_storage = self.block_headers_storage()?;
+
+        let coin = UtxoCoinFields {
+            conf,
+            decimals,
+            dust_amount,
+            rpc_client,
+            priv_key_policy: PrivKeyPolicy::Trezor,
+            derivation_method: DerivationMethod::HDWallet(hd_wallet),
+            history_sync_state: Mutex::new(initial_history_state),
+            block_headers_storage,
+            tx_cache,
+            recently_spent_outpoints,
+            tx_fee,
+            tx_hash_algo,
+            check_utxo_maturity,
+        };
+        Ok(coin)
+    }
+
+    async fn load_hd_wallet_accounts(
+        &self,
+        hd_wallet_storage: &HDWalletCoinStorage,
+        derivation_path: &Bip44PathToCoin,
+    ) -> UtxoCoinBuildResult<HDAccountsMap<UtxoHDAccount>> {
+        utxo_common::load_hd_accounts_from_storage(hd_wallet_storage, derivation_path)
+            .await
+            .mm_err(UtxoCoinBuildError::from)
+    }
+
+    fn derivation_path(&self) -> UtxoConfResult<Bip44PathToCoin> {
+        if self.conf()["derivation_path"].is_null() {
+            return MmError::err(UtxoConfError::DerivationPathIsNotSet);
+        }
+        json::from_value(self.conf()["derivation_path"].clone())
+            .map_to_mm(|e| UtxoConfError::ErrorDeserializingDerivationPath(e.to_string()))
+    }
+
+    fn gap_limit(&self) -> u32 { self.activation_params().gap_limit.unwrap_or(DEFAULT_GAP_LIMIT) }
+
+    fn supports_trezor(&self, conf: &UtxoCoinConf) -> bool { conf.trezor_coin.is_some() }
+
+    fn check_if_trezor_is_initialized(&self) -> UtxoCoinBuildResult<()> {
+        let crypto_ctx = CryptoCtx::from_ctx(self.ctx())?;
+        let hw_ctx = crypto_ctx
+            .hw_ctx()
+            .or_mm_err(|| UtxoCoinBuildError::HwContextNotInitialized)?;
+        match hw_ctx.hw_wallet_type() {
+            HwWalletType::Trezor => Ok(()),
+        }
+    }
+}
+
+#[async_trait]
+pub trait UtxoCoinBuilderCommonOps {
+    fn ctx(&self) -> &MmArc;
+
+    fn conf(&self) -> &Json;
+
+    fn activation_params(&self) -> &UtxoActivationParams;
+
+    fn ticker(&self) -> &str;
+
+    fn block_headers_storage(&self) -> UtxoCoinBuildResult<Option<BlockHeaderStorage>> {
+        let params: Option<_> = json::from_value(self.conf()["block_header_params"].clone())
+            .map_to_mm(|e| UtxoConfError::InvalidBlockHeaderParams(e.to_string()))?;
+        match params {
+            None => Ok(None),
+            Some(params) => Ok(BlockHeaderStorage::new_from_ctx(self.ctx().clone(), params)),
+        }
+    }
+
+    fn address_format(&self) -> UtxoCoinBuildResult<UtxoAddressFormat> {
+        let format_from_req = self.activation_params().address_format.clone();
+        let format_from_conf = json::from_value::<Option<UtxoAddressFormat>>(self.conf()["address_format"].clone())
+            .map_to_mm(|e| UtxoConfError::InvalidAddressFormat(e.to_string()))?
+            .unwrap_or(UtxoAddressFormat::Standard);
+
+        let mut address_format = match format_from_req {
+            Some(from_req) => {
+                if from_req.is_segwit() != format_from_conf.is_segwit() {
+                    let error = format!(
+                        "Both conf {:?} and request {:?} must be either Segwit or Standard/CashAddress",
+                        format_from_conf, from_req
+                    );
+                    return MmError::err(UtxoCoinBuildError::from(UtxoConfError::InvalidAddressFormat(error)));
+                } else {
+                    from_req
+                }
+            },
+            None => format_from_conf,
+        };
+
+        if let UtxoAddressFormat::CashAddress {
+            network: _,
+            ref mut pub_addr_prefix,
+            ref mut p2sh_addr_prefix,
+        } = address_format
+        {
+            *pub_addr_prefix = self.pub_addr_prefix();
+            *p2sh_addr_prefix = self.p2sh_address_prefix();
+        }
+
+        let is_segwit_in_conf = self.conf()["segwit"].as_bool().unwrap_or(false);
+        if address_format.is_segwit() && (!is_segwit_in_conf || self.conf()["bech32_hrp"].is_null()) {
+            let error =
+                "Cannot use Segwit address format for coin without segwit support or bech32_hrp in config".to_owned();
+            return MmError::err(UtxoCoinBuildError::from(UtxoConfError::InvalidAddressFormat(error)));
+        }
+        Ok(address_format)
+    }
+
+    fn pub_addr_prefix(&self) -> u8 {
+        let pubtype = self.conf()["pubtype"]
+            .as_u64()
+            .unwrap_or(if self.ticker() == "BTC" { 0 } else { 60 });
+        pubtype as u8
+    }
+
+    fn p2sh_address_prefix(&self) -> u8 {
+        self.conf()["p2shtype"]
+            .as_u64()
+            .unwrap_or(if self.ticker() == "BTC" { 5 } else { 85 }) as u8
+    }
+
+    fn dust_amount(&self) -> u64 { json::from_value(self.conf()["dust"].clone()).unwrap_or(UTXO_DUST_AMOUNT) }
+
+    fn network(&self) -> UtxoCoinBuildResult<BlockchainNetwork> {
+        let conf = self.conf();
+        if !conf["network"].is_null() {
+            return json::from_value(conf["network"].clone())
+                .map_to_mm(|e| UtxoCoinBuildError::InvalidBlockchainNetwork(e.to_string()));
+        }
+        Ok(BlockchainNetwork::Mainnet)
+    }
+
+    async fn decimals(&self, _rpc_client: &UtxoRpcClientEnum) -> UtxoCoinBuildResult<u8> {
+        Ok(self.conf()["decimals"].as_u64().unwrap_or(8) as u8)
+    }
+
+    async fn tx_fee(&self, rpc_client: &UtxoRpcClientEnum) -> UtxoCoinBuildResult<TxFee> {
+        let tx_fee = match self.conf()["txfee"].as_u64() {
+            None => TxFee::FixedPerKb(1000),
+            Some(0) => {
+                let fee_method = match &rpc_client {
+                    UtxoRpcClientEnum::Electrum(_) => EstimateFeeMethod::Standard,
+                    UtxoRpcClientEnum::Native(client) => client
+                        .detect_fee_method()
+                        .compat()
+                        .await
+                        .map_to_mm(UtxoCoinBuildError::ErrorDetectingFeeMethod)?,
+                };
+                TxFee::Dynamic(fee_method)
+            },
+            Some(fee) => TxFee::FixedPerKb(fee),
+        };
+        Ok(tx_fee)
+    }
+
+    fn initial_history_state(&self) -> HistorySyncState {
+        if self.activation_params().tx_history {
+            HistorySyncState::NotStarted
+        } else {
+            HistorySyncState::NotEnabled
+        }
+    }
+
+    async fn rpc_client(&self) -> UtxoCoinBuildResult<UtxoRpcClientEnum> {
+        match self.activation_params().mode.clone() {
+            UtxoRpcMode::Native => {
+                #[cfg(target_arch = "wasm32")]
+                {
+                    MmError::err(UtxoCoinBuildError::NativeRpcNotSupportedInWasm)
+                }
+                #[cfg(not(target_arch = "wasm32"))]
+                {
+                    let native = self.native_client()?;
+                    Ok(UtxoRpcClientEnum::Native(native))
+                }
+            },
+            UtxoRpcMode::Electrum { servers } => {
+                let electrum = self.electrum_client(ElectrumBuilderArgs::default(), servers).await?;
+                Ok(UtxoRpcClientEnum::Electrum(electrum))
+            },
+        }
+    }
+
+    async fn electrum_client(
+        &self,
+        args: ElectrumBuilderArgs,
+        mut servers: Vec<ElectrumRpcRequest>,
+    ) -> UtxoCoinBuildResult<ElectrumClient> {
+        let (on_connect_tx, on_connect_rx) = mpsc::unbounded();
+        let ticker = self.ticker().to_owned();
+        let ctx = self.ctx();
+        let mut event_handlers = vec![];
+        if args.collect_metrics {
+            event_handlers.push(
+                CoinTransportMetrics::new(ctx.metrics.weak(), ticker.clone(), RpcClientType::Electrum).into_shared(),
+            );
+        }
+
+        if args.negotiate_version {
+            event_handlers.push(ElectrumProtoVerifier { on_connect_tx }.into_shared());
+        }
+
+        let mut rng = small_rng();
+        servers.as_mut_slice().shuffle(&mut rng);
+        let client = ElectrumClientImpl::new(ticker, event_handlers);
+        for server in servers.iter() {
+            match client.add_server(server).await {
+                Ok(_) => (),
+                Err(e) => error!("Error {:?} connecting to {:?}. Address won't be used", e, server),
+            };
+        }
+
+        let mut attempts = 0i32;
+        while !client.is_connected().await {
+            if attempts >= 10 {
+                return MmError::err(UtxoCoinBuildError::FailedToConnectToElectrums {
+                    electrum_servers: servers.clone(),
+                    seconds: 5,
+                });
+            }
+
+            Timer::sleep(0.5).await;
+            attempts += 1;
+        }
+
+        let client = Arc::new(client);
+
+        if args.negotiate_version {
+            let weak_client = Arc::downgrade(&client);
+            let client_name = format!("{} GUI/MM2 {}", ctx.gui().unwrap_or("UNKNOWN"), ctx.mm_version());
+            spawn_electrum_version_loop(weak_client, on_connect_rx, client_name);
+
+            wait_for_protocol_version_checked(&client)
+                .await
+                .map_to_mm(UtxoCoinBuildError::ElectrumProtocolVersionCheckError)?;
+        }
+
+        if args.spawn_ping {
+            let weak_client = Arc::downgrade(&client);
+            spawn_electrum_ping_loop(weak_client, servers);
+        }
+
+        Ok(ElectrumClient(client))
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn native_client(&self) -> UtxoCoinBuildResult<NativeClient> {
+        use base64::{encode_config as base64_encode, URL_SAFE};
+
+        let native_conf_path = self.confpath()?;
+        let network = self.network()?;
+        let (rpc_port, rpc_user, rpc_password) = read_native_mode_conf(&native_conf_path, &network)
+            .map_to_mm(UtxoCoinBuildError::ErrorReadingNativeModeConf)?;
+        let auth_str = format!("{}:{}", rpc_user, rpc_password);
+        let rpc_port = match rpc_port {
+            Some(p) => p,
+            None => self.conf()["rpcport"]
+                .as_u64()
+                .or_mm_err(|| UtxoCoinBuildError::RpcPortIsNotSet)? as u16,
+        };
+
+        let ctx = self.ctx();
+        let coin_ticker = self.ticker().to_owned();
+        let event_handlers =
+            vec![
+                CoinTransportMetrics::new(ctx.metrics.weak(), coin_ticker.clone(), RpcClientType::Native).into_shared(),
+            ];
+        let client = Arc::new(NativeClientImpl {
+            coin_ticker,
+            uri: format!("http://127.0.0.1:{}", rpc_port),
+            auth: format!("Basic {}", base64_encode(&auth_str, URL_SAFE)),
+            event_handlers,
+            request_id: 0u64.into(),
+            list_unspent_concurrent_map: ConcurrentRequestMap::new(),
+        });
+
+        Ok(NativeClient(client))
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn confpath(&self) -> UtxoCoinBuildResult<PathBuf> {
+        let conf = self.conf();
+        // Documented at https://github.com/jl777/coins#bitcoin-protocol-specific-json
+        // "USERHOME/" prefix should be replaced with the user's home folder.
+        let declared_confpath = match self.conf()["confpath"].as_str() {
+            Some(path) if !path.is_empty() => path.trim(),
+            _ => {
+                let (name, is_asset_chain) = {
+                    match conf["asset"].as_str() {
+                        Some(a) => (a, true),
+                        None => {
+                            let name = conf["name"]
+                                .as_str()
+                                .or_mm_err(|| UtxoConfError::CurrencyNameIsNotSet)?;
+                            (name, false)
+                        },
+                    }
+                };
+                let data_dir = coin_daemon_data_dir(name, is_asset_chain);
+                let confname = format!("{}.conf", name);
+
+                return Ok(data_dir.join(&confname[..]));
+            },
+        };
+
+        let (confpath, rel_to_home) = match declared_confpath.strip_prefix("~/") {
+            Some(stripped) => (stripped, true),
+            None => match declared_confpath.strip_prefix("USERHOME/") {
+                Some(stripped) => (stripped, true),
+                None => (declared_confpath, false),
+            },
+        };
+
+        if rel_to_home {
+            let home = home_dir().or_mm_err(|| UtxoCoinBuildError::CantDetectUserHome)?;
+            Ok(home.join(confpath))
+        } else {
+            Ok(confpath.into())
+        }
+    }
+
+    fn tx_hash_algo(&self) -> TxHashAlgo {
+        if self.ticker() == "GRS" {
+            TxHashAlgo::SHA256
+        } else {
+            TxHashAlgo::DSHA256
+        }
+    }
+
+    fn check_utxo_maturity(&self) -> bool {
+        // First, check if the flag is set in the activation params.
+        if let Some(check_utxo_maturity) = self.activation_params().check_utxo_maturity {
+            return check_utxo_maturity;
+        }
+        self.conf()["check_utxo_maturity"].as_bool().unwrap_or_default()
+    }
+
+    fn is_hw_coin(&self, conf: &UtxoCoinConf) -> bool { conf.trezor_coin.is_some() }
+
+    #[cfg(target_arch = "wasm32")]
+    fn tx_cache(&self) -> UtxoVerboseCacheShared {
+        crate::utxo::tx_cache::wasm_tx_cache::WasmVerboseCache::default().into_shared()
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn tx_cache(&self) -> UtxoVerboseCacheShared {
+        crate::utxo::tx_cache::fs_tx_cache::FsVerboseCache::new(self.ticker().to_owned(), self.tx_cache_path())
+            .into_shared()
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn tx_cache_path(&self) -> PathBuf { self.ctx().dbdir().join("TX_CACHE") }
+}
+
+/// Attempts to parse native daemon conf file and return rpcport, rpcuser and rpcpassword
+#[cfg(not(target_arch = "wasm32"))]
+fn read_native_mode_conf(
+    filename: &dyn AsRef<Path>,
+    network: &BlockchainNetwork,
+) -> Result<(Option<u16>, String, String), String> {
+    use ini::Ini;
+
+    fn read_property<'a>(conf: &'a ini::Ini, network: &BlockchainNetwork, property: &str) -> Option<&'a String> {
+        let subsection = match network {
+            BlockchainNetwork::Mainnet => None,
+            BlockchainNetwork::Testnet => conf.section(Some("test")),
+            BlockchainNetwork::Regtest => conf.section(Some("regtest")),
+        };
+        subsection
+            .and_then(|props| props.get(property))
+            .or_else(|| conf.general_section().get(property))
+    }
+
+    let conf: Ini = match Ini::load_from_file(&filename) {
+        Ok(ini) => ini,
+        Err(err) => {
+            return ERR!(
+                "Error parsing the native wallet configuration '{}': {}",
+                filename.as_ref().display(),
+                err
+            )
+        },
+    };
+    let rpc_port = match read_property(&conf, network, "rpcport") {
+        Some(port) => port.parse::<u16>().ok(),
+        None => None,
+    };
+    let rpc_user = try_s!(read_property(&conf, network, "rpcuser").ok_or(ERRL!(
+        "Conf file {} doesn't have the rpcuser key",
+        filename.as_ref().display()
+    )));
+    let rpc_password = try_s!(read_property(&conf, network, "rpcpassword").ok_or(ERRL!(
+        "Conf file {} doesn't have the rpcpassword key",
+        filename.as_ref().display()
+    )));
+    Ok((rpc_port, rpc_user.clone(), rpc_password.clone()))
+}
+
+/// Ping the electrum servers every 30 seconds to prevent them from disconnecting us.
+/// According to docs server can do it if there are no messages in ~10 minutes.
+/// https://electrumx.readthedocs.io/en/latest/protocol-methods.html?highlight=keep#server-ping
+/// Weak reference will allow to stop the thread if client is dropped.
+fn spawn_electrum_ping_loop(weak_client: Weak<ElectrumClientImpl>, servers: Vec<ElectrumRpcRequest>) {
+    spawn(async move {
+        loop {
+            if let Some(client) = weak_client.upgrade() {
+                if let Err(e) = ElectrumClient(client).server_ping().compat().await {
+                    error!("Electrum servers {:?} ping error: {}", servers, e);
+                }
+            } else {
+                info!("Electrum servers {:?} ping loop stopped", servers);
+                break;
+            }
+            Timer::sleep(30.).await
+        }
+    });
+}
+
+/// Follow the `on_connect_rx` stream and verify the protocol version of each connected electrum server.
+/// https://electrumx.readthedocs.io/en/latest/protocol-methods.html?highlight=keep#server-version
+/// Weak reference will allow to stop the thread if client is dropped.
+fn spawn_electrum_version_loop(
+    weak_client: Weak<ElectrumClientImpl>,
+    mut on_connect_rx: mpsc::UnboundedReceiver<String>,
+    client_name: String,
+) {
+    spawn(async move {
+        while let Some(electrum_addr) = on_connect_rx.next().await {
+            spawn(check_electrum_server_version(
+                weak_client.clone(),
+                client_name.clone(),
+                electrum_addr,
+            ));
+        }
+
+        info!("Electrum server.version loop stopped");
+    });
+}
+
+async fn check_electrum_server_version(
+    weak_client: Weak<ElectrumClientImpl>,
+    client_name: String,
+    electrum_addr: String,
+) {
+    // client.remove_server() is called too often
+    async fn remove_server(client: ElectrumClient, electrum_addr: &str) {
+        if let Err(e) = client.remove_server(electrum_addr).await {
+            error!("Error on remove server: {}", e);
+        }
+    }
+
+    if let Some(c) = weak_client.upgrade() {
+        let client = ElectrumClient(c);
+        let available_protocols = client.protocol_version();
+        let version = match client
+            .server_version(&electrum_addr, &client_name, available_protocols)
+            .compat()
+            .await
+        {
+            Ok(version) => version,
+            Err(e) => {
+                error!("Electrum {} server.version error: {:?}", electrum_addr, e);
+                if !e.error.is_transport() {
+                    remove_server(client, &electrum_addr).await;
+                };
+                return;
+            },
+        };
+
+        // check if the version is allowed
+        let actual_version = match version.protocol_version.parse::<f32>() {
+            Ok(v) => v,
+            Err(e) => {
+                error!("Error on parse protocol_version: {:?}", e);
+                remove_server(client, &electrum_addr).await;
+                return;
+            },
+        };
+
+        if !available_protocols.contains(&actual_version) {
+            error!(
+                "Received unsupported protocol version {:?} from {:?}. Remove the connection",
+                actual_version, electrum_addr
+            );
+            remove_server(client, &electrum_addr).await;
+            return;
+        }
+
+        match client.set_protocol_version(&electrum_addr, actual_version).await {
+            Ok(()) => info!(
+                "Use protocol version {:?} for Electrum {:?}",
+                actual_version, electrum_addr
+            ),
+            Err(e) => error!("Error on set protocol_version: {}", e),
+        };
+    }
+}
+
+/// Wait until the protocol version of at least one client's Electrum is checked.
+async fn wait_for_protocol_version_checked(client: &ElectrumClientImpl) -> Result<(), String> {
+    let mut attempts = 0;
+    loop {
+        if attempts >= 10 {
+            return ERR!("Failed protocol version verifying of at least 1 of Electrums in 5 seconds.");
+        }
+
+        if client.count_connections().await == 0 {
+            // All of the connections were removed because of server.version checking
+            return ERR!(
+                "There are no Electrums with the required protocol version {:?}",
+                client.protocol_version()
+            );
+        }
+
+        if client.is_protocol_version_checked().await {
+            break;
+        }
+
+        Timer::sleep(0.5).await;
+        attempts += 1;
+    }
+
+    Ok(())
+}
diff --git a/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs
new file mode 100644
index 0000000000..3cc89efe7b
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs
@@ -0,0 +1,292 @@
+use crate::utxo::rpc_clients::EstimateFeeMode;
+use crate::utxo::{parse_hex_encoded_u32, UtxoCoinConf, DEFAULT_DYNAMIC_FEE_VOLATILITY_PERCENT, KMD_MTP_BLOCK_COUNT,
+                  MATURE_CONFIRMATIONS_DEFAULT};
+use crate::UtxoActivationParams;
+use bitcrypto::ChecksumType;
+use crypto::trezor::utxo::TrezorUtxoCoin;
+use crypto::{Bip32Error, ChildNumber};
+use derive_more::Display;
+pub use keys::{Address, AddressFormat as UtxoAddressFormat, AddressHashEnum, KeyPair, Private, Public, Secret,
+               Type as ScriptType};
+use mm2_err_handle::prelude::*;
+use script::SignatureVersion;
+use serde_json::{self as json, Value as Json};
+use std::num::NonZeroU64;
+use std::sync::atomic::AtomicBool;
+
+pub type UtxoConfResult<T> = Result<T, MmError<UtxoConfError>>;
+
+#[derive(Debug, Display)]
+pub enum UtxoConfError {
+    #[display(fmt = "'name' field is not found in config")]
+    CurrencyNameIsNotSet,
+    #[display(fmt = "'derivation_path' field is not found in config")]
+    DerivationPathIsNotSet,
+    #[display(fmt = "'trezor_coin' field is not found in config")]
+    TrezorCoinIsNotSet,
+    #[display(fmt = "Invalid 'derivation_path' purpose {}. BIP44 is supported only", found)]
+    InvalidDerivationPathPurpose {
+        found: ChildNumber,
+    },
+    #[display(
+        fmt = "Invalid length '{}' of 'derivation_path'. Expected \"m/purpose'/coin_type'/\" path, i.e 2 children",
+        found_children
+    )]
+    InvalidDerivationPathLen {
+        found_children: usize,
+    },
+    #[display(fmt = "Error deserializing 'derivation_path': {}", _0)]
+    ErrorDeserializingDerivationPath(String),
+    InvalidConsensusBranchId(String),
+    InvalidVersionGroupId(String),
+    InvalidAddressFormat(String),
+    InvalidBlockHeaderParams(String),
+    InvalidDecimals(String),
+}
+
+impl From<Bip32Error> for UtxoConfError {
+    fn from(e: Bip32Error) -> Self { UtxoConfError::ErrorDeserializingDerivationPath(e.to_string()) }
+}
+
+pub struct UtxoConfBuilder<'a> {
+    conf: &'a Json,
+    ticker: &'a str,
+    params: &'a UtxoActivationParams,
+}
+
+impl<'a> UtxoConfBuilder<'a> {
+    pub fn new(conf: &'a Json, params: &'a UtxoActivationParams, ticker: &'a str) -> Self {
+        UtxoConfBuilder { conf, ticker, params }
+    }
+
+    pub fn build(&self) -> UtxoConfResult<UtxoCoinConf> {
+        let checksum_type = self.checksum_type();
+        let pub_addr_prefix = self.pub_addr_prefix();
+        let p2sh_addr_prefix = self.p2sh_address_prefix();
+        let pub_t_addr_prefix = self.pub_t_address_prefix();
+        let p2sh_t_addr_prefix = self.p2sh_t_address_prefix();
+        let sign_message_prefix = self.sign_message_prefix();
+
+        let wif_prefix = self.wif_prefix();
+
+        let bech32_hrp = self.bech32_hrp();
+
+        let default_address_format = self.default_address_format();
+
+        let asset_chain = self.asset_chain();
+        let tx_version = self.tx_version();
+        let overwintered = self.overwintered();
+
+        let tx_fee_volatility_percent = self.tx_fee_volatility_percent();
+        let version_group_id = self.version_group_id(tx_version, overwintered)?;
+        let consensus_branch_id = self.consensus_branch_id(tx_version)?;
+        let signature_version = self.signature_version();
+        let fork_id = self.fork_id();
+
+        // should be sufficient to detect zcash by overwintered flag
+        let zcash = overwintered;
+
+        let required_confirmations = self.required_confirmations();
+        let requires_notarization = self.requires_notarization();
+
+        let mature_confirmations = self.mature_confirmations();
+
+        let is_pos = self.is_pos();
+        let segwit = self.segwit();
+        let force_min_relay_fee = self.conf["force_min_relay_fee"].as_bool().unwrap_or(false);
+        let mtp_block_count = self.mtp_block_count();
+        let estimate_fee_mode = self.estimate_fee_mode();
+        let estimate_fee_blocks = self.estimate_fee_blocks();
+        let trezor_coin = self.trezor_coin();
+        let enable_spv_proof = self.enable_spv_proof();
+
+        Ok(UtxoCoinConf {
+            ticker: self.ticker.to_owned(),
+            is_pos,
+            requires_notarization,
+            overwintered,
+            pub_addr_prefix,
+            p2sh_addr_prefix,
+            pub_t_addr_prefix,
+            p2sh_t_addr_prefix,
+            sign_message_prefix,
+            bech32_hrp,
+            segwit,
+            wif_prefix,
+            tx_version,
+            default_address_format,
+            asset_chain,
+            tx_fee_volatility_percent,
+            version_group_id,
+            consensus_branch_id,
+            zcash,
+            checksum_type,
+            signature_version,
+            fork_id,
+            required_confirmations: required_confirmations.into(),
+            force_min_relay_fee,
+            mtp_block_count,
+            estimate_fee_mode,
+            mature_confirmations,
+            estimate_fee_blocks,
+            trezor_coin,
+            enable_spv_proof,
+        })
+    }
+
+    fn checksum_type(&self) -> ChecksumType {
+        match self.ticker {
+            "GRS" => ChecksumType::DGROESTL512,
+            "SMART" => ChecksumType::KECCAK256,
+            _ => ChecksumType::DSHA256,
+        }
+    }
+
+    fn pub_addr_prefix(&self) -> u8 {
+        let pubtype = self.conf["pubtype"]
+            .as_u64()
+            .unwrap_or(if self.ticker == "BTC" { 0 } else { 60 });
+        pubtype as u8
+    }
+
+    fn p2sh_address_prefix(&self) -> u8 {
+        self.conf["p2shtype"]
+            .as_u64()
+            .unwrap_or(if self.ticker == "BTC" { 5 } else { 85 }) as u8
+    }
+
+    fn pub_t_address_prefix(&self) -> u8 { self.conf["taddr"].as_u64().unwrap_or(0) as u8 }
+
+    fn p2sh_t_address_prefix(&self) -> u8 { self.conf["taddr"].as_u64().unwrap_or(0) as u8 }
+
+    fn sign_message_prefix(&self) -> Option<String> {
+        json::from_value(self.conf["sign_message_prefix"].clone()).unwrap_or(None)
+    }
+
+    fn wif_prefix(&self) -> u8 {
+        let wiftype = self.conf["wiftype"]
+            .as_u64()
+            .unwrap_or(if self.ticker == "BTC" { 128 } else { 188 });
+        wiftype as u8
+    }
+
+    fn bech32_hrp(&self) -> Option<String> { json::from_value(self.conf["bech32_hrp"].clone()).unwrap_or(None) }
+
+    fn default_address_format(&self) -> UtxoAddressFormat {
+        let mut address_format: UtxoAddressFormat =
+            json::from_value(self.conf["address_format"].clone()).unwrap_or(UtxoAddressFormat::Standard);
+
+        if let UtxoAddressFormat::CashAddress {
+            network: _,
+            ref mut pub_addr_prefix,
+            ref mut p2sh_addr_prefix,
+        } = address_format
+        {
+            *pub_addr_prefix = self.pub_addr_prefix();
+            *p2sh_addr_prefix = self.p2sh_address_prefix();
+        }
+
+        address_format
+    }
+
+    fn asset_chain(&self) -> bool { self.conf["asset"].as_str().is_some() }
+
+    fn tx_version(&self) -> i32 { self.conf["txversion"].as_i64().unwrap_or(1) as i32 }
+
+    fn overwintered(&self) -> bool { self.conf["overwintered"].as_u64().unwrap_or(0) == 1 }
+
+    fn tx_fee_volatility_percent(&self) -> f64 {
+        match self.conf["txfee_volatility_percent"].as_f64() {
+            Some(volatility) => volatility,
+            None => DEFAULT_DYNAMIC_FEE_VOLATILITY_PERCENT,
+        }
+    }
+
+    fn version_group_id(&self, tx_version: i32, overwintered: bool) -> UtxoConfResult<u32> {
+        let version_group_id = match self.conf["version_group_id"].as_str() {
+            Some(s) => parse_hex_encoded_u32(s).mm_err(UtxoConfError::InvalidVersionGroupId)?,
+            None => {
+                if tx_version == 3 && overwintered {
+                    0x03c4_8270
+                } else if tx_version == 4 && overwintered {
+                    0x892f_2085
+                } else {
+                    0
+                }
+            },
+        };
+        Ok(version_group_id)
+    }
+
+    fn consensus_branch_id(&self, tx_version: i32) -> UtxoConfResult<u32> {
+        let consensus_branch_id = match self.conf["consensus_branch_id"].as_str() {
+            Some(s) => parse_hex_encoded_u32(s).mm_err(UtxoConfError::InvalidConsensusBranchId)?,
+            None => match tx_version {
+                3 => 0x5ba8_1b19,
+                4 => 0x76b8_09bb,
+                _ => 0,
+            },
+        };
+        Ok(consensus_branch_id)
+    }
+
+    fn signature_version(&self) -> SignatureVersion {
+        let default_signature_version = if self.ticker == "BCH" || self.fork_id() != 0 {
+            SignatureVersion::ForkId
+        } else {
+            SignatureVersion::Base
+        };
+        json::from_value(self.conf["signature_version"].clone()).unwrap_or(default_signature_version)
+    }
+
+    fn fork_id(&self) -> u32 {
+        let default_fork_id = match self.ticker {
+            "BCH" => "0x40",
+            _ => "0x0",
+        };
+        let hex_string = self.conf["fork_id"].as_str().unwrap_or(default_fork_id);
+        let fork_id = u32::from_str_radix(hex_string.trim_start_matches("0x"), 16).unwrap();
+        fork_id
+    }
+
+    fn required_confirmations(&self) -> u64 {
+        // param from request should override the config
+        self.params
+            .required_confirmations
+            .unwrap_or_else(|| self.conf["required_confirmations"].as_u64().unwrap_or(1))
+    }
+
+    fn requires_notarization(&self) -> AtomicBool {
+        self.params
+            .requires_notarization
+            .unwrap_or_else(|| self.conf["requires_notarization"].as_bool().unwrap_or(false))
+            .into()
+    }
+
+    fn mature_confirmations(&self) -> u32 {
+        self.conf["mature_confirmations"]
+            .as_u64()
+            .map(|x| x as u32)
+            .unwrap_or(MATURE_CONFIRMATIONS_DEFAULT)
+    }
+
+    fn is_pos(&self) -> bool { self.conf["isPoS"].as_u64() == Some(1) }
+
+    fn segwit(&self) -> bool { self.conf["segwit"].as_bool().unwrap_or(false) }
+
+    fn mtp_block_count(&self) -> NonZeroU64 {
+        json::from_value(self.conf["mtp_block_count"].clone()).unwrap_or(KMD_MTP_BLOCK_COUNT)
+    }
+
+    fn estimate_fee_mode(&self) -> Option<EstimateFeeMode> {
+        json::from_value(self.conf["estimate_fee_mode"].clone()).unwrap_or(None)
+    }
+
+    fn estimate_fee_blocks(&self) -> u32 { json::from_value(self.conf["estimate_fee_blocks"].clone()).unwrap_or(1) }
+
+    fn trezor_coin(&self) -> Option<TrezorUtxoCoin> {
+        json::from_value(self.conf["trezor_coin"].clone()).unwrap_or_default()
+    }
+
+    fn enable_spv_proof(&self) -> bool { self.conf["enable_spv_proof"].as_bool().unwrap_or(false) }
+}
diff --git a/mm2src/coins/utxo/utxo_common.rs b/mm2src/coins/utxo/utxo_common.rs
index 32e089e2e6..a67c9136c4 100644
--- a/mm2src/coins/utxo/utxo_common.rs
+++ b/mm2src/coins/utxo/utxo_common.rs
@@ -1,42 +1,65 @@
+use super::rpc_clients::TxMerkleBranch;
 use super::*;
-use bigdecimal::{BigDecimal, Zero};
+use crate::coin_balance::{AddressBalanceStatus, HDAddressBalance, HDWalletBalanceOps};
+use crate::hd_pubkey::{ExtractExtendedPubkey, HDExtractPubkeyError, HDXPubExtractor};
+use crate::hd_wallet::{AccountUpdatingError, AddressDerivingError, HDAccountMut, HDAccountsMap,
+                       NewAccountCreatingError};
+use crate::hd_wallet_storage::{HDWalletCoinWithStorageOps, HDWalletStorageResult};
+use crate::rpc_command::init_withdraw::WithdrawTaskHandle;
+use crate::utxo::rpc_clients::{electrum_script_hash, BlockHashOrHeight, UnspentInfo, UnspentMap, UtxoRpcClientEnum,
+                               UtxoRpcClientOps, UtxoRpcResult};
+use crate::utxo::tx_cache::TxCacheResult;
+use crate::utxo::utxo_withdraw::{InitUtxoWithdraw, StandardUtxoWithdraw, UtxoWithdraw};
+use crate::{CanRefundHtlc, CoinBalance, CoinWithDerivationMethod, GetWithdrawSenderAddress, HDAddressId,
+            RawTransactionError, RawTransactionRequest, RawTransactionRes, SearchForSwapTxSpendInput, SignatureError,
+            SignatureResult, SwapOps, TradePreimageValue, TransactionFut, TxFeeDetails, ValidateAddressResult,
+            ValidatePaymentInput, VerificationError, VerificationResult, WithdrawFrom, WithdrawResult,
+            WithdrawSenderAddress};
+use bitcrypto::dhash256;
 pub use bitcrypto::{dhash160, sha256, ChecksumType};
 use chain::constants::SEQUENCE_FINAL;
-use chain::{OutPoint, TransactionInput, TransactionOutput};
+use chain::{BlockHeader, OutPoint, RawBlockHeader, TransactionOutput};
 use common::executor::Timer;
-use common::jsonrpc_client::{JsonRpcError, JsonRpcErrorType};
-use common::log::{error, info, warn};
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
+use common::jsonrpc_client::JsonRpcErrorType;
+use common::log::{debug, error, info, warn};
 use common::mm_metrics::MetricsArc;
-use common::mm_number::MmNumber;
-use common::{block_on, now_ms};
+use common::{now_ms, one_hundred, ten_f64};
+use crypto::{Bip32DerPathOps, Bip44Chain, Bip44DerPathError, Bip44DerivationPath, RpcDerivationPath};
 use futures::compat::Future01CompatExt;
 use futures::future::{FutureExt, TryFutureExt};
 use futures01::future::Either;
+use itertools::Itertools;
 use keys::bytes::Bytes;
-use keys::{Address, AddressFormat as UtxoAddressFormat, AddressHash, KeyPair, Public, SegwitAddress,
+use keys::{Address, AddressFormat as UtxoAddressFormat, AddressHashEnum, CompactSignature, Public, SegwitAddress,
            Type as ScriptType};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
 use primitives::hash::H512;
-use rpc::v1::types::{Bytes as BytesJson, TransactionInputEnum, H256 as H256Json};
-use script::{Builder, Opcode, Script, ScriptAddress, SignatureVersion, TransactionInputSigner,
-             UnsignedTransactionInput};
+use rpc::v1::types::{Bytes as BytesJson, ToTxHash, TransactionInputEnum, H256 as H256Json};
+use script::{Builder, Opcode, Script, ScriptAddress, TransactionInputSigner, UnsignedTransactionInput};
 use secp256k1::{PublicKey, Signature};
 use serde_json::{self as json};
-use serialization::{deserialize, serialize, serialize_with_flags, CoinVariant, SERIALIZE_TRANSACTION_WITNESS};
+use serialization::{deserialize, serialize, serialize_list, serialize_with_flags, CoinVariant, CompactInteger,
+                    Serializable, Stream, SERIALIZE_TRANSACTION_WITNESS};
+use spv_validation::helpers_validation::validate_headers;
+use spv_validation::helpers_validation::SPVError;
+use spv_validation::spv_proof::{SPVProof, TRY_SPV_PROOF_INTERVAL};
 use std::cmp::Ordering;
 use std::collections::hash_map::{Entry, HashMap};
 use std::str::FromStr;
-use std::sync::atomic::Ordering as AtomicOrderding;
+use std::sync::atomic::Ordering as AtomicOrdering;
+use utxo_block_header_storage::BlockHeaderStorageOps;
+use utxo_signer::with_key_pair::p2sh_spend;
+use utxo_signer::UtxoSignerOps;
 
 pub use chain::Transaction as UtxoTx;
 
-use self::rpc_clients::{electrum_script_hash, UnspentInfo, UtxoRpcClientEnum, UtxoRpcClientOps, UtxoRpcResult};
-use crate::{CanRefundHtlc, CoinBalance, TradePreimageValue, TxFeeDetails, ValidateAddressResult, WithdrawResult};
-
-const MIN_BTC_TRADING_VOL: &str = "0.00777";
-pub const DEFAULT_SWAP_VOUT: usize = 0;
 pub const DEFAULT_FEE_VOUT: usize = 0;
+pub const DEFAULT_SWAP_TX_SPEND_SIZE: u64 = 305;
+pub const DEFAULT_SWAP_VOUT: usize = 0;
+const MIN_BTC_TRADING_VOL: &str = "0.00777";
+pub const NO_TX_ERROR_CODE: &str = "'code': -5";
 
 macro_rules! true_or {
     ($cond: expr, $etype: expr) => {
@@ -55,119 +78,407 @@ lazy_static! {
 
 pub const HISTORY_TOO_LARGE_ERR_CODE: i64 = -1;
 
-pub struct UtxoArcBuilder<'a> {
-    ctx: &'a MmArc,
-    ticker: &'a str,
-    conf: &'a Json,
-    req: &'a Json,
-    priv_key: &'a [u8],
-}
-
-impl<'a> UtxoArcBuilder<'a> {
-    pub fn new(
-        ctx: &'a MmArc,
-        ticker: &'a str,
-        conf: &'a Json,
-        req: &'a Json,
-        priv_key: &'a [u8],
-    ) -> UtxoArcBuilder<'a> {
-        UtxoArcBuilder {
-            ctx,
-            ticker,
-            conf,
-            req,
-            priv_key,
-        }
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct UtxoMergeParams {
+    merge_at: usize,
+    #[serde(default = "ten_f64")]
+    check_every: f64,
+    #[serde(default = "one_hundred")]
+    max_merge_at_once: usize,
+}
+
+pub async fn get_tx_fee(coin: &UtxoCoinFields) -> UtxoRpcResult<ActualTxFee> {
+    let conf = &coin.conf;
+    match &coin.tx_fee {
+        TxFee::Dynamic(method) => {
+            let fee = coin
+                .rpc_client
+                .estimate_fee_sat(coin.decimals, method, &conf.estimate_fee_mode, conf.estimate_fee_blocks)
+                .compat()
+                .await?;
+            Ok(ActualTxFee::Dynamic(fee))
+        },
+        TxFee::FixedPerKb(satoshis) => Ok(ActualTxFee::FixedPerKb(*satoshis)),
     }
 }
 
-#[async_trait]
-impl UtxoCoinBuilder for UtxoArcBuilder<'_> {
-    type ResultCoin = UtxoArc;
+pub fn derive_address<T: UtxoCommonOps>(
+    coin: &T,
+    hd_account: &UtxoHDAccount,
+    chain: Bip44Chain,
+    address_id: u32,
+) -> MmResult<HDAddress<Address, Public>, AddressDerivingError> {
+    let change_child = chain.to_child_number();
+    let address_id_child = ChildNumber::from(address_id);
+
+    let derived_pubkey = hd_account
+        .extended_pubkey
+        .derive_child(change_child)?
+        .derive_child(address_id_child)?;
+    let address = coin.address_from_extended_pubkey(&derived_pubkey);
+    let pubkey = Public::Compressed(H264::from(derived_pubkey.public_key().serialize()));
+
+    let mut derivation_path = hd_account.account_derivation_path.to_derivation_path();
+    derivation_path.push(change_child);
+    derivation_path.push(address_id_child);
+    Ok(HDAddress {
+        address,
+        pubkey,
+        derivation_path,
+    })
+}
 
-    async fn build(self) -> Result<Self::ResultCoin, String> {
-        let utxo = try_s!(self.build_utxo_fields().await);
-        Ok(UtxoArc(Arc::new(utxo)))
+pub async fn create_new_account<'a, Coin, XPubExtractor>(
+    coin: &Coin,
+    hd_wallet: &'a UtxoHDWallet,
+    xpub_extractor: &XPubExtractor,
+) -> MmResult<HDAccountMut<'a, UtxoHDAccount>, NewAccountCreatingError>
+where
+    Coin: ExtractExtendedPubkey<ExtendedPublicKey = Secp256k1ExtendedPublicKey>
+        + HDWalletCoinWithStorageOps<HDWallet = UtxoHDWallet, HDAccount = UtxoHDAccount>
+        + Sync,
+    XPubExtractor: HDXPubExtractor + Sync,
+{
+    const INIT_ACCOUNT_ID: u32 = 0;
+    let new_account_id = hd_wallet
+        .accounts
+        .lock()
+        .await
+        .iter()
+        // The last element of the BTreeMap has the max account index.
+        .last()
+        .map(|(account_id, _account)| *account_id + 1)
+        .unwrap_or(INIT_ACCOUNT_ID);
+    if new_account_id >= ChildNumber::HARDENED_FLAG {
+        return MmError::err(NewAccountCreatingError::AccountLimitReached {
+            max_accounts_number: ChildNumber::HARDENED_FLAG,
+        });
     }
 
-    fn ctx(&self) -> &MmArc { self.ctx }
+    let account_child_hardened = true;
+    let account_child = ChildNumber::new(new_account_id, account_child_hardened)
+        .map_to_mm(|e| NewAccountCreatingError::Internal(e.to_string()))?;
 
-    fn conf(&self) -> &Json { self.conf }
+    let account_derivation_path: Bip44PathToAccount = hd_wallet.derivation_path.derive(account_child)?;
+    let account_pubkey = coin
+        .extract_extended_pubkey(xpub_extractor, account_derivation_path.to_derivation_path())
+        .await?;
+
+    let new_account = UtxoHDAccount {
+        account_id: new_account_id,
+        extended_pubkey: account_pubkey,
+        account_derivation_path,
+        // We don't know how many addresses are used by the user at this moment.
+        external_addresses_number: 0,
+        internal_addresses_number: 0,
+    };
 
-    fn req(&self) -> &Json { self.req }
+    let accounts = hd_wallet.accounts.lock().await;
+    if accounts.contains_key(&new_account_id) {
+        let error = format!(
+            "Account '{}' has been activated while we proceed the 'create_new_account' function",
+            new_account_id
+        );
+        return MmError::err(NewAccountCreatingError::Internal(error));
+    }
 
-    fn ticker(&self) -> &str { self.ticker }
+    coin.upload_new_account(hd_wallet, new_account.to_storage_item())
+        .await?;
 
-    fn priv_key(&self) -> &[u8] { self.priv_key }
+    Ok(AsyncMutexGuard::map(accounts, |accounts| {
+        accounts
+            .entry(new_account_id)
+            // the `entry` method should return [`Entry::Vacant`] due to the checks above
+            .or_insert(new_account)
+    }))
 }
 
-pub async fn utxo_arc_from_conf_and_request<T>(
-    ctx: &MmArc,
-    ticker: &str,
-    conf: &Json,
-    req: &Json,
-    priv_key: &[u8],
-) -> Result<T, String>
+pub async fn set_known_addresses_number<T>(
+    coin: &T,
+    hd_wallet: &UtxoHDWallet,
+    hd_account: &mut UtxoHDAccount,
+    chain: Bip44Chain,
+    new_known_addresses_number: u32,
+) -> MmResult<(), AccountUpdatingError>
 where
-    T: From<UtxoArc> + AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
+    T: HDWalletCoinWithStorageOps<HDWallet = UtxoHDWallet, HDAccount = UtxoHDAccount> + Sync,
 {
-    let builder = UtxoArcBuilder::new(ctx, ticker, conf, req, priv_key);
-    let utxo_arc = try_s!(builder.build().await);
-
-    let merge_params: Option<UtxoMergeParams> = try_s!(json::from_value(req["utxo_merge_params"].clone()));
-    if let Some(merge_params) = merge_params {
-        let weak = utxo_arc.downgrade();
-        let merge_loop = merge_utxo_loop::<T>(
-            weak,
-            merge_params.merge_at,
-            merge_params.check_every,
-            merge_params.max_merge_at_once,
-        );
-        info!("Starting UTXO merge loop for coin {}", ticker);
-        spawn(merge_loop);
+    if new_known_addresses_number >= ChildNumber::HARDENED_FLAG {
+        return MmError::err(AccountUpdatingError::AddressLimitReached {
+            max_addresses_number: ChildNumber::HARDENED_FLAG,
+        });
+    }
+    match chain {
+        Bip44Chain::External => {
+            coin.update_external_addresses_number(hd_wallet, hd_account.account_id, new_known_addresses_number)
+                .await?;
+            hd_account.external_addresses_number = new_known_addresses_number;
+        },
+        Bip44Chain::Internal => {
+            coin.update_internal_addresses_number(hd_wallet, hd_account.account_id, new_known_addresses_number)
+                .await?;
+            hd_account.internal_addresses_number = new_known_addresses_number;
+        },
     }
-    Ok(T::from(utxo_arc))
+    Ok(())
 }
 
-fn ten_f64() -> f64 { 10. }
+pub async fn produce_hd_address_scanner<T>(coin: &T) -> BalanceResult<UtxoAddressScanner>
+where
+    T: AsRef<UtxoCoinFields>,
+{
+    Ok(UtxoAddressScanner::init(coin.as_ref().rpc_client.clone()).await?)
+}
 
-fn one_hundred() -> usize { 100 }
+pub async fn scan_for_new_addresses<T>(
+    coin: &T,
+    hd_wallet: &T::HDWallet,
+    hd_account: &mut T::HDAccount,
+    address_scanner: &T::HDAddressScanner,
+    gap_limit: u32,
+) -> BalanceResult<Vec<HDAddressBalance>>
+where
+    T: HDWalletBalanceOps + Sync,
+    T::Address: std::fmt::Display,
+{
+    let mut addresses = scan_for_new_addresses_impl(
+        coin,
+        hd_wallet,
+        hd_account,
+        address_scanner,
+        Bip44Chain::External,
+        gap_limit,
+    )
+    .await?;
+    addresses.extend(
+        scan_for_new_addresses_impl(
+            coin,
+            hd_wallet,
+            hd_account,
+            address_scanner,
+            Bip44Chain::Internal,
+            gap_limit,
+        )
+        .await?,
+    );
 
-#[derive(Debug, Deserialize)]
-struct UtxoMergeParams {
-    merge_at: usize,
-    #[serde(default = "ten_f64")]
-    check_every: f64,
-    #[serde(default = "one_hundred")]
-    max_merge_at_once: usize,
+    Ok(addresses)
 }
 
-pub async fn get_tx_fee(coin: &UtxoCoinFields) -> Result<ActualTxFee, JsonRpcError> {
-    let conf = &coin.conf;
-    match &coin.tx_fee {
-        TxFee::Dynamic(method) => {
-            let fee = coin
-                .rpc_client
-                .estimate_fee_sat(coin.decimals, method, &conf.estimate_fee_mode, conf.estimate_fee_blocks)
-                .compat()
-                .await?;
-            Ok(ActualTxFee::Dynamic(fee))
+/// Checks addresses that either had empty transaction history last time we checked or has not been checked before.
+/// The checking stops at the moment when we find `gap_limit` consecutive empty addresses.
+pub async fn scan_for_new_addresses_impl<T>(
+    coin: &T,
+    hd_wallet: &T::HDWallet,
+    hd_account: &mut T::HDAccount,
+    address_scanner: &T::HDAddressScanner,
+    chain: Bip44Chain,
+    gap_limit: u32,
+) -> BalanceResult<Vec<HDAddressBalance>>
+where
+    T: HDWalletBalanceOps + Sync,
+    T::Address: std::fmt::Display,
+{
+    let mut balances = Vec::with_capacity(gap_limit as usize);
+
+    // Get the first unknown address id.
+    let mut checking_address_id = hd_account
+        .known_addresses_number(chain)
+        // A UTXO coin should support both [`Bip44Chain::External`] and [`Bip44Chain::Internal`].
+        .mm_err(|e| BalanceError::Internal(e.to_string()))?;
+
+    let mut unused_addresses_counter = 0;
+    while checking_address_id < ChildNumber::HARDENED_FLAG && unused_addresses_counter < gap_limit {
+        let HDAddress {
+            address: checking_address,
+            derivation_path: checking_address_der_path,
+            ..
+        } = coin.derive_address(hd_account, chain, checking_address_id)?;
+
+        match coin.is_address_used(&checking_address, address_scanner).await? {
+            // We found a non-empty address, so we have to fill up the balance list
+            // with zeros starting from `last_non_empty_address_id = checking_address_id - unused_addresses_counter`.
+            AddressBalanceStatus::Used(non_empty_balance) => {
+                let last_non_empty_address_id = checking_address_id - unused_addresses_counter;
+                for empty_address_id in last_non_empty_address_id..checking_address_id {
+                    let empty_address = coin.derive_address(hd_account, chain, empty_address_id)?;
+
+                    balances.push(HDAddressBalance {
+                        address: empty_address.address.to_string(),
+                        derivation_path: RpcDerivationPath(empty_address.derivation_path),
+                        chain,
+                        balance: CoinBalance::default(),
+                    });
+                }
+
+                balances.push(HDAddressBalance {
+                    address: checking_address.to_string(),
+                    derivation_path: RpcDerivationPath(checking_address_der_path),
+                    chain,
+                    balance: non_empty_balance,
+                });
+                // Reset the counter of unused addresses to zero since we found a non-empty address.
+                unused_addresses_counter = 0;
+            },
+            AddressBalanceStatus::NotUsed => unused_addresses_counter += 1,
+        }
+
+        checking_address_id += 1;
+    }
+
+    coin.set_known_addresses_number(
+        hd_wallet,
+        hd_account,
+        chain,
+        checking_address_id - unused_addresses_counter,
+    )
+    .await?;
+
+    Ok(balances)
+}
+
+pub async fn all_known_addresses_balances<T>(
+    coin: &T,
+    hd_account: &T::HDAccount,
+) -> BalanceResult<Vec<HDAddressBalance>>
+where
+    T: HDWalletBalanceOps + Sync,
+    T::Address: std::fmt::Display + Clone,
+{
+    let external_addresses = hd_account
+        .known_addresses_number(Bip44Chain::External)
+        // A UTXO coin should support both [`Bip44Chain::External`] and [`Bip44Chain::Internal`].
+        .mm_err(|e| BalanceError::Internal(e.to_string()))?;
+    let internal_addresses = hd_account
+        .known_addresses_number(Bip44Chain::Internal)
+        // A UTXO coin should support both [`Bip44Chain::External`] and [`Bip44Chain::Internal`].
+        .mm_err(|e| BalanceError::Internal(e.to_string()))?;
+
+    let mut balances = coin
+        .known_addresses_balances_with_ids(hd_account, Bip44Chain::External, 0..external_addresses)
+        .await?;
+    balances.extend(
+        coin.known_addresses_balances_with_ids(hd_account, Bip44Chain::Internal, 0..internal_addresses)
+            .await?,
+    );
+
+    Ok(balances)
+}
+
+pub async fn load_hd_accounts_from_storage(
+    hd_wallet_storage: &HDWalletCoinStorage,
+    derivation_path: &Bip44PathToCoin,
+) -> HDWalletStorageResult<HDAccountsMap<UtxoHDAccount>> {
+    let accounts = hd_wallet_storage.load_all_accounts().await?;
+    let res: HDWalletStorageResult<HDAccountsMap<UtxoHDAccount>> = accounts
+        .iter()
+        .map(|account_info| {
+            let account = UtxoHDAccount::try_from_storage_item(derivation_path, account_info)?;
+            Ok((account.account_id, account))
+        })
+        .collect();
+    match res {
+        Ok(accounts) => Ok(accounts),
+        Err(e) if e.get_inner().is_deserializing_err() => {
+            warn!("Error loading HD accounts from the storage: '{}'. Clear accounts", e);
+            hd_wallet_storage.clear_accounts().await?;
+            Ok(HDAccountsMap::new())
         },
-        TxFee::FixedPerKb(satoshis) => Ok(ActualTxFee::FixedPerKb(*satoshis)),
+        Err(e) => Err(e),
     }
 }
 
-/// returns the fee required to be paid for HTLC spend transaction
-pub async fn get_htlc_spend_fee<T>(coin: &T) -> UtxoRpcResult<u64>
+/// Requests balance of the given `address`.
+pub async fn address_balance<T>(coin: &T, address: &Address) -> BalanceResult<CoinBalance>
+where
+    T: UtxoCommonOps + GetUtxoListOps + MarketCoinOps,
+{
+    if coin.as_ref().check_utxo_maturity {
+        let (unspents, _) = coin.get_mature_unspent_ordered_list(address).await?;
+        return Ok(unspents.to_coin_balance(coin.as_ref().decimals));
+    }
+
+    let balance = coin
+        .as_ref()
+        .rpc_client
+        .display_balance(address.clone(), coin.as_ref().decimals)
+        .compat()
+        .await?;
+
+    Ok(CoinBalance {
+        spendable: balance,
+        unspendable: BigDecimal::from(0),
+    })
+}
+
+/// Requests balances of the given `addresses`.
+/// The pairs `(Address, CoinBalance)` are guaranteed to be in the same order in which they were requested.
+pub async fn addresses_balances<T>(coin: &T, addresses: Vec<Address>) -> BalanceResult<Vec<(Address, CoinBalance)>>
+where
+    T: UtxoCommonOps + GetUtxoMapOps + MarketCoinOps,
+{
+    if coin.as_ref().check_utxo_maturity {
+        let (unspents_map, _) = coin.get_mature_unspent_ordered_map(addresses.clone()).await?;
+        addresses
+            .into_iter()
+            .map(|address| {
+                let unspents = unspents_map.get(&address).or_mm_err(|| {
+                    let error = format!("'get_mature_unspent_ordered_map' should have returned '{}'", address);
+                    BalanceError::Internal(error)
+                })?;
+                let balance = unspents.to_coin_balance(coin.as_ref().decimals);
+                Ok((address, balance))
+            })
+            .collect()
+    } else {
+        Ok(coin
+            .as_ref()
+            .rpc_client
+            .display_balances(addresses.clone(), coin.as_ref().decimals)
+            .compat()
+            .await?
+            .into_iter()
+            .map(|(address, spendable)| {
+                let unspendable = BigDecimal::from(0);
+                let balance = CoinBalance { spendable, unspendable };
+                (address, balance)
+            })
+            .collect())
+    }
+}
+
+pub fn derivation_method(coin: &UtxoCoinFields) -> &DerivationMethod<Address, UtxoHDWallet> { &coin.derivation_method }
+
+pub async fn extract_extended_pubkey<XPubExtractor>(
+    conf: &UtxoCoinConf,
+    xpub_extractor: &XPubExtractor,
+    derivation_path: DerivationPath,
+) -> MmResult<Secp256k1ExtendedPublicKey, HDExtractPubkeyError>
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
+    XPubExtractor: HDXPubExtractor,
 {
+    let trezor_coin = conf
+        .trezor_coin
+        .or_mm_err(|| HDExtractPubkeyError::CoinDoesntSupportTrezor)?;
+    let xpub = xpub_extractor.extract_utxo_xpub(trezor_coin, derivation_path).await?;
+    Secp256k1ExtendedPublicKey::from_str(&xpub).map_to_mm(HDExtractPubkeyError::InvalidXpub)
+}
+
+/// returns the fee required to be paid for HTLC spend transaction
+pub async fn get_htlc_spend_fee<T: UtxoCommonOps>(coin: &T, tx_size: u64) -> UtxoRpcResult<u64> {
     let coin_fee = coin.get_tx_fee().await?;
     let mut fee = match coin_fee {
         // atomic swap payment spend transaction is slightly more than 300 bytes in average as of now
-        ActualTxFee::Dynamic(fee_per_kb) => (fee_per_kb * SWAP_TX_SPEND_SIZE) / KILO_BYTE,
+        ActualTxFee::Dynamic(fee_per_kb) => (fee_per_kb * tx_size) / KILO_BYTE,
         // return satoshis here as swap spend transaction size is always less than 1 kb
-        ActualTxFee::FixedPerKb(satoshis) => satoshis,
+        ActualTxFee::FixedPerKb(satoshis) => {
+            let tx_size_kb = if tx_size % KILO_BYTE == 0 {
+                tx_size / KILO_BYTE
+            } else {
+                tx_size / KILO_BYTE + 1
+            };
+            satoshis * tx_size_kb
+        },
     };
     if coin.as_ref().conf.force_min_relay_fee {
         let relay_fee = coin.as_ref().rpc_client.get_relay_fee().compat().await?;
@@ -179,10 +490,7 @@ where
     Ok(fee)
 }
 
-pub fn addresses_from_script<T: AsRef<UtxoCoinFields> + UtxoCommonOps>(
-    coin: &T,
-    script: &Script,
-) -> Result<Vec<Address>, String> {
+pub fn addresses_from_script<T: UtxoCommonOps>(coin: &T, script: &Script) -> Result<Vec<Address>, String> {
     let destinations: Vec<ScriptAddress> = try_s!(script.extract_destinations());
 
     let conf = &coin.as_ref().conf;
@@ -202,6 +510,7 @@ pub fn addresses_from_script<T: AsRef<UtxoCoinFields> + UtxoCommonOps>(
                     coin.addr_format_for_standard_scripts(),
                 ),
                 ScriptType::P2WPKH => (conf.pub_addr_prefix, conf.pub_t_addr_prefix, UtxoAddressFormat::Segwit),
+                ScriptType::P2WSH => (conf.pub_addr_prefix, conf.pub_t_addr_prefix, UtxoAddressFormat::Segwit),
             };
 
             Address {
@@ -237,8 +546,8 @@ pub fn address_from_str_unchecked(coin: &UtxoCoinFields, address: &str) -> Resul
     if let Ok(segwit) = Address::from_segwitaddress(
         address,
         coin.conf.checksum_type,
-        coin.my_address.prefix,
-        coin.my_address.t_addr_prefix,
+        coin.conf.pub_addr_prefix,
+        coin.conf.pub_t_addr_prefix,
     ) {
         return Ok(segwit);
     }
@@ -248,7 +557,7 @@ pub fn address_from_str_unchecked(coin: &UtxoCoinFields, address: &str) -> Resul
         coin.conf.checksum_type,
         coin.conf.pub_addr_prefix,
         coin.conf.p2sh_addr_prefix,
-        coin.my_address.t_addr_prefix,
+        coin.conf.pub_t_addr_prefix,
     ) {
         return Ok(cashaddress);
     }
@@ -256,9 +565,17 @@ pub fn address_from_str_unchecked(coin: &UtxoCoinFields, address: &str) -> Resul
     return ERR!("Invalid address: {}", address);
 }
 
-pub fn checked_address_from_str(coin: &UtxoCoinFields, address: &str) -> Result<Address, String> {
-    let addr = try_s!(address_from_str_unchecked(coin, address));
-    try_s!(coin.check_withdraw_address_supported(&addr));
+pub fn my_public_key(coin: &UtxoCoinFields) -> Result<&Public, MmError<UnexpectedDerivationMethod>> {
+    match coin.priv_key_policy {
+        PrivKeyPolicy::KeyPair(ref key_pair) => Ok(key_pair.public()),
+        // Hardware Wallets requires BIP39/BIP44 derivation path to extract a public key.
+        PrivKeyPolicy::Trezor => MmError::err(UnexpectedDerivationMethod::IguanaPrivKeyUnavailable),
+    }
+}
+
+pub fn checked_address_from_str<T: UtxoCommonOps>(coin: &T, address: &str) -> Result<Address, String> {
+    let addr = try_s!(address_from_str_unchecked(coin.as_ref(), address));
+    try_s!(check_withdraw_address_supported(coin, &addr));
     Ok(addr)
 }
 
@@ -272,7 +589,7 @@ pub async fn get_current_mtp(coin: &UtxoCoinFields, coin_variant: CoinVariant) -
 
 pub fn send_outputs_from_my_address<T>(coin: T, outputs: Vec<TransactionOutput>) -> TransactionFut
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
+    T: UtxoCommonOps + GetUtxoListOps,
 {
     let fut = send_outputs_from_my_address_impl(coin, outputs);
     Box::new(fut.boxed().compat().map(|tx| tx.into()))
@@ -296,115 +613,109 @@ pub fn tx_size_in_v_bytes(from_addr_format: &UtxoAddressFormat, tx: &UtxoTx) ->
     }
 }
 
-/// Generates unsigned transaction (TransactionInputSigner) from specified utxos and outputs.
-/// This function expects that utxos are sorted by amounts in ascending order
-/// Consider sorting before calling this function
-/// Sends the change (inputs amount - outputs amount) to "my_address"
-/// Also returns additional transaction data
-///
-/// Note `gas_fee` should be enough to execute all of the contract calls within UTXO outputs.
-/// QRC20 specific: `gas_fee` should be calculated by: gas_limit * gas_price * (count of contract calls),
-/// or should be sum of gas fee of all contract calls.
-pub async fn generate_transaction<T>(
-    coin: &T,
-    utxos: Vec<UnspentInfo>,
-    outputs: Vec<TransactionOutput>,
+pub struct UtxoTxBuilder<'a, T: AsRef<UtxoCoinFields> + UtxoTxGenerationOps> {
+    coin: &'a T,
+    from: Option<Address>,
+    /// The available inputs that *can* be included in the resulting tx
+    available_inputs: Vec<UnspentInfo>,
     fee_policy: FeePolicy,
     fee: Option<ActualTxFee>,
     gas_fee: Option<u64>,
-) -> GenerateTxResult
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
-{
-    let dust: u64 = coin.as_ref().dust_amount;
-    let lock_time = (now_ms() / 1000) as u32;
+    tx: TransactionInputSigner,
+    change: u64,
+    sum_inputs: u64,
+    sum_outputs_value: u64,
+    tx_fee: u64,
+    min_relay_fee: Option<u64>,
+    dust: Option<u64>,
+}
+
+impl<'a, T: AsRef<UtxoCoinFields> + UtxoTxGenerationOps> UtxoTxBuilder<'a, T> {
+    pub fn new(coin: &'a T) -> Self {
+        UtxoTxBuilder {
+            tx: coin.as_ref().transaction_preimage(),
+            coin,
+            from: coin.as_ref().derivation_method.iguana().cloned(),
+            available_inputs: vec![],
+            fee_policy: FeePolicy::SendExact,
+            fee: None,
+            gas_fee: None,
+            change: 0,
+            sum_inputs: 0,
+            sum_outputs_value: 0,
+            tx_fee: 0,
+            min_relay_fee: None,
+            dust: None,
+        }
+    }
 
-    let change_script_pubkey = output_script(&coin.as_ref().my_address, ScriptType::P2PKH).to_bytes();
-    let coin_tx_fee = match fee {
-        Some(f) => f,
-        None => coin.get_tx_fee().await?,
-    };
+    pub fn with_from_address(mut self, from: Address) -> Self {
+        self.from = Some(from);
+        self
+    }
 
-    true_or!(!outputs.is_empty(), GenerateTxError::EmptyOutputs);
+    pub fn with_dust(mut self, dust_amount: u64) -> Self {
+        self.dust = Some(dust_amount);
+        self
+    }
 
-    let mut sum_outputs_value = 0;
-    let mut received_by_me = 0;
-    for output in outputs.iter() {
-        let script: Script = output.script_pubkey.clone().into();
-        if script.opcodes().next() != Some(Ok(Opcode::OP_RETURN)) {
-            true_or!(output.value >= dust, GenerateTxError::OutputValueLessThanDust {
-                value: output.value,
-                dust
-            });
-        }
-        sum_outputs_value += output.value;
-        if output.script_pubkey == change_script_pubkey {
-            received_by_me += output.value;
-        }
+    pub fn add_required_inputs(mut self, inputs: impl IntoIterator<Item = UnspentInfo>) -> Self {
+        self.tx
+            .inputs
+            .extend(inputs.into_iter().map(|input| UnsignedTransactionInput {
+                previous_output: input.outpoint,
+                sequence: SEQUENCE_FINAL,
+                amount: input.value,
+                witness: Vec::new(),
+            }));
+        self
     }
 
-    if let Some(gas_fee) = gas_fee {
-        sum_outputs_value += gas_fee;
+    /// This function expects that utxos are sorted by amounts in ascending order
+    /// Consider sorting before calling this function
+    pub fn add_available_inputs(mut self, inputs: impl IntoIterator<Item = UnspentInfo>) -> Self {
+        self.available_inputs.extend(inputs);
+        self
     }
 
-    true_or!(!utxos.is_empty(), GenerateTxError::EmptyUtxoSet {
-        required: sum_outputs_value
-    });
+    pub fn add_outputs(mut self, outputs: impl IntoIterator<Item = TransactionOutput>) -> Self {
+        self.tx.outputs.extend(outputs);
+        self
+    }
 
-    let str_d_zeel = if coin.as_ref().conf.ticker == "NAV" {
-        Some("".into())
-    } else {
-        None
-    };
-    let hash_algo = coin.as_ref().tx_hash_algo.into();
-    let mut tx = TransactionInputSigner {
-        inputs: vec![],
-        outputs,
-        lock_time,
-        version: coin.as_ref().conf.tx_version,
-        n_time: if coin.as_ref().conf.is_pos {
-            Some((now_ms() / 1000) as u32)
-        } else {
-            None
-        },
-        overwintered: coin.as_ref().conf.overwintered,
-        expiry_height: 0,
-        join_splits: vec![],
-        shielded_spends: vec![],
-        shielded_outputs: vec![],
-        value_balance: 0,
-        version_group_id: coin.as_ref().conf.version_group_id,
-        consensus_branch_id: coin.as_ref().conf.consensus_branch_id,
-        zcash: coin.as_ref().conf.zcash,
-        str_d_zeel,
-        hash_algo,
-    };
-    let mut sum_inputs = 0;
-    let mut tx_fee = 0;
-    let min_relay_fee = if coin.as_ref().conf.force_min_relay_fee {
-        let fee_dec = coin.as_ref().rpc_client.get_relay_fee().compat().await?;
-        let min_relay_fee = sat_from_big_decimal(&fee_dec, coin.as_ref().decimals)?;
-        Some(min_relay_fee)
-    } else {
-        None
-    };
-    for utxo in utxos.iter() {
-        sum_inputs += utxo.value;
-        tx.inputs.push(UnsignedTransactionInput {
-            previous_output: utxo.outpoint.clone(),
-            sequence: SEQUENCE_FINAL,
-            amount: utxo.value,
-            witness: Vec::new(),
-        });
-        tx_fee = match &coin_tx_fee {
+    pub fn with_fee_policy(mut self, new_policy: FeePolicy) -> Self {
+        self.fee_policy = new_policy;
+        self
+    }
+
+    pub fn with_fee(mut self, fee: ActualTxFee) -> Self {
+        self.fee = Some(fee);
+        self
+    }
+
+    /// Note `gas_fee` should be enough to execute all of the contract calls within UTXO outputs.
+    /// QRC20 specific: `gas_fee` should be calculated by: gas_limit * gas_price * (count of contract calls),
+    /// or should be sum of gas fee of all contract calls.
+    pub fn with_gas_fee(mut self, gas_fee: u64) -> Self {
+        self.gas_fee = Some(gas_fee);
+        self
+    }
+
+    /// Recalculates fee and checks whether transaction is complete (inputs collected cover the outputs)
+    fn update_fee_and_check_completeness(
+        &mut self,
+        from_addr_format: &UtxoAddressFormat,
+        actual_tx_fee: &ActualTxFee,
+    ) -> bool {
+        self.tx_fee = match &actual_tx_fee {
             ActualTxFee::Dynamic(f) => {
-                let transaction = UtxoTx::from(tx.clone());
-                let v_size = tx_size_in_v_bytes(&coin.as_ref().my_address.addr_format, &transaction);
+                let transaction = UtxoTx::from(self.tx.clone());
+                let v_size = tx_size_in_v_bytes(from_addr_format, &transaction);
                 (f * v_size as u64) / KILO_BYTE
             },
             ActualTxFee::FixedPerKb(f) => {
-                let transaction = UtxoTx::from(tx.clone());
-                let v_size = tx_size_in_v_bytes(&coin.as_ref().my_address.addr_format, &transaction) as u64;
+                let transaction = UtxoTx::from(self.tx.clone());
+                let v_size = tx_size_in_v_bytes(from_addr_format, &transaction) as u64;
                 let v_size_kb = if v_size % KILO_BYTE == 0 {
                     v_size / KILO_BYTE
                 } else {
@@ -414,109 +725,189 @@ where
             },
         };
 
-        match fee_policy {
+        match self.fee_policy {
             FeePolicy::SendExact => {
-                let mut outputs_plus_fee = sum_outputs_value + tx_fee;
-                if sum_inputs >= outputs_plus_fee {
-                    let change = sum_inputs - outputs_plus_fee;
-                    if change > dust {
+                let mut outputs_plus_fee = self.sum_outputs_value + self.tx_fee;
+                if self.sum_inputs >= outputs_plus_fee {
+                    self.change = self.sum_inputs - outputs_plus_fee;
+                    if self.change > self.dust() {
                         // there will be change output
-                        if let ActualTxFee::Dynamic(ref f) = coin_tx_fee {
-                            tx_fee += (f * P2PKH_OUTPUT_LEN) / KILO_BYTE;
+                        if let ActualTxFee::Dynamic(ref f) = actual_tx_fee {
+                            self.tx_fee += (f * P2PKH_OUTPUT_LEN) / KILO_BYTE;
                             outputs_plus_fee += (f * P2PKH_OUTPUT_LEN) / KILO_BYTE;
                         }
                     }
-                    if let Some(min_relay) = min_relay_fee {
-                        if tx_fee < min_relay {
-                            outputs_plus_fee -= tx_fee;
+                    if let Some(min_relay) = self.min_relay_fee {
+                        if self.tx_fee < min_relay {
+                            outputs_plus_fee -= self.tx_fee;
                             outputs_plus_fee += min_relay;
-                            tx_fee = min_relay;
+                            self.tx_fee = min_relay;
                         }
                     }
-                    if sum_inputs >= outputs_plus_fee {
-                        break;
-                    }
+                    self.sum_inputs >= outputs_plus_fee
+                } else {
+                    false
                 }
             },
             FeePolicy::DeductFromOutput(_) => {
-                if sum_inputs >= sum_outputs_value {
-                    let change = sum_inputs - sum_outputs_value;
-                    if change > dust {
-                        if let ActualTxFee::Dynamic(ref f) = coin_tx_fee {
-                            tx_fee += (f * P2PKH_OUTPUT_LEN) / KILO_BYTE;
+                if self.sum_inputs >= self.sum_outputs_value {
+                    self.change = self.sum_inputs - self.sum_outputs_value;
+                    if self.change > self.dust() {
+                        if let ActualTxFee::Dynamic(ref f) = actual_tx_fee {
+                            self.tx_fee += (f * P2PKH_OUTPUT_LEN) / KILO_BYTE;
                         }
                     }
-                    if let Some(min_relay) = min_relay_fee {
-                        if tx_fee < min_relay {
-                            tx_fee = min_relay;
+                    if let Some(min_relay) = self.min_relay_fee {
+                        if self.tx_fee < min_relay {
+                            self.tx_fee = min_relay;
                         }
                     }
-                    break;
+                    true
+                } else {
+                    false
                 }
             },
-        };
+        }
+    }
+
+    fn dust(&self) -> u64 {
+        match self.dust {
+            Some(dust) => dust,
+            None => self.coin.as_ref().dust_amount,
+        }
     }
-    match fee_policy {
-        FeePolicy::SendExact => sum_outputs_value += tx_fee,
-        FeePolicy::DeductFromOutput(i) => {
-            let min_output = tx_fee + dust;
-            let val = tx.outputs[i].value;
-            true_or!(val >= min_output, GenerateTxError::DeductFeeFromOutputFailed {
-                output_idx: i,
-                output_value: val,
-                required: min_output,
+
+    /// Generates unsigned transaction (TransactionInputSigner) from specified utxos and outputs.
+    /// Sends the change (inputs amount - outputs amount) to the [`UtxoTxBuilder::from`] address.
+    /// Also returns additional transaction data
+    pub async fn build(mut self) -> GenerateTxResult {
+        let coin = self.coin;
+        let dust: u64 = self.dust();
+        let from = self
+            .from
+            .clone()
+            .or_mm_err(|| GenerateTxError::Internal("'from' address is not specified".to_owned()))?;
+        let change_script_pubkey = output_script(&from, ScriptType::P2PKH).to_bytes();
+
+        let actual_tx_fee = match self.fee {
+            Some(fee) => fee,
+            None => coin.get_tx_fee().await?,
+        };
+
+        true_or!(!self.tx.outputs.is_empty(), GenerateTxError::EmptyOutputs);
+
+        let mut received_by_me = 0;
+        for output in self.tx.outputs.iter() {
+            let script: Script = output.script_pubkey.clone().into();
+            if script.opcodes().next() != Some(Ok(Opcode::OP_RETURN)) {
+                true_or!(output.value >= dust, GenerateTxError::OutputValueLessThanDust {
+                    value: output.value,
+                    dust
+                });
+            }
+            self.sum_outputs_value += output.value;
+            if output.script_pubkey == change_script_pubkey {
+                received_by_me += output.value;
+            }
+        }
+
+        if let Some(gas_fee) = self.gas_fee {
+            self.sum_outputs_value += gas_fee;
+        }
+
+        true_or!(
+            !self.available_inputs.is_empty() || !self.tx.inputs.is_empty(),
+            GenerateTxError::EmptyUtxoSet {
+                required: self.sum_outputs_value
+            }
+        );
+
+        self.min_relay_fee = if coin.as_ref().conf.force_min_relay_fee {
+            let fee_dec = coin.as_ref().rpc_client.get_relay_fee().compat().await?;
+            let min_relay_fee = sat_from_big_decimal(&fee_dec, coin.as_ref().decimals)?;
+            Some(min_relay_fee)
+        } else {
+            None
+        };
+
+        for utxo in self.available_inputs.clone() {
+            self.tx.inputs.push(UnsignedTransactionInput {
+                previous_output: utxo.outpoint,
+                sequence: SEQUENCE_FINAL,
+                amount: utxo.value,
+                witness: vec![],
             });
-            tx.outputs[i].value -= tx_fee;
-            if tx.outputs[i].script_pubkey == change_script_pubkey {
-                received_by_me -= tx_fee;
+            self.sum_inputs += utxo.value;
+
+            if self.update_fee_and_check_completeness(&from.addr_format, &actual_tx_fee) {
+                break;
             }
-        },
-    };
-    true_or!(sum_inputs >= sum_outputs_value, GenerateTxError::NotEnoughUtxos {
-        sum_utxos: sum_inputs,
-        required: sum_outputs_value
-    });
+        }
 
-    let change = sum_inputs - sum_outputs_value;
-    let unused_change = if change > dust {
-        tx.outputs.push({
-            TransactionOutput {
-                value: change,
-                script_pubkey: change_script_pubkey.clone(),
+        match self.fee_policy {
+            FeePolicy::SendExact => self.sum_outputs_value += self.tx_fee,
+            FeePolicy::DeductFromOutput(i) => {
+                let min_output = self.tx_fee + dust;
+                let val = self.tx.outputs[i].value;
+                true_or!(val >= min_output, GenerateTxError::DeductFeeFromOutputFailed {
+                    output_idx: i,
+                    output_value: val,
+                    required: min_output,
+                });
+                self.tx.outputs[i].value -= self.tx_fee;
+                if self.tx.outputs[i].script_pubkey == change_script_pubkey {
+                    received_by_me -= self.tx_fee;
+                }
+            },
+        };
+        true_or!(
+            self.sum_inputs >= self.sum_outputs_value,
+            GenerateTxError::NotEnoughUtxos {
+                sum_utxos: self.sum_inputs,
+                required: self.sum_outputs_value
             }
-        });
-        received_by_me += change;
-        None
-    } else if change > 0 {
-        Some(change)
-    } else {
-        None
-    };
+        );
 
-    let data = AdditionalTxData {
-        fee_amount: tx_fee,
-        received_by_me,
-        spent_by_me: sum_inputs,
-        unused_change,
-        // will be changed if the ticker is KMD
-        kmd_rewards: None,
-    };
+        let change = self.sum_inputs - self.sum_outputs_value;
+        let unused_change = if change > dust {
+            self.tx.outputs.push({
+                TransactionOutput {
+                    value: change,
+                    script_pubkey: change_script_pubkey.clone(),
+                }
+            });
+            received_by_me += change;
+            None
+        } else if change > 0 {
+            Some(change)
+        } else {
+            None
+        };
+
+        let data = AdditionalTxData {
+            fee_amount: self.tx_fee,
+            received_by_me,
+            spent_by_me: self.sum_inputs,
+            unused_change,
+            // will be changed if the ticker is KMD
+            kmd_rewards: None,
+        };
 
-    Ok(coin.calc_interest_if_required(tx, data, change_script_pubkey).await?)
+        Ok(coin
+            .calc_interest_if_required(self.tx, data, change_script_pubkey)
+            .await?)
+    }
 }
 
 /// Calculates interest if the coin is KMD
 /// Adds the value to existing output to my_script_pub or creates additional interest output
 /// returns transaction and data as is if the coin is not KMD
-pub async fn calc_interest_if_required<T>(
+pub async fn calc_interest_if_required<T: UtxoCommonOps>(
     coin: &T,
     mut unsigned: TransactionInputSigner,
     mut data: AdditionalTxData,
     my_script_pub: Bytes,
-) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
-{
+) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
     if coin.as_ref().conf.ticker != "KMD" {
         return Ok((unsigned, data));
     }
@@ -527,7 +918,7 @@ where
         let tx = coin
             .as_ref()
             .rpc_client
-            .get_verbose_transaction(prev_hash)
+            .get_verbose_transaction(&prev_hash)
             .compat()
             .await?;
         if let Ok(output_interest) =
@@ -563,19 +954,18 @@ where
     Ok((unsigned, data))
 }
 
-pub async fn p2sh_spending_tx<T>(
-    coin: &T,
+pub struct P2SHSpendingTxInput<'a> {
     prev_transaction: UtxoTx,
     redeem_script: Bytes,
     outputs: Vec<TransactionOutput>,
     script_data: Script,
     sequence: u32,
     lock_time: u32,
-) -> Result<UtxoTx, String>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
-{
-    let lock_time = try_s!(coin.p2sh_tx_locktime(lock_time).await);
+    keypair: &'a KeyPair,
+}
+
+pub async fn p2sh_spending_tx<T: UtxoCommonOps>(coin: &T, input: P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String> {
+    let lock_time = try_s!(coin.p2sh_tx_locktime(input.lock_time).await);
     let n_time = if coin.as_ref().conf.is_pos {
         Some((now_ms() / 1000) as u32)
     } else {
@@ -593,15 +983,15 @@ where
         n_time,
         overwintered: coin.as_ref().conf.overwintered,
         inputs: vec![UnsignedTransactionInput {
-            sequence,
+            sequence: input.sequence,
             previous_output: OutPoint {
-                hash: prev_transaction.hash(),
+                hash: input.prev_transaction.hash(),
                 index: DEFAULT_SWAP_VOUT as u32,
             },
-            amount: prev_transaction.outputs[0].value,
+            amount: input.prev_transaction.outputs[0].value,
             witness: Vec::new(),
         }],
-        outputs: outputs.clone(),
+        outputs: input.outputs,
         expiry_height: 0,
         join_splits: vec![],
         shielded_spends: vec![],
@@ -616,9 +1006,9 @@ where
     let signed_input = try_s!(p2sh_spend(
         &unsigned,
         DEFAULT_SWAP_VOUT,
-        &coin.as_ref().key_pair,
-        script_data,
-        redeem_script.into(),
+        input.keypair,
+        input.script_data,
+        input.redeem_script.into(),
         coin.as_ref().conf.signature_version,
         coin.as_ref().conf.fork_id
     ));
@@ -628,7 +1018,7 @@ where
         overwintered: unsigned.overwintered,
         lock_time: unsigned.lock_time,
         inputs: vec![signed_input],
-        outputs,
+        outputs: unsigned.outputs,
         expiry_height: unsigned.expiry_height,
         join_splits: vec![],
         shielded_spends: vec![],
@@ -646,17 +1036,17 @@ where
 
 pub fn send_taker_fee<T>(coin: T, fee_pub_key: &[u8], amount: BigDecimal) -> TransactionFut
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
+    T: UtxoCommonOps + GetUtxoListOps,
 {
-    let address = try_fus!(address_from_raw_pubkey(
+    let address = try_tx_fus!(address_from_raw_pubkey(
         fee_pub_key,
         coin.as_ref().conf.pub_addr_prefix,
         coin.as_ref().conf.pub_t_addr_prefix,
         coin.as_ref().conf.checksum_type,
         coin.as_ref().conf.bech32_hrp.clone(),
-        coin.as_ref().my_address.addr_format.clone()
+        coin.addr_format().clone(),
     ));
-    let amount = try_fus!(sat_from_big_decimal(&amount, coin.as_ref().decimals));
+    let amount = try_tx_fus!(sat_from_big_decimal(&amount, coin.as_ref().decimals));
     let output = TransactionOutput {
         value: amount,
         script_pubkey: Builder::build_p2pkh(&address.hash).to_bytes(),
@@ -670,16 +1060,19 @@ pub fn send_maker_payment<T>(
     taker_pub: &[u8],
     secret_hash: &[u8],
     amount: BigDecimal,
+    swap_unique_data: &[u8],
 ) -> TransactionFut
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Clone + Send + Sync + 'static,
+    T: UtxoCommonOps + GetUtxoListOps + SwapOps,
 {
+    let maker_htlc_key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let SwapPaymentOutputsResult {
         payment_address,
         outputs,
-    } = try_fus!(generate_swap_payment_outputs(
+    } = try_tx_fus!(generate_swap_payment_outputs(
         &coin,
         time_lock,
+        maker_htlc_key_pair.public_slice(),
         taker_pub,
         secret_hash,
         amount
@@ -687,11 +1080,11 @@ where
     let send_fut = match &coin.as_ref().rpc_client {
         UtxoRpcClientEnum::Electrum(_) => Either::A(send_outputs_from_my_address(coin, outputs)),
         UtxoRpcClientEnum::Native(client) => {
-            let addr_string = try_fus!(payment_address.display_address());
+            let addr_string = try_tx_fus!(payment_address.display_address());
             Either::B(
                 client
                     .import_address(&addr_string, &addr_string, false)
-                    .map_err(|e| ERRL!("{}", e))
+                    .map_err(|e| TransactionErr::Plain(ERRL!("{}", e)))
                     .and_then(move |_| send_outputs_from_my_address(coin, outputs)),
             )
         },
@@ -705,28 +1098,32 @@ pub fn send_taker_payment<T>(
     maker_pub: &[u8],
     secret_hash: &[u8],
     amount: BigDecimal,
+    swap_unique_data: &[u8],
 ) -> TransactionFut
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Clone + Send + Sync + 'static,
+    T: UtxoCommonOps + GetUtxoListOps + SwapOps,
 {
+    let taker_htlc_key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let SwapPaymentOutputsResult {
         payment_address,
         outputs,
-    } = try_fus!(generate_swap_payment_outputs(
+    } = try_tx_fus!(generate_swap_payment_outputs(
         &coin,
         time_lock,
+        taker_htlc_key_pair.public_slice(),
         maker_pub,
         secret_hash,
         amount
     ));
+
     let send_fut = match &coin.as_ref().rpc_client {
         UtxoRpcClientEnum::Electrum(_) => Either::A(send_outputs_from_my_address(coin, outputs)),
         UtxoRpcClientEnum::Native(client) => {
-            let addr_string = try_fus!(payment_address.display_address());
+            let addr_string = try_tx_fus!(payment_address.display_address());
             Either::B(
                 client
                     .import_address(&addr_string, &addr_string, false)
-                    .map_err(|e| ERRL!("{}", e))
+                    .map_err(|e| TransactionErr::Plain(ERRL!("{}", e)))
                     .and_then(move |_| send_outputs_from_my_address(coin, outputs)),
             )
         },
@@ -734,18 +1131,19 @@ where
     Box::new(send_fut)
 }
 
-pub fn send_maker_spends_taker_payment<T>(
+pub fn send_maker_spends_taker_payment<T: UtxoCommonOps + SwapOps>(
     coin: T,
     taker_payment_tx: &[u8],
     time_lock: u32,
     taker_pub: &[u8],
     secret: &[u8],
-) -> TransactionFut
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
-    let mut prev_tx: UtxoTx = try_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
-    prev_tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
+    swap_unique_data: &[u8],
+) -> TransactionFut {
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let mut prev_transaction: UtxoTx = try_tx_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+    prev_transaction.tx_hash_algo = coin.as_ref().tx_hash_algo;
+
+    let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let script_data = Builder::default()
         .push_data(secret)
         .push_opcode(Opcode::OP_0)
@@ -753,46 +1151,51 @@ where
     let redeem_script = payment_script(
         time_lock,
         &*dhash160(secret),
-        &try_fus!(Public::from_slice(taker_pub)),
-        coin.as_ref().key_pair.public(),
-    );
+        &try_tx_fus!(Public::from_slice(taker_pub)),
+        key_pair.public(),
+    )
+    .into();
     let fut = async move {
-        let fee = try_s!(coin.get_htlc_spend_fee().await);
-        let script_pubkey = output_script(&coin.as_ref().my_address, ScriptType::P2PKH).to_bytes();
+        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
-            value: prev_tx.outputs[0].value - fee,
+            value: prev_transaction.outputs[0].value - fee,
             script_pubkey,
         };
-        let transaction = try_s!(
-            coin.p2sh_spending_tx(
-                prev_tx,
-                redeem_script.into(),
-                vec![output],
-                script_data,
-                SEQUENCE_FINAL,
-                time_lock
-            )
-            .await
-        );
+
+        let input = P2SHSpendingTxInput {
+            prev_transaction,
+            redeem_script,
+            outputs: vec![output],
+            script_data,
+            sequence: SEQUENCE_FINAL,
+            lock_time: time_lock,
+            keypair: &key_pair,
+        };
+        let transaction = try_tx_s!(coin.p2sh_spending_tx(input).await);
+
         let tx_fut = coin.as_ref().rpc_client.send_transaction(&transaction).compat();
-        try_s!(tx_fut.await);
+        try_tx_s!(tx_fut.await, transaction);
+
         Ok(transaction.into())
     };
     Box::new(fut.boxed().compat())
 }
 
-pub fn send_taker_spends_maker_payment<T>(
+pub fn send_taker_spends_maker_payment<T: UtxoCommonOps + SwapOps>(
     coin: T,
     maker_payment_tx: &[u8],
     time_lock: u32,
     maker_pub: &[u8],
     secret: &[u8],
-) -> TransactionFut
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
-    let mut prev_tx: UtxoTx = try_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
-    prev_tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
+    swap_unique_data: &[u8],
+) -> TransactionFut {
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let mut prev_transaction: UtxoTx = try_tx_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+    prev_transaction.tx_hash_algo = coin.as_ref().tx_hash_algo;
+
+    let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
+
     let script_data = Builder::default()
         .push_data(secret)
         .push_opcode(Opcode::OP_0)
@@ -800,117 +1203,129 @@ where
     let redeem_script = payment_script(
         time_lock,
         &*dhash160(secret),
-        &try_fus!(Public::from_slice(maker_pub)),
-        coin.as_ref().key_pair.public(),
-    );
+        &try_tx_fus!(Public::from_slice(maker_pub)),
+        key_pair.public(),
+    )
+    .into();
     let fut = async move {
-        let fee = try_s!(coin.get_htlc_spend_fee().await);
-        let script_pubkey = output_script(&coin.as_ref().my_address, ScriptType::P2PKH).to_bytes();
+        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
-            value: prev_tx.outputs[0].value - fee,
+            value: prev_transaction.outputs[0].value - fee,
             script_pubkey,
         };
-        let transaction = try_s!(
-            coin.p2sh_spending_tx(
-                prev_tx,
-                redeem_script.into(),
-                vec![output],
-                script_data,
-                SEQUENCE_FINAL,
-                time_lock
-            )
-            .await
-        );
+
+        let input = P2SHSpendingTxInput {
+            prev_transaction,
+            redeem_script,
+            outputs: vec![output],
+            script_data,
+            sequence: SEQUENCE_FINAL,
+            lock_time: time_lock,
+            keypair: &key_pair,
+        };
+        let transaction = try_tx_s!(coin.p2sh_spending_tx(input).await);
+
         let tx_fut = coin.as_ref().rpc_client.send_transaction(&transaction).compat();
-        try_s!(tx_fut.await);
+        try_tx_s!(tx_fut.await, transaction);
+
         Ok(transaction.into())
     };
     Box::new(fut.boxed().compat())
 }
 
-pub fn send_taker_refunds_payment<T>(
+pub fn send_taker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     coin: T,
     taker_payment_tx: &[u8],
     time_lock: u32,
     maker_pub: &[u8],
     secret_hash: &[u8],
-) -> TransactionFut
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
-    let mut prev_tx: UtxoTx = try_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
-    prev_tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
+    swap_unique_data: &[u8],
+) -> TransactionFut {
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let mut prev_transaction: UtxoTx =
+        try_tx_fus!(deserialize(taker_payment_tx).map_err(|e| TransactionErr::Plain(format!("{:?}", e))));
+    prev_transaction.tx_hash_algo = coin.as_ref().tx_hash_algo;
+
+    let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let script_data = Builder::default().push_opcode(Opcode::OP_1).into_script();
     let redeem_script = payment_script(
         time_lock,
         secret_hash,
-        coin.as_ref().key_pair.public(),
-        &try_fus!(Public::from_slice(maker_pub)),
-    );
+        key_pair.public(),
+        &try_tx_fus!(Public::from_slice(maker_pub)),
+    )
+    .into();
     let fut = async move {
-        let fee = try_s!(coin.get_htlc_spend_fee().await);
-        let script_pubkey = output_script(&coin.as_ref().my_address, ScriptType::P2PKH).to_bytes();
+        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
-            value: prev_tx.outputs[0].value - fee,
+            value: prev_transaction.outputs[0].value - fee,
             script_pubkey,
         };
-        let transaction = try_s!(
-            coin.p2sh_spending_tx(
-                prev_tx,
-                redeem_script.into(),
-                vec![output],
-                script_data,
-                SEQUENCE_FINAL - 1,
-                time_lock,
-            )
-            .await
-        );
+
+        let input = P2SHSpendingTxInput {
+            prev_transaction,
+            redeem_script,
+            outputs: vec![output],
+            script_data,
+            sequence: SEQUENCE_FINAL - 1,
+            lock_time: time_lock,
+            keypair: &key_pair,
+        };
+        let transaction = try_tx_s!(coin.p2sh_spending_tx(input).await);
+
         let tx_fut = coin.as_ref().rpc_client.send_transaction(&transaction).compat();
-        try_s!(tx_fut.await);
+        try_tx_s!(tx_fut.await, transaction);
+
         Ok(transaction.into())
     };
     Box::new(fut.boxed().compat())
 }
 
-pub fn send_maker_refunds_payment<T>(
+pub fn send_maker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     coin: T,
     maker_payment_tx: &[u8],
     time_lock: u32,
     taker_pub: &[u8],
     secret_hash: &[u8],
-) -> TransactionFut
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
-    let mut prev_tx: UtxoTx = try_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
-    prev_tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
+    swap_unique_data: &[u8],
+) -> TransactionFut {
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let mut prev_transaction: UtxoTx = try_tx_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+    prev_transaction.tx_hash_algo = coin.as_ref().tx_hash_algo;
+
+    let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let script_data = Builder::default().push_opcode(Opcode::OP_1).into_script();
     let redeem_script = payment_script(
         time_lock,
         secret_hash,
-        coin.as_ref().key_pair.public(),
-        &try_fus!(Public::from_slice(taker_pub)),
-    );
+        key_pair.public(),
+        &try_tx_fus!(Public::from_slice(taker_pub)),
+    )
+    .into();
     let fut = async move {
-        let fee = try_s!(coin.get_htlc_spend_fee().await);
-        let script_pubkey = output_script(&coin.as_ref().my_address, ScriptType::P2PKH).to_bytes();
+        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
-            value: prev_tx.outputs[0].value - fee,
+            value: prev_transaction.outputs[0].value - fee,
             script_pubkey,
         };
-        let transaction = try_s!(
-            coin.p2sh_spending_tx(
-                prev_tx,
-                redeem_script.into(),
-                vec![output],
-                script_data,
-                SEQUENCE_FINAL - 1,
-                time_lock,
-            )
-            .await
-        );
+
+        let input = P2SHSpendingTxInput {
+            prev_transaction,
+            redeem_script,
+            outputs: vec![output],
+            script_data,
+            sequence: SEQUENCE_FINAL - 1,
+            lock_time: time_lock,
+            keypair: &key_pair,
+        };
+        let transaction = try_tx_s!(coin.p2sh_spending_tx(input).await);
+
         let tx_fut = coin.as_ref().rpc_client.send_transaction(&transaction).compat();
-        try_s!(tx_fut.await);
+        try_tx_s!(tx_fut.await, transaction);
+
         Ok(transaction.into())
     };
     Box::new(fut.boxed().compat())
@@ -967,7 +1382,7 @@ fn pubkey_from_witness_script(witness_script: &[Bytes]) -> Result<H264, String>
 
 pub async fn is_tx_confirmed_before_block<T>(coin: &T, tx: &RpcTransaction, block_number: u64) -> Result<bool, String>
 where
-    T: AsRef<UtxoCoinFields> + Send + Sync + 'static,
+    T: UtxoCommonOps,
 {
     match tx.height {
         Some(confirmed_at) => Ok(confirmed_at <= block_number),
@@ -1000,7 +1415,7 @@ pub fn check_all_inputs_signed_by_pub(tx: &UtxoTx, expected_pub: &[u8]) -> Resul
     Ok(true)
 }
 
-pub fn validate_fee<T>(
+pub fn validate_fee<T: UtxoCommonOps>(
     coin: T,
     tx: UtxoTx,
     output_index: usize,
@@ -1008,10 +1423,7 @@ pub fn validate_fee<T>(
     amount: &BigDecimal,
     min_block_number: u64,
     fee_addr: &[u8],
-) -> Box<dyn Future<Item = (), Error = String> + Send>
-where
-    T: AsRef<UtxoCoinFields> + Send + Sync + 'static,
-{
+) -> Box<dyn Future<Item = (), Error = String> + Send> {
     let amount = amount.clone();
     let address = try_fus!(address_from_raw_pubkey(
         fee_addr,
@@ -1019,7 +1431,7 @@ where
         coin.as_ref().conf.pub_t_addr_prefix,
         coin.as_ref().conf.checksum_type,
         coin.as_ref().conf.bech32_hrp.clone(),
-        coin.as_ref().my_address.addr_format.clone()
+        coin.addr_format().clone(),
     ));
 
     if !try_fus!(check_all_inputs_signed_by_pub(&tx, sender_pubkey)) {
@@ -1030,7 +1442,7 @@ where
         let tx_from_rpc = try_s!(
             coin.as_ref()
                 .rpc_client
-                .get_verbose_transaction(tx.hash().reversed().into())
+                .get_verbose_transaction(&tx.hash().reversed().into())
                 .compat()
                 .await
         );
@@ -1079,77 +1491,66 @@ where
     Box::new(fut.boxed().compat())
 }
 
-pub fn validate_maker_payment<T>(
+pub fn validate_maker_payment<T: UtxoCommonOps + SwapOps>(
     coin: &T,
-    payment_tx: &[u8],
-    time_lock: u32,
-    maker_pub: &[u8],
-    priv_bn_hash: &[u8],
-    amount: BigDecimal,
-) -> Box<dyn Future<Item = (), Error = String> + Send>
-where
-    T: AsRef<UtxoCoinFields> + Clone + Send + Sync + 'static,
-{
-    let my_public = coin.as_ref().key_pair.public();
-    let mut tx: UtxoTx = try_fus!(deserialize(payment_tx).map_err(|e| ERRL!("{:?}", e)));
+    input: ValidatePaymentInput,
+) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    let mut tx: UtxoTx = try_fus!(deserialize(input.payment_tx.as_slice()).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
 
+    let htlc_keypair = coin.derive_htlc_key_pair(&input.unique_swap_data);
     validate_payment(
         coin.clone(),
         tx,
         DEFAULT_SWAP_VOUT,
-        &try_fus!(Public::from_slice(maker_pub)),
-        my_public,
-        priv_bn_hash,
-        amount,
-        time_lock,
+        &try_fus!(Public::from_slice(&input.other_pub)),
+        htlc_keypair.public(),
+        &input.secret_hash,
+        input.amount,
+        input.time_lock,
+        input.try_spv_proof_until,
+        input.confirmations,
     )
 }
 
-pub fn validate_taker_payment<T>(
+pub fn validate_taker_payment<T: UtxoCommonOps + SwapOps>(
     coin: &T,
-    payment_tx: &[u8],
-    time_lock: u32,
-    taker_pub: &[u8],
-    priv_bn_hash: &[u8],
-    amount: BigDecimal,
-) -> Box<dyn Future<Item = (), Error = String> + Send>
-where
-    T: AsRef<UtxoCoinFields> + Clone + Send + Sync + 'static,
-{
-    let my_public = coin.as_ref().key_pair.public();
-    let mut tx: UtxoTx = try_fus!(deserialize(payment_tx).map_err(|e| ERRL!("{:?}", e)));
+    input: ValidatePaymentInput,
+) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    let mut tx: UtxoTx = try_fus!(deserialize(input.payment_tx.as_slice()).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
 
+    let htlc_keypair = coin.derive_htlc_key_pair(&input.unique_swap_data);
     validate_payment(
         coin.clone(),
         tx,
         DEFAULT_SWAP_VOUT,
-        &try_fus!(Public::from_slice(taker_pub)),
-        my_public,
-        priv_bn_hash,
-        amount,
-        time_lock,
+        &try_fus!(Public::from_slice(&input.other_pub)),
+        htlc_keypair.public(),
+        &input.secret_hash,
+        input.amount,
+        input.time_lock,
+        input.try_spv_proof_until,
+        input.confirmations,
     )
 }
 
-pub fn check_if_my_payment_sent<T>(
+pub fn check_if_my_payment_sent<T: UtxoCommonOps + SwapOps>(
     coin: T,
     time_lock: u32,
     other_pub: &[u8],
     secret_hash: &[u8],
-) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
+    swap_unique_data: &[u8],
+) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+    let my_htlc_keypair = coin.derive_htlc_key_pair(swap_unique_data);
     let script = payment_script(
         time_lock,
         secret_hash,
-        coin.as_ref().key_pair.public(),
+        my_htlc_keypair.public(),
         &try_fus!(Public::from_slice(other_pub)),
     );
     let hash = dhash160(&script);
-    let p2sh = Builder::build_p2sh(&hash);
+    let p2sh = Builder::build_p2sh(&hash.into());
     let script_hash = electrum_script_hash(&p2sh);
     let fut = async move {
         match &coin.as_ref().rpc_client {
@@ -1157,7 +1558,7 @@ where
                 let history = try_s!(client.scripthash_get_history(&hex::encode(script_hash)).compat().await);
                 match history.first() {
                     Some(item) => {
-                        let tx_bytes = try_s!(client.get_transaction_bytes(item.tx_hash.clone()).compat().await);
+                        let tx_bytes = try_s!(client.get_transaction_bytes(&item.tx_hash).compat().await);
                         let mut tx: UtxoTx = try_s!(deserialize(tx_bytes.0.as_slice()).map_err(|e| ERRL!("{:?}", e)));
                         tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
                         Ok(Some(tx.into()))
@@ -1169,10 +1570,10 @@ where
                 let target_addr = Address {
                     t_addr_prefix: coin.as_ref().conf.p2sh_t_addr_prefix,
                     prefix: coin.as_ref().conf.p2sh_addr_prefix,
-                    hash,
+                    hash: hash.into(),
                     checksum_type: coin.as_ref().conf.checksum_type,
                     hrp: coin.as_ref().conf.bech32_hrp.clone(),
-                    addr_format: coin.as_ref().my_address.addr_format.clone(),
+                    addr_format: coin.addr_format().clone(),
                 };
                 let target_addr = target_addr.to_string();
                 let is_imported = try_s!(client.is_address_imported(&target_addr).await);
@@ -1182,7 +1583,7 @@ where
                 let received_by_addr = try_s!(client.list_received_by_address(0, true, true).compat().await);
                 for item in received_by_addr {
                     if item.address == target_addr && !item.txids.is_empty() {
-                        let tx_bytes = try_s!(client.get_transaction_bytes(item.txids[0].clone()).compat().await);
+                        let tx_bytes = try_s!(client.get_transaction_bytes(&item.txids[0]).compat().await);
                         let mut tx: UtxoTx = try_s!(deserialize(tx_bytes.0.as_slice()).map_err(|e| ERRL!("{:?}", e)));
                         tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
                         return Ok(Some(tx.into()));
@@ -1195,46 +1596,40 @@ where
     Box::new(fut.boxed().compat())
 }
 
-pub fn search_for_swap_tx_spend_my(
-    coin: &UtxoCoinFields,
-    time_lock: u32,
-    other_pub: &[u8],
-    secret_hash: &[u8],
-    tx: &[u8],
+pub async fn search_for_swap_tx_spend_my<T: AsRef<UtxoCoinFields> + SwapOps>(
+    coin: &T,
+    input: SearchForSwapTxSpendInput<'_>,
     output_index: usize,
-    search_from_block: u64,
 ) -> Result<Option<FoundSwapTxSpend>, String> {
-    block_on(search_for_swap_output_spend(
-        coin,
-        time_lock,
-        coin.key_pair.public(),
-        &try_s!(Public::from_slice(other_pub)),
-        secret_hash,
-        tx,
+    search_for_swap_output_spend(
+        coin.as_ref(),
+        input.time_lock,
+        coin.derive_htlc_key_pair(input.swap_unique_data).public(),
+        &try_s!(Public::from_slice(input.other_pub)),
+        input.secret_hash,
+        input.tx,
         output_index,
-        search_from_block,
-    ))
+        input.search_from_block,
+    )
+    .await
 }
 
-pub fn search_for_swap_tx_spend_other(
-    coin: &UtxoCoinFields,
-    time_lock: u32,
-    other_pub: &[u8],
-    secret_hash: &[u8],
-    tx: &[u8],
+pub async fn search_for_swap_tx_spend_other<T: AsRef<UtxoCoinFields> + SwapOps>(
+    coin: &T,
+    input: SearchForSwapTxSpendInput<'_>,
     output_index: usize,
-    search_from_block: u64,
 ) -> Result<Option<FoundSwapTxSpend>, String> {
-    block_on(search_for_swap_output_spend(
-        coin,
-        time_lock,
-        &try_s!(Public::from_slice(other_pub)),
-        coin.key_pair.public(),
-        secret_hash,
-        tx,
+    search_for_swap_output_spend(
+        coin.as_ref(),
+        input.time_lock,
+        &try_s!(Public::from_slice(input.other_pub)),
+        coin.derive_htlc_key_pair(input.swap_unique_data).public(),
+        input.secret_hash,
+        input.tx,
         output_index,
-        search_from_block,
-    ))
+        input.search_from_block,
+    )
+    .await
 }
 
 /// Extract a secret from the `spend_tx`.
@@ -1246,31 +1641,39 @@ pub fn extract_secret(secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, St
         let instruction = match script.get_instruction(1) {
             Some(Ok(instr)) => instr,
             Some(Err(e)) => {
-                log!("Warning: "[e]);
+                warn!("{:?}", e);
                 continue;
             },
             None => {
-                log!("Warning: couldn't find secret in "[input_idx]" input");
+                warn!("Couldn't find secret in {:?} input", input_idx);
                 continue;
             },
         };
 
         if instruction.opcode != Opcode::OP_PUSHBYTES_32 {
-            log!("Warning: expected "[Opcode::OP_PUSHBYTES_32]" opcode, found "[instruction.opcode] " in "[input_idx]" input");
+            warn!(
+                "Expected {:?} opcode, found {:?} in {:?} input",
+                Opcode::OP_PUSHBYTES_32,
+                instruction.opcode,
+                input_idx
+            );
             continue;
         }
 
         let secret = match instruction.data {
             Some(data) => data.to_vec(),
             None => {
-                log!("Warning: secret is empty in "[input_idx] " input");
+                warn!("Secret is empty in {:?} input", input_idx);
                 continue;
             },
         };
 
         let actual_secret_hash = &*dhash160(&secret);
         if actual_secret_hash != secret_hash {
-            log!("Warning: invalid 'dhash160(secret)' "[actual_secret_hash]", expected "[secret_hash]);
+            warn!(
+                "Invalid 'dhash160(secret)' {:?}, expected {:?}",
+                actual_secret_hash, secret_hash
+            );
             continue;
         }
         return Ok(secret);
@@ -1278,31 +1681,80 @@ pub fn extract_secret(secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, St
     ERR!("Couldn't extract secret")
 }
 
-pub fn my_address<T>(coin: &T) -> Result<String, String>
+pub fn my_address<T: UtxoCommonOps>(coin: &T) -> Result<String, String> {
+    match coin.as_ref().derivation_method {
+        DerivationMethod::Iguana(ref my_address) => my_address.display_address(),
+        DerivationMethod::HDWallet(_) => ERR!("'my_address' is deprecated for HD wallets"),
+    }
+}
+
+/// Hash message for signature using Bitcoin's message signing format.
+/// sha256(sha256(PREFIX_LENGTH + PREFIX + MESSAGE_LENGTH + MESSAGE))
+pub fn sign_message_hash(coin: &UtxoCoinFields, message: &str) -> Option<[u8; 32]> {
+    let message_prefix = coin.conf.sign_message_prefix.clone()?;
+    let mut stream = Stream::new();
+    let prefix_len = CompactInteger::from(message_prefix.len());
+    prefix_len.serialize(&mut stream);
+    stream.append_slice(message_prefix.as_bytes());
+    let msg_len = CompactInteger::from(message.len());
+    msg_len.serialize(&mut stream);
+    stream.append_slice(message.as_bytes());
+    Some(dhash256(&stream.out()).take())
+}
+
+pub fn sign_message(coin: &UtxoCoinFields, message: &str) -> SignatureResult<String> {
+    let message_hash = sign_message_hash(coin, message).ok_or(SignatureError::PrefixNotFound)?;
+    let private_key = coin.priv_key_policy.key_pair_or_err()?.private();
+    let signature = private_key.sign_compact(&H256::from(message_hash))?;
+    Ok(base64::encode(&*signature))
+}
+
+pub fn verify_message<T: UtxoCommonOps>(
+    coin: &T,
+    signature_base64: &str,
+    message: &str,
+    address: &str,
+) -> VerificationResult<bool> {
+    let message_hash = sign_message_hash(coin.as_ref(), message).ok_or(VerificationError::PrefixNotFound)?;
+    let signature = CompactSignature::from(base64::decode(signature_base64)?);
+    let recovered_pubkey = Public::recover_compact(&H256::from(message_hash), &signature)?;
+    let received_address = checked_address_from_str(coin, address).map_err(VerificationError::AddressDecodingError)?;
+    Ok(AddressHashEnum::from(recovered_pubkey.address_hash()) == received_address.hash)
+}
+
+pub fn my_balance<T>(coin: T) -> BalanceFut<CoinBalance>
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
+    T: UtxoCommonOps + GetUtxoListOps + MarketCoinOps,
 {
-    coin.as_ref().my_address.display_address()
+    let my_address = try_f!(coin
+        .as_ref()
+        .derivation_method
+        .iguana_or_err()
+        .mm_err(BalanceError::from))
+    .clone();
+    let fut = async move { address_balance(&coin, &my_address).await };
+    Box::new(fut.boxed().compat())
 }
 
-pub fn my_balance(coin: &UtxoCoinFields) -> BalanceFut<CoinBalance> {
+/// Takes raw transaction as input and returns tx hash in hexadecimal format
+pub fn send_raw_tx(coin: &UtxoCoinFields, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
+    let bytes = try_fus!(hex::decode(tx));
     Box::new(
         coin.rpc_client
-            .display_balance(coin.my_address.clone(), coin.decimals)
-            .map_to_mm_fut(BalanceError::from)
-            // at the moment standard UTXO coins do not have an unspendable balance
-            .map(|spendable| CoinBalance {
-                spendable,
-                unspendable: BigDecimal::from(0),
-            }),
+            .send_raw_transaction(bytes.into())
+            .map_err(|e| ERRL!("{}", e))
+            .map(|hash| format!("{:?}", hash)),
     )
 }
 
-pub fn send_raw_tx(coin: &UtxoCoinFields, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
-    let bytes = try_fus!(hex::decode(tx));
+/// Takes raw transaction bytes as input and returns tx hash in hexadecimal format
+pub fn send_raw_tx_bytes(
+    coin: &UtxoCoinFields,
+    tx_bytes: &[u8],
+) -> Box<dyn Future<Item = String, Error = String> + Send> {
     Box::new(
         coin.rpc_client
-            .send_raw_transaction(bytes.into())
+            .send_raw_transaction(tx_bytes.into())
             .map_err(|e| ERRL!("{}", e))
             .map(|hash| format!("{:?}", hash)),
     )
@@ -1318,8 +1770,14 @@ pub fn wait_for_confirmations(
 ) -> Box<dyn Future<Item = (), Error = String> + Send> {
     let mut tx: UtxoTx = try_fus!(deserialize(tx).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.tx_hash_algo;
-    coin.rpc_client
-        .wait_for_confirmations(&tx, confirmations as u32, requires_nota, wait_until, check_every)
+    coin.rpc_client.wait_for_confirmations(
+        tx.hash().reversed().into(),
+        tx.expiry_height,
+        confirmations as u32,
+        requires_nota,
+        wait_until,
+        check_every,
+    )
 }
 
 pub fn wait_for_output_spend(
@@ -1329,25 +1787,33 @@ pub fn wait_for_output_spend(
     from_block: u64,
     wait_until: u64,
 ) -> TransactionFut {
-    let mut tx: UtxoTx = try_fus!(deserialize(tx_bytes).map_err(|e| ERRL!("{:?}", e)));
+    let mut tx: UtxoTx = try_tx_fus!(deserialize(tx_bytes).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.tx_hash_algo;
     let client = coin.rpc_client.clone();
     let tx_hash_algo = coin.tx_hash_algo;
     let fut = async move {
         loop {
-            match client.find_output_spend(&tx, output_index, from_block).compat().await {
-                Ok(Some(mut tx)) => {
+            match client
+                .find_output_spend(
+                    tx.hash(),
+                    &tx.outputs[output_index].script_pubkey,
+                    output_index,
+                    BlockHashOrHeight::Height(from_block as i64),
+                )
+                .compat()
+                .await
+            {
+                Ok(Some(spent_output_info)) => {
+                    let mut tx = spent_output_info.spending_tx;
                     tx.tx_hash_algo = tx_hash_algo;
                     return Ok(tx.into());
                 },
                 Ok(None) => (),
-                Err(e) => {
-                    log!("Error " (e) " on find_output_spend of tx " [e]);
-                },
+                Err(e) => error!("Error on find_output_spend_of_tx: {}", e),
             };
 
             if now_ms() / 1000 > wait_until {
-                return ERR!(
+                return TX_PLAIN_ERR!(
                     "Waited too long until {} for transaction {:?} {} to be spent ",
                     wait_until,
                     tx,
@@ -1370,7 +1836,12 @@ pub fn current_block(coin: &UtxoCoinFields) -> Box<dyn Future<Item = u64, Error
     Box::new(coin.rpc_client.get_block_count().map_err(|e| ERRL!("{}", e)))
 }
 
-pub fn display_priv_key(coin: &UtxoCoinFields) -> String { format!("{}", coin.key_pair.private()) }
+pub fn display_priv_key(coin: &UtxoCoinFields) -> Result<String, String> {
+    match coin.priv_key_policy {
+        PrivKeyPolicy::KeyPair(ref key_pair) => Ok(key_pair.private().to_string()),
+        PrivKeyPolicy::Trezor => ERR!("'display_priv_key' doesn't support Hardware Wallets"),
+    }
+}
 
 pub fn min_tx_amount(coin: &UtxoCoinFields) -> BigDecimal {
     big_decimal_from_sat(coin.dust_amount as i64, coin.decimals)
@@ -1386,116 +1857,126 @@ pub fn min_trading_vol(coin: &UtxoCoinFields) -> MmNumber {
 
 pub fn is_asset_chain(coin: &UtxoCoinFields) -> bool { coin.conf.asset_chain }
 
+pub async fn get_raw_transaction(coin: &UtxoCoinFields, req: RawTransactionRequest) -> RawTransactionResult {
+    let hash = H256Json::from_str(&req.tx_hash).map_to_mm(|e| RawTransactionError::InvalidHashError(e.to_string()))?;
+    let hex = coin
+        .rpc_client
+        .get_transaction_bytes(&hash)
+        .compat()
+        .await
+        .map_err(|e| RawTransactionError::Transport(e.to_string()))?;
+    Ok(RawTransactionRes { tx_hex: hex })
+}
+
 pub async fn withdraw<T>(coin: T, req: WithdrawRequest) -> WithdrawResult
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + MarketCoinOps,
+    T: UtxoCommonOps + GetUtxoListOps + MarketCoinOps,
 {
-    let decimals = coin.as_ref().decimals;
-
-    let conf = &coin.as_ref().conf;
-
-    let to = coin
-        .address_from_str(&req.to)
-        .map_to_mm(WithdrawError::InvalidAddress)?;
-
-    let is_p2pkh = to.prefix == conf.pub_addr_prefix && to.t_addr_prefix == conf.pub_t_addr_prefix;
-    let is_p2sh = to.prefix == conf.p2sh_addr_prefix && to.t_addr_prefix == conf.p2sh_t_addr_prefix && conf.segwit;
+    StandardUtxoWithdraw::new(coin, req)?.build().await
+}
 
-    let script_type = if is_p2pkh {
-        ScriptType::P2PKH
-    } else if is_p2sh {
-        ScriptType::P2SH
-    } else {
-        return MmError::err(WithdrawError::InvalidAddress("Expected either P2PKH or P2SH".into()));
-    };
+pub async fn init_withdraw<T>(
+    ctx: MmArc,
+    coin: T,
+    req: WithdrawRequest,
+    task_handle: &WithdrawTaskHandle,
+) -> WithdrawResult
+where
+    T: UtxoCommonOps
+        + GetUtxoListOps
+        + UtxoSignerOps
+        + CoinWithDerivationMethod
+        + GetWithdrawSenderAddress<Address = Address, Pubkey = Public>,
+{
+    InitUtxoWithdraw::new(ctx, coin, req, task_handle).await?.build().await
+}
 
-    let script_pubkey = output_script(&to, script_type).to_bytes();
+pub async fn get_withdraw_from_address<T>(
+    coin: &T,
+    req: &WithdrawRequest,
+) -> MmResult<WithdrawSenderAddress<Address, Public>, WithdrawError>
+where
+    T: CoinWithDerivationMethod<Address = Address, HDWallet = <T as HDWalletCoinOps>::HDWallet>
+        + HDWalletCoinOps<Address = Address, Pubkey = Public>
+        + UtxoCommonOps,
+{
+    match coin.derivation_method() {
+        DerivationMethod::Iguana(my_address) => get_withdraw_iguana_sender(coin, req, my_address),
+        DerivationMethod::HDWallet(hd_wallet) => get_withdraw_hd_sender(coin, req, hd_wallet).await,
+    }
+}
 
-    let signature_version = match coin.as_ref().my_address.addr_format {
-        UtxoAddressFormat::Segwit => SignatureVersion::WitnessV0,
-        _ => conf.signature_version,
-    };
+pub fn get_withdraw_iguana_sender<T: UtxoCommonOps>(
+    coin: &T,
+    req: &WithdrawRequest,
+    my_address: &Address,
+) -> MmResult<WithdrawSenderAddress<Address, Public>, WithdrawError> {
+    if req.from.is_some() {
+        let error = "'from' is not supported if the coin is initialized with an Iguana private key";
+        return MmError::err(WithdrawError::UnexpectedFromAddress(error.to_owned()));
+    }
+    let pubkey = coin
+        .my_public_key()
+        .mm_err(|e| WithdrawError::InternalError(e.to_string()))?;
+    Ok(WithdrawSenderAddress {
+        address: my_address.clone(),
+        pubkey: *pubkey,
+        derivation_path: None,
+    })
+}
 
-    let _utxo_lock = UTXO_LOCK.lock().await;
-    let (unspents, _) = coin.ordered_mature_unspents(&coin.as_ref().my_address).await?;
-    let (value, fee_policy) = if req.max {
-        (
-            unspents.iter().fold(0, |sum, unspent| sum + unspent.value),
-            FeePolicy::DeductFromOutput(0),
-        )
-    } else {
-        let value = sat_from_big_decimal(&req.amount, decimals)?;
-        (value, FeePolicy::SendExact)
-    };
-    let outputs = vec![TransactionOutput { value, script_pubkey }];
-    let fee = match req.fee {
-        Some(WithdrawFee::UtxoFixed { amount }) => {
-            let fixed = sat_from_big_decimal(&amount, decimals)?;
-            Some(ActualTxFee::FixedPerKb(fixed))
-        },
-        Some(WithdrawFee::UtxoPerKbyte { amount }) => {
-            let dynamic = sat_from_big_decimal(&amount, decimals)?;
-            Some(ActualTxFee::Dynamic(dynamic))
-        },
-        Some(fee_policy) => {
-            let error = format!(
-                "Expected 'UtxoFixed' or 'UtxoPerKbyte' fee types, found {:?}",
-                fee_policy
-            );
-            return MmError::err(WithdrawError::InvalidFeePolicy(error));
+pub async fn get_withdraw_hd_sender<T>(
+    coin: &T,
+    req: &WithdrawRequest,
+    hd_wallet: &T::HDWallet,
+) -> MmResult<WithdrawSenderAddress<Address, Public>, WithdrawError>
+where
+    T: HDWalletCoinOps<Address = Address, Pubkey = Public>,
+{
+    let HDAddressId {
+        account_id,
+        chain,
+        address_id,
+    } = match req.from.clone().or_mm_err(|| WithdrawError::FromAddressNotFound)? {
+        WithdrawFrom::AddressId(id) => id,
+        WithdrawFrom::DerivationPath { derivation_path } => {
+            let derivation_path = Bip44DerivationPath::from_str(&derivation_path)
+                .map_to_mm(Bip44DerPathError::from)
+                .mm_err(|e| WithdrawError::UnexpectedFromAddress(e.to_string()))?;
+            let coin_type = derivation_path.coin_type();
+            let expected_coin_type = hd_wallet.coin_type();
+            if coin_type != expected_coin_type {
+                let error = format!(
+                    "Derivation path '{}' must has '{}' coin type",
+                    derivation_path, expected_coin_type
+                );
+                return MmError::err(WithdrawError::UnexpectedFromAddress(error));
+            }
+            HDAddressId::from(derivation_path)
         },
-        None => None,
     };
-    let gas_fee = None;
-    let (unsigned, data) = coin
-        .generate_transaction(unspents, outputs, fee_policy, fee, gas_fee)
+
+    let hd_account = hd_wallet
+        .get_account(account_id)
         .await
-        .mm_err(|gen_tx_error| {
-            WithdrawError::from_generate_tx_error(gen_tx_error, coin.ticker().to_owned(), decimals)
-        })?;
-    let prev_script = Builder::build_p2pkh(&coin.as_ref().my_address.hash);
-    let signed = sign_tx(
-        unsigned,
-        &coin.as_ref().key_pair,
-        prev_script,
-        signature_version,
-        coin.as_ref().conf.fork_id,
-    )
-    .map_to_mm(WithdrawError::InternalError)?;
+        .or_mm_err(|| WithdrawError::UnknownAccount { account_id })?;
+    let hd_address = coin.derive_address(&hd_account, chain, address_id)?;
+
+    let is_address_activated = hd_account
+        .is_address_activated(chain, address_id)
+        // If [`HDWalletCoinOps::derive_address`] succeeds, [`HDAccountOps::is_address_activated`] shouldn't fails with an `InvalidBip44ChainError`.
+        .mm_err(|e| WithdrawError::InternalError(e.to_string()))?;
+    if !is_address_activated {
+        let error = format!("'{}' address is not activated", hd_address.address);
+        return MmError::err(WithdrawError::UnexpectedFromAddress(error));
+    }
 
-    let fee_amount = data.fee_amount + data.unused_change.unwrap_or_default();
-    let fee_details = UtxoFeeDetails {
-        amount: big_decimal_from_sat(fee_amount as i64, decimals),
-    };
-    let my_address = coin.my_address().map_to_mm(WithdrawError::InternalError)?;
-    let tx_hex = match coin.as_ref().my_address.addr_format {
-        UtxoAddressFormat::Segwit => serialize_with_flags(&signed, SERIALIZE_TRANSACTION_WITNESS).into(),
-        _ => serialize(&signed).into(),
-    };
-    Ok(TransactionDetails {
-        from: vec![my_address],
-        to: vec![req.to],
-        total_amount: big_decimal_from_sat(data.spent_by_me as i64, decimals),
-        spent_by_me: big_decimal_from_sat(data.spent_by_me as i64, decimals),
-        received_by_me: big_decimal_from_sat(data.received_by_me as i64, decimals),
-        my_balance_change: big_decimal_from_sat(data.received_by_me as i64 - data.spent_by_me as i64, decimals),
-        tx_hash: signed.hash().reversed().to_vec().into(),
-        tx_hex,
-        fee_details: Some(fee_details.into()),
-        block_height: 0,
-        coin: coin.as_ref().conf.ticker.clone(),
-        internal_id: vec![].into(),
-        timestamp: now_ms() / 1000,
-        kmd_rewards: data.kmd_rewards,
-    })
+    Ok(WithdrawSenderAddress::from(hd_address))
 }
 
 pub fn decimals(coin: &UtxoCoinFields) -> u8 { coin.decimals }
 
-pub fn convert_to_address<T>(coin: &T, from: &str, to_address_format: Json) -> Result<String, String>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
-{
+pub fn convert_to_address<T: UtxoCommonOps>(coin: &T, from: &str, to_address_format: Json) -> Result<String, String> {
     let to_address_format: UtxoAddressFormat =
         json::from_value(to_address_format).map_err(|e| ERRL!("Error on parse UTXO address format {:?}", e))?;
     let mut from_address = try_s!(coin.address_from_str(from));
@@ -1521,10 +2002,7 @@ where
     }
 }
 
-pub fn validate_address<T>(coin: &T, address: &str) -> ValidateAddressResult
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
-{
+pub fn validate_address<T: UtxoCommonOps>(coin: &T, address: &str) -> ValidateAddressResult {
     let result = coin.address_from_str(address);
     let address = match result {
         Ok(addr) => addr,
@@ -1539,8 +2017,7 @@ where
     let is_p2pkh = address.prefix == coin.as_ref().conf.pub_addr_prefix
         && address.t_addr_prefix == coin.as_ref().conf.pub_t_addr_prefix;
     let is_p2sh = address.prefix == coin.as_ref().conf.p2sh_addr_prefix
-        && address.t_addr_prefix == coin.as_ref().conf.p2sh_t_addr_prefix
-        && coin.as_ref().conf.segwit;
+        && address.t_addr_prefix == coin.as_ref().conf.p2sh_t_addr_prefix;
     let is_segwit = address.hrp.is_some() && address.hrp == coin.as_ref().conf.bech32_hrp && coin.as_ref().conf.segwit;
 
     if is_p2pkh || is_p2sh || is_segwit {
@@ -1559,23 +2036,29 @@ where
 #[allow(clippy::cognitive_complexity)]
 pub async fn process_history_loop<T>(coin: T, ctx: MmArc)
 where
-    T: AsRef<UtxoCoinFields> + UtxoStandardOps + UtxoCommonOps + MmCoin + MarketCoinOps,
+    T: UtxoStandardOps + UtxoCommonOps + MmCoin + MarketCoinOps,
 {
     let mut my_balance: Option<CoinBalance> = None;
     let history = match coin.load_history_from_file(&ctx).compat().await {
         Ok(history) => history,
         Err(e) => {
-            ctx.log.log(
+            log_tag!(
+                ctx,
                 "",
-                &[&"tx_history", &coin.as_ref().conf.ticker],
-                &ERRL!("Error {} on 'load_history_from_file', stop the history loop", e),
+                "tx_history",
+                "coin" => coin.as_ref().conf.ticker;
+                fmt = "Error {} on 'load_history_from_file', stop the history loop", e
             );
             return;
         },
     };
+
     let mut history_map: HashMap<H256Json, TransactionDetails> = history
         .into_iter()
-        .map(|tx| (H256Json::from(tx.tx_hash.as_slice()), tx))
+        .filter_map(|tx| {
+            let tx_hash = H256Json::from_str(&tx.tx_hash).ok()?;
+            Some((tx_hash, tx))
+        })
         .collect();
 
     let mut success_iteration = 0i32;
@@ -1587,8 +2070,7 @@ where
             let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
             let coins = coins_ctx.coins.lock().await;
             if !coins.contains_key(&coin.as_ref().conf.ticker) {
-                ctx.log
-                    .log("", &[&"tx_history", &coin.as_ref().conf.ticker], "Loop stopped");
+                log_tag!(ctx, "", "tx_history", "coin" => coin.as_ref().conf.ticker; fmt = "Loop stopped");
                 break;
             };
         }
@@ -1596,10 +2078,12 @@ where
         let actual_balance = match coin.my_balance().compat().await {
             Ok(actual_balance) => Some(actual_balance),
             Err(err) => {
-                ctx.log.log(
+                log_tag!(
+                    ctx,
                     "",
-                    &[&"tx_history", &coin.as_ref().conf.ticker],
-                    &ERRL!("Error {:?} on getting balance", err),
+                    "tx_history",
+                    "coin" => coin.as_ref().conf.ticker;
+                    fmt = "Error {:?} on getting balance", err
                 );
                 None
             },
@@ -1619,19 +2103,23 @@ where
         let tx_ids = match coin.request_tx_history(metrics).await {
             RequestTxHistoryResult::Ok(tx_ids) => tx_ids,
             RequestTxHistoryResult::Retry { error } => {
-                ctx.log.log(
+                log_tag!(
+                    ctx,
                     "",
-                    &[&"tx_history", &coin.as_ref().conf.ticker],
-                    &ERRL!("{}, retrying", error),
+                    "tx_history",
+                    "coin" => coin.as_ref().conf.ticker;
+                    fmt = "{}, retrying", error
                 );
                 Timer::sleep(10.).await;
                 continue;
             },
             RequestTxHistoryResult::HistoryTooLarge => {
-                ctx.log.log(
+                log_tag!(
+                    ctx,
                     "",
-                    &[&"tx_history", &coin.as_ref().conf.ticker],
-                    &ERRL!("Got `history too large`, stopping further attempts to retrieve it"),
+                    "tx_history",
+                    "coin" => coin.as_ref().conf.ticker;
+                    fmt = "Got `history too large`, stopping further attempts to retrieve it"
                 );
                 *coin.as_ref().history_sync_state.lock().unwrap() = HistorySyncState::Error(json!({
                     "code": HISTORY_TOO_LARGE_ERR_CODE,
@@ -1639,15 +2127,37 @@ where
                 }));
                 break;
             },
-            RequestTxHistoryResult::UnknownError(e) => {
-                ctx.log.log(
+            RequestTxHistoryResult::CriticalError(e) => {
+                log_tag!(
+                    ctx,
                     "",
-                    &[&"tx_history", &coin.as_ref().conf.ticker],
-                    &ERRL!("{}, stopping futher attempts to retreive it", e),
+                    "tx_history",
+                    "coin" => coin.as_ref().conf.ticker;
+                    fmt = "{}, stopping futher attempts to retreive it", e
                 );
                 break;
             },
         };
+
+        // Remove transactions in the history_map that are not in the requested transaction list anymore
+        let history_length = history_map.len();
+        let requested_ids: HashSet<H256Json> = tx_ids.iter().map(|x| x.0).collect();
+        history_map.retain(|hash, _| requested_ids.contains(hash));
+
+        if history_map.len() < history_length {
+            let to_write: Vec<TransactionDetails> = history_map.iter().map(|(_, value)| value.clone()).collect();
+            if let Err(e) = coin.save_history_to_file(&ctx, to_write).compat().await {
+                log_tag!(
+                    ctx,
+                    "",
+                    "tx_history",
+                    "coin" => coin.as_ref().conf.ticker;
+                    fmt = "Error {} on 'save_history_to_file', stop the history loop", e
+                );
+                return;
+            };
+        }
+
         let mut transactions_left = if tx_ids.len() > history_map.len() {
             *coin.as_ref().history_sync_state.lock().unwrap() = HistorySyncState::InProgress(json!({
                 "transactions_left": tx_ids.len() - history_map.len()
@@ -1664,7 +2174,7 @@ where
         let mut input_transactions = HistoryUtxoTxMap::default();
         for (txid, height) in tx_ids {
             let mut updated = false;
-            match history_map.entry(txid.clone()) {
+            match history_map.entry(txid) {
                 Entry::Vacant(e) => {
                     mm_counter!(ctx.metrics, "tx.history.request.count", 1, "coin" => coin.as_ref().conf.ticker.clone(), "method" => "tx_detail_by_hash");
 
@@ -1684,10 +2194,12 @@ where
                             }
                             updated = true;
                         },
-                        Err(e) => ctx.log.log(
+                        Err(e) => log_tag!(
+                            ctx,
                             "",
-                            &[&"tx_history", &coin.as_ref().conf.ticker],
-                            &ERRL!("Error {:?} on getting the details of {:?}, skipping the tx", e, txid),
+                            "tx_history",
+                            "coin" => coin.as_ref().conf.ticker;
+                            fmt = "Error {:?} on getting the details of {:?}, skipping the tx", e, txid
                         ),
                     }
                 },
@@ -1707,42 +2219,17 @@ where
                             updated = true;
                         }
                     }
-                    // TODO uncomment this when `update_kmd_rewards` works correctly
-                    // if e.get().should_update_kmd_rewards() && e.get().block_height > 0 {
-                    //     mm_counter!(ctx.metrics, "tx.history.update.kmd_rewards", 1);
-                    //     match coin.update_kmd_rewards(e.get_mut(), &mut input_transactions).await {
-                    //         Ok(()) => updated = true,
-                    //         Err(e) => ctx.log.log(
-                    //             "😟",
-                    //             &[&"tx_history", &coin.as_ref().conf.ticker],
-                    //             &ERRL!(
-                    //                 "Error {:?} on updating the KMD rewards of {:?}, skipping the tx",
-                    //                 e,
-                    //                 txid
-                    //             ),
-                    //         ),
-                    //     }
-                    // }
                 },
             }
             if updated {
-                let mut to_write: Vec<TransactionDetails> =
-                    history_map.iter().map(|(_, value)| value.clone()).collect();
-                // the transactions with block_height == 0 are the most recent so we need to separately handle them while sorting
-                to_write.sort_unstable_by(|a, b| {
-                    if a.block_height == 0 {
-                        Ordering::Less
-                    } else if b.block_height == 0 {
-                        Ordering::Greater
-                    } else {
-                        b.block_height.cmp(&a.block_height)
-                    }
-                });
+                let to_write: Vec<TransactionDetails> = history_map.iter().map(|(_, value)| value.clone()).collect();
                 if let Err(e) = coin.save_history_to_file(&ctx, to_write).compat().await {
-                    ctx.log.log(
+                    log_tag!(
+                        ctx,
                         "",
-                        &[&"tx_history", &coin.as_ref().conf.ticker],
-                        &ERRL!("Error {} on 'save_history_to_file', stop the history loop", e),
+                        "tx_history",
+                        "coin" => coin.as_ref().conf.ticker;
+                        fmt = "Error {} on 'save_history_to_file', stop the history loop", e
                     );
                     return;
                 };
@@ -1751,10 +2238,12 @@ where
         *coin.as_ref().history_sync_state.lock().unwrap() = HistorySyncState::Finished;
 
         if success_iteration == 0 {
-            ctx.log.log(
+            log_tag!(
+                ctx,
                 "😅",
-                &[&"tx_history", &("coin", coin.as_ref().conf.ticker.clone().as_str())],
-                "history has been loaded successfully",
+                "tx_history",
+                "coin" => coin.as_ref().conf.ticker;
+                fmt = "history has been loaded successfully"
             );
         }
 
@@ -1766,12 +2255,15 @@ where
 
 pub async fn request_tx_history<T>(coin: &T, metrics: MetricsArc) -> RequestTxHistoryResult
 where
-    T: AsRef<UtxoCoinFields> + MmCoin + MarketCoinOps,
+    T: UtxoCommonOps + MmCoin + MarketCoinOps,
 {
     let my_address = match coin.my_address() {
         Ok(addr) => addr,
         Err(e) => {
-            return RequestTxHistoryResult::UnknownError(ERRL!("Error on getting self address: {}. Stop tx history", e))
+            return RequestTxHistoryResult::CriticalError(ERRL!(
+                "Error on getting self address: {}. Stop tx history",
+                e
+            ))
         },
     };
 
@@ -1817,7 +2309,11 @@ where
                 .collect()
         },
         UtxoRpcClientEnum::Electrum(client) => {
-            let script = output_script(&coin.as_ref().my_address, ScriptType::P2PKH);
+            let my_address = match coin.as_ref().derivation_method.iguana_or_err() {
+                Ok(my_address) => my_address,
+                Err(e) => return RequestTxHistoryResult::CriticalError(e.to_string()),
+            };
+            let script = output_script(my_address, ScriptType::P2PKH);
             let script_hash = electrum_script_hash(&script);
 
             mm_counter!(metrics, "tx.history.request.count", 1,
@@ -1826,7 +2322,9 @@ where
             let electrum_history = match client.scripthash_get_history(&hex::encode(script_hash)).compat().await {
                 Ok(value) => value,
                 Err(e) => match &e.error {
-                    JsonRpcErrorType::Transport(e) | JsonRpcErrorType::Parse(_, e) => {
+                    JsonRpcErrorType::InvalidRequest(e)
+                    | JsonRpcErrorType::Transport(e)
+                    | JsonRpcErrorType::Parse(_, e) => {
                         return RequestTxHistoryResult::Retry {
                             error: ERRL!("Error {} on scripthash_get_history", e),
                         };
@@ -1863,25 +2361,17 @@ where
     RequestTxHistoryResult::Ok(tx_ids)
 }
 
-pub async fn tx_details_by_hash<T>(
+pub async fn tx_details_by_hash<T: UtxoCommonOps>(
     coin: &T,
     hash: &[u8],
     input_transactions: &mut HistoryUtxoTxMap,
-) -> Result<TransactionDetails, String>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
+) -> Result<TransactionDetails, String> {
     let ticker = &coin.as_ref().conf.ticker;
     let hash = H256Json::from(hash);
-    let verbose_tx = try_s!(
-        coin.as_ref()
-            .rpc_client
-            .get_verbose_transaction(hash.clone())
-            .compat()
-            .await
-    );
+    let verbose_tx = try_s!(coin.as_ref().rpc_client.get_verbose_transaction(&hash).compat().await);
     let mut tx: UtxoTx = try_s!(deserialize(verbose_tx.hex.as_slice()).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
+    let my_address = try_s!(coin.as_ref().derivation_method.iguana_or_err());
 
     input_transactions.insert(hash, HistoryUtxoTx {
         tx: tx.clone(),
@@ -1903,7 +2393,7 @@ where
 
         let prev_tx_hash: H256Json = input.previous_output.hash.reversed().into();
         let prev_tx = try_s!(
-            coin.get_mut_verbose_transaction_from_map_or_rpc(prev_tx_hash.clone(), input_transactions)
+            coin.get_mut_verbose_transaction_from_map_or_rpc(prev_tx_hash, input_transactions)
                 .await
         );
         let prev_tx = &mut prev_tx.tx;
@@ -1917,7 +2407,7 @@ where
                 .clone()
                 .into()
         ));
-        if from.contains(&coin.as_ref().my_address) {
+        if from.contains(my_address) {
             spent_by_me += prev_tx_value;
         }
         from_addresses.extend(from.into_iter());
@@ -1926,7 +2416,7 @@ where
     for output in tx.outputs.iter() {
         output_amount += output.value;
         let to = try_s!(coin.addresses_from_script(&output.script_pubkey.clone().into()));
-        if to.contains(&coin.as_ref().my_address) {
+        if to.contains(my_address) {
             received_by_me += output.value;
         }
         to_addresses.extend(to.into_iter());
@@ -1972,7 +2462,7 @@ where
             };
             cur + fee
         });
-        (fee.into(), None)
+        (try_s!(fee.try_into()), None)
     } else {
         let fee = input_amount as i64 - output_amount as i64;
         (big_decimal_from_sat(fee, coin.as_ref().decimals), None)
@@ -1988,6 +2478,11 @@ where
     to_addresses.sort();
     to_addresses.dedup();
 
+    let fee_details = UtxoFeeDetails {
+        coin: Some(coin.as_ref().conf.ticker.clone()),
+        amount: fee,
+    };
+
     Ok(TransactionDetails {
         from: from_addresses,
         to: to_addresses,
@@ -1995,14 +2490,15 @@ where
         spent_by_me: big_decimal_from_sat_unsigned(spent_by_me, coin.as_ref().decimals),
         my_balance_change: big_decimal_from_sat(received_by_me as i64 - spent_by_me as i64, coin.as_ref().decimals),
         total_amount: big_decimal_from_sat_unsigned(input_amount, coin.as_ref().decimals),
-        tx_hash: tx.hash().reversed().to_vec().into(),
+        tx_hash: tx.hash().reversed().to_vec().to_tx_hash(),
         tx_hex: verbose_tx.hex,
-        fee_details: Some(UtxoFeeDetails { amount: fee }.into()),
+        fee_details: Some(fee_details.into()),
         block_height: verbose_tx.height.unwrap_or(0),
         coin: ticker.clone(),
         internal_id: tx.hash().reversed().to_vec().into(),
         timestamp: verbose_tx.time.into(),
         kmd_rewards,
+        transaction_type: Default::default(),
     })
 }
 
@@ -2014,12 +2510,12 @@ pub async fn get_mut_verbose_transaction_from_map_or_rpc<'a, 'b, T>(
 where
     T: AsRef<UtxoCoinFields>,
 {
-    let tx = match utxo_tx_map.entry(tx_hash.clone()) {
+    let tx = match utxo_tx_map.entry(tx_hash) {
         Entry::Vacant(e) => {
             let verbose = coin
                 .as_ref()
                 .rpc_client
-                .get_verbose_transaction(tx_hash.clone())
+                .get_verbose_transaction(&tx_hash)
                 .compat()
                 .await?;
             let tx = HistoryUtxoTx {
@@ -2047,7 +2543,7 @@ pub async fn update_kmd_rewards<T>(
     input_transactions: &mut HistoryUtxoTxMap,
 ) -> UtxoRpcResult<()>
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + UtxoStandardOps + MarketCoinOps + Send + Sync + 'static,
+    T: UtxoCommonOps + UtxoStandardOps + MarketCoinOps,
 {
     if !tx_details.should_update_kmd_rewards() {
         let error = "There is no need to update KMD rewards".to_owned();
@@ -2062,9 +2558,10 @@ where
     let kmd_rewards = coin.calc_interest_of_tx(&tx, input_transactions).await?;
     let kmd_rewards = big_decimal_from_sat_unsigned(kmd_rewards, coin.as_ref().decimals);
 
-    if let Some(TxFeeDetails::Utxo(UtxoFeeDetails { ref amount })) = tx_details.fee_details {
+    if let Some(TxFeeDetails::Utxo(UtxoFeeDetails { ref amount, .. })) = tx_details.fee_details {
         let actual_fee_amount = amount + &kmd_rewards;
         tx_details.fee_details = Some(TxFeeDetails::Utxo(UtxoFeeDetails {
+            coin: Some(coin.as_ref().conf.ticker.clone()),
             amount: actual_fee_amount,
         }));
     }
@@ -2079,14 +2576,11 @@ where
     Ok(())
 }
 
-pub async fn calc_interest_of_tx<T>(
+pub async fn calc_interest_of_tx<T: UtxoCommonOps>(
     coin: &T,
     tx: &UtxoTx,
     input_transactions: &mut HistoryUtxoTxMap,
-) -> UtxoRpcResult<u64>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
+) -> UtxoRpcResult<u64> {
     if coin.as_ref().conf.ticker != "KMD" {
         let error = format!("Expected KMD ticker, found {}", coin.as_ref().conf.ticker);
         return MmError::err(UtxoRpcError::Internal(error));
@@ -2101,7 +2595,7 @@ where
 
         let prev_tx_hash: H256Json = input.previous_output.hash.reversed().into();
         let prev_tx = coin
-            .get_mut_verbose_transaction_from_map_or_rpc(prev_tx_hash.clone(), input_transactions)
+            .get_mut_verbose_transaction_from_map_or_rpc(prev_tx_hash, input_transactions)
             .await?;
 
         let prev_tx_value = prev_tx.tx.outputs[input.previous_output.index as usize].value;
@@ -2118,10 +2612,7 @@ pub fn history_sync_status(coin: &UtxoCoinFields) -> HistorySyncState {
     coin.history_sync_state.lock().unwrap().clone()
 }
 
-pub fn get_trade_fee<T>(coin: T) -> Box<dyn Future<Item = TradeFee, Error = String> + Send>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
+pub fn get_trade_fee<T: UtxoCommonOps>(coin: T) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> {
     let ticker = coin.as_ref().conf.ticker.clone();
     let decimals = coin.as_ref().decimals;
     let fut = async move {
@@ -2153,19 +2644,20 @@ where
 /// So we should always return a fee as if a transaction includes the change output.
 pub async fn preimage_trade_fee_required_to_send_outputs<T>(
     coin: &T,
+    ticker: &str,
     outputs: Vec<TransactionOutput>,
     fee_policy: FeePolicy,
     gas_fee: Option<u64>,
     stage: &FeeApproxStage,
 ) -> TradePreimageResult<BigDecimal>
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
+    T: UtxoCommonOps + GetUtxoListOps,
 {
-    let ticker = coin.as_ref().conf.ticker.clone();
     let decimals = coin.as_ref().decimals;
     let tx_fee = coin.get_tx_fee().await?;
     // [`FeePolicy::DeductFromOutput`] is used if the value is [`TradePreimageValue::UpperBound`] only
     let is_amount_upper_bound = matches!(fee_policy, FeePolicy::DeductFromOutput(_));
+    let my_address = coin.as_ref().derivation_method.iguana_or_err()?;
 
     match tx_fee {
         // if it's a dynamic fee, we should generate a swap transaction to get an actual trade fee
@@ -2174,12 +2666,21 @@ where
             let dynamic_fee = coin.increase_dynamic_fee_by_stage(fee, stage);
 
             let outputs_count = outputs.len();
-            let (unspents, _recently_sent_txs) = coin.list_unspent_ordered(&coin.as_ref().my_address).await?;
+            let (unspents, _recently_sent_txs) = coin.get_unspent_ordered_list(my_address).await?;
 
-            let actual_tx_fee = Some(ActualTxFee::Dynamic(dynamic_fee));
-            let (tx, data) = generate_transaction(coin, unspents, outputs, fee_policy, actual_tx_fee, gas_fee)
-                .await
-                .mm_err(|e| TradePreimageError::from_generate_tx_error(e, ticker, decimals, is_amount_upper_bound))?;
+            let actual_tx_fee = ActualTxFee::Dynamic(dynamic_fee);
+
+            let mut tx_builder = UtxoTxBuilder::new(coin)
+                .add_available_inputs(unspents)
+                .add_outputs(outputs)
+                .with_fee_policy(fee_policy)
+                .with_fee(actual_tx_fee);
+            if let Some(gas) = gas_fee {
+                tx_builder = tx_builder.with_gas_fee(gas);
+            }
+            let (tx, data) = tx_builder.build().await.mm_err(|e| {
+                TradePreimageError::from_generate_tx_error(e, ticker.to_owned(), decimals, is_amount_upper_bound)
+            })?;
 
             let total_fee = if tx.outputs.len() == outputs_count {
                 // take into account the change output
@@ -2193,11 +2694,19 @@ where
         },
         ActualTxFee::FixedPerKb(fee) => {
             let outputs_count = outputs.len();
-            let (unspents, _recently_sent_txs) = coin.list_unspent_ordered(&coin.as_ref().my_address).await?;
-
-            let (tx, data) = generate_transaction(coin, unspents, outputs, fee_policy, Some(tx_fee), gas_fee)
-                .await
-                .mm_err(|e| TradePreimageError::from_generate_tx_error(e, ticker, decimals, is_amount_upper_bound))?;
+            let (unspents, _recently_sent_txs) = coin.get_unspent_ordered_list(my_address).await?;
+
+            let mut tx_builder = UtxoTxBuilder::new(coin)
+                .add_available_inputs(unspents)
+                .add_outputs(outputs)
+                .with_fee_policy(fee_policy)
+                .with_fee(tx_fee);
+            if let Some(gas) = gas_fee {
+                tx_builder = tx_builder.with_gas_fee(gas);
+            }
+            let (tx, data) = tx_builder.build().await.mm_err(|e| {
+                TradePreimageError::from_generate_tx_error(e, ticker.to_string(), decimals, is_amount_upper_bound)
+            })?;
 
             let total_fee = if tx.outputs.len() == outputs_count {
                 // take into account the change output if tx_size_kb(tx with change) > tx_size_kb(tx without change)
@@ -2222,45 +2731,44 @@ where
 /// Even if refund will be required the fee will be deducted from P2SH input.
 /// Please note the `get_sender_trade_fee` satisfies the following condition:
 /// `get_sender_trade_fee(x) <= get_sender_trade_fee(y)` for any `x < y`.
-pub fn get_sender_trade_fee<T>(coin: T, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee>
+pub async fn get_sender_trade_fee<T>(
+    coin: &T,
+    value: TradePreimageValue,
+    stage: FeeApproxStage,
+) -> TradePreimageResult<TradeFee>
 where
-    T: AsRef<UtxoCoinFields> + MarketCoinOps + UtxoCommonOps + Send + Sync + 'static,
+    T: MarketCoinOps + UtxoCommonOps,
 {
-    let fut = async move {
-        let (amount, fee_policy) = match value {
-            TradePreimageValue::UpperBound(upper_bound) => (upper_bound, FeePolicy::DeductFromOutput(0)),
-            TradePreimageValue::Exact(amount) => (amount, FeePolicy::SendExact),
-        };
-
-        // pass the dummy params
-        let time_lock = (now_ms() / 1000) as u32;
-        let other_pub = &[0; 33]; // H264 is 33 bytes
-        let secret_hash = &[0; 20]; // H160 is 20 bytes
-
-        // `generate_swap_payment_outputs` may fail due to either invalid `other_pub` or a number conversation error
-        let SwapPaymentOutputsResult { outputs, .. } =
-            generate_swap_payment_outputs(&coin, time_lock, other_pub, secret_hash, amount)
-                .map_to_mm(TradePreimageError::InternalError)?;
-        let gas_fee = None;
-        let fee_amount = coin
-            .preimage_trade_fee_required_to_send_outputs(outputs, fee_policy, gas_fee, &stage)
-            .await?;
-        Ok(TradeFee {
-            coin: coin.as_ref().conf.ticker.clone(),
-            amount: fee_amount.into(),
-            paid_from_trading_vol: false,
-        })
+    let (amount, fee_policy) = match value {
+        TradePreimageValue::UpperBound(upper_bound) => (upper_bound, FeePolicy::DeductFromOutput(0)),
+        TradePreimageValue::Exact(amount) => (amount, FeePolicy::SendExact),
     };
-    Box::new(fut.boxed().compat())
+
+    // pass the dummy params
+    let time_lock = (now_ms() / 1000) as u32;
+    let my_pub = &[0; 33]; // H264 is 33 bytes
+    let other_pub = &[0; 33]; // H264 is 33 bytes
+    let secret_hash = &[0; 20]; // H160 is 20 bytes
+
+    // `generate_swap_payment_outputs` may fail due to either invalid `other_pub` or a number conversation error
+    let SwapPaymentOutputsResult { outputs, .. } =
+        generate_swap_payment_outputs(&coin, time_lock, my_pub, other_pub, secret_hash, amount)
+            .map_to_mm(TradePreimageError::InternalError)?;
+    let gas_fee = None;
+    let fee_amount = coin
+        .preimage_trade_fee_required_to_send_outputs(outputs, fee_policy, gas_fee, &stage)
+        .await?;
+    Ok(TradeFee {
+        coin: coin.as_ref().conf.ticker.clone(),
+        amount: fee_amount.into(),
+        paid_from_trading_vol: false,
+    })
 }
 
 /// The fee to spend (receive) other payment is deducted from the trading amount so we should display it
-pub fn get_receiver_trade_fee<T>(coin: T) -> TradePreimageFut<TradeFee>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + Send + Sync + 'static,
-{
+pub fn get_receiver_trade_fee<T: UtxoCommonOps>(coin: T) -> TradePreimageFut<TradeFee> {
     let fut = async move {
-        let amount_sat = get_htlc_spend_fee(&coin).await?;
+        let amount_sat = get_htlc_spend_fee(&coin, DEFAULT_SWAP_TX_SPEND_SIZE).await?;
         let amount = big_decimal_from_sat_unsigned(amount_sat, coin.as_ref().decimals).into();
         Ok(TradeFee {
             coin: coin.as_ref().conf.ticker.clone(),
@@ -2271,78 +2779,114 @@ where
     Box::new(fut.boxed().compat())
 }
 
-pub fn get_fee_to_send_taker_fee<T>(
-    coin: T,
+pub async fn get_fee_to_send_taker_fee<T>(
+    coin: &T,
     dex_fee_amount: BigDecimal,
     stage: FeeApproxStage,
-) -> TradePreimageFut<TradeFee>
+) -> TradePreimageResult<TradeFee>
 where
-    T: AsRef<UtxoCoinFields> + MarketCoinOps + UtxoCommonOps + Send + Sync + 'static,
+    T: MarketCoinOps + UtxoCommonOps,
 {
     let decimals = coin.as_ref().decimals;
-    let fut = async move {
-        let value = sat_from_big_decimal(&dex_fee_amount, decimals)?;
-        let output = TransactionOutput {
-            value,
-            script_pubkey: Builder::build_p2pkh(&AddressHash::default()).to_bytes(),
-        };
-        let gas_fee = None;
-        let fee_amount = coin
-            .preimage_trade_fee_required_to_send_outputs(vec![output], FeePolicy::SendExact, gas_fee, &stage)
-            .await?;
-        Ok(TradeFee {
-            coin: coin.ticker().to_owned(),
-            amount: fee_amount.into(),
-            paid_from_trading_vol: false,
-        })
+    let value = sat_from_big_decimal(&dex_fee_amount, decimals)?;
+    let output = TransactionOutput {
+        value,
+        script_pubkey: Builder::build_p2pkh(&AddressHashEnum::default_address_hash()).to_bytes(),
     };
-    Box::new(fut.boxed().compat())
+    let gas_fee = None;
+    let fee_amount = coin
+        .preimage_trade_fee_required_to_send_outputs(vec![output], FeePolicy::SendExact, gas_fee, &stage)
+        .await?;
+    Ok(TradeFee {
+        coin: coin.ticker().to_owned(),
+        amount: fee_amount.into(),
+        paid_from_trading_vol: false,
+    })
 }
 
 pub fn required_confirmations(coin: &UtxoCoinFields) -> u64 {
-    coin.conf.required_confirmations.load(AtomicOrderding::Relaxed)
+    coin.conf.required_confirmations.load(AtomicOrdering::Relaxed)
 }
 
 pub fn requires_notarization(coin: &UtxoCoinFields) -> bool {
-    coin.conf.requires_notarization.load(AtomicOrderding::Relaxed)
+    coin.conf.requires_notarization.load(AtomicOrdering::Relaxed)
 }
 
 pub fn set_required_confirmations(coin: &UtxoCoinFields, confirmations: u64) {
     coin.conf
         .required_confirmations
-        .store(confirmations, AtomicOrderding::Relaxed);
+        .store(confirmations, AtomicOrdering::Relaxed);
 }
 
 pub fn set_requires_notarization(coin: &UtxoCoinFields, requires_nota: bool) {
     coin.conf
         .requires_notarization
-        .store(requires_nota, AtomicOrderding::Relaxed);
+        .store(requires_nota, AtomicOrdering::Relaxed);
 }
 
-pub fn coin_protocol_info(coin: &UtxoCoinFields) -> Vec<u8> {
-    rmp_serde::to_vec(&coin.my_address.addr_format).expect("Serialization should not fail")
+pub fn coin_protocol_info<T: UtxoCommonOps>(coin: &T) -> Vec<u8> {
+    rmp_serde::to_vec(coin.addr_format()).expect("Serialization should not fail")
 }
 
-pub fn is_coin_protocol_supported(coin: &UtxoCoinFields, info: &Option<Vec<u8>>) -> bool {
+pub fn is_coin_protocol_supported<T: UtxoCommonOps>(coin: &T, info: &Option<Vec<u8>>) -> bool {
     match info {
         Some(format) => rmp_serde::from_read_ref::<_, UtxoAddressFormat>(format).is_ok(),
-        None => !coin.my_address.addr_format.is_segwit(),
+        None => !coin.addr_format().is_segwit(),
     }
 }
 
-#[allow(clippy::needless_lifetimes)]
-pub async fn ordered_mature_unspents<'a, T>(
+/// [`GetUtxoListOps::get_mature_unspent_ordered_list`] implementation.
+/// Returns available mature and immature unspents in ascending order
+/// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+pub async fn get_mature_unspent_ordered_list<'a, T>(
     coin: &'a T,
     address: &Address,
-) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)>
+) -> UtxoRpcResult<(MatureUnspentList, RecentlySpentOutPointsGuard<'a>)>
+where
+    T: UtxoCommonOps + GetUtxoListOps,
+{
+    let (unspents, recently_spent) = coin.get_all_unspent_ordered_list(address).await?;
+    let mature_unspents = identify_mature_unspents(coin, unspents).await?;
+    Ok((mature_unspents, recently_spent))
+}
+
+/// [`GetUtxoMapOps::get_mature_unspent_ordered_map`] implementation.
+/// Returns available mature and immature unspents in ascending order for every given `addresses`
+/// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+pub async fn get_mature_unspent_ordered_map<T>(
+    coin: &T,
+    addresses: Vec<Address>,
+) -> UtxoRpcResult<(MatureUnspentMap, RecentlySpentOutPointsGuard<'_>)>
 where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps,
+    T: UtxoCommonOps + GetUtxoMapOps,
 {
+    let (unspents_map, recently_spent) = coin.get_all_unspent_ordered_map(addresses).await?;
+    // Get an iterator of futures: `Future<Output=UtxoRpcResult<(Address, MatureUnspentList)>>`
+    let fut_it = unspents_map.into_iter().map(|(address, unspents)| {
+        identify_mature_unspents(coin, unspents).map(|res| -> UtxoRpcResult<(Address, MatureUnspentList)> {
+            let mature_unspents = res?;
+            Ok((address, mature_unspents))
+        })
+    });
+    // Poll the `fut_it` futures concurrently.
+    let result_map = futures::future::try_join_all(fut_it).await?.into_iter().collect();
+    Ok((result_map, recently_spent))
+}
+
+/// Splits the given `unspents` outputs into mature and immature.
+pub async fn identify_mature_unspents<T>(coin: &T, unspents: Vec<UnspentInfo>) -> UtxoRpcResult<MatureUnspentList>
+where
+    T: UtxoCommonOps,
+{
+    /// Returns `true` if the given transaction has a known non-zero height.
+    fn can_tx_be_cached(tx: &RpcTransaction) -> bool { tx.height > Some(0) }
+
+    /// Calculates actual confirmations number of the given `tx` transaction loaded from cache.
     fn calc_actual_cached_tx_confirmations(tx: &RpcTransaction, block_count: u64) -> UtxoRpcResult<u32> {
         let tx_height = tx.height.or_mm_err(|| {
             UtxoRpcError::Internal(format!(r#"Warning, height of cached "{:?}" tx is unknown"#, tx.txid))
         })?;
-        // utxo_common::cache_transaction_if_possible() shouldn't cache transaction with height == 0
+        // There shouldn't be cached transactions with height == 0
         if tx_height == 0 {
             let error = format!(
                 r#"Warning, height of cached "{:?}" tx is expected to be non-zero"#,
@@ -2362,24 +2906,31 @@ where
         Ok(confirmations as u32)
     }
 
-    let (unspents, recently_spent) = list_unspent_ordered(coin, address).await?;
     let block_count = coin.as_ref().rpc_client.get_block_count().compat().await?;
 
-    let mut result = Vec::with_capacity(unspents.len());
+    let to_verbose: HashSet<H256Json> = unspents
+        .iter()
+        .map(|unspent| unspent.outpoint.hash.reversed().into())
+        .collect();
+    let verbose_txs = coin
+        .get_verbose_transactions_from_cache_or_rpc(to_verbose)
+        .compat()
+        .await?;
+    // Transactions that should be cached.
+    let mut txs_to_cache = HashMap::with_capacity(verbose_txs.len());
+
+    let mut result = MatureUnspentList::with_capacity(unspents.len());
     for unspent in unspents {
         let tx_hash: H256Json = unspent.outpoint.hash.reversed().into();
-        let tx_info = match coin
-            .get_verbose_transaction_from_cache_or_rpc(tx_hash.clone())
-            .compat()
-            .await
-        {
-            Ok(x) => x,
-            Err(err) => {
-                log!("Error " [err] " getting the transaction " [tx_hash] ", skip the unspent output");
-                continue;
-            },
-        };
-
+        let tx_info = verbose_txs
+            .get(&tx_hash)
+            .or_mm_err(|| {
+                UtxoRpcError::Internal(format!(
+                    "'get_verbose_transactions_from_cache_or_rpc' should have returned '{:?}'",
+                    tx_hash
+                ))
+            })?
+            .clone();
         let tx_info = match tx_info {
             VerboseTransactionFrom::Cache(mut tx) => {
                 if unspent.height.is_some() {
@@ -2389,7 +2940,7 @@ where
                     Ok(conf) => tx.confirmations = conf,
                     // do not skip the transaction with unknown confirmations,
                     // because the transaction can be matured
-                    Err(e) => log!((e)),
+                    Err(e) => error!("{}", e),
                 }
                 tx
             },
@@ -2397,19 +2948,25 @@ where
                 if tx.height.is_none() {
                     tx.height = unspent.height;
                 }
-                if let Err(e) = coin.cache_transaction_if_possible(&tx).await {
-                    log!((e));
+                if can_tx_be_cached(&tx) {
+                    txs_to_cache.insert(tx_hash, tx.clone());
                 }
                 tx
             },
         };
 
         if coin.is_unspent_mature(&tx_info) {
-            result.push(unspent);
+            result.mature.push(unspent);
+        } else {
+            result.immature.push(unspent);
         }
     }
 
-    Ok((result, recently_spent))
+    coin.as_ref()
+        .tx_cache
+        .cache_transactions_concurrently(&txs_to_cache)
+        .await;
+    Ok(result)
 }
 
 pub fn is_unspent_mature(mature_confirmations: u32, output: &RpcTransaction) -> bool {
@@ -2417,107 +2974,70 @@ pub fn is_unspent_mature(mature_confirmations: u32, output: &RpcTransaction) ->
     !output.is_coinbase() || output.confirmations >= mature_confirmations
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-pub async fn get_verbose_transaction_from_cache_or_rpc(
+/// [`UtxoCommonOps::get_verbose_transactions_from_cache_or_rpc`] implementation.
+/// Loads verbose transactions from cache or requests it using RPC client.
+pub async fn get_verbose_transactions_from_cache_or_rpc(
     coin: &UtxoCoinFields,
-    txid: H256Json,
-) -> Result<VerboseTransactionFrom, String> {
-    let tx_cache_path = match &coin.tx_cache_directory {
-        Some(p) => p.clone(),
-        _ => {
-            // the coin doesn't support TX local cache, don't try to load from cache and don't cache it
-            let tx = try_s!(coin.rpc_client.get_verbose_transaction(txid.clone()).compat().await);
-            return Ok(VerboseTransactionFrom::Rpc(tx));
-        },
-    };
-
-    match tx_cache::load_transaction_from_cache(&tx_cache_path, &txid).await {
-        Ok(Some(tx)) => return Ok(VerboseTransactionFrom::Cache(tx)),
-        Err(err) => log!("Error " [err] " loading the " [txid] " transaction. Try request tx using Rpc client"),
-        // txid just not found
-        _ => (),
+    tx_ids: HashSet<H256Json>,
+) -> UtxoRpcResult<HashMap<H256Json, VerboseTransactionFrom>> {
+    /// Determines whether the transaction is needed to be requested through RPC or not.
+    /// Puts the inner `RpcTransaction` transaction into `result_map` if it has been loaded successfully,
+    /// otherwise puts `txid` into `to_request`.
+    fn on_cached_transaction_result(
+        result_map: &mut HashMap<H256Json, VerboseTransactionFrom>,
+        to_request: &mut Vec<H256Json>,
+        txid: H256Json,
+        res: TxCacheResult<Option<RpcTransaction>>,
+    ) {
+        match res {
+            Ok(Some(tx)) => {
+                result_map.insert(txid, VerboseTransactionFrom::Cache(tx));
+            },
+            // txid not found
+            Ok(None) => {
+                to_request.push(txid);
+            },
+            Err(err) => {
+                error!(
+                    "Error loading the {:?} transaction: {:?}. Trying to request tx using RPC client",
+                    err, txid
+                );
+                to_request.push(txid);
+            },
+        }
     }
 
-    let tx = try_s!(coin.rpc_client.get_verbose_transaction(txid).compat().await);
-    Ok(VerboseTransactionFrom::Rpc(tx))
-}
+    let mut result_map = HashMap::with_capacity(tx_ids.len());
+    let mut to_request = Vec::with_capacity(tx_ids.len());
 
-#[cfg(target_arch = "wasm32")]
-pub async fn get_verbose_transaction_from_cache_or_rpc(
-    coin: &UtxoCoinFields,
-    txid: H256Json,
-) -> Result<VerboseTransactionFrom, String> {
-    let tx = try_s!(coin.rpc_client.get_verbose_transaction(txid.clone()).compat().await);
-    Ok(VerboseTransactionFrom::Rpc(tx))
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub async fn cache_transaction_if_possible(coin: &UtxoCoinFields, tx: &RpcTransaction) -> Result<(), String> {
-    let tx_cache_path = match &coin.tx_cache_directory {
-        Some(p) => p.clone(),
-        _ => {
-            return Ok(());
-        },
-    };
-    // check if the transaction height is set and not zero
-    match tx.height {
-        Some(0) => return Ok(()),
-        Some(_) => (),
-        None => return Ok(()),
-    }
-
-    tx_cache::cache_transaction(&tx_cache_path, tx)
+    coin.tx_cache
+        .load_transactions_from_cache_concurrently(tx_ids)
         .await
-        .map_err(|e| ERRL!("Error {:?} on caching transaction {:?}", e, tx.txid))
-}
-
-#[cfg(target_arch = "wasm32")]
-pub async fn cache_transaction_if_possible(_coin: &UtxoCoinFields, _tx: &RpcTransaction) -> Result<(), String> {
-    Ok(())
-}
-
-pub async fn my_unspendable_balance<T>(coin: &T, total_balance: &BigDecimal) -> BalanceResult<BigDecimal>
-where
-    T: AsRef<UtxoCoinFields> + UtxoCommonOps + MarketCoinOps + ?Sized,
-{
-    let mut attempts = 0i32;
-    loop {
-        let (mature_unspents, _) = coin.ordered_mature_unspents(&coin.as_ref().my_address).await?;
-        let spendable_balance = mature_unspents.iter().fold(BigDecimal::zero(), |acc, x| {
-            acc + big_decimal_from_sat(x.value as i64, coin.as_ref().decimals)
-        });
-        if total_balance >= &spendable_balance {
-            return Ok(total_balance - spendable_balance);
-        }
-
-        if attempts == 2 {
-            let error = format!(
-                "Spendable balance {} greater than total balance {}",
-                spendable_balance, total_balance
-            );
-            return MmError::err(BalanceError::Internal(error));
-        }
-
-        warn!(
-            "Attempt N{}: spendable balance {} greater than total balance {}",
-            attempts, spendable_balance, total_balance
-        );
+        .into_iter()
+        .for_each(|(txid, res)| on_cached_transaction_result(&mut result_map, &mut to_request, txid, res));
 
-        // the balance could be changed by other instance between my_balance() and ordered_mature_unspents() calls
-        // try again
-        attempts += 1;
-        Timer::sleep(0.3).await;
-    }
+    result_map.extend(
+        coin.rpc_client
+            .get_verbose_transactions(&to_request)
+            .compat()
+            .await?
+            .into_iter()
+            .map(|tx| (tx.txid, VerboseTransactionFrom::Rpc(tx))),
+    );
+    Ok(result_map)
 }
 
 /// Swap contract address is not used by standard UTXO coins.
+#[inline]
 pub fn swap_contract_address() -> Option<BytesJson> { None }
 
 /// Convert satoshis to BigDecimal amount of coin units
+#[inline]
 pub fn big_decimal_from_sat(satoshis: i64, decimals: u8) -> BigDecimal {
     BigDecimal::from(satoshis) / BigDecimal::from(10u64.pow(decimals as u32))
 }
 
+#[inline]
 pub fn big_decimal_from_sat_unsigned(satoshis: u64, decimals: u8) -> BigDecimal {
     BigDecimal::from(satoshis) / BigDecimal::from(10u64.pow(decimals as u32))
 }
@@ -2533,15 +3053,158 @@ pub fn address_from_raw_pubkey(
     Ok(Address {
         t_addr_prefix,
         prefix,
-        hash: try_s!(Public::from_slice(pub_key)).address_hash(),
+        hash: try_s!(Public::from_slice(pub_key)).address_hash().into(),
         checksum_type,
         hrp,
         addr_format,
     })
 }
 
+pub fn address_from_pubkey(
+    pub_key: &Public,
+    prefix: u8,
+    t_addr_prefix: u8,
+    checksum_type: ChecksumType,
+    hrp: Option<String>,
+    addr_format: UtxoAddressFormat,
+) -> Address {
+    Address {
+        t_addr_prefix,
+        prefix,
+        hash: pub_key.address_hash().into(),
+        checksum_type,
+        hrp,
+        addr_format,
+    }
+}
+
+pub async fn validate_spv_proof<T: UtxoCommonOps>(
+    coin: T,
+    tx: UtxoTx,
+    try_spv_proof_until: u64,
+) -> Result<(), MmError<SPVError>> {
+    let client = match &coin.as_ref().rpc_client {
+        UtxoRpcClientEnum::Native(_) => return Ok(()),
+        UtxoRpcClientEnum::Electrum(electrum_client) => electrum_client,
+    };
+    if tx.outputs.is_empty() {
+        return MmError::err(SPVError::InvalidVout);
+    }
+
+    let (merkle_branch, block_header) = spv_proof_retry_pool(&coin, client, &tx, try_spv_proof_until).await?;
+    let raw_header = RawBlockHeader::new(block_header.raw().take())?;
+    let intermediate_nodes: Vec<H256> = merkle_branch
+        .merkle
+        .into_iter()
+        .map(|hash| hash.reversed().into())
+        .collect();
+
+    let proof = SPVProof {
+        tx_id: tx.hash(),
+        vin: serialize_list(&tx.inputs).take(),
+        vout: serialize_list(&tx.outputs).take(),
+        index: merkle_branch.pos as u64,
+        confirming_header: block_header,
+        raw_header,
+        intermediate_nodes,
+    };
+
+    proof.validate().map_err(MmError::new)
+}
+
+async fn spv_proof_retry_pool<T: UtxoCommonOps>(
+    coin: &T,
+    client: &ElectrumClient,
+    tx: &UtxoTx,
+    try_spv_proof_until: u64,
+) -> Result<(TxMerkleBranch, BlockHeader), MmError<SPVError>> {
+    let mut height: Option<u64> = None;
+    let mut merkle_branch: Option<TxMerkleBranch> = None;
+
+    loop {
+        if now_ms() / 1000 > try_spv_proof_until {
+            error!(
+                "Waited too long until {} for transaction {:?} to validate spv proof",
+                try_spv_proof_until,
+                tx.hash(),
+            );
+            return Err(SPVError::Timeout.into());
+        }
+
+        if height.is_none() {
+            match get_tx_height(tx, client).await {
+                Ok(h) => height = Some(h),
+                Err(e) => {
+                    debug!("`get_tx_height` returned an error {:?}", e);
+                    error!("{:?} for tx {:?}", SPVError::InvalidHeight, tx);
+                },
+            }
+        }
+
+        if height.is_some() && merkle_branch.is_none() {
+            match client
+                .blockchain_transaction_get_merkle(tx.hash().reversed().into(), height.unwrap())
+                .compat()
+                .await
+            {
+                Ok(m) => merkle_branch = Some(m),
+                Err(e) => {
+                    debug!("`blockchain_transaction_get_merkle` returned an error {:?}", e);
+                    error!(
+                        "{:?} by tx: {:?}, height: {}",
+                        SPVError::UnableToGetMerkle,
+                        H256Json::from(tx.hash().reversed()),
+                        height.unwrap()
+                    );
+                },
+            }
+        }
+
+        if height.is_some() && merkle_branch.is_some() {
+            match block_header_from_storage_or_rpc(&coin, height.unwrap(), &coin.as_ref().block_headers_storage, client)
+                .await
+            {
+                Ok(block_header) => {
+                    return Ok((merkle_branch.unwrap(), block_header));
+                },
+                Err(e) => {
+                    debug!("`block_header_from_storage_or_rpc` returned an error {:?}", e);
+                    error!(
+                        "{:?}, Received header likely not compatible with header format in mm2",
+                        SPVError::UnableToGetHeader
+                    );
+                },
+            }
+        }
+
+        error!(
+            "Failed spv proof validation for transaction {:?}, retrying in {} seconds.",
+            tx.hash(),
+            TRY_SPV_PROOF_INTERVAL,
+        );
+
+        Timer::sleep(TRY_SPV_PROOF_INTERVAL as f64).await;
+    }
+}
+
+pub async fn get_tx_height(tx: &UtxoTx, client: &ElectrumClient) -> Result<u64, MmError<GetTxHeightError>> {
+    for output in tx.outputs.clone() {
+        let script_pubkey_str = hex::encode(electrum_script_hash(&output.script_pubkey));
+        if let Ok(history) = client.scripthash_get_history(script_pubkey_str.as_str()).compat().await {
+            if let Some(item) = history
+                .into_iter()
+                .find(|item| item.tx_hash.reversed() == H256Json(*tx.hash()) && item.height > 0)
+            {
+                return Ok(item.height as u64);
+            }
+        }
+    }
+    MmError::err(GetTxHeightError::HeightNotFound)
+}
+
 #[allow(clippy::too_many_arguments)]
-pub fn validate_payment<T>(
+#[cfg_attr(test, mockable)]
+pub fn validate_payment<T: UtxoCommonOps>(
     coin: T,
     tx: UtxoTx,
     output_index: usize,
@@ -2550,10 +3213,9 @@ pub fn validate_payment<T>(
     priv_bn_hash: &[u8],
     amount: BigDecimal,
     time_lock: u32,
-) -> Box<dyn Future<Item = (), Error = String> + Send>
-where
-    T: AsRef<UtxoCoinFields> + Send + Sync + 'static,
-{
+    try_spv_proof_until: u64,
+    confirmations: u64,
+) -> Box<dyn Future<Item = (), Error = String> + Send> {
     let amount = try_fus!(sat_from_big_decimal(&amount, coin.as_ref().decimals));
 
     let expected_redeem = payment_script(time_lock, priv_bn_hash, first_pub0, second_pub0);
@@ -2563,7 +3225,7 @@ where
             let tx_from_rpc = match coin
                 .as_ref()
                 .rpc_client
-                .get_transaction_bytes(tx.hash().reversed().into())
+                .get_transaction_bytes(&tx.hash().reversed().into())
                 .compat()
                 .await
             {
@@ -2577,7 +3239,7 @@ where
                         );
                     };
                     attempts += 1;
-                    log!("Error " [e] " getting the tx " [tx.tx_hash()] " from rpc");
+                    error!("Error getting tx {:?} from rpc: {:?}", tx.tx_hash(), e);
                     Timer::sleep(10.).await;
                     continue;
                 },
@@ -2594,7 +3256,7 @@ where
 
             let expected_output = TransactionOutput {
                 value: amount,
-                script_pubkey: Builder::build_p2sh(&dhash160(&expected_redeem)).into(),
+                script_pubkey: Builder::build_p2sh(&dhash160(&expected_redeem).into()).into(),
             };
 
             let actual_output = tx.outputs.get(output_index);
@@ -2605,7 +3267,17 @@ where
                     expected_output
                 );
             }
-            return Ok(());
+
+            if !coin.as_ref().conf.enable_spv_proof {
+                return Ok(());
+            }
+
+            return match confirmations {
+                0 => Ok(()),
+                _ => validate_spv_proof(coin, tx, try_spv_proof_until)
+                    .await
+                    .map_err(|e| format!("{:?}", e)),
+            };
         }
     };
     Box::new(fut.boxed().compat())
@@ -2625,7 +3297,7 @@ async fn search_for_swap_output_spend(
     let mut tx: UtxoTx = try_s!(deserialize(tx).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.tx_hash_algo;
     let script = payment_script(time_lock, secret_hash, first_pub, second_pub);
-    let expected_script_pubkey = Builder::build_p2sh(&dhash160(&script)).to_bytes();
+    let expected_script_pubkey = Builder::build_p2sh(&dhash160(&script).into()).to_bytes();
     if tx.outputs[0].script_pubkey != expected_script_pubkey {
         return ERR!(
             "Transaction {:?} output 0 script_pubkey doesn't match expected {:?}",
@@ -2636,12 +3308,18 @@ async fn search_for_swap_output_spend(
 
     let spend = try_s!(
         coin.rpc_client
-            .find_output_spend(&tx, output_index, search_from_block)
+            .find_output_spend(
+                tx.hash(),
+                &tx.outputs[output_index].script_pubkey,
+                output_index,
+                BlockHashOrHeight::Height(search_from_block as i64)
+            )
             .compat()
             .await
     );
     match spend {
-        Some(mut tx) => {
+        Some(spent_output_info) => {
+            let mut tx = spent_output_info.spending_tx;
             tx.tx_hash_algo = coin.tx_hash_algo;
             let script: Script = tx.inputs[0].script_sig.clone().into();
             if let Some(Ok(ref i)) = script.iter().nth(2) {
@@ -2673,6 +3351,7 @@ struct SwapPaymentOutputsResult {
 fn generate_swap_payment_outputs<T>(
     coin: T,
     time_lock: u32,
+    my_pub: &[u8],
     other_pub: &[u8],
     secret_hash: &[u8],
     amount: BigDecimal,
@@ -2680,17 +3359,18 @@ fn generate_swap_payment_outputs<T>(
 where
     T: AsRef<UtxoCoinFields>,
 {
+    let my_public = try_s!(Public::from_slice(my_pub));
     let redeem_script = payment_script(
         time_lock,
         secret_hash,
-        coin.as_ref().key_pair.public(),
+        &my_public,
         &try_s!(Public::from_slice(other_pub)),
     );
     let redeem_script_hash = dhash160(&redeem_script);
     let amount = try_s!(sat_from_big_decimal(&amount, coin.as_ref().decimals));
     let htlc_out = TransactionOutput {
         value: amount,
-        script_pubkey: Builder::build_p2sh(&redeem_script_hash).into(),
+        script_pubkey: Builder::build_p2sh(&redeem_script_hash.into()).into(),
     };
     // record secret hash to blockchain too making it impossible to lose
     // lock time may be easily brute forced so it is not mandatory to record it
@@ -2712,7 +3392,7 @@ where
 
     let payment_address = Address {
         checksum_type: coin.as_ref().conf.checksum_type,
-        hash: redeem_script_hash,
+        hash: redeem_script_hash.into(),
         prefix: coin.as_ref().conf.p2sh_addr_prefix,
         t_addr_prefix: coin.as_ref().conf.p2sh_t_addr_prefix,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
@@ -2765,73 +3445,92 @@ pub fn dex_fee_script(uuid: [u8; 16], time_lock: u32, watcher_pub: &Public, send
         .into_script()
 }
 
-/// Creates signed input spending hash time locked p2sh output
-pub fn p2sh_spend(
-    signer: &TransactionInputSigner,
-    input_index: usize,
-    key_pair: &KeyPair,
-    script_data: Script,
-    redeem_script: Script,
-    signature_version: SignatureVersion,
-    fork_id: u32,
-) -> Result<TransactionInput, String> {
-    let sighash = signer.signature_hash(
-        input_index,
-        signer.inputs[input_index].amount,
-        &redeem_script,
-        signature_version,
-        1 | fork_id,
-    );
-
-    let sig = try_s!(script_sig(&sighash, key_pair, fork_id));
-
-    let mut resulting_script = Builder::default().push_data(&sig).into_bytes();
-    if !script_data.is_empty() {
-        resulting_script.extend_from_slice(&script_data);
+/// [`GetUtxoListOps::get_unspent_ordered_list`] implementation.
+/// Returns available unspents in ascending order
+/// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+pub async fn get_unspent_ordered_list<'a, T>(
+    coin: &'a T,
+    address: &Address,
+) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'a>)>
+where
+    T: UtxoCommonOps + GetUtxoListOps,
+{
+    if coin.as_ref().check_utxo_maturity {
+        coin.get_mature_unspent_ordered_list(address)
+            .await
+            // Convert `MatureUnspentList` into `Vec<UnspentInfo>` by discarding immature unspents.
+            .map(|(mature_unspents, recently_spent)| (mature_unspents.only_mature(), recently_spent))
+    } else {
+        coin.get_all_unspent_ordered_list(address).await
     }
+}
 
-    let redeem_part = Builder::default().push_data(&redeem_script).into_bytes();
-    resulting_script.extend_from_slice(&redeem_part);
-
-    Ok(TransactionInput {
-        script_sig: resulting_script,
-        sequence: signer.inputs[input_index].sequence,
-        script_witness: vec![],
-        previous_output: signer.inputs[input_index].previous_output.clone(),
-    })
+/// [`GetUtxoMapOps::get_unspent_ordered_map`] implementation.
+/// Returns available unspents in ascending order + `RecentlySpentOutPoints` MutexGuard for further interaction
+/// (e.g. to add new transaction to it).
+pub async fn get_unspent_ordered_map<T>(
+    coin: &T,
+    addresses: Vec<Address>,
+) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)>
+where
+    T: UtxoCommonOps + GetUtxoMapOps,
+{
+    if coin.as_ref().check_utxo_maturity {
+        coin.get_mature_unspent_ordered_map(addresses)
+            .await
+            // Convert `MatureUnspentMap` into `UnspentMap` by discarding immature unspents.
+            .map(|(mature_unspents_map, recently_spent)| {
+                let unspents_map = mature_unspents_map
+                    .into_iter()
+                    .map(|(address, unspents)| (address, unspents.only_mature()))
+                    .collect();
+                (unspents_map, recently_spent)
+            })
+    } else {
+        coin.get_all_unspent_ordered_map(addresses).await
+    }
 }
 
-#[allow(clippy::needless_lifetimes)]
-pub async fn list_unspent_ordered<'a, T>(
+/// [`GetUtxoListOps::get_all_unspent_ordered_list`] implementation.
+/// Returns available mature and immature unspents in ascending
+/// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+pub async fn get_all_unspent_ordered_list<'a, T: UtxoCommonOps>(
     coin: &'a T,
     address: &Address,
-) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)>
-where
-    T: AsRef<UtxoCoinFields>,
-{
+) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'a>)> {
     let decimals = coin.as_ref().decimals;
-    let mut unspents = coin
+    let unspents = coin
         .as_ref()
         .rpc_client
         .list_unspent(address, decimals)
         .compat()
         .await?;
     let recently_spent = coin.as_ref().recently_spent_outpoints.lock().await;
-    unspents = recently_spent
-        .replace_spent_outputs_with_cache(unspents.into_iter().collect())
-        .into_iter()
-        .collect();
-    unspents.sort_unstable_by(|a, b| {
-        if a.value < b.value {
-            Ordering::Less
-        } else {
-            Ordering::Greater
-        }
-    });
-    // dedup just in case we add duplicates of same unspent out
-    // all duplicates will be removed because vector in sorted before dedup
-    unspents.dedup_by(|one, another| one.outpoint == another.outpoint);
-    Ok((unspents, recently_spent))
+    let unordered_unspents = recently_spent.replace_spent_outputs_with_cache(unspents.into_iter().collect());
+    let ordered_unspents = sort_dedup_unspents(unordered_unspents);
+    Ok((ordered_unspents, recently_spent))
+}
+
+/// [`GetUtxoMapOps::get_all_unspent_ordered_map`] implementation.
+/// Returns available mature and immature unspents in ascending order for every given `addresses`
+/// + `RecentlySpentOutPoints` MutexGuard for further interaction (e.g. to add new transaction to it).
+pub async fn get_all_unspent_ordered_map<T: UtxoCommonOps>(
+    coin: &T,
+    addresses: Vec<Address>,
+) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)> {
+    let decimals = coin.as_ref().decimals;
+    let mut unspents_map = coin
+        .as_ref()
+        .rpc_client
+        .list_unspent_group(addresses, decimals)
+        .compat()
+        .await?;
+    let recently_spent = coin.as_ref().recently_spent_outpoints.lock().await;
+    for (_address, unspents) in unspents_map.iter_mut() {
+        let unordered_unspents = recently_spent.replace_spent_outputs_with_cache(unspents.iter().cloned().collect());
+        *unspents = sort_dedup_unspents(unordered_unspents);
+    }
+    Ok((unspents_map, recently_spent))
 }
 
 /// Increase the given `dynamic_fee` according to the fee approximation `stage` using the [`UtxoCoinFields::tx_fee_volatility_percent`].
@@ -2862,23 +3561,158 @@ fn increase_by_percent(num: u64, percent: f64) -> u64 {
     num + (percent.round() as u64)
 }
 
-async fn merge_utxo_loop<T>(weak: UtxoWeak, merge_at: usize, check_every: f64, max_merge_at_once: usize)
+pub async fn valid_block_header_from_storage<T>(
+    coin: &T,
+    height: u64,
+    storage: &BlockHeaderStorage,
+    client: &ElectrumClient,
+) -> Result<BlockHeader, MmError<GetBlockHeaderError>>
 where
-    T: From<UtxoArc> + AsRef<UtxoCoinFields> + UtxoCommonOps,
+    T: AsRef<UtxoCoinFields>,
+{
+    match storage
+        .get_block_header(coin.as_ref().conf.ticker.as_str(), height)
+        .await?
+    {
+        None => {
+            let bytes = client.blockchain_block_header(height).compat().await?;
+            let header: BlockHeader = deserialize(bytes.0.as_slice())?;
+            let params = &storage.params;
+            let blocks_limit = params.blocks_limit_to_check;
+            let (headers_registry, headers) = client.retrieve_last_headers(blocks_limit, height).compat().await?;
+            match spv_validation::helpers_validation::validate_headers(
+                headers,
+                params.difficulty_check,
+                params.constant_difficulty,
+            ) {
+                Ok(_) => {
+                    storage
+                        .add_block_headers_to_storage(coin.as_ref().conf.ticker.as_str(), headers_registry)
+                        .await?;
+                    Ok(header)
+                },
+                Err(err) => MmError::err(GetBlockHeaderError::SPVError(err)),
+            }
+        },
+        Some(header) => Ok(header),
+    }
+}
+
+#[inline]
+pub async fn block_header_from_storage_or_rpc<T>(
+    coin: &T,
+    height: u64,
+    storage: &Option<BlockHeaderStorage>,
+    client: &ElectrumClient,
+) -> Result<BlockHeader, MmError<GetBlockHeaderError>>
+where
+    T: AsRef<UtxoCoinFields>,
+{
+    match storage {
+        Some(ref storage) => valid_block_header_from_storage(&coin, height, storage, client).await,
+        None => Ok(deserialize(
+            client.blockchain_block_header(height).compat().await?.as_slice(),
+        )?),
+    }
+}
+
+pub async fn block_header_utxo_loop<T: UtxoCommonOps>(weak: UtxoWeak, constructor: impl Fn(UtxoArc) -> T) {
+    {
+        let coin = match weak.upgrade() {
+            Some(arc) => constructor(arc),
+            None => return,
+        };
+        let ticker = coin.as_ref().conf.ticker.as_str();
+        let storage = match &coin.as_ref().block_headers_storage {
+            None => return,
+            Some(storage) => storage,
+        };
+        match storage.is_initialized_for(ticker).await {
+            Ok(true) => info!("Block Header Storage already initialized for {}", ticker),
+            Ok(false) => {
+                if let Err(e) = storage.init(ticker).await {
+                    error!(
+                        "Couldn't initiate storage - aborting the block_header_utxo_loop: {:?}",
+                        e
+                    );
+                    return;
+                }
+                info!("Block Header Storage successfully initialized for {}", ticker);
+            },
+            Err(_e) => return,
+        };
+    }
+    while let Some(arc) = weak.upgrade() {
+        let coin = constructor(arc);
+        let storage = match &coin.as_ref().block_headers_storage {
+            None => break,
+            Some(storage) => storage,
+        };
+        let params = storage.params.clone();
+        let (check_every, blocks_limit_to_check, difficulty_check, constant_difficulty) = (
+            params.check_every,
+            params.blocks_limit_to_check,
+            params.difficulty_check,
+            params.constant_difficulty,
+        );
+        let height =
+            ok_or_continue_after_sleep!(coin.as_ref().rpc_client.get_block_count().compat().await, check_every);
+        let client = match &coin.as_ref().rpc_client {
+            UtxoRpcClientEnum::Native(_) => break,
+            UtxoRpcClientEnum::Electrum(client) => client,
+        };
+        let (block_registry, block_headers) = ok_or_continue_after_sleep!(
+            client
+                .retrieve_last_headers(blocks_limit_to_check, height)
+                .compat()
+                .await,
+            check_every
+        );
+        ok_or_continue_after_sleep!(
+            validate_headers(block_headers, difficulty_check, constant_difficulty),
+            check_every
+        );
+
+        let ticker = coin.as_ref().conf.ticker.as_str();
+        ok_or_continue_after_sleep!(
+            storage.add_block_headers_to_storage(ticker, block_registry).await,
+            check_every
+        );
+        debug!("tick block_header_utxo_loop for {}", coin.as_ref().conf.ticker);
+        Timer::sleep(check_every).await;
+    }
+}
+
+pub async fn merge_utxo_loop<T>(
+    weak: UtxoWeak,
+    merge_at: usize,
+    check_every: f64,
+    max_merge_at_once: usize,
+    constructor: impl Fn(UtxoArc) -> T,
+) where
+    T: UtxoCommonOps + GetUtxoListOps,
 {
     loop {
         Timer::sleep(check_every).await;
 
         let coin = match weak.upgrade() {
-            Some(arc) => T::from(arc),
+            Some(arc) => constructor(arc),
             None => break,
         };
 
+        let my_address = match coin.as_ref().derivation_method {
+            DerivationMethod::Iguana(ref my_address) => my_address,
+            DerivationMethod::HDWallet(_) => {
+                warn!("'merge_utxo_loop' is currently not used for HD wallets");
+                return;
+            },
+        };
+
         let ticker = &coin.as_ref().conf.ticker;
-        let (unspents, recently_spent) = match coin.list_unspent_ordered(&coin.as_ref().my_address).await {
+        let (unspents, recently_spent) = match coin.get_unspent_ordered_list(my_address).await {
             Ok((unspents, recently_spent)) => (unspents, recently_spent),
             Err(e) => {
-                error!("Error {} on list_unspent_ordered of coin {}", e, ticker);
+                error!("Error {} on get_unspent_ordered_list of coin {}", e, ticker);
                 continue;
             },
         };
@@ -2886,14 +3720,15 @@ where
             let unspents: Vec<_> = unspents.into_iter().take(max_merge_at_once).collect();
             info!("Trying to merge {} UTXOs of coin {}", unspents.len(), ticker);
             let value = unspents.iter().fold(0, |sum, unspent| sum + unspent.value);
-            let script_pubkey = Builder::build_p2pkh(&coin.as_ref().my_address.hash).to_bytes();
+            let script_pubkey = Builder::build_p2pkh(&my_address.hash).to_bytes();
             let output = TransactionOutput { value, script_pubkey };
             let merge_tx_fut = generate_and_send_tx(
                 &coin,
                 unspents,
-                vec![output],
+                None,
                 FeePolicy::DeductFromOutput(0),
                 recently_spent,
+                vec![output],
             );
             match merge_tx_fut.await {
                 Ok(tx) => info!(
@@ -2901,7 +3736,7 @@ where
                     ticker,
                     tx.hash().reversed()
                 ),
-                Err(e) => error!("Error {} on UTXO merge attempt for coin {}", e, ticker),
+                Err(e) => error!("Error {:?} on UTXO merge attempt for coin {}", e, ticker),
             }
         }
     }
@@ -2940,6 +3775,13 @@ where
     Ok(lock_time.max(htlc_locktime))
 }
 
+pub fn addr_format(coin: &dyn AsRef<UtxoCoinFields>) -> &UtxoAddressFormat {
+    match coin.as_ref().derivation_method {
+        DerivationMethod::Iguana(ref my_address) => &my_address.addr_format,
+        DerivationMethod::HDWallet(UtxoHDWallet { ref address_format, .. }) => address_format,
+    }
+}
+
 pub fn addr_format_for_standard_scripts(coin: &dyn AsRef<UtxoCoinFields>) -> UtxoAddressFormat {
     match &coin.as_ref().conf.default_address_format {
         UtxoAddressFormat::Segwit => UtxoAddressFormat::Standard,
@@ -2947,6 +3789,90 @@ pub fn addr_format_for_standard_scripts(coin: &dyn AsRef<UtxoCoinFields>) -> Utx
     }
 }
 
+fn check_withdraw_address_supported<T>(coin: &T, addr: &Address) -> Result<(), MmError<UnsupportedAddr>>
+where
+    T: UtxoCommonOps,
+{
+    let conf = &coin.as_ref().conf;
+
+    match addr.addr_format {
+        // Considering that legacy is supported with any configured formats
+        // This can be changed depending on the coins implementation
+        UtxoAddressFormat::Standard => {
+            let is_p2pkh = addr.prefix == conf.pub_addr_prefix && addr.t_addr_prefix == conf.pub_t_addr_prefix;
+            let is_p2sh = addr.prefix == conf.p2sh_addr_prefix && addr.t_addr_prefix == conf.p2sh_t_addr_prefix;
+            if !is_p2pkh && !is_p2sh {
+                MmError::err(UnsupportedAddr::PrefixError(conf.ticker.clone()))
+            } else {
+                Ok(())
+            }
+        },
+        UtxoAddressFormat::Segwit => {
+            if !conf.segwit {
+                return MmError::err(UnsupportedAddr::SegwitNotActivated(conf.ticker.clone()));
+            }
+
+            if addr.hrp != conf.bech32_hrp {
+                MmError::err(UnsupportedAddr::HrpError {
+                    ticker: conf.ticker.clone(),
+                    hrp: addr.hrp.clone().unwrap_or_default(),
+                })
+            } else {
+                Ok(())
+            }
+        },
+        UtxoAddressFormat::CashAddress { .. } => {
+            if addr.addr_format == conf.default_address_format || addr.addr_format == *coin.addr_format() {
+                Ok(())
+            } else {
+                MmError::err(UnsupportedAddr::FormatMismatch {
+                    ticker: conf.ticker.clone(),
+                    activated_format: coin.addr_format().to_string(),
+                    used_format: addr.addr_format.to_string(),
+                })
+            }
+        },
+    }
+}
+
+pub async fn broadcast_tx<T>(coin: &T, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>>
+where
+    T: AsRef<UtxoCoinFields>,
+{
+    coin.as_ref()
+        .rpc_client
+        .send_transaction(tx)
+        .compat()
+        .await
+        .mm_err(From::from)
+}
+
+pub fn derive_htlc_key_pair(coin: &UtxoCoinFields, _swap_unique_data: &[u8]) -> KeyPair {
+    match coin.priv_key_policy {
+        PrivKeyPolicy::KeyPair(k) => k,
+        PrivKeyPolicy::Trezor => todo!(),
+    }
+}
+
+/// Sorts and deduplicates the given `unspents` in ascending order.
+fn sort_dedup_unspents<I>(unspents: I) -> Vec<UnspentInfo>
+where
+    I: IntoIterator<Item = UnspentInfo>,
+{
+    unspents
+        .into_iter()
+        // dedup just in case we add duplicates of same unspent out
+        .unique_by(|unspent| unspent.outpoint)
+        .sorted_unstable_by(|a, b| {
+            if a.value < b.value {
+                Ordering::Less
+            } else {
+                Ordering::Greater
+            }
+        })
+        .collect()
+}
+
 #[test]
 fn test_increase_by_percent() {
     assert_eq!(increase_by_percent(4300, 1.), 4343);
diff --git a/mm2src/coins/utxo/utxo_common_tests.rs b/mm2src/coins/utxo/utxo_common_tests.rs
new file mode 100644
index 0000000000..94613eb5c8
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_common_tests.rs
@@ -0,0 +1,50 @@
+use super::*;
+use crate::utxo::rpc_clients::{ElectrumClient, UtxoRpcClientOps};
+use common::jsonrpc_client::JsonRpcErrorType;
+use std::convert::TryFrom;
+
+pub async fn test_electrum_display_balances(rpc_client: &ElectrumClient) {
+    let addresses = vec![
+        "RG278CfeNPFtNztFZQir8cgdWexVhViYVy".into(),
+        "RYPz6Lr4muj4gcFzpMdv3ks1NCGn3mkDPN".into(),
+        "RJeDDtDRtKUoL8BCKdH7TNCHqUKr7kQRsi".into(),
+        "RQHn9VPHBqNjYwyKfJbZCiaxVrWPKGQjeF".into(),
+    ];
+    let actual = rpc_client.display_balances(addresses, 8).compat().await.unwrap();
+
+    let expected: Vec<(Address, BigDecimal)> = vec![
+        (
+            "RG278CfeNPFtNztFZQir8cgdWexVhViYVy".into(),
+            BigDecimal::try_from(5.77699).unwrap(),
+        ),
+        ("RYPz6Lr4muj4gcFzpMdv3ks1NCGn3mkDPN".into(), BigDecimal::from(0)),
+        (
+            "RJeDDtDRtKUoL8BCKdH7TNCHqUKr7kQRsi".into(),
+            BigDecimal::try_from(0.77699).unwrap(),
+        ),
+        (
+            "RQHn9VPHBqNjYwyKfJbZCiaxVrWPKGQjeF".into(),
+            BigDecimal::try_from(16.55398).unwrap(),
+        ),
+    ];
+    assert_eq!(actual, expected);
+
+    let invalid_hashes = vec![
+        "0128a4ea8c5775039d39a192f8490b35b416f2f194cb6b6ee91a41d01233c3b5".to_owned(),
+        "!INVALID!".to_owned(),
+        "457206aa039ed77b223e4623c19152f9aa63aa7845fe93633920607500766931".to_owned(),
+    ];
+
+    let rpc_err = rpc_client
+        .scripthash_get_balances(invalid_hashes)
+        .compat()
+        .await
+        .unwrap_err();
+    match rpc_err.error {
+        JsonRpcErrorType::Response(_, json_err) => {
+            let expected = json!({"code": 1, "message": "!INVALID! is not a valid script hash"});
+            assert_eq!(json_err, expected);
+        },
+        ekind => panic!("Unexpected `JsonRpcErrorType`: {:?}", ekind),
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_indexedb_block_header_storage.rs b/mm2src/coins/utxo/utxo_indexedb_block_header_storage.rs
new file mode 100644
index 0000000000..d00d4f261f
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_indexedb_block_header_storage.rs
@@ -0,0 +1,49 @@
+use crate::utxo::rpc_clients::ElectrumBlockHeader;
+use crate::utxo::utxo_block_header_storage::BlockHeaderStorageError;
+use crate::utxo::utxo_block_header_storage::BlockHeaderStorageOps;
+use async_trait::async_trait;
+use chain::BlockHeader;
+use mm2_err_handle::prelude::*;
+use std::collections::HashMap;
+
+#[derive(Debug)]
+pub struct IndexedDBBlockHeadersStorage {}
+
+#[async_trait]
+impl BlockHeaderStorageOps for IndexedDBBlockHeadersStorage {
+    async fn init(&self, _for_coin: &str) -> Result<(), MmError<BlockHeaderStorageError>> { Ok(()) }
+
+    async fn is_initialized_for(&self, _for_coin: &str) -> Result<bool, MmError<BlockHeaderStorageError>> { Ok(true) }
+
+    async fn add_electrum_block_headers_to_storage(
+        &self,
+        _for_coin: &str,
+        _headers: Vec<ElectrumBlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>> {
+        Ok(())
+    }
+
+    async fn add_block_headers_to_storage(
+        &self,
+        _for_coin: &str,
+        _headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>> {
+        Ok(())
+    }
+
+    async fn get_block_header(
+        &self,
+        _for_coin: &str,
+        _height: u64,
+    ) -> Result<Option<BlockHeader>, MmError<BlockHeaderStorageError>> {
+        Ok(None)
+    }
+
+    async fn get_block_header_raw(
+        &self,
+        _for_coin: &str,
+        _height: u64,
+    ) -> Result<Option<String>, MmError<BlockHeaderStorageError>> {
+        Ok(None)
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_sql_block_header_storage.rs b/mm2src/coins/utxo/utxo_sql_block_header_storage.rs
new file mode 100644
index 0000000000..d11b794e54
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_sql_block_header_storage.rs
@@ -0,0 +1,324 @@
+use crate::utxo::rpc_clients::ElectrumBlockHeader;
+use crate::utxo::utxo_block_header_storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+use async_trait::async_trait;
+use chain::BlockHeader;
+use common::async_blocking;
+use db_common::{sqlite::rusqlite::Error as SqlError,
+                sqlite::rusqlite::{Connection, Row, ToSql, NO_PARAMS},
+                sqlite::string_from_row,
+                sqlite::validate_table_name,
+                sqlite::CHECK_TABLE_EXISTS_SQL};
+use mm2_err_handle::prelude::*;
+use serialization::deserialize;
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+fn block_headers_cache_table(ticker: &str) -> String { ticker.to_owned() + "_block_headers_cache" }
+
+fn get_table_name_and_validate(for_coin: &str) -> Result<String, MmError<BlockHeaderStorageError>> {
+    let table_name = block_headers_cache_table(for_coin);
+    validate_table_name(&table_name).map_err(|e| BlockHeaderStorageError::CantRetrieveTableError {
+        ticker: for_coin.to_string(),
+        reason: e.to_string(),
+    })?;
+    Ok(table_name)
+}
+
+fn create_block_header_cache_table_sql(for_coin: &str) -> Result<String, MmError<BlockHeaderStorageError>> {
+    let table_name = get_table_name_and_validate(for_coin)?;
+    let sql = format!(
+        "CREATE TABLE IF NOT EXISTS {} (
+            block_height INTEGER NOT NULL UNIQUE,
+            hex TEXT NOT NULL
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn insert_block_header_in_cache_sql(for_coin: &str) -> Result<String, MmError<BlockHeaderStorageError>> {
+    let table_name = get_table_name_and_validate(for_coin)?;
+    // Always update the block headers with new values just in case a chain reorganization occurs.
+    let sql = format!(
+        "INSERT OR REPLACE INTO {} (block_height, hex) VALUES (?1, ?2);",
+        table_name
+    );
+    Ok(sql)
+}
+
+fn get_block_header_by_height(for_coin: &str) -> Result<String, MmError<BlockHeaderStorageError>> {
+    let table_name = get_table_name_and_validate(for_coin)?;
+    let sql = format!("SELECT hex FROM {} WHERE block_height=?1;", table_name);
+
+    Ok(sql)
+}
+
+#[derive(Clone, Debug)]
+pub struct SqliteBlockHeadersStorage(pub Arc<Mutex<Connection>>);
+
+fn query_single_row<T, P, F>(
+    conn: &Connection,
+    query: &str,
+    params: P,
+    map_fn: F,
+) -> Result<Option<T>, MmError<BlockHeaderStorageError>>
+where
+    P: IntoIterator,
+    P::Item: ToSql,
+    F: FnOnce(&Row<'_>) -> Result<T, SqlError>,
+{
+    db_common::sqlite::query_single_row(conn, query, params, map_fn).map_err(|e| {
+        MmError::new(BlockHeaderStorageError::QueryError {
+            query: query.to_string(),
+            reason: e.to_string(),
+        })
+    })
+}
+
+struct SqlBlockHeader {
+    block_height: String,
+    block_hex: String,
+}
+
+impl From<ElectrumBlockHeader> for SqlBlockHeader {
+    fn from(header: ElectrumBlockHeader) -> Self {
+        match header {
+            ElectrumBlockHeader::V12(h) => {
+                let block_hex = h.as_hex();
+                let block_height = h.block_height.to_string();
+                SqlBlockHeader {
+                    block_height,
+                    block_hex,
+                }
+            },
+            ElectrumBlockHeader::V14(h) => {
+                let block_hex = format!("{:02x}", h.hex);
+                let block_height = h.height.to_string();
+                SqlBlockHeader {
+                    block_height,
+                    block_hex,
+                }
+            },
+        }
+    }
+}
+async fn common_headers_insert(
+    for_coin: &str,
+    storage: SqliteBlockHeadersStorage,
+    headers: Vec<SqlBlockHeader>,
+) -> Result<(), MmError<BlockHeaderStorageError>> {
+    let for_coin = for_coin.to_owned();
+    let mut conn = storage.0.lock().unwrap();
+    let sql_transaction = conn
+        .transaction()
+        .map_err(|e| BlockHeaderStorageError::AddToStorageError {
+            ticker: for_coin.to_string(),
+            reason: e.to_string(),
+        })?;
+    for header in headers {
+        let block_cache_params = [&header.block_height, &header.block_hex];
+        sql_transaction
+            .execute(&insert_block_header_in_cache_sql(&for_coin)?, block_cache_params)
+            .map_err(|e| BlockHeaderStorageError::AddToStorageError {
+                ticker: for_coin.to_string(),
+                reason: e.to_string(),
+            })?;
+    }
+    sql_transaction
+        .commit()
+        .map_err(|e| BlockHeaderStorageError::AddToStorageError {
+            ticker: for_coin.to_string(),
+            reason: e.to_string(),
+        })?;
+    Ok(())
+}
+
+#[async_trait]
+impl BlockHeaderStorageOps for SqliteBlockHeadersStorage {
+    async fn init(&self, for_coin: &str) -> Result<(), MmError<BlockHeaderStorageError>> {
+        let selfi = self.clone();
+        let sql_cache = create_block_header_cache_table_sql(for_coin)?;
+        let ticker = for_coin.to_owned();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            conn.execute(&sql_cache, NO_PARAMS).map(|_| ()).map_err(|e| {
+                BlockHeaderStorageError::InitializationError {
+                    ticker,
+                    reason: e.to_string(),
+                }
+            })?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn is_initialized_for(&self, for_coin: &str) -> Result<bool, MmError<BlockHeaderStorageError>> {
+        let block_headers_cache_table = get_table_name_and_validate(for_coin)?;
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            let cache_initialized = query_single_row(
+                &conn,
+                CHECK_TABLE_EXISTS_SQL,
+                [block_headers_cache_table],
+                string_from_row,
+            )?;
+            Ok(cache_initialized.is_some())
+        })
+        .await
+    }
+
+    async fn add_electrum_block_headers_to_storage(
+        &self,
+        for_coin: &str,
+        headers: Vec<ElectrumBlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>> {
+        let headers_for_sql = headers.into_iter().map(Into::into).collect();
+        common_headers_insert(for_coin, self.clone(), headers_for_sql).await
+    }
+
+    async fn add_block_headers_to_storage(
+        &self,
+        for_coin: &str,
+        headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), MmError<BlockHeaderStorageError>> {
+        let headers_for_sql = headers
+            .into_iter()
+            .map(|(height, header)| SqlBlockHeader {
+                block_height: height.to_string(),
+                block_hex: hex::encode(header.raw()),
+            })
+            .collect();
+        common_headers_insert(for_coin, self.clone(), headers_for_sql).await
+    }
+
+    async fn get_block_header(
+        &self,
+        for_coin: &str,
+        height: u64,
+    ) -> Result<Option<BlockHeader>, MmError<BlockHeaderStorageError>> {
+        if let Some(header_raw) = self.get_block_header_raw(for_coin, height).await? {
+            let header_bytes = hex::decode(header_raw).map_err(|e| BlockHeaderStorageError::DecodeError {
+                ticker: for_coin.to_string(),
+                reason: e.to_string(),
+            })?;
+            let header: BlockHeader =
+                deserialize(header_bytes.as_slice()).map_err(|e| BlockHeaderStorageError::DecodeError {
+                    ticker: for_coin.to_string(),
+                    reason: e.to_string(),
+                })?;
+            return Ok(Some(header));
+        }
+        Ok(None)
+    }
+
+    async fn get_block_header_raw(
+        &self,
+        for_coin: &str,
+        height: u64,
+    ) -> Result<Option<String>, MmError<BlockHeaderStorageError>> {
+        let params = [height.to_string()];
+        let sql = get_block_header_by_height(for_coin)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            query_single_row(&conn, &sql, params, string_from_row)
+        })
+        .await
+        .map_err(|e| {
+            MmError::new(BlockHeaderStorageError::GetFromStorageError {
+                ticker: for_coin.to_string(),
+                reason: e.into_inner().to_string(),
+            })
+        })
+    }
+}
+
+#[cfg(test)]
+impl SqliteBlockHeadersStorage {
+    pub fn in_memory() -> Self {
+        SqliteBlockHeadersStorage(Arc::new(Mutex::new(Connection::open_in_memory().unwrap())))
+    }
+
+    fn is_table_empty(&self, table_name: &str) -> bool {
+        validate_table_name(table_name).unwrap();
+        let sql = "SELECT COUNT(block_height) FROM ".to_owned() + table_name + ";";
+        let conn = self.0.lock().unwrap();
+        let rows_count: u32 = conn.query_row(&sql, NO_PARAMS, |row| row.get(0)).unwrap();
+        rows_count == 0
+    }
+}
+
+#[cfg(test)]
+mod sql_block_headers_storage_tests {
+    use super::*;
+    use crate::utxo::rpc_clients::ElectrumBlockHeaderV14;
+    use common::block_on;
+    use primitives::hash::H256;
+
+    #[test]
+    fn test_init_collection() {
+        let for_coin = "init_collection";
+        let storage = SqliteBlockHeadersStorage::in_memory();
+        let initialized = block_on(storage.is_initialized_for(for_coin)).unwrap();
+        assert!(!initialized);
+
+        block_on(storage.init(for_coin)).unwrap();
+        // repetitive init must not fail
+        block_on(storage.init(for_coin)).unwrap();
+
+        let initialized = block_on(storage.is_initialized_for(for_coin)).unwrap();
+        assert!(initialized);
+    }
+
+    #[test]
+    fn test_add_block_headers() {
+        let for_coin = "insert";
+        let storage = SqliteBlockHeadersStorage::in_memory();
+        let table = block_headers_cache_table(for_coin);
+        block_on(storage.init(for_coin)).unwrap();
+
+        let initialized = block_on(storage.is_initialized_for(for_coin)).unwrap();
+        assert!(initialized);
+
+        let block_header = ElectrumBlockHeaderV14 {
+            height: 520481,
+            hex: "0000002076d41d3e4b0bfd4c0d3b30aa69fdff3ed35d85829efd04000000000000000000b386498b583390959d9bac72346986e3015e83ac0b54bc7747a11a494ac35c94bb3ce65a53fb45177f7e311c".into(),
+        }.into();
+        let headers = vec![ElectrumBlockHeader::V14(block_header)];
+        block_on(storage.add_electrum_block_headers_to_storage(for_coin, headers)).unwrap();
+        assert!(!storage.is_table_empty(&table));
+    }
+
+    #[test]
+    fn test_get_block_header() {
+        let for_coin = "get";
+        let storage = SqliteBlockHeadersStorage::in_memory();
+        let table = block_headers_cache_table(for_coin);
+        block_on(storage.init(for_coin)).unwrap();
+
+        let initialized = block_on(storage.is_initialized_for(for_coin)).unwrap();
+        assert!(initialized);
+
+        let block_header = ElectrumBlockHeaderV14 {
+            height: 520481,
+            hex: "0000002076d41d3e4b0bfd4c0d3b30aa69fdff3ed35d85829efd04000000000000000000b386498b583390959d9bac72346986e3015e83ac0b54bc7747a11a494ac35c94bb3ce65a53fb45177f7e311c".into(),
+        }.into();
+        let headers = vec![ElectrumBlockHeader::V14(block_header)];
+        block_on(storage.add_electrum_block_headers_to_storage(for_coin, headers)).unwrap();
+        assert!(!storage.is_table_empty(&table));
+
+        let hex = block_on(storage.get_block_header_raw(for_coin, 520481))
+            .unwrap()
+            .unwrap();
+        assert_eq!(hex, "0000002076d41d3e4b0bfd4c0d3b30aa69fdff3ed35d85829efd04000000000000000000b386498b583390959d9bac72346986e3015e83ac0b54bc7747a11a494ac35c94bb3ce65a53fb45177f7e311c".to_string());
+
+        let block_header = block_on(storage.get_block_header(for_coin, 520481)).unwrap().unwrap();
+        assert_eq!(
+            block_header.hash(),
+            H256::from_reversed_str("0000000000000000002e31d0714a5ab23100945ff87ba2d856cd566a3c9344ec")
+        )
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_standard.rs b/mm2src/coins/utxo/utxo_standard.rs
index 36d3ade158..b48f9bfe59 100644
--- a/mm2src/coins/utxo/utxo_standard.rs
+++ b/mm2src/coins/utxo/utxo_standard.rs
@@ -1,10 +1,29 @@
 use super::*;
-use crate::{CanRefundHtlc, CoinBalance, NegotiateSwapContractAddrErr, SwapOps, TradePreimageValue,
-            ValidateAddressResult, WithdrawFut};
+use crate::coin_balance::{self, EnableCoinBalanceError, HDAccountBalance, HDAddressBalance, HDWalletBalance,
+                          HDWalletBalanceOps};
+use crate::hd_pubkey::{ExtractExtendedPubkey, HDExtractPubkeyError, HDXPubExtractor};
+use crate::hd_wallet::{self, AccountUpdatingError, AddressDerivingError, GetNewHDAddressParams,
+                       GetNewHDAddressResponse, HDAccountMut, HDWalletRpcError, HDWalletRpcOps,
+                       NewAccountCreatingError};
+use crate::hd_wallet_storage::HDWalletCoinWithStorageOps;
+use crate::rpc_command::account_balance::{self, AccountBalanceParams, AccountBalanceRpcOps, HDAccountBalanceResponse};
+use crate::rpc_command::hd_account_balance_rpc_error::HDAccountBalanceRpcError;
+use crate::rpc_command::init_create_account::{self, CreateNewAccountParams, InitCreateHDAccountRpcOps};
+use crate::rpc_command::init_scan_for_new_addresses::{self, InitScanAddressesRpcOps, ScanAddressesParams,
+                                                      ScanAddressesResponse};
+use crate::rpc_command::init_withdraw::{InitWithdrawCoin, WithdrawTaskHandle};
+use crate::utxo::utxo_builder::{UtxoArcBuilder, UtxoCoinBuilder};
+use crate::{CanRefundHtlc, CoinBalance, CoinWithDerivationMethod, GetWithdrawSenderAddress,
+            NegotiateSwapContractAddrErr, PrivKeyBuildPolicy, SearchForSwapTxSpendInput, SignatureResult, SwapOps,
+            TradePreimageValue, TransactionFut, ValidateAddressResult, ValidatePaymentInput, VerificationResult,
+            WithdrawFut, WithdrawSenderAddress};
 use common::mm_metrics::MetricsArc;
-use common::mm_number::MmNumber;
+use crypto::trezor::utxo::TrezorUtxoCoin;
+use crypto::Bip44Chain;
 use futures::{FutureExt, TryFutureExt};
-use serialization::CoinVariant;
+use mm2_number::MmNumber;
+use serialization::coin_variant_by_ticker;
+use utxo_signer::UtxoSignerOps;
 
 #[derive(Clone, Debug)]
 pub struct UtxoStandardCoin {
@@ -23,25 +42,111 @@ impl From<UtxoStandardCoin> for UtxoArc {
     fn from(coin: UtxoStandardCoin) -> Self { coin.utxo_arc }
 }
 
-pub async fn utxo_standard_coin_from_conf_and_request(
+pub async fn utxo_standard_coin_with_priv_key(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
-    req: &Json,
+    activation_params: &UtxoActivationParams,
     priv_key: &[u8],
 ) -> Result<UtxoStandardCoin, String> {
-    let coin: UtxoStandardCoin =
-        try_s!(utxo_common::utxo_arc_from_conf_and_request(ctx, ticker, conf, req, priv_key).await);
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    let coin = try_s!(
+        UtxoArcBuilder::new(
+            ctx,
+            ticker,
+            conf,
+            activation_params,
+            priv_key_policy,
+            UtxoStandardCoin::from
+        )
+        .build()
+        .await
+    );
     Ok(coin)
 }
 
 // if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
 #[async_trait]
 #[cfg_attr(test, mockable)]
-impl UtxoCommonOps for UtxoStandardCoin {
-    async fn get_tx_fee(&self) -> Result<ActualTxFee, JsonRpcError> { utxo_common::get_tx_fee(&self.utxo_arc).await }
+impl UtxoTxBroadcastOps for UtxoStandardCoin {
+    async fn broadcast_tx(&self, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>> {
+        utxo_common::broadcast_tx(self, tx).await
+    }
+}
+
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoTxGenerationOps for UtxoStandardCoin {
+    async fn get_tx_fee(&self) -> UtxoRpcResult<ActualTxFee> { utxo_common::get_tx_fee(&self.utxo_arc).await }
+
+    async fn calc_interest_if_required(
+        &self,
+        unsigned: TransactionInputSigner,
+        data: AdditionalTxData,
+        my_script_pub: Bytes,
+    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
+        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl GetUtxoListOps for UtxoStandardCoin {
+    async fn get_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_unspent_ordered_list(self, address).await
+    }
 
-    async fn get_htlc_spend_fee(&self) -> UtxoRpcResult<u64> { utxo_common::get_htlc_spend_fee(self).await }
+    async fn get_all_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_all_unspent_ordered_list(self, address).await
+    }
+
+    async fn get_mature_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(MatureUnspentList, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_mature_unspent_ordered_list(self, address).await
+    }
+}
+
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl GetUtxoMapOps for UtxoStandardCoin {
+    async fn get_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_unspent_ordered_map(self, addresses).await
+    }
+
+    async fn get_all_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(UnspentMap, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_all_unspent_ordered_map(self, addresses).await
+    }
+
+    async fn get_mature_unspent_ordered_map(
+        &self,
+        addresses: Vec<Address>,
+    ) -> UtxoRpcResult<(MatureUnspentMap, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_mature_unspent_ordered_map(self, addresses).await
+    }
+}
+
+// if mockable is placed before async_trait there is `munmap_chunk(): invalid pointer` error on async fn mocking attempt
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl UtxoCommonOps for UtxoStandardCoin {
+    async fn get_htlc_spend_fee(&self, tx_size: u64) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size).await
+    }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
         utxo_common::addresses_from_script(self, script)
@@ -49,40 +154,23 @@ impl UtxoCommonOps for UtxoStandardCoin {
 
     fn denominate_satoshis(&self, satoshi: i64) -> f64 { utxo_common::denominate_satoshis(&self.utxo_arc, satoshi) }
 
-    fn my_public_key(&self) -> &Public { self.utxo_arc.key_pair.public() }
+    fn my_public_key(&self) -> Result<&Public, MmError<UnexpectedDerivationMethod>> {
+        utxo_common::my_public_key(self.as_ref())
+    }
 
     fn address_from_str(&self, address: &str) -> Result<Address, String> {
-        utxo_common::checked_address_from_str(&self.utxo_arc, address)
+        utxo_common::checked_address_from_str(self, address)
     }
 
     async fn get_current_mtp(&self) -> UtxoRpcResult<u32> {
-        utxo_common::get_current_mtp(&self.utxo_arc, CoinVariant::Standard).await
+        let coin_variant = coin_variant_by_ticker(self.ticker());
+        utxo_common::get_current_mtp(&self.utxo_arc, coin_variant).await
     }
 
     fn is_unspent_mature(&self, output: &RpcTransaction) -> bool {
         utxo_common::is_unspent_mature(self.utxo_arc.conf.mature_confirmations, output)
     }
 
-    async fn generate_transaction(
-        &self,
-        utxos: Vec<UnspentInfo>,
-        outputs: Vec<TransactionOutput>,
-        fee_policy: FeePolicy,
-        fee: Option<ActualTxFee>,
-        gas_fee: Option<u64>,
-    ) -> GenerateTxResult {
-        utxo_common::generate_transaction(self, utxos, outputs, fee_policy, fee, gas_fee).await
-    }
-
-    async fn calc_interest_if_required(
-        &self,
-        unsigned: TransactionInputSigner,
-        data: AdditionalTxData,
-        my_script_pub: Bytes,
-    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
-        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
-    }
-
     async fn calc_interest_of_tx(&self, tx: &UtxoTx, input_transactions: &mut HistoryUtxoTxMap) -> UtxoRpcResult<u64> {
         utxo_common::calc_interest_of_tx(self, tx, input_transactions).await
     }
@@ -95,54 +183,19 @@ impl UtxoCommonOps for UtxoStandardCoin {
         utxo_common::get_mut_verbose_transaction_from_map_or_rpc(self, tx_hash, utxo_tx_map).await
     }
 
-    async fn p2sh_spending_tx(
-        &self,
-        prev_transaction: UtxoTx,
-        redeem_script: Bytes,
-        outputs: Vec<TransactionOutput>,
-        script_data: Script,
-        sequence: u32,
-        lock_time: u32,
-    ) -> Result<UtxoTx, String> {
-        utxo_common::p2sh_spending_tx(
-            self,
-            prev_transaction,
-            redeem_script,
-            outputs,
-            script_data,
-            sequence,
-            lock_time,
-        )
-        .await
-    }
-
-    async fn ordered_mature_unspents<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::ordered_mature_unspents(self, address).await
+    async fn p2sh_spending_tx(&self, input: utxo_common::P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String> {
+        utxo_common::p2sh_spending_tx(self, input).await
     }
 
-    fn get_verbose_transaction_from_cache_or_rpc(
+    fn get_verbose_transactions_from_cache_or_rpc(
         &self,
-        txid: H256Json,
-    ) -> Box<dyn Future<Item = VerboseTransactionFrom, Error = String> + Send> {
+        tx_ids: HashSet<H256Json>,
+    ) -> UtxoRpcFut<HashMap<H256Json, VerboseTransactionFrom>> {
         let selfi = self.clone();
-        let fut = async move { utxo_common::get_verbose_transaction_from_cache_or_rpc(&selfi.utxo_arc, txid).await };
+        let fut = async move { utxo_common::get_verbose_transactions_from_cache_or_rpc(&selfi.utxo_arc, tx_ids).await };
         Box::new(fut.boxed().compat())
     }
 
-    async fn cache_transaction_if_possible(&self, tx: &RpcTransaction) -> Result<(), String> {
-        utxo_common::cache_transaction_if_possible(&self.utxo_arc, tx).await
-    }
-
-    async fn list_unspent_ordered<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::list_unspent_ordered(self, address).await
-    }
-
     async fn preimage_trade_fee_required_to_send_outputs(
         &self,
         outputs: Vec<TransactionOutput>,
@@ -150,7 +203,15 @@ impl UtxoCommonOps for UtxoStandardCoin {
         gas_fee: Option<u64>,
         stage: &FeeApproxStage,
     ) -> TradePreimageResult<BigDecimal> {
-        utxo_common::preimage_trade_fee_required_to_send_outputs(self, outputs, fee_policy, gas_fee, stage).await
+        utxo_common::preimage_trade_fee_required_to_send_outputs(
+            self,
+            self.ticker(),
+            outputs,
+            fee_policy,
+            gas_fee,
+            stage,
+        )
+        .await
     }
 
     fn increase_dynamic_fee_by_stage(&self, dynamic_fee: u64, stage: &FeeApproxStage) -> u64 {
@@ -161,9 +222,23 @@ impl UtxoCommonOps for UtxoStandardCoin {
         utxo_common::p2sh_tx_locktime(self, &self.utxo_arc.conf.ticker, htlc_locktime).await
     }
 
+    fn addr_format(&self) -> &UtxoAddressFormat { utxo_common::addr_format(self) }
+
     fn addr_format_for_standard_scripts(&self) -> UtxoAddressFormat {
         utxo_common::addr_format_for_standard_scripts(self)
     }
+
+    fn address_from_pubkey(&self, pubkey: &Public) -> Address {
+        let conf = &self.utxo_arc.conf;
+        utxo_common::address_from_pubkey(
+            pubkey,
+            conf.pub_addr_prefix,
+            conf.pub_t_addr_prefix,
+            conf.checksum_type,
+            conf.bech32_hrp.clone(),
+            self.addr_format().clone(),
+        )
+    }
 }
 
 #[async_trait]
@@ -189,8 +264,9 @@ impl UtxoStandardOps for UtxoStandardCoin {
     }
 }
 
+#[async_trait]
 impl SwapOps for UtxoStandardCoin {
-    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal) -> TransactionFut {
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
         utxo_common::send_taker_fee(self.clone(), fee_addr, amount)
     }
 
@@ -201,8 +277,16 @@ impl SwapOps for UtxoStandardCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_maker_payment(self.clone(), time_lock, taker_pub, secret_hash, amount)
+        utxo_common::send_maker_payment(
+            self.clone(),
+            time_lock,
+            taker_pub,
+            secret_hash,
+            amount,
+            swap_unique_data,
+        )
     }
 
     fn send_taker_payment(
@@ -212,8 +296,16 @@ impl SwapOps for UtxoStandardCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_taker_payment(self.clone(), time_lock, maker_pub, secret_hash, amount)
+        utxo_common::send_taker_payment(
+            self.clone(),
+            time_lock,
+            maker_pub,
+            secret_hash,
+            amount,
+            swap_unique_data,
+        )
     }
 
     fn send_maker_spends_taker_payment(
@@ -223,41 +315,73 @@ impl SwapOps for UtxoStandardCoin {
         taker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_maker_spends_taker_payment(self.clone(), taker_payment_tx, time_lock, taker_pub, secret)
+        utxo_common::send_maker_spends_taker_payment(
+            self.clone(),
+            taker_payment_tx,
+            time_lock,
+            taker_pub,
+            secret,
+            swap_unique_data,
+        )
     }
 
     fn send_taker_spends_maker_payment(
         &self,
-        maker_payment_tx: &[u8],
+        maker_tx: &[u8],
         time_lock: u32,
         maker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_taker_spends_maker_payment(self.clone(), maker_payment_tx, time_lock, maker_pub, secret)
+        utxo_common::send_taker_spends_maker_payment(
+            self.clone(),
+            maker_tx,
+            time_lock,
+            maker_pub,
+            secret,
+            swap_unique_data,
+        )
     }
 
     fn send_taker_refunds_payment(
         &self,
-        taker_payment_tx: &[u8],
+        taker_tx: &[u8],
         time_lock: u32,
         maker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_taker_refunds_payment(self.clone(), taker_payment_tx, time_lock, maker_pub, secret_hash)
+        utxo_common::send_taker_refunds_payment(
+            self.clone(),
+            taker_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
     }
 
     fn send_maker_refunds_payment(
         &self,
-        maker_payment_tx: &[u8],
+        maker_tx: &[u8],
         time_lock: u32,
         taker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        utxo_common::send_maker_refunds_payment(self.clone(), maker_payment_tx, time_lock, taker_pub, secret_hash)
+        utxo_common::send_maker_refunds_payment(
+            self.clone(),
+            maker_tx,
+            time_lock,
+            taker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
     }
 
     fn validate_fee(
@@ -267,6 +391,7 @@ impl SwapOps for UtxoStandardCoin {
         fee_addr: &[u8],
         amount: &BigDecimal,
         min_block_number: u64,
+        _uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let tx = match fee_tx {
             TransactionEnum::UtxoTx(tx) => tx.clone(),
@@ -283,28 +408,12 @@ impl SwapOps for UtxoStandardCoin {
         )
     }
 
-    fn validate_maker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        utxo_common::validate_maker_payment(self, payment_tx, time_lock, maker_pub, priv_bn_hash, amount)
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_maker_payment(self, input)
     }
 
-    fn validate_taker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        utxo_common::validate_taker_payment(self, payment_tx, time_lock, taker_pub, priv_bn_hash, amount)
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_taker_payment(self, input)
     }
 
     fn check_if_my_payment_sent(
@@ -314,48 +423,23 @@ impl SwapOps for UtxoStandardCoin {
         secret_hash: &[u8],
         _search_from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
-        utxo_common::check_if_my_payment_sent(self.clone(), time_lock, other_pub, secret_hash)
+        utxo_common::check_if_my_payment_sent(self.clone(), time_lock, other_pub, secret_hash, swap_unique_data)
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_my(
-            &self.utxo_arc,
-            time_lock,
-            other_pub,
-            secret_hash,
-            tx,
-            utxo_common::DEFAULT_SWAP_VOUT,
-            search_from_block,
-        )
+        utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_other(
-            &self.utxo_arc,
-            time_lock,
-            other_pub,
-            secret_hash,
-            tx,
-            utxo_common::DEFAULT_SWAP_VOUT,
-            search_from_block,
-        )
+        utxo_common::search_for_swap_tx_spend_other(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
     fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
@@ -377,21 +461,50 @@ impl SwapOps for UtxoStandardCoin {
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
         Ok(None)
     }
+
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
+    }
 }
 
 impl MarketCoinOps for UtxoStandardCoin {
     fn ticker(&self) -> &str { &self.utxo_arc.conf.ticker }
 
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        let pubkey = utxo_common::my_public_key(&self.utxo_arc)?;
+        Ok(pubkey.to_string())
+    }
+
     fn my_address(&self) -> Result<String, String> { utxo_common::my_address(self) }
 
-    fn my_balance(&self) -> BalanceFut<CoinBalance> { utxo_common::my_balance(&self.utxo_arc) }
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
+        utxo_common::sign_message_hash(self.as_ref(), message)
+    }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> {
+        utxo_common::sign_message(self.as_ref(), message)
+    }
+
+    fn verify_message(&self, signature_base64: &str, message: &str, address: &str) -> VerificationResult<bool> {
+        utxo_common::verify_message(self, signature_base64, message, address)
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> { utxo_common::my_balance(self.clone()) }
 
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> { utxo_common::base_coin_balance(self) }
 
+    fn platform_ticker(&self) -> &str { self.ticker() }
+
+    #[inline(always)]
     fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
         utxo_common::send_raw_tx(&self.utxo_arc, tx)
     }
 
+    #[inline(always)]
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        utxo_common::send_raw_tx_bytes(&self.utxo_arc, tx)
+    }
+
     fn wait_for_confirmations(
         &self,
         tx: &[u8],
@@ -434,16 +547,21 @@ impl MarketCoinOps for UtxoStandardCoin {
         utxo_common::current_block(&self.utxo_arc)
     }
 
-    fn display_priv_key(&self) -> String { utxo_common::display_priv_key(&self.utxo_arc) }
+    fn display_priv_key(&self) -> Result<String, String> { utxo_common::display_priv_key(&self.utxo_arc) }
 
     fn min_tx_amount(&self) -> BigDecimal { utxo_common::min_tx_amount(self.as_ref()) }
 
     fn min_trading_vol(&self) -> MmNumber { utxo_common::min_trading_vol(self.as_ref()) }
 }
 
+#[async_trait]
 impl MmCoin for UtxoStandardCoin {
     fn is_asset_chain(&self) -> bool { utxo_common::is_asset_chain(&self.utxo_arc) }
 
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
+    }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
         Box::new(utxo_common::withdraw(self.clone(), req).boxed().compat())
     }
@@ -471,20 +589,24 @@ impl MmCoin for UtxoStandardCoin {
         utxo_common::get_trade_fee(self.clone())
     }
 
-    fn get_sender_trade_fee(&self, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
-        utxo_common::get_sender_trade_fee(self.clone(), value, stage)
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        utxo_common::get_sender_trade_fee(self, value, stage).await
     }
 
     fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         utxo_common::get_receiver_trade_fee(self.clone())
     }
 
-    fn get_fee_to_send_taker_fee(
+    async fn get_fee_to_send_taker_fee(
         &self,
         dex_fee_amount: BigDecimal,
         stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee> {
-        utxo_common::get_fee_to_send_taker_fee(self.clone(), dex_fee_amount, stage)
+    ) -> TradePreimageResult<TradeFee> {
+        utxo_common::get_fee_to_send_taker_fee(self, dex_fee_amount, stage).await
     }
 
     fn required_confirmations(&self) -> u64 { utxo_common::required_confirmations(&self.utxo_arc) }
@@ -503,9 +625,212 @@ impl MmCoin for UtxoStandardCoin {
 
     fn mature_confirmations(&self) -> Option<u32> { Some(self.utxo_arc.conf.mature_confirmations) }
 
-    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(&self.utxo_arc) }
+    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(self) }
 
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
-        utxo_common::is_coin_protocol_supported(&self.utxo_arc, info)
+        utxo_common::is_coin_protocol_supported(self, info)
+    }
+}
+
+#[async_trait]
+impl GetWithdrawSenderAddress for UtxoStandardCoin {
+    type Address = Address;
+    type Pubkey = Public;
+
+    async fn get_withdraw_sender_address(
+        &self,
+        req: &WithdrawRequest,
+    ) -> MmResult<WithdrawSenderAddress<Self::Address, Self::Pubkey>, WithdrawError> {
+        utxo_common::get_withdraw_from_address(self, req).await
+    }
+}
+
+#[async_trait]
+impl InitWithdrawCoin for UtxoStandardCoin {
+    async fn init_withdraw(
+        &self,
+        ctx: MmArc,
+        req: WithdrawRequest,
+        task_handle: &WithdrawTaskHandle,
+    ) -> Result<TransactionDetails, MmError<WithdrawError>> {
+        utxo_common::init_withdraw(ctx, self.clone(), req, task_handle).await
+    }
+}
+
+impl UtxoSignerOps for UtxoStandardCoin {
+    type TxGetter = UtxoRpcClientEnum;
+
+    fn trezor_coin(&self) -> UtxoSignTxResult<TrezorUtxoCoin> {
+        self.utxo_arc
+            .conf
+            .trezor_coin
+            .or_mm_err(|| UtxoSignTxError::CoinNotSupportedWithTrezor {
+                coin: self.utxo_arc.conf.ticker.clone(),
+            })
+    }
+
+    fn fork_id(&self) -> u32 { self.utxo_arc.conf.fork_id }
+
+    fn branch_id(&self) -> u32 { self.utxo_arc.conf.consensus_branch_id }
+
+    fn tx_provider(&self) -> Self::TxGetter { self.utxo_arc.rpc_client.clone() }
+}
+
+impl CoinWithDerivationMethod for UtxoStandardCoin {
+    type Address = Address;
+    type HDWallet = UtxoHDWallet;
+
+    fn derivation_method(&self) -> &DerivationMethod<Self::Address, Self::HDWallet> {
+        utxo_common::derivation_method(self.as_ref())
+    }
+}
+
+#[async_trait]
+impl ExtractExtendedPubkey for UtxoStandardCoin {
+    type ExtendedPublicKey = Secp256k1ExtendedPublicKey;
+
+    async fn extract_extended_pubkey<XPubExtractor>(
+        &self,
+        xpub_extractor: &XPubExtractor,
+        derivation_path: DerivationPath,
+    ) -> MmResult<Self::ExtendedPublicKey, HDExtractPubkeyError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        utxo_common::extract_extended_pubkey(&self.utxo_arc.conf, xpub_extractor, derivation_path).await
+    }
+}
+
+#[async_trait]
+impl HDWalletCoinOps for UtxoStandardCoin {
+    type Address = Address;
+    type Pubkey = Public;
+    type HDWallet = UtxoHDWallet;
+    type HDAccount = UtxoHDAccount;
+
+    fn derive_address(
+        &self,
+        hd_account: &Self::HDAccount,
+        chain: Bip44Chain,
+        address_id: u32,
+    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, AddressDerivingError> {
+        utxo_common::derive_address(self, hd_account, chain, address_id)
+    }
+
+    async fn create_new_account<'a, XPubExtractor>(
+        &self,
+        hd_wallet: &'a Self::HDWallet,
+        xpub_extractor: &XPubExtractor,
+    ) -> MmResult<HDAccountMut<'a, Self::HDAccount>, NewAccountCreatingError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        utxo_common::create_new_account(self, hd_wallet, xpub_extractor).await
+    }
+
+    async fn set_known_addresses_number(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        chain: Bip44Chain,
+        new_known_addresses_number: u32,
+    ) -> MmResult<(), AccountUpdatingError> {
+        utxo_common::set_known_addresses_number(self, hd_wallet, hd_account, chain, new_known_addresses_number).await
+    }
+}
+
+#[async_trait]
+impl HDWalletRpcOps for UtxoStandardCoin {
+    async fn get_new_address_rpc(
+        &self,
+        params: GetNewHDAddressParams,
+    ) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError> {
+        hd_wallet::common_impl::get_new_address_rpc(self, params).await
+    }
+}
+
+#[async_trait]
+impl HDWalletBalanceOps for UtxoStandardCoin {
+    type HDAddressScanner = UtxoAddressScanner;
+
+    async fn produce_hd_address_scanner(&self) -> BalanceResult<Self::HDAddressScanner> {
+        utxo_common::produce_hd_address_scanner(self).await
+    }
+
+    async fn enable_hd_wallet<XPubExtractor>(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        xpub_extractor: &XPubExtractor,
+        scan_policy: EnableCoinScanPolicy,
+    ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        coin_balance::common_impl::enable_hd_wallet(self, hd_wallet, xpub_extractor, scan_policy).await
+    }
+
+    async fn scan_for_new_addresses(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        address_scanner: &Self::HDAddressScanner,
+        gap_limit: u32,
+    ) -> BalanceResult<Vec<HDAddressBalance>> {
+        utxo_common::scan_for_new_addresses(self, hd_wallet, hd_account, address_scanner, gap_limit).await
+    }
+
+    async fn all_known_addresses_balances(&self, hd_account: &Self::HDAccount) -> BalanceResult<Vec<HDAddressBalance>> {
+        utxo_common::all_known_addresses_balances(self, hd_account).await
+    }
+
+    async fn known_address_balance(&self, address: &Self::Address) -> BalanceResult<CoinBalance> {
+        utxo_common::address_balance(self, address).await
+    }
+
+    async fn known_addresses_balances(
+        &self,
+        addresses: Vec<Self::Address>,
+    ) -> BalanceResult<Vec<(Self::Address, CoinBalance)>> {
+        utxo_common::addresses_balances(self, addresses).await
+    }
+}
+
+impl HDWalletCoinWithStorageOps for UtxoStandardCoin {
+    fn hd_wallet_storage<'a>(&self, hd_wallet: &'a Self::HDWallet) -> &'a HDWalletCoinStorage {
+        &hd_wallet.hd_wallet_storage
+    }
+}
+
+#[async_trait]
+impl AccountBalanceRpcOps for UtxoStandardCoin {
+    async fn account_balance_rpc(
+        &self,
+        params: AccountBalanceParams,
+    ) -> MmResult<HDAccountBalanceResponse, HDAccountBalanceRpcError> {
+        account_balance::common_impl::account_balance_rpc(self, params).await
+    }
+}
+
+#[async_trait]
+impl InitScanAddressesRpcOps for UtxoStandardCoin {
+    async fn init_scan_for_new_addresses_rpc(
+        &self,
+        params: ScanAddressesParams,
+    ) -> MmResult<ScanAddressesResponse, HDAccountBalanceRpcError> {
+        init_scan_for_new_addresses::common_impl::scan_for_new_addresses_rpc(self, params).await
+    }
+}
+
+#[async_trait]
+impl InitCreateHDAccountRpcOps for UtxoStandardCoin {
+    async fn init_create_account_rpc<XPubExtractor>(
+        &self,
+        params: CreateNewAccountParams,
+        xpub_extractor: &XPubExtractor,
+    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    where
+        XPubExtractor: HDXPubExtractor + Sync,
+    {
+        init_create_account::common_impl::init_create_new_account_rpc(self, params, xpub_extractor).await
     }
 }
diff --git a/mm2src/coins/utxo/utxo_tests.rs b/mm2src/coins/utxo/utxo_tests.rs
index fa78d5014e..00f74b03ce 100644
--- a/mm2src/coins/utxo/utxo_tests.rs
+++ b/mm2src/coins/utxo/utxo_tests.rs
@@ -1,20 +1,39 @@
-use super::rpc_clients::{ListSinceBlockRes, NetworkInfo};
 use super::*;
-use crate::utxo::qtum::{qtum_coin_from_conf_and_request, QtumCoin};
-use crate::utxo::rpc_clients::{GetAddressInfoRes, UtxoRpcClientOps, ValidateAddressRes, VerboseBlock};
-use crate::utxo::utxo_common::{generate_transaction, UtxoArcBuilder};
-use crate::utxo::utxo_standard::{utxo_standard_coin_from_conf_and_request, UtxoStandardCoin};
+use crate::coin_balance::HDAddressBalance;
+use crate::hd_wallet::HDAccountsMap;
+use crate::hd_wallet_storage::{HDWalletMockStorage, HDWalletStorageInternalOps};
+use crate::rpc_command::account_balance::{AccountBalanceParams, AccountBalanceRpcOps, HDAccountBalanceResponse};
+use crate::rpc_command::init_scan_for_new_addresses::{InitScanAddressesRpcOps, ScanAddressesParams,
+                                                      ScanAddressesResponse};
+use crate::utxo::qtum::{qtum_coin_with_priv_key, QtumCoin, QtumDelegationOps, QtumDelegationRequest};
+use crate::utxo::rpc_clients::{BlockHashOrHeight, ElectrumBalance, ElectrumClient, ElectrumClientImpl,
+                               GetAddressInfoRes, ListSinceBlockRes, ListTransactionsItem, NativeClient,
+                               NativeClientImpl, NativeUnspent, NetworkInfo, UtxoRpcClientOps, ValidateAddressRes,
+                               VerboseBlock};
+use crate::utxo::tx_cache::dummy_tx_cache::DummyVerboseCache;
+use crate::utxo::tx_cache::UtxoVerboseCacheOps;
+use crate::utxo::utxo_builder::{UtxoArcBuilder, UtxoCoinBuilderCommonOps};
+use crate::utxo::utxo_common::UtxoTxBuilder;
+use crate::utxo::utxo_common_tests;
+use crate::utxo::utxo_standard::{utxo_standard_coin_with_priv_key, UtxoStandardCoin};
 #[cfg(not(target_arch = "wasm32"))] use crate::WithdrawFee;
-use crate::{CoinBalance, SwapOps, TradePreimageValue, TxFeeDetails};
-use bigdecimal::BigDecimal;
+use crate::{CoinBalance, PrivKeyBuildPolicy, SearchForSwapTxSpendInput, StakingInfosDetails, SwapOps,
+            TradePreimageValue, TxFeeDetails};
 use chain::OutPoint;
-use common::mm_ctx::MmCtxBuilder;
-use common::privkey::key_pair_from_seed;
-use common::{block_on, now_ms, OrdRange, DEX_FEE_ADDR_RAW_PUBKEY};
+use common::executor::Timer;
+use common::{block_on, now_ms, OrdRange, PagingOptionsEnum, DEX_FEE_ADDR_RAW_PUBKEY};
+use crypto::{privkey::key_pair_from_seed, Bip44Chain, RpcDerivationPath};
 use futures::future::join_all;
+use futures::TryFutureExt;
+use mm2_core::mm_ctx::MmCtxBuilder;
+use mm2_number::bigdecimal::{BigDecimal, Signed};
 use mocktopus::mocking::*;
 use rpc::v1::types::H256 as H256Json;
 use serialization::{deserialize, CoinVariant};
+use std::convert::TryFrom;
+use std::iter;
+use std::mem::discriminant;
+use std::num::NonZeroUsize;
 
 const TEST_COIN_NAME: &'static str = "RICK";
 // Made-up hrp for rick to test p2wpkh script
@@ -24,6 +43,7 @@ const RICK_ELECTRUM_ADDRS: &[&'static str] = &[
     "electrum2.cipig.net:10017",
     "electrum3.cipig.net:10017",
 ];
+const TEST_COIN_DECIMALS: u8 = 8;
 
 pub fn electrum_client_for_test(servers: &[&str]) -> ElectrumClient {
     let ctx = MmCtxBuilder::default().into_mm_arc();
@@ -32,14 +52,24 @@ pub fn electrum_client_for_test(servers: &[&str]) -> ElectrumClient {
         "method": "electrum",
         "servers": servers,
     });
-    let builder = UtxoArcBuilder::new(&ctx, TEST_COIN_NAME, &Json::Null, &req, &[]);
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(&[]);
+    let builder = UtxoArcBuilder::new(
+        &ctx,
+        TEST_COIN_NAME,
+        &Json::Null,
+        &params,
+        priv_key_policy,
+        UtxoStandardCoin::from,
+    );
     let args = ElectrumBuilderArgs {
         spawn_ping: false,
         negotiate_version: true,
         collect_metrics: false,
     };
 
-    block_on(builder.electrum_client(args)).unwrap()
+    let servers = servers.into_iter().map(|s| json::from_value(s).unwrap()).collect();
+    block_on(builder.electrum_client(args, servers)).unwrap()
 }
 
 /// Returned client won't work by default, requires some mocks to be usable
@@ -69,13 +99,25 @@ fn utxo_coin_fields_for_test(
     let key_pair = key_pair_from_seed(&seed).unwrap();
     let my_address = Address {
         prefix: 60,
-        hash: key_pair.public().address_hash(),
+        hash: key_pair.public().address_hash().into(),
         t_addr_prefix: 0,
         checksum_type,
-        hrp: None,
-        addr_format: UtxoAddressFormat::Standard,
+        hrp: if is_segwit_coin {
+            Some(TEST_COIN_HRP.to_string())
+        } else {
+            None
+        },
+        addr_format: if is_segwit_coin {
+            UtxoAddressFormat::Segwit
+        } else {
+            UtxoAddressFormat::Standard
+        },
     };
     let my_script_pubkey = Builder::build_p2pkh(&my_address.hash).to_bytes();
+
+    let priv_key_policy = PrivKeyPolicy::KeyPair(key_pair);
+    let derivation_method = DerivationMethod::Iguana(my_address);
+
     let bech32_hrp = if is_segwit_coin {
         Some(TEST_COIN_HRP.to_string())
     } else {
@@ -95,6 +137,7 @@ fn utxo_coin_fields_for_test(
             p2sh_t_addr_prefix: 0,
             pub_addr_prefix: 60,
             pub_t_addr_prefix: 0,
+            sign_message_prefix: Some(String::from("Komodo Signed Message:\n")),
             bech32_hrp,
             ticker: TEST_COIN_NAME.into(),
             wif_prefix: 0,
@@ -111,17 +154,21 @@ fn utxo_coin_fields_for_test(
             estimate_fee_mode: None,
             mature_confirmations: MATURE_CONFIRMATIONS_DEFAULT,
             estimate_fee_blocks: 1,
+            trezor_coin: None,
+            enable_spv_proof: false,
         },
-        decimals: 8,
+        decimals: TEST_COIN_DECIMALS,
         dust_amount: UTXO_DUST_AMOUNT,
         tx_fee: TxFee::FixedPerKb(1000),
         rpc_client,
-        key_pair,
-        my_address,
+        priv_key_policy,
+        derivation_method,
         history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
-        tx_cache_directory: None,
+        tx_cache: DummyVerboseCache::default().into_shared(),
+        block_headers_storage: None,
         recently_spent_outpoints: AsyncMutex::new(RecentlySpentOutPoints::new(my_script_pubkey)),
         tx_hash_algo: TxHashAlgo::DSHA256,
+        check_utxo_maturity: false,
     }
 }
 
@@ -150,6 +197,34 @@ fn test_extract_secret() {
     assert_eq!(secret, expected_secret);
 }
 
+#[test]
+fn test_send_maker_spends_taker_payment_recoverable_tx() {
+    let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
+    let coin = utxo_coin_for_test(client.into(), None, false);
+    let tx_hex = hex::decode("0100000001de7aa8d29524906b2b54ee2e0281f3607f75662cbc9080df81d1047b78e21dbc00000000d7473044022079b6c50820040b1fbbe9251ced32ab334d33830f6f8d0bf0a40c7f1336b67d5b0220142ccf723ddabb34e542ed65c395abc1fbf5b6c3e730396f15d25c49b668a1a401209da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365004c6b6304f62b0e5cb175210270e75970bb20029b3879ec76c4acd320a8d0589e003636264d01a7d566504bfbac6782012088a9142fb610d856c19fd57f2d0cffe8dff689074b3d8a882103f368228456c940ac113e53dad5c104cf209f2f102a409207269383b6ab9b03deac68ffffffff01d0dc9800000000001976a9146d9d2b554d768232320587df75c4338ecc8bf37d88ac40280e5c").unwrap();
+    let secret = hex::decode("9da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365").unwrap();
+
+    let tx_err = coin
+        .send_maker_spends_taker_payment(
+            &tx_hex,
+            777,
+            &coin.my_public_key().unwrap().to_vec(),
+            &secret,
+            &coin.swap_contract_address(),
+            &[],
+        )
+        .wait()
+        .unwrap_err();
+
+    let tx: UtxoTx = deserialize(tx_hex.as_slice()).unwrap();
+
+    // The error variant should equal to `TxRecoverable`
+    assert_eq!(
+        discriminant(&tx_err),
+        discriminant(&TransactionErr::TxRecoverable(TransactionEnum::from(tx), String::new()))
+    );
+}
+
 #[test]
 fn test_generate_transaction() {
     let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
@@ -165,7 +240,10 @@ fn test_generate_transaction() {
         value: 999,
     }];
 
-    let generated = block_on(coin.generate_transaction(unspents, outputs, FeePolicy::SendExact, None, None));
+    let builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs);
+    let generated = block_on(builder.build());
     // must not allow to use output with value < dust
     generated.unwrap_err();
 
@@ -180,9 +258,10 @@ fn test_generate_transaction() {
         value: 98001,
     }];
 
-    let generated =
-        block_on(coin.generate_transaction(unspents.clone(), outputs.clone(), FeePolicy::SendExact, None, None))
-            .unwrap();
+    let builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs);
+    let generated = block_on(builder.build()).unwrap();
     // the change that is less than dust must be included to miner fee
     // so no extra outputs should appear in generated transaction
     assert_eq!(generated.0.outputs.len(), 1);
@@ -199,13 +278,17 @@ fn test_generate_transaction() {
     }];
 
     let outputs = vec![TransactionOutput {
-        script_pubkey: Builder::build_p2pkh(&coin.as_ref().my_address.hash).to_bytes(),
+        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_iguana().hash).to_bytes(),
         value: 100000,
     }];
 
     // test that fee is properly deducted from output amount equal to input amount (max withdraw case)
-    let generated =
-        block_on(coin.generate_transaction(unspents, outputs, FeePolicy::DeductFromOutput(0), None, None)).unwrap();
+    let builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs)
+        .with_fee_policy(FeePolicy::DeductFromOutput(0));
+
+    let generated = block_on(builder.build()).unwrap();
     assert_eq!(generated.0.outputs.len(), 1);
 
     assert_eq!(generated.1.fee_amount, 1000);
@@ -226,7 +309,11 @@ fn test_generate_transaction() {
     }];
 
     // test that generate_transaction returns an error when input amount is not sufficient to cover output + fee
-    block_on(coin.generate_transaction(unspents, outputs, FeePolicy::SendExact, None, None)).unwrap_err();
+    let builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs);
+
+    block_on(builder.build()).unwrap_err();
 }
 
 #[test]
@@ -356,7 +443,7 @@ fn test_wait_for_payment_spend_timeout_native() {
     let client = NativeClientImpl::default();
 
     static mut OUTPUT_SPEND_CALLED: bool = false;
-    NativeClient::find_output_spend.mock_safe(|_, _, _, _| {
+    NativeClient::find_output_spend.mock_safe(|_, _, _, _, _| {
         unsafe { OUTPUT_SPEND_CALLED = true };
         MockResult::Return(Box::new(futures01::future::ok(None)))
     });
@@ -377,7 +464,7 @@ fn test_wait_for_payment_spend_timeout_native() {
 #[test]
 fn test_wait_for_payment_spend_timeout_electrum() {
     static mut OUTPUT_SPEND_CALLED: bool = false;
-    ElectrumClient::find_output_spend.mock_safe(|_, _, _, _| {
+    ElectrumClient::find_output_spend.mock_safe(|_, _, _, _, _| {
         unsafe { OUTPUT_SPEND_CALLED = true };
         MockResult::Return(Box::new(futures01::future::ok(None)))
     });
@@ -416,15 +503,16 @@ fn test_search_for_swap_tx_spend_electrum_was_spent() {
         .unwrap();
     let spend_tx = TransactionEnum::UtxoTx(deserialize(spend_tx_bytes.as_slice()).unwrap());
 
-    let found = coin
-        .search_for_swap_tx_spend_my(
-            1591928233,
-            &*coin.my_public_key(),
-            &*dhash160(&secret),
-            &payment_tx_bytes,
-            0,
-            &None,
-        )
+    let search_input = SearchForSwapTxSpendInput {
+        time_lock: 1591928233,
+        other_pub: &*coin.my_public_key().unwrap(),
+        secret_hash: &*dhash160(&secret),
+        tx: &payment_tx_bytes,
+        search_from_block: 0,
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
         .unwrap()
         .unwrap();
     assert_eq!(FoundSwapTxSpend::Spent(spend_tx), found);
@@ -432,7 +520,7 @@ fn test_search_for_swap_tx_spend_electrum_was_spent() {
 
 #[test]
 fn test_search_for_swap_tx_spend_electrum_was_refunded() {
-    let secret = [0; 20];
+    let secret_hash = [0; 20];
     let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
     let coin = utxo_coin_for_test(
         client.into(),
@@ -449,15 +537,16 @@ fn test_search_for_swap_tx_spend_electrum_was_refunded() {
         .unwrap();
     let refund_tx = TransactionEnum::UtxoTx(deserialize(refund_tx_bytes.as_slice()).unwrap());
 
-    let found = coin
-        .search_for_swap_tx_spend_my(
-            1591933469,
-            coin.as_ref().key_pair.public(),
-            &secret,
-            &payment_tx_bytes,
-            0,
-            &None,
-        )
+    let search_input = SearchForSwapTxSpendInput {
+        time_lock: 1591933469,
+        other_pub: &coin.as_ref().priv_key_policy.key_pair_or_err().unwrap().public(),
+        secret_hash: &secret_hash,
+        tx: &payment_tx_bytes,
+        search_from_block: 0,
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
         .unwrap()
         .unwrap();
     assert_eq!(FoundSwapTxSpend::Refunded(refund_tx), found);
@@ -466,7 +555,7 @@ fn test_search_for_swap_tx_spend_electrum_was_refunded() {
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_impl_set_fixed_fee() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -484,7 +573,8 @@ fn test_withdraw_impl_set_fixed_fee() {
     let coin = utxo_coin_for_test(UtxoRpcClientEnum::Native(client), None, false);
 
     let withdraw_req = WithdrawRequest {
-        amount: 1.into(),
+        amount: 1u64.into(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -494,6 +584,7 @@ fn test_withdraw_impl_set_fixed_fee() {
     };
     let expected = Some(
         UtxoFeeDetails {
+            coin: Some(TEST_COIN_NAME.into()),
             amount: "0.1".parse().unwrap(),
         }
         .into(),
@@ -505,7 +596,7 @@ fn test_withdraw_impl_set_fixed_fee() {
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_impl_sat_per_kb_fee() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -523,7 +614,8 @@ fn test_withdraw_impl_sat_per_kb_fee() {
     let coin = utxo_coin_for_test(UtxoRpcClientEnum::Native(client), None, false);
 
     let withdraw_req = WithdrawRequest {
-        amount: 1.into(),
+        amount: 1u64.into(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -536,6 +628,7 @@ fn test_withdraw_impl_sat_per_kb_fee() {
     // 0.1 * 245 / 1000 ~ 0.0245
     let expected = Some(
         UtxoFeeDetails {
+            coin: Some(TEST_COIN_NAME.into()),
             amount: "0.0245".parse().unwrap(),
         }
         .into(),
@@ -547,7 +640,7 @@ fn test_withdraw_impl_sat_per_kb_fee() {
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -566,6 +659,7 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max() {
 
     let withdraw_req = WithdrawRequest {
         amount: "9.9789".parse().unwrap(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -579,19 +673,20 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max() {
     // 0.1 * 211 / 1000 = 0.0211
     let expected_fee = Some(
         UtxoFeeDetails {
+            coin: Some(TEST_COIN_NAME.into()),
             amount: "0.0211".parse().unwrap(),
         }
         .into(),
     );
     assert_eq!(expected_fee, tx_details.fee_details);
-    let expected_balance_change = BigDecimal::from(-10);
+    let expected_balance_change = BigDecimal::from(-10i32);
     assert_eq!(expected_balance_change, tx_details.my_balance_change);
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max_dust_included_to_fee() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -610,6 +705,7 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max_dust_included_to_fee()
 
     let withdraw_req = WithdrawRequest {
         amount: "9.9789".parse().unwrap(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -623,19 +719,20 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_equal_to_max_dust_included_to_fee()
     // 0.1 * 211 / 1000 = 0.0211
     let expected_fee = Some(
         UtxoFeeDetails {
+            coin: Some(TEST_COIN_NAME.into()),
             amount: "0.0211".parse().unwrap(),
         }
         .into(),
     );
     assert_eq!(expected_fee, tx_details.fee_details);
-    let expected_balance_change = BigDecimal::from(-10);
+    let expected_balance_change = BigDecimal::from(-10i32);
     assert_eq!(expected_balance_change, tx_details.my_balance_change);
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_impl_sat_per_kb_fee_amount_over_max() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -654,6 +751,7 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_over_max() {
 
     let withdraw_req = WithdrawRequest {
         amount: "9.97939455".parse().unwrap(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -667,7 +765,7 @@ fn test_withdraw_impl_sat_per_kb_fee_amount_over_max() {
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_impl_sat_per_kb_fee_max() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -685,7 +783,8 @@ fn test_withdraw_impl_sat_per_kb_fee_max() {
     let coin = utxo_coin_for_test(UtxoRpcClientEnum::Native(client), None, false);
 
     let withdraw_req = WithdrawRequest {
-        amount: 0.into(),
+        amount: 0u64.into(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: TEST_COIN_NAME.into(),
         max: true,
@@ -698,6 +797,7 @@ fn test_withdraw_impl_sat_per_kb_fee_max() {
     // 0.1 * 211 / 1000 = 0.0211
     let expected = Some(
         UtxoFeeDetails {
+            coin: Some(TEST_COIN_NAME.into()),
             amount: "0.0211".parse().unwrap(),
         }
         .into(),
@@ -716,7 +816,7 @@ fn test_withdraw_kmd_rewards_impl(
 ) {
     let verbose: RpcTransaction = json::from_str(verbose_serialized).unwrap();
     let unspent_height = verbose.height;
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(move |coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(move |coin, _| {
         let tx: UtxoTx = tx_hex.into();
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -733,7 +833,7 @@ fn test_withdraw_kmd_rewards_impl(
         .mock_safe(move |_fields| MockResult::Return(Box::pin(futures::future::ok(current_mtp))));
     NativeClient::get_verbose_transaction.mock_safe(move |_coin, txid| {
         let expected: H256Json = hex::decode(tx_hash).unwrap().as_slice().into();
-        assert_eq!(txid, expected);
+        assert_eq!(*txid, expected);
         MockResult::Return(Box::new(futures01::future::ok(verbose.clone())))
     });
 
@@ -745,12 +845,14 @@ fn test_withdraw_kmd_rewards_impl(
 
     let withdraw_req = WithdrawRequest {
         amount: BigDecimal::from_str("0.00001").unwrap(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: "KMD".to_owned(),
         max: false,
         fee: None,
     };
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some("KMD".into()),
         amount: "0.00001".parse().unwrap(),
     });
     let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
@@ -797,7 +899,7 @@ fn test_withdraw_rick_rewards_none() {
     // https://rick.explorer.dexstats.info/tx/7181400be323acc6b5f3164240e6c4601ff4c252f40ce7649f87e81634330209
     const TX_HEX: &str = "0400008085202f8901df8119c507aa61d32332cd246dbfeb3818a4f96e76492454c1fbba5aa097977e000000004847304402205a7e229ea6929c97fd6dde254c19e4eb890a90353249721701ae7a1c477d99c402206a8b7c5bf42b5095585731d6b4c589ce557f63c20aed69ff242eca22ecfcdc7a01feffffff02d04d1bffbc050000232102afdbba3e3c90db5f0f4064118f79cf308f926c68afd64ea7afc930975663e4c4ac402dd913000000001976a9143e17014eca06281ee600adffa34b4afb0922a22288ac2bdab86035a00e000000000000000000000000";
 
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(move |coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(move |coin, _| {
         let tx: UtxoTx = TX_HEX.into();
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -817,12 +919,14 @@ fn test_withdraw_rick_rewards_none() {
 
     let withdraw_req = WithdrawRequest {
         amount: BigDecimal::from_str("0.00001").unwrap(),
+        from: None,
         to: "RQq6fWoy8aGGMLjvRfMY5mBNVm2RQxJyLa".to_string(),
         coin: "RICK".to_owned(),
         max: false,
         fee: None,
     };
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some(TEST_COIN_NAME.into()),
         amount: "0.00001".parse().unwrap(),
     });
     let tx_details = coin.withdraw(withdraw_req).wait().unwrap();
@@ -830,25 +934,6 @@ fn test_withdraw_rick_rewards_none() {
     assert_eq!(tx_details.kmd_rewards, None);
 }
 
-#[test]
-fn test_ordered_mature_unspents_without_tx_cache() {
-    let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
-    let coin = utxo_coin_for_test(
-        client.into(),
-        Some("spice describe gravity federal blast come thank unfair canal monkey style afraid"),
-        false,
-    );
-    assert!(coin.as_ref().tx_cache_directory.is_none());
-    assert_ne!(
-        coin.my_spendable_balance().wait().unwrap(),
-        0.into(),
-        "The test address doesn't have unspent outputs"
-    );
-    let (unspents, _) =
-        block_on(coin.ordered_mature_unspents(&Address::from("R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW"))).unwrap();
-    assert!(!unspents.is_empty());
-}
-
 #[test]
 fn test_utxo_lock() {
     // send several transactions concurrently to check that they are not using same inputs
@@ -856,7 +941,7 @@ fn test_utxo_lock() {
     let coin = utxo_coin_for_test(client.into(), None, false);
     let output = TransactionOutput {
         value: 1000000,
-        script_pubkey: Builder::build_p2pkh(&coin.as_ref().my_address.hash).to_bytes(),
+        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_iguana().hash).to_bytes(),
     };
     let mut futures = vec![];
     for _ in 0..5 {
@@ -868,6 +953,23 @@ fn test_utxo_lock() {
     }
 }
 
+#[test]
+fn test_spv_proof() {
+    let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
+    let coin = utxo_coin_for_test(
+        client.into(),
+        Some("spice describe gravity federal blast come thank unfair canal monkey style afraid"),
+        false,
+    );
+
+    // https://rick.explorer.dexstats.info/tx/78ea7839f6d1b0dafda2ba7e34c1d8218676a58bd1b33f03a5f76391f61b72b0
+    let tx_str = "0400008085202f8902bf17bf7d1daace52e08f732a6b8771743ca4b1cb765a187e72fd091a0aabfd52000000006a47304402203eaaa3c4da101240f80f9c5e9de716a22b1ec6d66080de6a0cca32011cd77223022040d9082b6242d6acf9a1a8e658779e1c655d708379862f235e8ba7b8ca4e69c6012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffffff023ca13c0e9e085dd13f481f193e8a3e8fd609020936e98b5587342d994f4d020000006b483045022100c0ba56adb8de923975052312467347d83238bd8d480ce66e8b709a7997373994022048507bcac921fdb2302fa5224ce86e41b7efc1a2e20ae63aa738dfa99b7be826012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0300e1f5050000000017a9141ee6d4c38a3c078eab87ad1a5e4b00f21259b10d870000000000000000166a1400000000000000000000000000000000000000001b94d736000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac2d08e35e000000000000000000000000000000";
+    let tx: UtxoTx = tx_str.into();
+
+    let res = block_on(utxo_common::validate_spv_proof(coin.clone(), tx, now_ms() / 1000 + 30));
+    res.unwrap()
+}
+
 #[test]
 fn list_since_block_btc_serde() {
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/563
@@ -875,63 +977,6 @@ fn list_since_block_btc_serde() {
     let _res: ListSinceBlockRes = json::from_str(input).unwrap();
 }
 
-#[test]
-#[ignore]
-fn get_tx_details_doge() {
-    let conf = json!(  {
-        "coin": "DOGE",
-        "name": "dogecoin",
-        "fname": "Dogecoin",
-        "rpcport": 22555,
-        "pubtype": 30,
-        "p2shtype": 22,
-        "wiftype": 158,
-        "txfee": 0,
-        "mm2": 1,
-        "required_confirmations": 2
-    });
-    let req = json!({
-         "method": "electrum",
-         "servers": [{"url":"electrum1.cipig.net:10060"},{"url":"electrum2.cipig.net:10060"},{"url":"electrum3.cipig.net:10060"}]
-    });
-
-    let ctx = MmCtxBuilder::new().into_mm_arc();
-
-    use common::executor::spawn;
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "DOGE", &conf, &req, &[1u8; 32],
-    ))
-    .unwrap();
-
-    let coin1 = coin.clone();
-    let coin2 = coin.clone();
-    let fut1 = async move {
-        let block = coin1.current_block().compat().await.unwrap();
-        log!((block));
-        let hash = hex::decode("99caab76bd025d189f10856dc649aad1a191b1cfd9b139ece457c5fedac58132").unwrap();
-        loop {
-            let mut input_transactions = HistoryUtxoTxMap::new();
-            let tx_details = coin1.tx_details_by_hash(&hash, &mut input_transactions).await.unwrap();
-            log!([tx_details]);
-            Timer::sleep(1.).await;
-        }
-    };
-    let fut2 = async move {
-        let block = coin2.current_block().compat().await.unwrap();
-        log!((block));
-        let hash = hex::decode("99caab76bd025d189f10856dc649aad1a191b1cfd9b139ece457c5fedac58132").unwrap();
-        loop {
-            let mut input_transactions = HistoryUtxoTxMap::new();
-            let tx_details = coin2.tx_details_by_hash(&hash, &mut input_transactions).await.unwrap();
-            log!([tx_details]);
-            Timer::sleep(1.).await;
-        }
-    };
-    spawn(fut1);
-    spawn(fut2);
-    loop {}
-}
-
 #[test]
 // https://github.com/KomodoPlatform/atomicDEX-API/issues/587
 fn get_tx_details_coinbase_transaction() {
@@ -963,14 +1008,14 @@ fn test_electrum_rpc_client_error() {
     let client = electrum_client_for_test(&["electrum1.cipig.net:10060"]);
 
     let empty_hash = H256Json::default();
-    let err = client.get_verbose_transaction(empty_hash).wait().unwrap_err();
+    let err = client.get_verbose_transaction(&empty_hash).wait().unwrap_err();
 
     // use the static string instead because the actual error message cannot be obtain
     // by serde_json serialization
     let expected = r#"JsonRpcError { client_info: "coin: RICK", request: JsonRpcRequest { jsonrpc: "2.0", id: "1", method: "blockchain.transaction.get", params: [String("0000000000000000000000000000000000000000000000000000000000000000"), Bool(true)] }, error: Response(electrum1.cipig.net:10060, Object({"code": Number(2), "message": String("daemon error: DaemonError({'code': -5, 'message': 'No such mempool or blockchain transaction. Use gettransaction for wallet transactions.'})")})) }"#;
     let actual = format!("{}", err);
 
-    assert_eq!(expected, actual);
+    assert!(actual.contains(expected));
 }
 
 #[test]
@@ -1083,14 +1128,12 @@ fn test_generate_transaction_relay_fee_is_used_when_dynamic_fee_is_lower() {
         value: 900000000,
     }];
 
-    let fut = coin.generate_transaction(
-        unspents,
-        outputs,
-        FeePolicy::SendExact,
-        Some(ActualTxFee::Dynamic(100)),
-        None,
-    );
-    let generated = block_on(fut).unwrap();
+    let builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs)
+        .with_fee(ActualTxFee::Dynamic(100));
+
+    let generated = block_on(builder.build()).unwrap();
     assert_eq!(generated.0.outputs.len(), 1);
 
     // generated transaction fee must be equal to relay fee if calculated dynamic fee is lower than relay
@@ -1127,14 +1170,13 @@ fn test_generate_transaction_relay_fee_is_used_when_dynamic_fee_is_lower_and_ded
         value: 1000000000,
     }];
 
-    let fut = coin.generate_transaction(
-        unspents,
-        outputs,
-        FeePolicy::DeductFromOutput(0),
-        Some(ActualTxFee::Dynamic(100)),
-        None,
-    );
-    let generated = block_on(fut).unwrap();
+    let tx_builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs)
+        .with_fee_policy(FeePolicy::DeductFromOutput(0))
+        .with_fee(ActualTxFee::Dynamic(100));
+
+    let generated = block_on(tx_builder.build()).unwrap();
     assert_eq!(generated.0.outputs.len(), 1);
     // `output (= 10.0) - fee_amount (= 1.0)`
     assert_eq!(generated.0.outputs[0].value, 900000000);
@@ -1176,14 +1218,13 @@ fn test_generate_tx_fee_is_correct_when_dynamic_fee_is_larger_than_relay() {
         value: 19000000000,
     }];
 
-    let fut = coin.generate_transaction(
-        unspents,
-        outputs,
-        FeePolicy::SendExact,
-        Some(ActualTxFee::Dynamic(1000)),
-        None,
-    );
-    let generated = block_on(fut).unwrap();
+    let builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs)
+        .with_fee(ActualTxFee::Dynamic(1000));
+
+    let generated = block_on(builder.build()).unwrap();
+
     assert_eq!(generated.0.outputs.len(), 2);
     assert_eq!(generated.0.inputs.len(), 20);
 
@@ -1320,9 +1361,10 @@ fn test_cashaddresses_in_tx_details_by_hash() {
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
 
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "BCH", &conf, &req, &[1u8; 32],
+    let coin = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "BCH", &conf, &params, &[1u8; 32],
     ))
     .unwrap();
 
@@ -1330,7 +1372,7 @@ fn test_cashaddresses_in_tx_details_by_hash() {
     let fut = async {
         let mut input_transactions = HistoryUtxoTxMap::new();
         let tx_details = coin.tx_details_by_hash(&hash, &mut input_transactions).await.unwrap();
-        log!([tx_details]);
+        log!("{:?}", tx_details);
 
         assert!(tx_details
             .from
@@ -1366,9 +1408,10 @@ fn test_address_from_str_with_cashaddress_activated() {
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
 
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "BCH", &conf, &req, &[1u8; 32],
+    let coin = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "BCH", &conf, &params, &[1u8; 32],
     ))
     .unwrap();
 
@@ -1400,9 +1443,10 @@ fn test_address_from_str_with_legacy_address_activated() {
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
 
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "BCH", &conf, &req, &[1u8; 32],
+    let coin = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "BCH", &conf, &params, &[1u8; 32],
     ))
     .unwrap();
 
@@ -1444,12 +1488,13 @@ fn test_unavailable_electrum_proto_version() {
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
-    let error = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "RICK", &conf, &req, &[1u8; 32],
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let error = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "RICK", &conf, &params, &[1u8; 32],
     ))
     .err()
     .unwrap();
-    log!("Error: "(error));
+    log!("Error: {}", error);
     assert!(error.contains("There are no Electrums with the required protocol version"));
 }
 
@@ -1466,18 +1511,19 @@ fn test_spam_rick() {
 
     let key_pair = key_pair_from_seed("my_seed").unwrap();
     let ctx = MmCtxBuilder::new().into_mm_arc();
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(utxo_standard_coin_with_priv_key(
         &ctx,
         "RICK",
         &conf,
-        &req,
+        &params,
         &*key_pair.private().secret,
     ))
     .unwrap();
 
     let output = TransactionOutput {
         value: 1000000,
-        script_pubkey: Builder::build_p2pkh(&coin.as_ref().my_address.hash).to_bytes(),
+        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_iguana().hash).to_bytes(),
     };
     let mut futures = vec![];
     for _ in 0..5 {
@@ -1517,8 +1563,10 @@ fn test_one_unavailable_electrum_proto_version() {
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "BTC", &conf, &req, &[1u8; 32],
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "BTC", &conf, &params, &[1u8; 32],
     ))
     .unwrap();
 
@@ -1528,80 +1576,156 @@ fn test_one_unavailable_electrum_proto_version() {
 }
 
 #[test]
-fn test_qtum_unspendable_balance_failed_once() {
-    let mut unspents = vec![
-        // spendable balance (69.0) > balance (68.0)
-        vec![
-            UnspentInfo {
-                outpoint: OutPoint {
-                    hash: 1.into(),
-                    index: 0,
-                },
-                value: 5000000000,
-                height: Default::default(),
-            },
-            UnspentInfo {
-                outpoint: OutPoint {
-                    hash: 1.into(),
-                    index: 0,
-                },
-                value: 1900000000,
-                height: Default::default(),
-            },
-        ],
-        // spendable balance (68.0) == balance (68.0)
-        vec![
-            UnspentInfo {
-                outpoint: OutPoint {
-                    hash: 1.into(),
-                    index: 0,
-                },
-                value: 5000000000,
-                height: Default::default(),
-            },
-            UnspentInfo {
-                outpoint: OutPoint {
-                    hash: 1.into(),
-                    index: 0,
-                },
-                value: 1800000000,
-                height: Default::default(),
-            },
-        ],
+fn test_qtum_generate_pod() {
+    let priv_key = [
+        3, 98, 177, 3, 108, 39, 234, 144, 131, 178, 103, 103, 127, 80, 230, 166, 53, 68, 147, 215, 42, 216, 144, 72,
+        172, 110, 180, 13, 123, 179, 10, 49,
     ];
-    QtumCoin::ordered_mature_unspents.mock_safe(move |coin, _| {
-        let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
-        let unspents = unspents.pop().unwrap();
-        MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
+    let req = json!({
+        "method": "electrum",
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
     });
 
-    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "tQTUM", &conf, &params, &priv_key)).unwrap();
+    let expected_res = "20086d757b34c01deacfef97a391f8ed2ca761c72a08d5000adc3d187b1007aca86a03bc5131b1f99b66873a12b51f8603213cdc1aa74c05ca5d48fe164b82152b";
+    let address = Address::from_str("qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE").unwrap();
+    let res = coin.generate_pod(address.hash).unwrap();
+    assert_eq!(expected_res, res.to_string());
+}
+
+#[test]
+fn test_qtum_add_delegation() {
+    let keypair = key_pair_from_seed("asthma turtle lizard tone genuine tube hunt valley soap cloth urge alpha amazing frost faculty cycle mammal leaf normal bright topple avoid pulse buffalo").unwrap();
+    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110, "mature_confirmations":1});
     let req = json!({
         "method": "electrum",
-        "servers": [{"url":"95.217.83.126:10001"}],
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(
+        &ctx,
+        "tQTUM",
+        &conf,
+        &params,
+        keypair.private().secret.as_slice(),
+    ))
+    .unwrap();
+    let address = Address::from_str("qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE").unwrap();
+    let request = QtumDelegationRequest {
+        address: address.to_string(),
+        fee: Some(10),
+    };
+    let res = coin.add_delegation(request).wait().unwrap();
+    // Eligible for delegation
+    assert_eq!(res.my_balance_change.is_negative(), true);
+    assert_eq!(res.total_amount, res.spent_by_me);
+    assert!(res.spent_by_me > res.received_by_me);
+
+    let request = QtumDelegationRequest {
+        address: "fake_address".to_string(),
+        fee: Some(10),
+    };
+    let res = coin.add_delegation(request).wait();
+    // Wrong address
+    assert_eq!(res.is_err(), true);
+}
 
-    let priv_key = [
-        184, 199, 116, 240, 113, 222, 8, 199, 253, 143, 98, 185, 127, 26, 87, 38, 246, 206, 159, 27, 207, 20, 27, 112,
-        184, 102, 137, 37, 78, 214, 113, 78,
-    ];
-    let coin = block_on(qtum_coin_from_conf_and_request(&ctx, "tQTUM", &conf, &req, &priv_key)).unwrap();
+#[test]
+fn test_qtum_add_delegation_on_already_delegating() {
+    let keypair = key_pair_from_seed("federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron").unwrap();
+    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110, "mature_confirmations":1});
+    let req = json!({
+        "method": "electrum",
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
+    });
 
-    let CoinBalance { spendable, unspendable } = coin.my_balance().wait().unwrap();
-    let expected_spendable = BigDecimal::from(68);
-    let expected_unspendable = BigDecimal::from(0);
-    assert_eq!(spendable, expected_spendable);
-    assert_eq!(unspendable, expected_unspendable);
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(
+        &ctx,
+        "tQTUM",
+        &conf,
+        &params,
+        keypair.private().secret.as_slice(),
+    ))
+    .unwrap();
+    let address = Address::from_str("qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE").unwrap();
+    let request = QtumDelegationRequest {
+        address: address.to_string(),
+        fee: Some(10),
+    };
+    let res = coin.add_delegation(request).wait();
+    // Already Delegating
+    assert_eq!(res.is_err(), true);
+}
+
+#[test]
+fn test_qtum_get_delegation_infos() {
+    let keypair =
+        key_pair_from_seed("federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron").unwrap();
+    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110, "mature_confirmations":1});
+    let req = json!({
+        "method": "electrum",
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
+    });
+
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(
+        &ctx,
+        "tQTUM",
+        &conf,
+        &params,
+        keypair.private().secret.as_slice(),
+    ))
+    .unwrap();
+    let staking_infos = coin.get_delegation_infos().wait().unwrap();
+    match staking_infos.staking_infos_details {
+        StakingInfosDetails::Qtum(staking_details) => {
+            assert_eq!(staking_details.am_i_staking, true);
+            assert_eq!(staking_details.staker.unwrap(), "qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE");
+            // Will return false for segwit.
+            assert_eq!(staking_details.is_staking_supported, true);
+        },
+    };
+}
+
+#[test]
+fn test_qtum_remove_delegation() {
+    let keypair = key_pair_from_seed("federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron").unwrap();
+    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110, "mature_confirmations":1});
+    let req = json!({
+        "method": "electrum",
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
+    });
+
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(
+        &ctx,
+        "tQTUM",
+        &conf,
+        &params,
+        keypair.private().secret.as_slice(),
+    ))
+    .unwrap();
+    let res = coin.remove_delegation().wait();
+    assert_eq!(res.is_err(), false);
 }
 
 #[test]
-fn test_qtum_unspendable_balance_failed() {
-    QtumCoin::ordered_mature_unspents.mock_safe(move |coin, _| {
+fn test_qtum_my_balance() {
+    QtumCoin::get_mature_unspent_ordered_list.mock_safe(move |coin, _address| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
-        // spendable balance (69.0) > balance (68.0)
-        let unspents = vec![
+        // spendable balance (66.0)
+        let mature = vec![
             UnspentInfo {
                 outpoint: OutPoint {
                     hash: 1.into(),
@@ -1615,17 +1739,29 @@ fn test_qtum_unspendable_balance_failed() {
                     hash: 1.into(),
                     index: 0,
                 },
-                value: 1900000000,
+                value: 1600000000,
                 height: Default::default(),
             },
         ];
-        MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+        // unspendable (2.0)
+        let immature = vec![UnspentInfo {
+            outpoint: OutPoint {
+                hash: 1.into(),
+                index: 0,
+            },
+            value: 200000000,
+            height: Default::default(),
+        }];
+        MockResult::Return(Box::pin(futures::future::ok((
+            MatureUnspentList { mature, immature },
+            cache,
+        ))))
     });
 
     let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
     let req = json!({
         "method": "electrum",
-        "servers": [{"url":"95.217.83.126:10001"}],
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
@@ -1634,44 +1770,34 @@ fn test_qtum_unspendable_balance_failed() {
         184, 199, 116, 240, 113, 222, 8, 199, 253, 143, 98, 185, 127, 26, 87, 38, 246, 206, 159, 27, 207, 20, 27, 112,
         184, 102, 137, 37, 78, 214, 113, 78,
     ];
-    let coin = block_on(qtum_coin_from_conf_and_request(&ctx, "tQTUM", &conf, &req, &priv_key)).unwrap();
 
-    let error = coin.my_balance().wait().err().unwrap();
-    log!("error: "[error]);
-    let expected_error = BalanceError::Internal("Spendable balance 69 greater than total balance 68".to_owned());
-    assert_eq!(error.get_inner(), &expected_error);
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "tQTUM", &conf, &params, &priv_key)).unwrap();
+
+    let CoinBalance { spendable, unspendable } = coin.my_balance().wait().unwrap();
+    let expected_spendable = BigDecimal::from(66);
+    let expected_unspendable = BigDecimal::from(2);
+    assert_eq!(spendable, expected_spendable);
+    assert_eq!(unspendable, expected_unspendable);
 }
 
 #[test]
-fn test_qtum_my_balance() {
-    QtumCoin::ordered_mature_unspents.mock_safe(move |coin, _| {
-        let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
-        // spendable balance (66.0) < balance (68.0), then unspendable balance is expected to be (2.0)
-        let unspents = vec![
-            UnspentInfo {
-                outpoint: OutPoint {
-                    hash: 1.into(),
-                    index: 0,
-                },
-                value: 5000000000,
-                height: Default::default(),
-            },
-            UnspentInfo {
-                outpoint: OutPoint {
-                    hash: 1.into(),
-                    index: 0,
-                },
-                value: 1600000000,
-                height: Default::default(),
-            },
-        ];
-        MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+fn test_qtum_my_balance_with_check_utxo_maturity_false() {
+    const DISPLAY_BALANCE: u64 = 68;
+    ElectrumClient::display_balance.mock_safe(move |_, _, _| {
+        MockResult::Return(Box::new(futures01::future::ok(BigDecimal::from(DISPLAY_BALANCE))))
+    });
+    QtumCoin::get_all_unspent_ordered_list.mock_safe(move |_, _| {
+        panic!(
+            "'QtumCoin::get_all_unspent_ordered_list' is not expected to be called when `check_utxo_maturity` is false"
+        )
     });
 
     let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
     let req = json!({
         "method": "electrum",
-        "servers": [{"url":"95.217.83.126:10001"}],
+        "servers": [{"url":"electrum1.cipig.net:10071"}, {"url":"electrum2.cipig.net:10071"}, {"url":"electrum3.cipig.net:10071"}],
+        "check_utxo_maturity": false,
     });
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
@@ -1680,16 +1806,18 @@ fn test_qtum_my_balance() {
         184, 199, 116, 240, 113, 222, 8, 199, 253, 143, 98, 185, 127, 26, 87, 38, 246, 206, 159, 27, 207, 20, 27, 112,
         184, 102, 137, 37, 78, 214, 113, 78,
     ];
-    let coin = block_on(qtum_coin_from_conf_and_request(&ctx, "tQTUM", &conf, &req, &priv_key)).unwrap();
+
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "tQTUM", &conf, &params, &priv_key)).unwrap();
 
     let CoinBalance { spendable, unspendable } = coin.my_balance().wait().unwrap();
-    let expected_spendable = BigDecimal::from(66);
-    let expected_unspendable = BigDecimal::from(2);
+    let expected_spendable = BigDecimal::from(DISPLAY_BALANCE);
+    let expected_unspendable = BigDecimal::from(0);
     assert_eq!(spendable, expected_spendable);
     assert_eq!(unspendable, expected_unspendable);
 }
 
-fn test_ordered_mature_unspents_from_cache_impl(
+fn test_get_mature_unspent_ordered_map_from_cache_impl(
     unspent_height: Option<u64>,
     cached_height: Option<u64>,
     cached_confs: u32,
@@ -1700,7 +1828,7 @@ fn test_ordered_mature_unspents_from_cache_impl(
     const TX_HASH: &str = "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f";
     let tx_hash: H256Json = hex::decode(TX_HASH).unwrap().as_slice().into();
     let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
-    let mut verbose = client.get_verbose_transaction(tx_hash.clone()).wait().unwrap();
+    let mut verbose = client.get_verbose_transaction(&tx_hash).wait().unwrap();
     verbose.confirmations = cached_confs;
     verbose.height = cached_height;
 
@@ -1718,11 +1846,10 @@ fn test_ordered_mature_unspents_from_cache_impl(
     });
     ElectrumClient::get_block_count
         .mock_safe(move |_| MockResult::Return(Box::new(futures01::future::ok(block_count))));
-    UtxoStandardCoin::get_verbose_transaction_from_cache_or_rpc.mock_safe(move |_, txid| {
-        assert_eq!(txid, tx_hash);
-        MockResult::Return(Box::new(futures01::future::ok(VerboseTransactionFrom::Cache(
-            verbose.clone(),
-        ))))
+    UtxoStandardCoin::get_verbose_transactions_from_cache_or_rpc.mock_safe(move |_, tx_ids| {
+        itertools::assert_equal(tx_ids, iter::once(tx_hash));
+        let result: HashMap<_, _> = iter::once((tx_hash, VerboseTransactionFrom::Cache(verbose.clone()))).collect();
+        MockResult::Return(Box::new(futures01::future::ok(result)))
     });
     static mut IS_UNSPENT_MATURE_CALLED: bool = false;
     UtxoStandardCoin::is_unspent_mature.mock_safe(move |_, tx: &RpcTransaction| {
@@ -1735,22 +1862,24 @@ fn test_ordered_mature_unspents_from_cache_impl(
 
     // run test
     let coin = utxo_coin_for_test(UtxoRpcClientEnum::Electrum(client), None, false);
-    let (unspents, _) = block_on(coin.ordered_mature_unspents(&Address::from("R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW")))
-        .expect("Expected an empty unspent list");
+    let (unspents, _) =
+        block_on(coin.get_mature_unspent_ordered_list(&Address::from("R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW")))
+            .expect("Expected an empty unspent list");
     // unspents should be empty because `is_unspent_mature()` always returns false
-    assert!(unspents.is_empty());
     assert!(unsafe { IS_UNSPENT_MATURE_CALLED == true });
+    assert!(unspents.mature.is_empty());
+    assert_eq!(unspents.immature.len(), 1);
 }
 
 #[test]
-fn test_ordered_mature_unspents_from_cache() {
+fn test_get_mature_unspents_ordered_map_from_cache() {
     let unspent_height = None;
     let cached_height = None;
     let cached_confs = 0;
     let block_count = 1000;
     let expected_height = None; // is unknown
     let expected_confs = 0; // is not changed because height is unknown
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1765,7 +1894,7 @@ fn test_ordered_mature_unspents_from_cache() {
     let block_count = 1000;
     let expected_height = None; // is unknown
     let expected_confs = 5; // is not changed because height is unknown
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1780,7 +1909,7 @@ fn test_ordered_mature_unspents_from_cache() {
     let block_count = 1000;
     let expected_height = Some(998); // as the unspent_height
     let expected_confs = 3; // 1000 - 998 + 1
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1795,7 +1924,7 @@ fn test_ordered_mature_unspents_from_cache() {
     let block_count = 1000;
     let expected_height = Some(998); // as the cached_height
     let expected_confs = 3; // 1000 - 998 + 1
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1810,7 +1939,7 @@ fn test_ordered_mature_unspents_from_cache() {
     let block_count = 1000;
     let expected_height = Some(998); // as the unspent_height
     let expected_confs = 3; // 1000 - 998 + 1
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1826,7 +1955,7 @@ fn test_ordered_mature_unspents_from_cache() {
     let block_count = 999;
     let expected_height = Some(1000); // as the cached_height
     let expected_confs = 1; // is not changed because height cannot be calculated
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1842,7 +1971,7 @@ fn test_ordered_mature_unspents_from_cache() {
     let block_count = 1000;
     let expected_height = Some(1000); // as the cached_height
     let expected_confs = 1; // 1000 - 1000 + 1
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1858,7 +1987,7 @@ fn test_ordered_mature_unspents_from_cache() {
     let block_count = 1000;
     let expected_height = Some(0); // as the cached_height
     let expected_confs = 1; // is not changed because tx_height is expected to be not zero
-    test_ordered_mature_unspents_from_cache_impl(
+    test_get_mature_unspent_ordered_map_from_cache_impl(
         unspent_height,
         cached_height,
         cached_confs,
@@ -1901,8 +2030,7 @@ fn test_native_client_unspents_filtered_using_tx_cache_single_tx_in_cache() {
     NativeClient::list_unspent
         .mock_safe(move |_, _, _| MockResult::Return(Box::new(futures01::future::ok(spent_by_tx.clone()))));
 
-    let address: Address = "RGfFZaaNV68uVe1uMf6Y37Y8E1i2SyYZBN".into();
-    let (unspents_ordered, _) = block_on(coin.list_unspent_ordered(&address)).unwrap();
+    let (unspents_ordered, _) = block_on(coin.get_unspent_ordered_list(&address)).unwrap();
     // output 2 is change so it must be returned
     let expected_unspent = UnspentInfo {
         outpoint: OutPoint {
@@ -1996,7 +2124,7 @@ fn test_native_client_unspents_filtered_using_tx_cache_single_several_chained_tx
     NativeClient::list_unspent
         .mock_safe(move |_, _, _| MockResult::Return(Box::new(futures01::future::ok(unspents_to_return.clone()))));
 
-    let (unspents_ordered, _) = block_on(coin.list_unspent_ordered(&address)).unwrap();
+    let (unspents_ordered, _) = block_on(coin.get_unspent_ordered_list(&address)).unwrap();
 
     // output 2 is change so it must be returned
     let expected_unspent = UnspentInfo {
@@ -2250,7 +2378,7 @@ fn test_find_output_spend_skips_conflicting_transactions() {
     static mut GET_RAW_TRANSACTION_BYTES_CALLED: usize = 0;
     NativeClientImpl::get_raw_transaction_bytes.mock_safe(move |_, txid| {
         unsafe { GET_RAW_TRANSACTION_BYTES_CALLED += 1 };
-        assert_eq!(txid, expected_txid);
+        assert_eq!(*txid, expected_txid);
         // no matter what we return here
         let bytes: BytesJson = hex::decode("0400008085202f890347d329798b508dc28ec99d8c6f6c7ced860a19a364e1bafe391cab89aeaac731020000006a47304402203ea8b380d0a7e64348869ef7c4c2bfa966fc7b148633003332fa8d0ab0c1bc5602202cc63fabdd2a6578c52d8f4f549069b16505f2ead48edc2b8de299be15aadf9a012102d8c948c6af848c588517288168faa397d6ba3ea924596d03d1d84f224b5123c2ffffffff1d1fd3a6b01710647a7f4a08c6de6075cb8e78d5069fa50f10c4a2a10ded2a95000000006a47304402203868945edc0f6dc2ee43d70a69ee4ec46ca188dc493173ce58924ba9bf6ee7a50220648ff99ce458ca72800758f6a1bd3800cd05ff9c3122f23f3653c25e09d22c79012102d8c948c6af848c588517288168faa397d6ba3ea924596d03d1d84f224b5123c2ffffffff7932150df8b4a1852b8b84b89b0d5322bf74665fb7f76a728369fd6895d3fd48000000006a4730440220127918c6f79c11f7f2376a6f3b750ed4c7103183181ad1218afcb2625ece9599022028c05e88d3a2f97cebd84a718cda33b62b48b18f16278fa8e531fd2155e61ee8012102d8c948c6af848c588517288168faa397d6ba3ea924596d03d1d84f224b5123c2ffffffff0329fd12000000000017a914cafb62e3e8bdb8db3735c39b92743ac6ebc9ef20870000000000000000166a14a7416b070c9bb98f4bafae55616f005a2a30bd6014b40c00000000001976a91450f4f098306f988d8843004689fae28c83ef16e888ac8cc5925f000000000000000000000000000000").unwrap().into();
         MockResult::Return(Box::new(futures01::future::ok(bytes)))
@@ -2261,7 +2389,14 @@ fn test_find_output_spend_skips_conflicting_transactions() {
     let tx: UtxoTx = "0400008085202f89027f57730fcbbc2c72fb18bcc3766a713044831a117bb1cade3ed88644864f7333020000006a47304402206e3737b2fcf078b61b16fa67340cc3e79c5d5e2dc9ffda09608371552a3887450220460a332aa1b8ad8f2de92d319666f70751078b221199951f80265b4f7cef8543012102d8c948c6af848c588517288168faa397d6ba3ea924596d03d1d84f224b5123c2ffffffff42b916a80430b80a77e114445b08cf120735447a524de10742fac8f6a9d4170f000000006a473044022004aa053edafb9d161ea8146e0c21ed1593aa6b9404dd44294bcdf920a1695fd902202365eac15dbcc5e9f83e2eed56a8f2f0e5aded36206f9c3fabc668fd4665fa2d012102d8c948c6af848c588517288168faa397d6ba3ea924596d03d1d84f224b5123c2ffffffff03547b16000000000017a9143e8ad0e2bf573d32cb0b3d3a304d9ebcd0c2023b870000000000000000166a144e2b3c0323ab3c2dc6f86dc5ec0729f11e42f56103970400000000001976a91450f4f098306f988d8843004689fae28c83ef16e888ac89c5925f000000000000000000000000000000".into();
     let vout = 0;
     let from_block = 0;
-    let actual = client.find_output_spend(&tx, vout, from_block).wait();
+    let actual = client
+        .find_output_spend(
+            tx.hash(),
+            &tx.outputs[vout].script_pubkey,
+            vout,
+            BlockHashOrHeight::Height(from_block),
+        )
+        .wait();
     assert_eq!(actual, Ok(None));
     assert_eq!(unsafe { GET_RAW_TRANSACTION_BYTES_CALLED }, 1);
 }
@@ -2279,7 +2414,7 @@ fn test_qtum_is_unspent_mature() {
     let coin = QtumCoin::from(arc);
 
     let empty_output = SignedTransactionOutput {
-        value: 0.,
+        value: Some(0.),
         n: 0,
         script: TransactionOutputScript {
             asm: "".into(),
@@ -2290,7 +2425,7 @@ fn test_qtum_is_unspent_mature() {
         },
     };
     let real_output = SignedTransactionOutput {
-        value: 117.02430015,
+        value: Some(117.02430015),
         n: 1,
         script: TransactionOutputScript {
             asm: "03e71b9c152bb233ddfe58f20056715c51b054a1823e0aba108e6f1cea0ceb89c8 OP_CHECKSIG".into(),
@@ -2337,7 +2472,7 @@ fn test_qtum_is_unspent_mature() {
 #[ignore]
 // TODO it fails at least when fee is 2055837 sat per kbyte, need to investigate
 fn test_get_sender_trade_fee_dynamic_tx_fee() {
-    let rpc_client = electrum_client_for_test(&["95.217.83.126:10001"]);
+    let rpc_client = electrum_client_for_test(&["electrum1.cipig.net:10071"]);
     let mut coin_fields = utxo_coin_fields_for_test(
         UtxoRpcClientEnum::Electrum(rpc_client),
         Some("bob passphrase max taker vol with dynamic trade fee"),
@@ -2349,31 +2484,26 @@ fn test_get_sender_trade_fee_dynamic_tx_fee() {
     let expected_balance = BigDecimal::from_str("2.22222").expect("!BigDecimal::from_str");
     assert_eq!(my_balance, expected_balance);
 
-    let fee1 = coin
-        .get_sender_trade_fee(
-            TradePreimageValue::UpperBound(my_balance.clone()),
-            FeeApproxStage::WithoutApprox,
-        )
-        .wait()
-        .expect("!get_sender_trade_fee");
+    let fee1 = block_on(coin.get_sender_trade_fee(
+        TradePreimageValue::UpperBound(my_balance.clone()),
+        FeeApproxStage::WithoutApprox,
+    ))
+    .expect("!get_sender_trade_fee");
 
     let value_without_fee = &my_balance - &fee1.amount.to_decimal();
-    log!("value_without_fee "(value_without_fee));
-    let fee2 = coin
-        .get_sender_trade_fee(
-            TradePreimageValue::Exact(value_without_fee),
-            FeeApproxStage::WithoutApprox,
-        )
-        .wait()
-        .expect("!get_sender_trade_fee");
+    log!("value_without_fee {}", value_without_fee);
+    let fee2 = block_on(coin.get_sender_trade_fee(
+        TradePreimageValue::Exact(value_without_fee),
+        FeeApproxStage::WithoutApprox,
+    ))
+    .expect("!get_sender_trade_fee");
     assert_eq!(fee1, fee2);
 
     // `2.21934443` value was obtained as a result of executing the `max_taker_vol` RPC call for this wallet
     let max_taker_vol = BigDecimal::from_str("2.21934443").expect("!BigDecimal::from_str");
-    let fee3 = coin
-        .get_sender_trade_fee(TradePreimageValue::Exact(max_taker_vol), FeeApproxStage::WithoutApprox)
-        .wait()
-        .expect("!get_sender_trade_fee");
+    let fee3 =
+        block_on(coin.get_sender_trade_fee(TradePreimageValue::Exact(max_taker_vol), FeeApproxStage::WithoutApprox))
+            .expect("!get_sender_trade_fee");
     assert_eq!(fee1, fee3);
 }
 
@@ -2396,6 +2526,7 @@ fn test_validate_fee_wrong_sender() {
             &*DEX_FEE_ADDR_RAW_PUBKEY,
             &amount,
             0,
+            &[],
         )
         .wait()
         .unwrap_err();
@@ -2416,7 +2547,14 @@ fn test_validate_fee_min_block() {
     let amount: BigDecimal = "0.0014157".parse().unwrap();
     let sender_pub = hex::decode("03ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fa").unwrap();
     let validate_err = coin
-        .validate_fee(&taker_fee_tx, &sender_pub, &*DEX_FEE_ADDR_RAW_PUBKEY, &amount, 810329)
+        .validate_fee(
+            &taker_fee_tx,
+            &sender_pub,
+            &*DEX_FEE_ADDR_RAW_PUBKEY,
+            &amount,
+            810329,
+            &[],
+        )
         .wait()
         .unwrap_err();
     assert!(validate_err.contains("confirmed before min_block"));
@@ -2436,7 +2574,7 @@ fn test_validate_fee_bch_70_bytes_signature() {
     let taker_fee_tx = coin.tx_enum_from_bytes(&tx_bytes).unwrap();
     let amount: BigDecimal = "0.0001".parse().unwrap();
     let sender_pub = hex::decode("02ae7dc4ef1b49aadeff79cfad56664105f4d114e1716bc4f930cb27dbd309e521").unwrap();
-    coin.validate_fee(&taker_fee_tx, &sender_pub, &*DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0)
+    coin.validate_fee(&taker_fee_tx, &sender_pub, &*DEX_FEE_ADDR_RAW_PUBKEY, &amount, 0, &[])
         .wait()
         .unwrap();
 }
@@ -2493,7 +2631,7 @@ fn firo_lelantus_tx() {
         "electrumx02.firo.org:50001",
         "electrumx03.firo.org:50001",
     ]);
-    let _tx = electrum.get_verbose_transaction(tx_hash).wait().unwrap();
+    let _tx = electrum.get_verbose_transaction(&tx_hash).wait().unwrap();
 }
 
 #[test]
@@ -2511,6 +2649,7 @@ fn firo_lelantus_tx_details() {
     let tx_details = block_on(coin.tx_details_by_hash(&tx_hash, &mut map)).unwrap();
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some(TEST_COIN_NAME.into()),
         amount: "0.00003793".parse().unwrap(),
     });
     assert_eq!(Some(expected_fee), tx_details.fee_details);
@@ -2519,6 +2658,7 @@ fn firo_lelantus_tx_details() {
     let tx_details = block_on(coin.tx_details_by_hash(&tx_hash, &mut map)).unwrap();
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some(TEST_COIN_NAME.into()),
         amount: "0.00045778".parse().unwrap(),
     });
     assert_eq!(Some(expected_fee), tx_details.fee_details);
@@ -2550,9 +2690,12 @@ fn test_generate_tx_doge_fee() {
         "servers": [{"url": "electrum1.cipig.net:10060"},{"url": "electrum2.cipig.net:10060"},{"url": "electrum3.cipig.net:10060"}],
     });
     let ctx = MmCtxBuilder::default().into_mm_arc();
-    let doge: UtxoStandardCoin = block_on(UtxoArcBuilder::new(&ctx, "DOGE", &config, &request, &[1; 32]).build())
-        .unwrap()
-        .into();
+    let params = UtxoActivationParams::from_legacy_req(&request).unwrap();
+
+    let doge = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "DOGE", &config, &params, &[1; 32],
+    ))
+    .unwrap();
 
     let unspents = vec![UnspentInfo {
         outpoint: Default::default(),
@@ -2563,8 +2706,10 @@ fn test_generate_tx_doge_fee() {
         value: 100000000,
         script_pubkey: vec![0; 26].into(),
     }];
-    let policy = FeePolicy::SendExact;
-    let (_, data) = block_on(generate_transaction(&doge, unspents, outputs, policy, None, None)).unwrap();
+    let builder = UtxoTxBuilder::new(&doge)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs);
+    let (_, data) = block_on(builder.build()).unwrap();
     let expected_fee = 1000000;
     assert_eq!(expected_fee, data.fee_amount);
 
@@ -2581,8 +2726,11 @@ fn test_generate_tx_doge_fee() {
         .clone();
         40
     ];
-    let policy = FeePolicy::SendExact;
-    let (_, data) = block_on(generate_transaction(&doge, unspents, outputs, policy, None, None)).unwrap();
+
+    let builder = UtxoTxBuilder::new(&doge)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs);
+    let (_, data) = block_on(builder.build()).unwrap();
     let expected_fee = 2000000;
     assert_eq!(expected_fee, data.fee_amount);
 
@@ -2599,8 +2747,11 @@ fn test_generate_tx_doge_fee() {
         .clone();
         60
     ];
-    let policy = FeePolicy::SendExact;
-    let (_, data) = block_on(generate_transaction(&doge, unspents, outputs, policy, None, None)).unwrap();
+
+    let builder = UtxoTxBuilder::new(&doge)
+        .add_available_inputs(unspents)
+        .add_outputs(outputs);
+    let (_, data) = block_on(builder.build()).unwrap();
     let expected_fee = 3000000;
     assert_eq!(expected_fee, data.fee_amount);
 }
@@ -2643,112 +2794,6 @@ fn verus_mtp() {
     assert_eq!(mtp, 1618579909);
 }
 
-#[test]
-#[ignore]
-fn mint_slp_token() {
-    use bitcoin_cash_slp::{slp_genesis_output, SlpTokenType};
-    let ctx = MmCtxBuilder::new().into_mm_arc();
-    let conf = json!({
-        "decimals": 8,
-        "network": "regtest",
-        "confpath": "/home/artem/.bch/bch.conf",
-        "address_format": {
-            "format": "cashaddress",
-            "network": "bchreg",
-        },
-        "pubtype": 111,
-        "p2shtype": 196,
-        "dust": 546,
-    });
-    let req = json!({
-        "method": "enable",
-    });
-    let priv_key = hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap();
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "BCH", &conf, &req, &priv_key,
-    ))
-    .unwrap();
-    let address = coin.my_address().unwrap();
-    println!("{}", address);
-
-    let balance = coin.my_balance().wait().unwrap();
-    println!("{}", balance.spendable);
-
-    let output = slp_genesis_output(SlpTokenType::Fungible, "ADEX", "ADEX", "", "", 8, None, 1000_0000_0000);
-    let script_pubkey = output.script.serialize().unwrap().to_vec().into();
-
-    println!("{}", hex::encode(&script_pubkey));
-
-    let op_return_output = TransactionOutput {
-        value: output.value,
-        script_pubkey,
-    };
-    let mint_output = TransactionOutput {
-        value: 546,
-        script_pubkey: hex::decode("76a91405aab5342166f8594baf17a7d9bef5d56744332788ac")
-            .unwrap()
-            .into(),
-    };
-    block_on(send_outputs_from_my_address_impl(coin, vec![
-        op_return_output,
-        mint_output,
-    ]))
-    .unwrap();
-}
-
-#[test]
-#[ignore]
-fn transfer_slp_token() {
-    use bitcoin_cash_slp::{slp_send_output, SlpTokenType, TokenId};
-    let ctx = MmCtxBuilder::new().into_mm_arc();
-    let conf = json!({
-        "decimals": 8,
-        "network": "regtest",
-        "confpath": "/home/artem/.bch/bch.conf",
-        "address_format": {
-            "format": "cashaddress",
-            "network": "bchreg",
-        },
-        "pubtype": 111,
-        "p2shtype": 196,
-        "dust": 546,
-    });
-    let req = json!({
-        "method": "enable",
-    });
-    let priv_key = hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap();
-    let coin = block_on(utxo_standard_coin_from_conf_and_request(
-        &ctx, "BCH", &conf, &req, &priv_key,
-    ))
-    .unwrap();
-    let token_id = hex::decode("e73b2b28c14db8ebbf97749988b539508990e1708021067f206f49d55807dbf4").unwrap();
-    let token_id = TokenId::from_slice(token_id.as_slice()).unwrap();
-    let address = coin.my_address().unwrap();
-    println!("{}", address);
-
-    let balance = coin.my_balance().wait().unwrap();
-    println!("{}", balance.spendable);
-
-    let output = slp_send_output(SlpTokenType::Fungible, &token_id, &[100000000]);
-    let script_pubkey = output.script.serialize().unwrap().to_vec();
-    println!("{}", hex::encode(&script_pubkey));
-    let op_return_output = TransactionOutput {
-        value: output.value,
-        script_pubkey: script_pubkey.into(),
-    };
-    let mint_output = TransactionOutput {
-        value: 546,
-        script_pubkey: hex::decode("76a91405aab5342166f8594baf17a7d9bef5d56744332788ac")
-            .unwrap()
-            .into(),
-    };
-    block_on(send_outputs_from_my_address_impl(coin, vec![
-        op_return_output,
-        mint_output,
-    ]))
-    .unwrap();
-}
-
 #[test]
 fn sys_mtp() {
     let electrum = electrum_client_for_test(&[
@@ -2829,7 +2874,7 @@ fn test_tx_details_kmd_rewards() {
     ]);
     let mut fields = utxo_coin_fields_for_test(electrum.into(), None, false);
     fields.conf.ticker = "KMD".to_owned();
-    fields.my_address = Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk");
+    fields.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
     let mut input_transactions = HistoryUtxoTxMap::new();
@@ -2837,6 +2882,7 @@ fn test_tx_details_kmd_rewards() {
     let tx_details = block_on(coin.tx_details_by_hash(&hash, &mut input_transactions)).expect("!tx_details_by_hash");
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some("KMD".into()),
         amount: BigDecimal::from_str("0.00001").unwrap(),
     });
     assert_eq!(tx_details.fee_details, Some(expected_fee));
@@ -2862,7 +2908,7 @@ fn test_tx_details_kmd_rewards_claimed_by_other() {
     ]);
     let mut fields = utxo_coin_fields_for_test(electrum.into(), None, false);
     fields.conf.ticker = "KMD".to_owned();
-    fields.my_address = Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk");
+    fields.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
     let mut input_transactions = HistoryUtxoTxMap::new();
@@ -2870,6 +2916,7 @@ fn test_tx_details_kmd_rewards_claimed_by_other() {
     let tx_details = block_on(coin.tx_details_by_hash(&hash, &mut input_transactions)).expect("!tx_details_by_hash");
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some("KMD".into()),
         amount: BigDecimal::from_str("0.00001").unwrap(),
     });
     assert_eq!(tx_details.fee_details, Some(expected_fee));
@@ -2897,6 +2944,7 @@ fn test_tx_details_bch_no_rewards() {
     let tx_details = block_on(coin.tx_details_by_hash(&hash, &mut input_transactions)).expect("!tx_details_by_hash");
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some(TEST_COIN_NAME.into()),
         amount: BigDecimal::from_str("0.00000452").unwrap(),
     });
     assert_eq!(tx_details.fee_details, Some(expected_fee));
@@ -2915,7 +2963,7 @@ fn test_update_kmd_rewards() {
     ]);
     let mut fields = utxo_coin_fields_for_test(electrum.into(), None, false);
     fields.conf.ticker = "KMD".to_owned();
-    fields.my_address = Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk");
+    fields.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
     let mut input_transactions = HistoryUtxoTxMap::default();
@@ -2929,6 +2977,7 @@ fn test_update_kmd_rewards() {
     assert_eq!(tx_details.kmd_rewards, Some(expected_rewards));
 
     let expected_fee_details = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some("KMD".into()),
         amount: BigDecimal::from_str("0.00001").unwrap(),
     });
     assert_eq!(tx_details.fee_details, Some(expected_fee_details));
@@ -2946,7 +2995,7 @@ fn test_update_kmd_rewards_claimed_not_by_me() {
     ]);
     let mut fields = utxo_coin_fields_for_test(electrum.into(), None, false);
     fields.conf.ticker = "KMD".to_owned();
-    fields.my_address = Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk");
+    fields.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
     let mut input_transactions = HistoryUtxoTxMap::default();
@@ -2960,6 +3009,7 @@ fn test_update_kmd_rewards_claimed_not_by_me() {
     assert_eq!(tx_details.kmd_rewards, Some(expected_rewards));
 
     let expected_fee_details = TxFeeDetails::Utxo(UtxoFeeDetails {
+        coin: Some("KMD".into()),
         amount: BigDecimal::from_str("0.00001").unwrap(),
     });
     assert_eq!(tx_details.fee_details, Some(expected_fee_details));
@@ -2973,10 +3023,22 @@ fn test_parse_tx_with_huge_locktime() {
     let _: UtxoTx = deserialize(verbose_tx.hex.as_slice()).unwrap();
 }
 
+#[test]
+fn tbch_electroncash_verbose_tx() {
+    let verbose = r#"{"blockhash":"00000000000d93dbc9c6e95c37044d584be959d24e514533b3a82f0f61dddc03","blocktime":1626262632,"confirmations":3708,"hash":"e64531613f909647651ac3f8fd72f3e6f72ac6e01c5a1d923884a10476f56a7f","height":1456230,"hex":"0100000002ebc10f58f220ec1bad5d634684ae649aa7bdd2f9c9081d36e5384e579caa95c2020000006a4730440220639ac218f572520c7d8addae74be6bfdefa9c86bc91474b6dedd7e117d232085022015a92f45f9ae5cee08c188e01fc614b77c461a41733649a55abfcc3e7ca207444121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffffebc10f58f220ec1bad5d634684ae649aa7bdd2f9c9081d36e5384e579caa95c2030000006a47304402204c27a2c04df44f34bd71ec69cc0a24291a96f265217473affb3c3fce2dbd937202202c2ad2e6cfaac3901c807d9b048ccb2b5e7b0dbd922f2066e637f6bbf459313a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000f5fee80300000000000017a9146569d9a853a1934c642223a9432f18c3b3f2a64b87e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac67a84601000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac87caee60","locktime":1626262151,"size":477,"time":1626262632,"txid":"e64531613f909647651ac3f8fd72f3e6f72ac6e01c5a1d923884a10476f56a7f","version":1,"vin":[{"coinbase":null,"scriptSig":{"asm":"OP_PUSHBYTES_71 30440220639ac218f572520c7d8addae74be6bfdefa9c86bc91474b6dedd7e117d232085022015a92f45f9ae5cee08c188e01fc614b77c461a41733649a55abfcc3e7ca2074441 OP_PUSHBYTES_33 036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c","hex":"4730440220639ac218f572520c7d8addae74be6bfdefa9c86bc91474b6dedd7e117d232085022015a92f45f9ae5cee08c188e01fc614b77c461a41733649a55abfcc3e7ca207444121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c"},"sequence":4294967295,"txid":"c295aa9c574e38e5361d08c9f9d2bda79a64ae8446635dad1bec20f2580fc1eb","vout":2},{"coinbase":null,"scriptSig":{"asm":"OP_PUSHBYTES_71 304402204c27a2c04df44f34bd71ec69cc0a24291a96f265217473affb3c3fce2dbd937202202c2ad2e6cfaac3901c807d9b048ccb2b5e7b0dbd922f2066e637f6bbf459313a41 OP_PUSHBYTES_33 036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c","hex":"47304402204c27a2c04df44f34bd71ec69cc0a24291a96f265217473affb3c3fce2dbd937202202c2ad2e6cfaac3901c807d9b048ccb2b5e7b0dbd922f2066e637f6bbf459313a4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c"},"sequence":4294967295,"txid":"c295aa9c574e38e5361d08c9f9d2bda79a64ae8446635dad1bec20f2580fc1eb","vout":3}],"vout":[{"n":0,"scriptPubKey":{"addresses":[],"asm":"OP_RETURN OP_PUSHBYTES_4 534c5000 OP_PUSHBYTES_1 01 OP_PUSHBYTES_4 53454e44 OP_PUSHBYTES_32 bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7 OP_PUSHBYTES_8 00000000000003e8 OP_PUSHBYTES_8 000000000000f5fe","hex":"6a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e808000000000000f5fe","type":"nulldata"},"value_coin":0.0,"value_satoshi":0},{"n":1,"scriptPubKey":{"addresses":["bchtest:ppjknkdg2wsexnryyg36jse0rrpm8u4xfv9hwa0rgl"],"asm":"OP_HASH160 OP_PUSHBYTES_20 6569d9a853a1934c642223a9432f18c3b3f2a64b OP_EQUAL","hex":"a9146569d9a853a1934c642223a9432f18c3b3f2a64b87","type":"scripthash"},"value_coin":0.00001,"value_satoshi":1000},{"n":2,"scriptPubKey":{"addresses":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"asm":"OP_DUP OP_HASH160 OP_PUSHBYTES_20 8cfffc2409d063437d6aa8b75a009b9ba51b71fc OP_EQUALVERIFY OP_CHECKSIG","hex":"76a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac","type":"pubkeyhash"},"value_coin":0.00001,"value_satoshi":1000},{"n":3,"scriptPubKey":{"addresses":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"asm":"OP_DUP OP_HASH160 OP_PUSHBYTES_20 8cfffc2409d063437d6aa8b75a009b9ba51b71fc OP_EQUALVERIFY OP_CHECKSIG","hex":"76a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac","type":"pubkeyhash"},"value_coin":0.21407847,"value_satoshi":21407847}]}"#;
+    let _: RpcTransaction = json::from_str(verbose).expect("!json::from_str");
+}
+
+#[test]
+fn tbch_electroncash_verbose_tx_unconfirmed() {
+    let verbose = r#"{"blockhash":null,"blocktime":null,"confirmations":null,"hash":"e5c9ec5013fca3a62fdf880d1a98f1096a00d20ceaeb6a4cb88ddbea6f1e185a","height":null,"hex":"01000000017f6af57604a18438921d5a1ce0c62af7e6f372fdf8c31a654796903f613145e6030000006b483045022100c335dd0f22e047b806a9d84e02b70aab609093e960888f6f1878e605a173e3da02201c274ce4983d8e519a47c4bd17aeca897b084954ce7a9d77033100e06aa999304121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff0280969800000000001976a914eed5d3ad264ffc68fc0a6454e1696a30d8f405be88acbe0dae00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac7a361261","locktime":1628583546,"size":226,"time":null,"txid":"e5c9ec5013fca3a62fdf880d1a98f1096a00d20ceaeb6a4cb88ddbea6f1e185a","version":1,"vin":[{"coinbase":null,"scriptSig":{"asm":"OP_PUSHBYTES_72 3045022100c335dd0f22e047b806a9d84e02b70aab609093e960888f6f1878e605a173e3da02201c274ce4983d8e519a47c4bd17aeca897b084954ce7a9d77033100e06aa9993041 OP_PUSHBYTES_33 036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c","hex":"483045022100c335dd0f22e047b806a9d84e02b70aab609093e960888f6f1878e605a173e3da02201c274ce4983d8e519a47c4bd17aeca897b084954ce7a9d77033100e06aa999304121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202c"},"sequence":4294967295,"txid":"e64531613f909647651ac3f8fd72f3e6f72ac6e01c5a1d923884a10476f56a7f","vout":3}],"vout":[{"n":0,"scriptPubKey":{"addresses":["bchtest:qrhdt5adye8lc68upfj9fctfdgcd3aq9hctf8ft6md"],"asm":"OP_DUP OP_HASH160 OP_PUSHBYTES_20 eed5d3ad264ffc68fc0a6454e1696a30d8f405be OP_EQUALVERIFY OP_CHECKSIG","hex":"76a914eed5d3ad264ffc68fc0a6454e1696a30d8f405be88ac","type":"pubkeyhash"},"value_coin":0.1,"value_satoshi":10000000},{"n":1,"scriptPubKey":{"addresses":["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66"],"asm":"OP_DUP OP_HASH160 OP_PUSHBYTES_20 8cfffc2409d063437d6aa8b75a009b9ba51b71fc OP_EQUALVERIFY OP_CHECKSIG","hex":"76a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac","type":"pubkeyhash"},"value_coin":0.11406782,"value_satoshi":11406782}]}"#;
+    let _: RpcTransaction = json::from_str(verbose).expect("!json::from_str");
+}
+
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_to_p2pkh() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -2996,15 +3058,16 @@ fn test_withdraw_to_p2pkh() {
     // Create a p2pkh address for the test coin
     let p2pkh_address = Address {
         prefix: coin.as_ref().conf.pub_addr_prefix,
-        hash: coin.as_ref().my_address.hash.clone(),
+        hash: coin.as_ref().derivation_method.unwrap_iguana().hash.clone(),
         t_addr_prefix: coin.as_ref().conf.pub_t_addr_prefix,
-        checksum_type: coin.as_ref().my_address.checksum_type,
+        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
         addr_format: UtxoAddressFormat::Standard,
     };
 
     let withdraw_req = WithdrawRequest {
         amount: 1.into(),
+        from: None,
         to: p2pkh_address.to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -3022,7 +3085,7 @@ fn test_withdraw_to_p2pkh() {
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_to_p2sh() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -3042,15 +3105,16 @@ fn test_withdraw_to_p2sh() {
     // Create a p2sh address for the test coin
     let p2sh_address = Address {
         prefix: coin.as_ref().conf.p2sh_addr_prefix,
-        hash: coin.as_ref().my_address.hash.clone(),
+        hash: coin.as_ref().derivation_method.unwrap_iguana().hash.clone(),
         t_addr_prefix: coin.as_ref().conf.p2sh_t_addr_prefix,
-        checksum_type: coin.as_ref().my_address.checksum_type,
+        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
         addr_format: UtxoAddressFormat::Standard,
     };
 
     let withdraw_req = WithdrawRequest {
         amount: 1.into(),
+        from: None,
         to: p2sh_address.to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -3068,7 +3132,7 @@ fn test_withdraw_to_p2sh() {
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_withdraw_to_p2wpkh() {
-    UtxoStandardCoin::ordered_mature_unspents.mock_safe(|coin, _| {
+    UtxoStandardCoin::get_unspent_ordered_list.mock_safe(|coin, _| {
         let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
         let unspents = vec![UnspentInfo {
             outpoint: OutPoint {
@@ -3088,15 +3152,16 @@ fn test_withdraw_to_p2wpkh() {
     // Create a p2wpkh address for the test coin
     let p2wpkh_address = Address {
         prefix: coin.as_ref().conf.pub_addr_prefix,
-        hash: coin.as_ref().my_address.hash.clone(),
+        hash: coin.as_ref().derivation_method.unwrap_iguana().hash.clone(),
         t_addr_prefix: coin.as_ref().conf.pub_t_addr_prefix,
-        checksum_type: coin.as_ref().my_address.checksum_type,
+        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
         addr_format: UtxoAddressFormat::Segwit,
     };
 
     let withdraw_req = WithdrawRequest {
         amount: 1.into(),
+        from: None,
         to: p2wpkh_address.to_string(),
         coin: TEST_COIN_NAME.into(),
         max: false,
@@ -3106,7 +3171,834 @@ fn test_withdraw_to_p2wpkh() {
     let transaction: UtxoTx = deserialize(tx_details.tx_hex.as_slice()).unwrap();
     let output_script: Script = transaction.outputs[0].script_pubkey.clone().into();
 
-    let expected_script = Builder::build_p2wpkh(&p2wpkh_address.hash);
+    let expected_script = Builder::build_witness_script(&p2wpkh_address.hash);
 
     assert_eq!(output_script, expected_script);
 }
+
+/// `UtxoStandardCoin` has to check UTXO maturity if `check_utxo_maturity` is `true`.
+/// https://github.com/KomodoPlatform/atomicDEX-API/issues/1181
+#[test]
+fn test_utxo_standard_with_check_utxo_maturity_true() {
+    /// Whether [`UtxoStandardCoin::get_mature_unspent_ordered_list`] is called or not.
+    static mut GET_MATURE_UNSPENT_ORDERED_LIST_CALLED: bool = false;
+
+    UtxoStandardCoin::get_mature_unspent_ordered_list.mock_safe(|coin, _| {
+        unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED = true };
+        let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
+        MockResult::Return(Box::pin(futures::future::ok((MatureUnspentList::default(), cache))))
+    });
+
+    let conf = json!({"coin":"RICK","asset":"RICK","rpcport":25435,"txversion":4,"overwintered":1,"mm2":1,"protocol":{"type":"UTXO"}});
+    let req = json!({
+         "method": "electrum",
+         "servers": [
+             {"url":"electrum1.cipig.net:10017"},
+             {"url":"electrum2.cipig.net:10017"},
+             {"url":"electrum3.cipig.net:10017"},
+         ],
+        "check_utxo_maturity": true,
+    });
+
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "RICK", &conf, &params, &[1u8; 32],
+    ))
+    .unwrap();
+
+    let address = Address::from("R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW");
+    // Don't use `block_on` here because it's used within a mock of [`GetUtxoListOps::get_mature_unspent_ordered_list`].
+    coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+    assert!(unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED });
+}
+
+/// `UtxoStandardCoin` hasn't to check UTXO maturity if `check_utxo_maturity` is not set.
+/// https://github.com/KomodoPlatform/atomicDEX-API/issues/1181
+#[test]
+fn test_utxo_standard_without_check_utxo_maturity() {
+    /// Whether [`UtxoStandardCoin::get_all_unspent_ordered_list`] is called or not.
+    static mut GET_ALL_UNSPENT_ORDERED_LIST_CALLED: bool = false;
+
+    UtxoStandardCoin::get_all_unspent_ordered_list.mock_safe(|coin, _| {
+        unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED = true };
+        let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
+        let unspents = Vec::new();
+        MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+    });
+
+    UtxoStandardCoin::get_mature_unspent_ordered_list.mock_safe(|_, _| {
+        panic!("'UtxoStandardCoin::get_mature_unspent_ordered_list' is not expected to be called when `check_utxo_maturity` is not set")
+    });
+
+    let conf = json!({"coin":"RICK","asset":"RICK","rpcport":25435,"txversion":4,"overwintered":1,"mm2":1,"protocol":{"type":"UTXO"}});
+    let req = json!({
+         "method": "electrum",
+         "servers": [
+             {"url":"electrum1.cipig.net:10017"},
+             {"url":"electrum2.cipig.net:10017"},
+             {"url":"electrum3.cipig.net:10017"},
+         ]
+    });
+
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(utxo_standard_coin_with_priv_key(
+        &ctx, "RICK", &conf, &params, &[1u8; 32],
+    ))
+    .unwrap();
+
+    let address = Address::from("R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW");
+    // Don't use `block_on` here because it's used within a mock of [`UtxoStandardCoin::get_all_unspent_ordered_list`].
+    coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+    assert!(unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED });
+}
+
+/// `QtumCoin` has to check UTXO maturity if `check_utxo_maturity` is not set.
+/// https://github.com/KomodoPlatform/atomicDEX-API/issues/1181
+#[test]
+fn test_qtum_without_check_utxo_maturity() {
+    /// Whether [`QtumCoin::get_mature_unspent_ordered_list`] is called or not.
+    static mut GET_MATURE_UNSPENT_ORDERED_LIST_CALLED: bool = false;
+
+    QtumCoin::get_mature_unspent_ordered_list.mock_safe(|coin, _| {
+        unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED = true };
+        let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
+        MockResult::Return(Box::pin(futures::future::ok((MatureUnspentList::default(), cache))))
+    });
+
+    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
+    let req = json!({
+        "method": "electrum",
+        "servers": [
+            {"url":"electrum1.cipig.net:10071"},
+            {"url":"electrum2.cipig.net:10071"},
+            {"url":"electrum3.cipig.net:10071"},
+        ],
+    });
+
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, &[1u8; 32])).unwrap();
+
+    let address = Address::from("qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE");
+    // Don't use `block_on` here because it's used within a mock of [`QtumCoin::get_mature_unspent_ordered_list`].
+    coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+    assert!(unsafe { GET_MATURE_UNSPENT_ORDERED_LIST_CALLED });
+}
+
+/// The test is for splitting some mature unspent `QTUM` out points into 40 outputs with amount `1 QTUM` in each
+#[test]
+#[ignore]
+fn test_split_qtum() {
+    let priv_key = [
+        3, 98, 177, 3, 108, 39, 234, 144, 131, 178, 103, 103, 127, 80, 230, 166, 53, 68, 147, 215, 42, 216, 144, 72,
+        172, 110, 180, 13, 123, 179, 10, 49,
+    ];
+    let conf = json!({
+      "coin": "tQTUM",
+      "name": "qtumtest",
+      "fname": "Qtum test",
+      "rpcport": 13889,
+      "pubtype": 120,
+      "p2shtype": 110,
+      "wiftype": 239,
+      "txfee": 400000,
+      "mm2": 1,
+      "required_confirmations": 1,
+      "mature_confirmations": 2000,
+      "avg_blocktime": 0.53,
+      "protocol": {
+        "type": "QTUM"
+      }
+    });
+    let req = json!({
+        "method": "electrum",
+        "servers": [
+            {"url":"electrum1.cipig.net:10071"},
+            {"url":"electrum2.cipig.net:10071"},
+            {"url":"electrum3.cipig.net:10071"},
+        ],
+    });
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, &priv_key)).unwrap();
+    let p2pkh_address = coin.as_ref().derivation_method.unwrap_iguana();
+    let script: Script = output_script(p2pkh_address, ScriptType::P2PKH);
+    let key_pair = coin.as_ref().priv_key_policy.key_pair_or_err().unwrap();
+    let (unspents, _) = block_on(coin.get_mature_unspent_ordered_list(p2pkh_address)).expect("Unspent list is empty");
+    log!("Mature unspents vec = {:?}", unspents.mature);
+    let outputs = vec![
+        TransactionOutput {
+            value: 100_000_000,
+            script_pubkey: script.to_bytes(),
+        };
+        40
+    ];
+    let builder = UtxoTxBuilder::new(&coin)
+        .add_available_inputs(unspents.mature)
+        .add_outputs(outputs);
+    let (unsigned, data) = block_on(builder.build()).unwrap();
+    // fee_amount must be higher than the minimum fee
+    assert!(data.fee_amount > 400_000);
+    log!("Unsigned tx = {:?}", unsigned);
+    let signature_version = match p2pkh_address.addr_format {
+        UtxoAddressFormat::Segwit => SignatureVersion::WitnessV0,
+        _ => coin.as_ref().conf.signature_version,
+    };
+    let prev_script = Builder::build_p2pkh(&p2pkh_address.hash);
+    let signed = sign_tx(
+        unsigned,
+        key_pair,
+        prev_script,
+        signature_version,
+        coin.as_ref().conf.fork_id,
+    )
+    .unwrap();
+    log!("Signed tx = {:?}", signed);
+    let res = block_on(coin.broadcast_tx(&signed)).unwrap();
+    log!("Res = {:?}", res);
+}
+
+/// `QtumCoin` hasn't to check UTXO maturity if `check_utxo_maturity` is `false`.
+/// https://github.com/KomodoPlatform/atomicDEX-API/issues/1181
+#[test]
+fn test_qtum_with_check_utxo_maturity_false() {
+    /// Whether [`QtumCoin::get_all_unspent_ordered_list`] is called or not.
+    static mut GET_ALL_UNSPENT_ORDERED_LIST_CALLED: bool = false;
+
+    QtumCoin::get_all_unspent_ordered_list.mock_safe(|coin, _address| {
+        unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED = true };
+        let cache = block_on(coin.as_ref().recently_spent_outpoints.lock());
+        let unspents = Vec::new();
+        MockResult::Return(Box::pin(futures::future::ok((unspents, cache))))
+    });
+    QtumCoin::get_mature_unspent_ordered_list.mock_safe(|_, _| {
+        panic!(
+            "'QtumCoin::get_mature_unspent_ordered_list' is not expected to be called when `check_utxo_maturity` is false"
+        )
+    });
+
+    let conf = json!({"coin":"tQTUM","rpcport":13889,"pubtype":120,"p2shtype":110});
+    let req = json!({
+        "method": "electrum",
+        "servers": [
+            {"url":"electrum1.cipig.net:10071"},
+            {"url":"electrum2.cipig.net:10071"},
+            {"url":"electrum3.cipig.net:10071"},
+        ],
+        "check_utxo_maturity": false,
+    });
+
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, &[1u8; 32])).unwrap();
+
+    let address = Address::from("qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE");
+    // Don't use `block_on` here because it's used within a mock of [`QtumCoin::get_all_unspent_ordered_list`].
+    coin.get_unspent_ordered_list(&address).compat().wait().unwrap();
+    assert!(unsafe { GET_ALL_UNSPENT_ORDERED_LIST_CALLED });
+}
+
+#[test]
+fn test_account_balance_rpc() {
+    let mut addresses_map: HashMap<String, u64> = HashMap::new();
+    let mut balances_by_der_path: HashMap<String, HDAddressBalance> = HashMap::new();
+
+    macro_rules! known_address {
+        ($der_path:literal, $address:literal, $chain:expr, balance = $balance:literal) => {
+            addresses_map.insert($address.to_string(), $balance);
+            balances_by_der_path.insert($der_path.to_string(), HDAddressBalance {
+                address: $address.to_string(),
+                derivation_path: RpcDerivationPath(DerivationPath::from_str($der_path).unwrap()),
+                chain: $chain,
+                balance: CoinBalance::new(BigDecimal::from($balance)),
+            })
+        };
+    }
+
+    macro_rules! get_balances {
+        ($($der_paths:literal),*) => {
+            [$($der_paths),*].iter().map(|der_path| balances_by_der_path.get(*der_path).unwrap().clone()).collect()
+        };
+    }
+
+    #[rustfmt::skip]
+    {
+        // Account#0, external addresses.
+        known_address!("m/44'/141'/0'/0/0", "RRqF4cYniMwYs66S4QDUUZ4GJQFQF69rBE", Bip44Chain::External, balance = 0);
+        known_address!("m/44'/141'/0'/0/1", "RSVLsjXc9LJ8fm9Jq7gXjeubfja3bbgSDf", Bip44Chain::External, balance = 0);
+        known_address!("m/44'/141'/0'/0/2", "RSSZjtgfnLzvqF4cZQJJEpN5gvK3pWmd3h", Bip44Chain::External, balance = 0);
+        known_address!("m/44'/141'/0'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1", Bip44Chain::External, balance = 98);
+        known_address!("m/44'/141'/0'/0/4", "RUkEvRzb7mtwfVeKiSFEbYupLkcvU5KJBw", Bip44Chain::External, balance = 1);
+        known_address!("m/44'/141'/0'/0/5", "RP8deqVfjBbkvxbGbsQ2EGdamMaP1wxizR", Bip44Chain::External, balance = 0);
+        known_address!("m/44'/141'/0'/0/6", "RSvKMMegKGP5e2EanH7fnD4yNsxdJvLAmL", Bip44Chain::External, balance = 32);
+
+        // Account#0, internal addresses.
+        known_address!("m/44'/141'/0'/1/0", "RLZxcZSYtKe74JZd1hBAmmD9PNHZqb72oL", Bip44Chain::Internal, balance = 13);
+        known_address!("m/44'/141'/0'/1/1", "RPj9JXUVnewWwVpxZDeqGB25qVqz5qJzwP", Bip44Chain::Internal, balance = 44);
+        known_address!("m/44'/141'/0'/1/2", "RSYdSLRYWuzBson2GDbWBa632q2PmFnCaH", Bip44Chain::Internal, balance = 10);
+
+        // Account#1, internal addresses.
+        known_address!("m/44'/141'/1'/1/0", "RGo7sYzivPtzv8aRQ4A6vRJDxoqkRRBRhZ", Bip44Chain::Internal, balance = 0);
+    }
+
+    NativeClient::display_balances.mock_safe(move |_, addresses: Vec<Address>, _| {
+        let result: Vec<_> = addresses
+            .into_iter()
+            .map(|address| {
+                let address_str = address.to_string();
+                let balance = addresses_map
+                    .remove(&address_str)
+                    .expect(&format!("Unexpected address: {}", address_str));
+                (address, BigDecimal::from(balance))
+            })
+            .collect();
+        MockResult::Return(Box::new(futures01::future::ok(result)))
+    });
+
+    let client = NativeClient(Arc::new(NativeClientImpl::default()));
+    let mut fields = utxo_coin_fields_for_test(UtxoRpcClientEnum::Native(client), None, false);
+    let mut hd_accounts = HDAccountsMap::new();
+    hd_accounts.insert(0, UtxoHDAccount {
+        account_id: 0,
+        extended_pubkey: Secp256k1ExtendedPublicKey::from_str("xpub6DEHSksajpRPM59RPw7Eg6PKdU7E2ehxJWtYdrfQ6JFmMGBsrR6jA78ANCLgzKYm4s5UqQ4ydLEYPbh3TRVvn5oAZVtWfi4qJLMntpZ8uGJ").unwrap(),
+        account_derivation_path: Bip44PathToAccount::from_str("m/44'/141'/0'").unwrap(),
+        external_addresses_number: 7,
+        internal_addresses_number: 3,
+    });
+    hd_accounts.insert(1, UtxoHDAccount {
+        account_id: 1,
+        extended_pubkey: Secp256k1ExtendedPublicKey::from_str("xpub6DEHSksajpRPQq2FdGT6JoieiQZUpTZ3WZn8fcuLJhFVmtCpXbuXxp5aPzaokwcLV2V9LE55Dwt8JYkpuMv7jXKwmyD28WbHYjBH2zhbW2p").unwrap(),
+        account_derivation_path: Bip44PathToAccount::from_str("m/44'/141'/1'").unwrap(),
+        external_addresses_number: 0,
+        internal_addresses_number: 1,
+    });
+    fields.derivation_method = DerivationMethod::HDWallet(UtxoHDWallet {
+        hd_wallet_storage: HDWalletCoinStorage::default(),
+        address_format: UtxoAddressFormat::Standard,
+        derivation_path: Bip44PathToCoin::from_str("m/44'/141'").unwrap(),
+        accounts: HDAccountsMutex::new(hd_accounts),
+        gap_limit: 3,
+    });
+    let coin = utxo_coin_from_fields(fields);
+
+    // Request a balance of Account#0, external addresses, 1st page
+
+    let params = AccountBalanceParams {
+        account_index: 0,
+        chain: Bip44Chain::External,
+        limit: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 0,
+        derivation_path: DerivationPath::from_str("m/44'/141'/0'").unwrap().into(),
+        addresses: get_balances!("m/44'/141'/0'/0/0", "m/44'/141'/0'/0/1", "m/44'/141'/0'/0/2"),
+        page_balance: CoinBalance::new(BigDecimal::from(0)),
+        limit: 3,
+        skipped: 0,
+        total: 7,
+        total_pages: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()),
+    };
+    assert_eq!(actual, expected);
+
+    // Request a balance of Account#0, external addresses, 2nd page
+
+    let params = AccountBalanceParams {
+        account_index: 0,
+        chain: Bip44Chain::External,
+        limit: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap()),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 0,
+        derivation_path: DerivationPath::from_str("m/44'/141'/0'").unwrap().into(),
+        addresses: get_balances!("m/44'/141'/0'/0/3", "m/44'/141'/0'/0/4", "m/44'/141'/0'/0/5"),
+        page_balance: CoinBalance::new(BigDecimal::from(99)),
+        limit: 3,
+        skipped: 3,
+        total: 7,
+        total_pages: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap()),
+    };
+    assert_eq!(actual, expected);
+
+    // Request a balance of Account#0, external addresses, 3rd page
+
+    let params = AccountBalanceParams {
+        account_index: 0,
+        chain: Bip44Chain::External,
+        limit: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(3).unwrap()),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 0,
+        derivation_path: DerivationPath::from_str("m/44'/141'/0'").unwrap().into(),
+        addresses: get_balances!("m/44'/141'/0'/0/6"),
+        page_balance: CoinBalance::new(BigDecimal::from(32)),
+        limit: 3,
+        skipped: 6,
+        total: 7,
+        total_pages: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(3).unwrap()),
+    };
+    assert_eq!(actual, expected);
+
+    // Request a balance of Account#0, external addresses, page 4 (out of bound)
+
+    let params = AccountBalanceParams {
+        account_index: 0,
+        chain: Bip44Chain::External,
+        limit: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(4).unwrap()),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 0,
+        derivation_path: DerivationPath::from_str("m/44'/141'/0'").unwrap().into(),
+        addresses: Vec::new(),
+        page_balance: CoinBalance::default(),
+        limit: 3,
+        skipped: 7,
+        total: 7,
+        total_pages: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(4).unwrap()),
+    };
+    assert_eq!(actual, expected);
+
+    // Request a balance of Account#0, internal addresses, where idx > 0
+
+    let params = AccountBalanceParams {
+        account_index: 0,
+        chain: Bip44Chain::Internal,
+        limit: 3,
+        paging_options: PagingOptionsEnum::FromId(0),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 0,
+        derivation_path: DerivationPath::from_str("m/44'/141'/0'").unwrap().into(),
+        addresses: get_balances!("m/44'/141'/0'/1/1", "m/44'/141'/0'/1/2"),
+        page_balance: CoinBalance::new(BigDecimal::from(54)),
+        limit: 3,
+        skipped: 1,
+        total: 3,
+        total_pages: 1,
+        paging_options: PagingOptionsEnum::FromId(0),
+    };
+    assert_eq!(actual, expected);
+
+    // Request a balance of Account#1, external addresses, page 1 (out of bound)
+
+    let params = AccountBalanceParams {
+        account_index: 1,
+        chain: Bip44Chain::External,
+        limit: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 1,
+        derivation_path: DerivationPath::from_str("m/44'/141'/1'").unwrap().into(),
+        addresses: Vec::new(),
+        page_balance: CoinBalance::default(),
+        limit: 3,
+        skipped: 0,
+        total: 0,
+        total_pages: 0,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()),
+    };
+    assert_eq!(actual, expected);
+
+    // Request a balance of Account#1, external addresses, page 1
+
+    let params = AccountBalanceParams {
+        account_index: 1,
+        chain: Bip44Chain::Internal,
+        limit: 3,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 1,
+        derivation_path: DerivationPath::from_str("m/44'/141'/1'").unwrap().into(),
+        addresses: get_balances!("m/44'/141'/1'/1/0"),
+        page_balance: CoinBalance::new(BigDecimal::from(0)),
+        limit: 3,
+        skipped: 0,
+        total: 1,
+        total_pages: 1,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()),
+    };
+    assert_eq!(actual, expected);
+
+    // Request a balance of Account#1, external addresses, where idx > 0 (out of bound)
+
+    let params = AccountBalanceParams {
+        account_index: 1,
+        chain: Bip44Chain::Internal,
+        limit: 3,
+        paging_options: PagingOptionsEnum::FromId(0),
+    };
+    let actual = block_on(coin.account_balance_rpc(params)).expect("!account_balance_rpc");
+    let expected = HDAccountBalanceResponse {
+        account_index: 1,
+        derivation_path: DerivationPath::from_str("m/44'/141'/1'").unwrap().into(),
+        addresses: Vec::new(),
+        page_balance: CoinBalance::default(),
+        limit: 3,
+        skipped: 1,
+        total: 1,
+        total_pages: 1,
+        paging_options: PagingOptionsEnum::FromId(0),
+    };
+    assert_eq!(actual, expected);
+}
+
+#[test]
+fn test_scan_for_new_addresses() {
+    static mut ACCOUNT_ID: u32 = 0;
+    static mut NEW_EXTERNAL_ADDRESSES_NUMBER: u32 = 0;
+    static mut NEW_INTERNAL_ADDRESSES_NUMBER: u32 = 0;
+
+    HDWalletMockStorage::update_external_addresses_number.mock_safe(
+        |_, _, account_id, new_external_addresses_number| {
+            assert_eq!(account_id, unsafe { ACCOUNT_ID });
+            assert_eq!(new_external_addresses_number, unsafe { NEW_EXTERNAL_ADDRESSES_NUMBER });
+            MockResult::Return(Box::pin(futures::future::ok(())))
+        },
+    );
+
+    HDWalletMockStorage::update_internal_addresses_number.mock_safe(
+        |_, _, account_id, new_internal_addresses_number| {
+            assert_eq!(account_id, unsafe { ACCOUNT_ID });
+            assert_eq!(new_internal_addresses_number, unsafe { NEW_INTERNAL_ADDRESSES_NUMBER });
+            MockResult::Return(Box::pin(futures::future::ok(())))
+        },
+    );
+
+    let mut checking_addresses: HashMap<String, Option<u64>> = HashMap::new();
+    let mut non_empty_addresses: Vec<String> = Vec::new();
+    let mut balances_by_der_path: HashMap<String, HDAddressBalance> = HashMap::new();
+
+    macro_rules! new_address {
+        ($der_path:literal, $address:literal, $chain:expr, balance = $balance:expr) => {{
+            let balance = $balance;
+            checking_addresses.insert($address.to_string(), balance);
+            balances_by_der_path.insert($der_path.to_string(), HDAddressBalance {
+                address: $address.to_string(),
+                derivation_path: RpcDerivationPath(DerivationPath::from_str($der_path).unwrap()),
+                chain: $chain,
+                balance: CoinBalance::new(BigDecimal::from(balance.unwrap_or(0))),
+            });
+            if balance.is_some() {
+                non_empty_addresses.push($address.to_string());
+            }
+        }};
+    }
+
+    macro_rules! unused_address {
+        ($_der_path:literal, $address:literal) => {
+            checking_addresses.insert($address.to_string(), None)
+        };
+    }
+
+    macro_rules! get_balances {
+        ($($der_paths:literal),*) => {
+            [$($der_paths),*].iter().map(|der_path| balances_by_der_path.get(*der_path).unwrap().clone()).collect()
+        };
+    }
+
+    // Please note that the order of the `known` and `new` addresses is important.
+    #[rustfmt::skip]
+    {
+        // Account#0, external addresses.
+        new_address!("m/44'/141'/0'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1", Bip44Chain::External, balance = Some(98));
+        unused_address!("m/44'/141'/0'/0/4", "RUkEvRzb7mtwfVeKiSFEbYupLkcvU5KJBw");
+        unused_address!("m/44'/141'/0'/0/5", "RP8deqVfjBbkvxbGbsQ2EGdamMaP1wxizR");
+        unused_address!("m/44'/141'/0'/0/6", "RSvKMMegKGP5e2EanH7fnD4yNsxdJvLAmL"); // Stop searching for a non-empty address (gap_limit = 3).
+
+        // Account#0, internal addresses.
+        new_address!("m/44'/141'/0'/1/1", "RPj9JXUVnewWwVpxZDeqGB25qVqz5qJzwP", Bip44Chain::Internal, balance = Some(98));
+        new_address!("m/44'/141'/0'/1/2", "RSYdSLRYWuzBson2GDbWBa632q2PmFnCaH", Bip44Chain::Internal, balance = None);
+        new_address!("m/44'/141'/0'/1/3", "RQstQeTUEZLh6c3YWJDkeVTTQoZUsfvNCr", Bip44Chain::Internal, balance = Some(14));
+        unused_address!("m/44'/141'/0'/1/4", "RT54m6pfj9scqwSLmYdfbmPcrpxnWGAe9J");
+        unused_address!("m/44'/141'/0'/1/5", "RYWfEFxqA6zya9c891Dj7vxiDojCmuWR9T");
+        unused_address!("m/44'/141'/0'/1/6", "RSkY6twW8knTcn6wGACUAG9crJHcuQ2kEH"); // Stop searching for a non-empty address (gap_limit = 3).
+
+        // Account#1, external addresses.
+        new_address!("m/44'/141'/1'/0/0", "RBQFLwJ88gVcnfkYvJETeTAB6AAYLow12K", Bip44Chain::External, balance = Some(9));
+        new_address!("m/44'/141'/1'/0/1", "RCyy77sRWFa2oiFPpyimeTQfenM1aRoiZs", Bip44Chain::External, balance = Some(7));
+        new_address!("m/44'/141'/1'/0/2", "RDnNa3pQmisfi42KiTZrfYfuxkLC91PoTJ", Bip44Chain::External, balance = None);
+        new_address!("m/44'/141'/1'/0/3", "RQRGgXcGJz93CoAfQJoLgBz2r9HtJYMX3Z", Bip44Chain::External, balance = None);
+        new_address!("m/44'/141'/1'/0/4", "RM6cqSFCFZ4J1LngLzqKkwo2ouipbDZUbm", Bip44Chain::External, balance = Some(11));
+        unused_address!("m/44'/141'/1'/0/5", "RX2fGBZjNZMNdNcnc5QBRXvmsXTvadvTPN");
+        unused_address!("m/44'/141'/1'/0/6", "RJJ7muUETyp59vxVXna9KAZ9uQ1QSqmcjE");
+        unused_address!("m/44'/141'/1'/0/7", "RYJ6vbhxFre5yChCMiJJFNTTBhAQbKM9AY"); // Stop searching for a non-empty address (gap_limit = 3).
+
+        // Account#1, internal addresses.
+        unused_address!("m/44'/141'/1'/0/2", "RCjRDibDAXKYpVYSUeJXrbTzZ1UEKYAwJa");
+        unused_address!("m/44'/141'/1'/0/3", "REs1NRzg8XjwN3v8Jp1wQUAyQb3TzeT8EB");
+        unused_address!("m/44'/141'/1'/0/4", "RS4UZtkwZ8eYaTL1xodXgFNryJoTbPJYE5"); // Stop searching for a non-empty address (gap_limit = 3).
+    }
+
+    NativeClient::display_balance.mock_safe(move |_, address: Address, _| {
+        let address = address.to_string();
+        let balance = checking_addresses
+            .remove(&address)
+            .expect(&format!("Unexpected address: {}", address))
+            .expect(&format!(
+                "'{}' address is empty. 'NativeClient::display_balance' must not be called for this address",
+                address
+            ));
+        MockResult::Return(Box::new(futures01::future::ok(BigDecimal::from(balance))))
+    });
+
+    NativeClient::list_all_transactions.mock_safe(move |_, _| {
+        let tx_history = non_empty_addresses
+            .clone()
+            .into_iter()
+            .map(|address| ListTransactionsItem {
+                address,
+                ..ListTransactionsItem::default()
+            })
+            .collect();
+        MockResult::Return(Box::new(futures01::future::ok(tx_history)))
+    });
+
+    let client = NativeClient(Arc::new(NativeClientImpl::default()));
+    let mut fields = utxo_coin_fields_for_test(UtxoRpcClientEnum::Native(client), None, false);
+    let mut hd_accounts = HDAccountsMap::new();
+    hd_accounts.insert(0, UtxoHDAccount {
+        account_id: 0,
+        extended_pubkey: Secp256k1ExtendedPublicKey::from_str("xpub6DEHSksajpRPM59RPw7Eg6PKdU7E2ehxJWtYdrfQ6JFmMGBsrR6jA78ANCLgzKYm4s5UqQ4ydLEYPbh3TRVvn5oAZVtWfi4qJLMntpZ8uGJ").unwrap(),
+        account_derivation_path: Bip44PathToAccount::from_str("m/44'/141'/0'").unwrap(),
+        external_addresses_number: 3,
+        internal_addresses_number: 1,
+    });
+    hd_accounts.insert(1, UtxoHDAccount {
+        account_id: 1,
+        extended_pubkey: Secp256k1ExtendedPublicKey::from_str("xpub6DEHSksajpRPQq2FdGT6JoieiQZUpTZ3WZn8fcuLJhFVmtCpXbuXxp5aPzaokwcLV2V9LE55Dwt8JYkpuMv7jXKwmyD28WbHYjBH2zhbW2p").unwrap(),
+        account_derivation_path: Bip44PathToAccount::from_str("m/44'/141'/1'").unwrap(),
+        external_addresses_number: 0,
+        internal_addresses_number: 2,
+    });
+    fields.derivation_method = DerivationMethod::HDWallet(UtxoHDWallet {
+        hd_wallet_storage: HDWalletCoinStorage::default(),
+        address_format: UtxoAddressFormat::Standard,
+        derivation_path: Bip44PathToCoin::from_str("m/44'/141'").unwrap(),
+        accounts: HDAccountsMutex::new(hd_accounts),
+        gap_limit: 3,
+    });
+    let coin = utxo_coin_from_fields(fields);
+
+    // Check balance of Account#0
+
+    unsafe {
+        ACCOUNT_ID = 0;
+        NEW_EXTERNAL_ADDRESSES_NUMBER = 4;
+        NEW_INTERNAL_ADDRESSES_NUMBER = 4;
+    }
+
+    let params = ScanAddressesParams {
+        account_index: 0,
+        gap_limit: Some(3),
+    };
+    let actual = block_on(coin.init_scan_for_new_addresses_rpc(params)).expect("!account_balance_rpc");
+    let expected = ScanAddressesResponse {
+        account_index: 0,
+        derivation_path: DerivationPath::from_str("m/44'/141'/0'").unwrap().into(),
+        new_addresses: get_balances!(
+            "m/44'/141'/0'/0/3",
+            "m/44'/141'/0'/1/1",
+            "m/44'/141'/0'/1/2",
+            "m/44'/141'/0'/1/3"
+        ),
+    };
+    assert_eq!(actual, expected);
+
+    // Check balance of Account#1
+
+    unsafe {
+        ACCOUNT_ID = 1;
+        NEW_EXTERNAL_ADDRESSES_NUMBER = 5;
+        NEW_INTERNAL_ADDRESSES_NUMBER = 2;
+    }
+
+    let params = ScanAddressesParams {
+        account_index: 1,
+        gap_limit: None,
+    };
+    let actual = block_on(coin.init_scan_for_new_addresses_rpc(params)).expect("!account_balance_rpc");
+    let expected = ScanAddressesResponse {
+        account_index: 1,
+        derivation_path: DerivationPath::from_str("m/44'/141'/1'").unwrap().into(),
+        new_addresses: get_balances!(
+            "m/44'/141'/1'/0/0",
+            "m/44'/141'/1'/0/1",
+            "m/44'/141'/1'/0/2",
+            "m/44'/141'/1'/0/3",
+            "m/44'/141'/1'/0/4"
+        ),
+    };
+    assert_eq!(actual, expected);
+
+    let accounts = match coin.as_ref().derivation_method {
+        DerivationMethod::HDWallet(UtxoHDWallet { ref accounts, .. }) => block_on(accounts.lock()).clone(),
+        _ => unreachable!(),
+    };
+    assert_eq!(accounts[&0].external_addresses_number, 4);
+    assert_eq!(accounts[&0].internal_addresses_number, 4);
+    assert_eq!(accounts[&1].external_addresses_number, 5);
+    assert_eq!(accounts[&1].internal_addresses_number, 2);
+}
+
+/// https://github.com/KomodoPlatform/atomicDEX-API/issues/1196
+#[test]
+fn test_electrum_balance_deserializing() {
+    let serialized = r#"{"confirmed": 988937858554305, "unconfirmed": 18446720562229577551}"#;
+    let actual: ElectrumBalance = json::from_str(serialized).unwrap();
+    assert_eq!(actual.confirmed, 988937858554305i128);
+    assert_eq!(actual.unconfirmed, 18446720562229577551i128);
+
+    let serialized = r#"{"confirmed": -170141183460469231731687303715884105728, "unconfirmed": 170141183460469231731687303715884105727}"#;
+    let actual: ElectrumBalance = json::from_str(serialized).unwrap();
+    assert_eq!(actual.confirmed, i128::MIN);
+    assert_eq!(actual.unconfirmed, i128::MAX);
+}
+
+#[test]
+fn test_electrum_display_balances() {
+    let rpc_client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
+    block_on(utxo_common_tests::test_electrum_display_balances(&rpc_client));
+}
+
+#[test]
+fn test_native_display_balances() {
+    let unspents = vec![
+        NativeUnspent {
+            address: "RG278CfeNPFtNztFZQir8cgdWexVhViYVy".to_owned(),
+            amount: "4.77699".into(),
+            ..NativeUnspent::default()
+        },
+        NativeUnspent {
+            address: "RJeDDtDRtKUoL8BCKdH7TNCHqUKr7kQRsi".to_owned(),
+            amount: "0.77699".into(),
+            ..NativeUnspent::default()
+        },
+        NativeUnspent {
+            address: "RQHn9VPHBqNjYwyKfJbZCiaxVrWPKGQjeF".to_owned(),
+            amount: "0.99998".into(),
+            ..NativeUnspent::default()
+        },
+        NativeUnspent {
+            address: "RG278CfeNPFtNztFZQir8cgdWexVhViYVy".to_owned(),
+            amount: "1".into(),
+            ..NativeUnspent::default()
+        },
+    ];
+
+    NativeClient::list_unspent_impl
+        .mock_safe(move |_, _, _, _| MockResult::Return(Box::new(futures01::future::ok(unspents.clone()))));
+
+    let rpc_client = native_client_for_test();
+
+    let addresses = vec![
+        "RG278CfeNPFtNztFZQir8cgdWexVhViYVy".into(),
+        "RYPz6Lr4muj4gcFzpMdv3ks1NCGn3mkDPN".into(),
+        "RJeDDtDRtKUoL8BCKdH7TNCHqUKr7kQRsi".into(),
+        "RQHn9VPHBqNjYwyKfJbZCiaxVrWPKGQjeF".into(),
+    ];
+    let actual = rpc_client
+        .display_balances(addresses, TEST_COIN_DECIMALS)
+        .wait()
+        .unwrap();
+
+    let expected: Vec<(Address, BigDecimal)> = vec![
+        (
+            "RG278CfeNPFtNztFZQir8cgdWexVhViYVy".into(),
+            BigDecimal::try_from(5.77699).unwrap(),
+        ),
+        ("RYPz6Lr4muj4gcFzpMdv3ks1NCGn3mkDPN".into(), BigDecimal::from(0)),
+        (
+            "RJeDDtDRtKUoL8BCKdH7TNCHqUKr7kQRsi".into(),
+            BigDecimal::try_from(0.77699).unwrap(),
+        ),
+        (
+            "RQHn9VPHBqNjYwyKfJbZCiaxVrWPKGQjeF".into(),
+            BigDecimal::try_from(0.99998).unwrap(),
+        ),
+    ];
+    assert_eq!(actual, expected);
+}
+
+#[test]
+fn test_message_hash() {
+    let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
+    let coin = utxo_coin_for_test(
+        client.into(),
+        Some("spice describe gravity federal blast come thank unfair canal monkey style afraid"),
+        false,
+    );
+    let expected = H256::from_reversed_str("5aef9b67485adba55a2cd935269e73f2f9876382f1eada02418797ae76c07e18");
+    let result = coin.sign_message_hash("test");
+    assert!(result.is_some());
+    assert_eq!(H256::from(result.unwrap()), expected);
+}
+
+#[test]
+fn test_sign_verify_message() {
+    let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
+    let coin = utxo_coin_for_test(
+        client.into(),
+        Some("spice describe gravity federal blast come thank unfair canal monkey style afraid"),
+        false,
+    );
+
+    let message = "test";
+    let signature = coin.sign_message(message).unwrap();
+    assert_eq!(
+        signature,
+        "HzetbqVj9gnUOznon9bvE61qRlmjH5R+rNgkxu8uyce3UBbOu+2aGh7r/GGSVFGZjRnaYC60hdwtdirTKLb7bE4="
+    );
+
+    let address = "R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW";
+    let is_valid = coin.verify_message(&signature, message, address).unwrap();
+    assert!(is_valid);
+}
+
+#[test]
+fn test_sign_verify_message_segwit() {
+    let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
+    let coin = utxo_coin_for_test(
+        client.into(),
+        Some("spice describe gravity federal blast come thank unfair canal monkey style afraid"),
+        true,
+    );
+
+    let message = "test";
+    let signature = coin.sign_message(message).unwrap();
+    assert_eq!(
+        signature,
+        "HzetbqVj9gnUOznon9bvE61qRlmjH5R+rNgkxu8uyce3UBbOu+2aGh7r/GGSVFGZjRnaYC60hdwtdirTKLb7bE4="
+    );
+
+    let is_valid = coin
+        .verify_message(&signature, message, "rck1qqk4t2dppvmu9jja0z7nan0h464n5gve8h7nhay")
+        .unwrap();
+    assert!(is_valid);
+
+    let is_valid = coin
+        .verify_message(&signature, message, "R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW")
+        .unwrap();
+    assert!(is_valid);
+}
diff --git a/mm2src/coins/utxo/utxo_wasm_tests.rs b/mm2src/coins/utxo/utxo_wasm_tests.rs
index 9ac222f926..4eaaf01d79 100644
--- a/mm2src/coins/utxo/utxo_wasm_tests.rs
+++ b/mm2src/coins/utxo/utxo_wasm_tests.rs
@@ -1,6 +1,8 @@
-use super::rpc_clients::ElectrumProtocol;
+use super::rpc_clients::{ElectrumClient, ElectrumClientImpl, ElectrumProtocol};
 use super::*;
 use crate::utxo::rpc_clients::UtxoRpcClientOps;
+use crate::utxo::utxo_common_tests;
+use common::executor::Timer;
 use serialization::deserialize;
 use wasm_bindgen_test::*;
 
@@ -43,7 +45,7 @@ async fn test_electrum_rpc_client() {
         .as_slice()
         .into();
     let verbose_tx = client
-        .get_verbose_transaction(tx_hash)
+        .get_verbose_transaction(&tx_hash)
         .compat()
         .await
         .expect("!get_verbose_transaction");
@@ -51,3 +53,9 @@ async fn test_electrum_rpc_client() {
     let expected = UtxoTx::from("0400008085202f8902358549fe3cf9a66bf61fb57bca1b3b49434a148a4dc29450b5eefe583f2f9ecf000000006a4730440220112aa3737672f8aa16a58426f5e7656ad13d21a219390c7a0b2e266ee6b216a8022008e9f9e94db91f069f831b0d40b7f75938122cddceaa25197146dfb00fe82599012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff358549fe3cf9a66bf61fb57bca1b3b49434a148a4dc29450b5eefe583f2f9ecf010000006b483045022100d054464799246254b09f96333bf52537938abe31c24bacf41c9ef600b28155950220527ec33c4a5bef79dcabf97e38aa240fecdd14c96f698560b2f10ec2abc2e992012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0240420f00000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac66418f00000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac0e2aa85f000000000000000000000000000000");
     assert_eq!(actual, expected);
 }
+
+#[wasm_bindgen_test]
+async fn test_electrum_display_balances() {
+    let rpc_client = electrum_client_for_test(&["electrum1.cipig.net:30017", "electrum2.cipig.net:30017"]).await;
+    utxo_common_tests::test_electrum_display_balances(&rpc_client).await;
+}
diff --git a/mm2src/coins/utxo/utxo_withdraw.rs b/mm2src/coins/utxo/utxo_withdraw.rs
new file mode 100644
index 0000000000..b54fd7a5fd
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_withdraw.rs
@@ -0,0 +1,447 @@
+use crate::rpc_command::init_withdraw::{WithdrawAwaitingStatus, WithdrawInProgressStatus, WithdrawTaskHandle};
+use crate::utxo::utxo_common::{big_decimal_from_sat, UtxoTxBuilder};
+use crate::utxo::{output_script, sat_from_big_decimal, ActualTxFee, Address, FeePolicy, GetUtxoListOps, PrivKeyPolicy,
+                  UtxoAddressFormat, UtxoCoinFields, UtxoCommonOps, UtxoFeeDetails, UtxoTx, UTXO_LOCK};
+use crate::{CoinWithDerivationMethod, GetWithdrawSenderAddress, MarketCoinOps, TransactionDetails, WithdrawError,
+            WithdrawFee, WithdrawRequest, WithdrawResult};
+use async_trait::async_trait;
+use chain::TransactionOutput;
+use common::log::info;
+use common::now_ms;
+use crypto::hw_rpc_task::{HwConnectStatuses, TrezorRpcTaskConnectProcessor};
+use crypto::trezor::client::TrezorClient;
+use crypto::trezor::{TrezorError, TrezorProcessingError};
+use crypto::{Bip32Error, CryptoCtx, CryptoInitError, DerivationPath, HwError, HwProcessingError};
+use keys::{Public as PublicKey, Type as ScriptType};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::ToTxHash;
+use rpc_task::RpcTaskError;
+use script::{Builder, Script, SignatureVersion, TransactionInputSigner};
+use serialization::{serialize, serialize_with_flags, SERIALIZE_TRANSACTION_WITNESS};
+use std::iter::once;
+use std::time::Duration;
+use utxo_signer::sign_params::{SendingOutputInfo, SpendingInputInfo, UtxoSignTxParamsBuilder};
+use utxo_signer::{with_key_pair, UtxoSignTxError};
+use utxo_signer::{SignPolicy, UtxoSignerOps};
+
+const TREZOR_CONNECT_TIMEOUT: Duration = Duration::from_secs(300);
+const TREZOR_PIN_TIMEOUT: Duration = Duration::from_secs(300);
+
+impl From<UtxoSignTxError> for WithdrawError {
+    fn from(sign_err: UtxoSignTxError) -> Self {
+        match sign_err {
+            UtxoSignTxError::TrezorError(trezor) => WithdrawError::from(trezor),
+            UtxoSignTxError::Transport(transport) => WithdrawError::Transport(transport),
+            UtxoSignTxError::Internal(internal) => WithdrawError::InternalError(internal),
+            sign_err => WithdrawError::InternalError(sign_err.to_string()),
+        }
+    }
+}
+
+impl From<HwProcessingError<RpcTaskError>> for WithdrawError {
+    fn from(e: HwProcessingError<RpcTaskError>) -> Self {
+        match e {
+            HwProcessingError::HwError(hw) => WithdrawError::from(hw),
+            HwProcessingError::ProcessorError(rpc_task) => WithdrawError::from(rpc_task),
+        }
+    }
+}
+
+impl From<TrezorProcessingError<RpcTaskError>> for WithdrawError {
+    fn from(e: TrezorProcessingError<RpcTaskError>) -> Self {
+        match e {
+            TrezorProcessingError::TrezorError(trezor) => WithdrawError::from(trezor),
+            TrezorProcessingError::ProcessorError(rpc_task) => WithdrawError::from(rpc_task),
+        }
+    }
+}
+
+impl From<HwError> for WithdrawError {
+    fn from(e: HwError) -> Self {
+        let error = e.to_string();
+        match e {
+            HwError::NoTrezorDeviceAvailable => WithdrawError::NoTrezorDeviceAvailable,
+            HwError::FoundUnexpectedDevice { .. } => WithdrawError::FoundUnexpectedDevice(error),
+            _ => WithdrawError::HardwareWalletInternal(error),
+        }
+    }
+}
+
+impl From<TrezorError> for WithdrawError {
+    fn from(e: TrezorError) -> Self { WithdrawError::HardwareWalletInternal(e.to_string()) }
+}
+
+impl From<CryptoInitError> for WithdrawError {
+    fn from(e: CryptoInitError) -> Self { WithdrawError::InternalError(e.to_string()) }
+}
+
+impl From<RpcTaskError> for WithdrawError {
+    fn from(e: RpcTaskError) -> Self {
+        let error = e.to_string();
+        match e {
+            RpcTaskError::Canceled => WithdrawError::InternalError("Canceled".to_owned()),
+            RpcTaskError::Timeout(timeout) => WithdrawError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
+                WithdrawError::InternalError(error)
+            },
+            RpcTaskError::Internal(internal) => WithdrawError::InternalError(internal),
+        }
+    }
+}
+
+impl From<Bip32Error> for WithdrawError {
+    fn from(e: Bip32Error) -> Self {
+        WithdrawError::HardwareWalletInternal(format!("Error parsing pubkey received from Hardware Wallet: {}", e))
+    }
+}
+
+#[async_trait]
+pub trait UtxoWithdraw<Coin>
+where
+    Self: Sized + Sync,
+    Coin: UtxoCommonOps + GetUtxoListOps,
+{
+    fn coin(&self) -> &Coin;
+
+    fn sender_address(&self) -> Address;
+
+    fn sender_address_string(&self) -> String;
+
+    fn request(&self) -> &WithdrawRequest;
+
+    fn signature_version(&self) -> SignatureVersion {
+        match self.sender_address().addr_format {
+            UtxoAddressFormat::Segwit => SignatureVersion::WitnessV0,
+            _ => self.coin().as_ref().conf.signature_version,
+        }
+    }
+
+    fn prev_script(&self) -> Script { Builder::build_p2pkh(&self.sender_address().hash) }
+
+    fn on_generating_transaction(&self) -> Result<(), MmError<WithdrawError>>;
+
+    fn on_finishing(&self) -> Result<(), MmError<WithdrawError>>;
+
+    async fn sign_tx(&self, unsigned_tx: TransactionInputSigner) -> Result<UtxoTx, MmError<WithdrawError>>;
+
+    async fn build(self) -> WithdrawResult {
+        let coin = self.coin();
+        let ticker = coin.as_ref().conf.ticker.clone();
+        let decimals = coin.as_ref().decimals;
+        let conf = &self.coin().as_ref().conf;
+        let req = self.request();
+
+        let to = coin
+            .address_from_str(&req.to)
+            .map_to_mm(WithdrawError::InvalidAddress)?;
+
+        let is_p2pkh = to.prefix == conf.pub_addr_prefix && to.t_addr_prefix == conf.pub_t_addr_prefix;
+        let is_p2sh = to.prefix == conf.p2sh_addr_prefix && to.t_addr_prefix == conf.p2sh_t_addr_prefix;
+
+        let script_type = if is_p2pkh {
+            ScriptType::P2PKH
+        } else if is_p2sh {
+            ScriptType::P2SH
+        } else {
+            return MmError::err(WithdrawError::InvalidAddress("Expected either P2PKH or P2SH".into()));
+        };
+
+        // Generate unsigned transaction.
+        self.on_generating_transaction()?;
+
+        let script_pubkey = output_script(&to, script_type).to_bytes();
+
+        let _utxo_lock = UTXO_LOCK.lock().await;
+        let (unspents, _) = coin.get_unspent_ordered_list(&self.sender_address()).await?;
+        let (value, fee_policy) = if req.max {
+            (
+                unspents.iter().fold(0, |sum, unspent| sum + unspent.value),
+                FeePolicy::DeductFromOutput(0),
+            )
+        } else {
+            let value = sat_from_big_decimal(&req.amount, decimals)?;
+            (value, FeePolicy::SendExact)
+        };
+        let outputs = vec![TransactionOutput { value, script_pubkey }];
+
+        let mut tx_builder = UtxoTxBuilder::new(coin)
+            .with_from_address(self.sender_address())
+            .add_available_inputs(unspents)
+            .add_outputs(outputs)
+            .with_fee_policy(fee_policy);
+
+        match req.fee {
+            Some(WithdrawFee::UtxoFixed { ref amount }) => {
+                let fixed = sat_from_big_decimal(amount, decimals)?;
+                tx_builder = tx_builder.with_fee(ActualTxFee::FixedPerKb(fixed));
+            },
+            Some(WithdrawFee::UtxoPerKbyte { ref amount }) => {
+                let dynamic = sat_from_big_decimal(amount, decimals)?;
+                tx_builder = tx_builder.with_fee(ActualTxFee::Dynamic(dynamic));
+            },
+            Some(ref fee_policy) => {
+                let error = format!(
+                    "Expected 'UtxoFixed' or 'UtxoPerKbyte' fee types, found {:?}",
+                    fee_policy
+                );
+                return MmError::err(WithdrawError::InvalidFeePolicy(error));
+            },
+            None => (),
+        };
+        let (unsigned, data) = tx_builder
+            .build()
+            .await
+            .mm_err(|gen_tx_error| WithdrawError::from_generate_tx_error(gen_tx_error, ticker.clone(), decimals))?;
+
+        // Sign the `unsigned` transaction.
+        let signed = self.sign_tx(unsigned).await?;
+
+        // Finish by generating `TransactionDetails` from the signed transaction.
+        self.on_finishing()?;
+
+        let fee_amount = data.fee_amount + data.unused_change.unwrap_or_default();
+        let fee_details = UtxoFeeDetails {
+            coin: Some(ticker.clone()),
+            amount: big_decimal_from_sat(fee_amount as i64, decimals),
+        };
+        let tx_hex = match coin.addr_format() {
+            UtxoAddressFormat::Segwit => serialize_with_flags(&signed, SERIALIZE_TRANSACTION_WITNESS).into(),
+            _ => serialize(&signed).into(),
+        };
+        Ok(TransactionDetails {
+            from: vec![self.sender_address_string()],
+            to: vec![req.to.clone()],
+            total_amount: big_decimal_from_sat(data.spent_by_me as i64, decimals),
+            spent_by_me: big_decimal_from_sat(data.spent_by_me as i64, decimals),
+            received_by_me: big_decimal_from_sat(data.received_by_me as i64, decimals),
+            my_balance_change: big_decimal_from_sat(data.received_by_me as i64 - data.spent_by_me as i64, decimals),
+            tx_hash: signed.hash().reversed().to_vec().to_tx_hash(),
+            tx_hex,
+            fee_details: Some(fee_details.into()),
+            block_height: 0,
+            coin: ticker,
+            internal_id: vec![].into(),
+            timestamp: now_ms() / 1000,
+            kmd_rewards: data.kmd_rewards,
+            transaction_type: Default::default(),
+        })
+    }
+}
+
+pub struct InitUtxoWithdraw<'a, Coin> {
+    ctx: MmArc,
+    coin: Coin,
+    task_handle: &'a WithdrawTaskHandle,
+    req: WithdrawRequest,
+    from_address: Address,
+    /// Displayed [`InitUtxoWithdraw::from_address`].
+    from_address_string: String,
+    /// Derivation path from which [`InitUtxoWithdraw::from_address`] was derived.
+    from_derivation_path: DerivationPath,
+    /// Public key corresponding to [`InitUtxoWithdraw::from_address`].
+    from_pubkey: PublicKey,
+}
+
+#[async_trait]
+impl<'a, Coin> UtxoWithdraw<Coin> for InitUtxoWithdraw<'a, Coin>
+where
+    Coin: UtxoCommonOps + GetUtxoListOps + UtxoSignerOps,
+{
+    fn coin(&self) -> &Coin { &self.coin }
+
+    fn sender_address(&self) -> Address { self.from_address.clone() }
+
+    fn sender_address_string(&self) -> String { self.from_address_string.clone() }
+
+    fn request(&self) -> &WithdrawRequest { &self.req }
+
+    fn on_generating_transaction(&self) -> Result<(), MmError<WithdrawError>> {
+        let amount_display = if self.req.max {
+            "MAX".to_owned()
+        } else {
+            self.req.amount.to_string()
+        };
+
+        // Display the address from which we are trying to withdraw funds.
+        info!(
+            "Trying to withdraw {} {} from {} to {}",
+            amount_display, self.req.coin, self.from_address_string, self.req.to,
+        );
+
+        Ok(self
+            .task_handle
+            .update_in_progress_status(WithdrawInProgressStatus::GeneratingTransaction)?)
+    }
+
+    fn on_finishing(&self) -> Result<(), MmError<WithdrawError>> {
+        Ok(self
+            .task_handle
+            .update_in_progress_status(WithdrawInProgressStatus::Finishing)?)
+    }
+
+    async fn sign_tx(&self, unsigned_tx: TransactionInputSigner) -> Result<UtxoTx, MmError<WithdrawError>> {
+        self.task_handle
+            .update_in_progress_status(WithdrawInProgressStatus::SigningTransaction)?;
+
+        let mut sign_params = UtxoSignTxParamsBuilder::new();
+
+        // TODO refactor [`UtxoTxBuilder::build`] to return `SpendingInputInfo` and `SendingOutputInfo` within `AdditionalTxData`.
+        sign_params.add_inputs_infos(unsigned_tx.inputs.iter().map(|_input| SpendingInputInfo::P2PKH {
+            address_derivation_path: self.from_derivation_path.clone(),
+            address_pubkey: self.from_pubkey,
+        }));
+        sign_params.add_outputs_infos(once(SendingOutputInfo {
+            destination_address: self.req.to.clone(),
+        }));
+        match unsigned_tx.outputs.len() {
+            // There is no change output.
+            1 => (),
+            // There is a change output.
+            2 => {
+                sign_params.add_outputs_infos(once(SendingOutputInfo {
+                    destination_address: self.from_address_string.clone(),
+                }));
+            },
+            unexpected => {
+                let error = format!("Unexpected number of outputs: {}", unexpected);
+                return MmError::err(WithdrawError::InternalError(error));
+            },
+        }
+
+        sign_params
+            .with_signature_version(self.signature_version())
+            .with_unsigned_tx(unsigned_tx)
+            .with_prev_script(Builder::build_p2pkh(&self.from_address.hash));
+        let sign_params = sign_params.build()?;
+
+        let sign_policy = match self.coin.as_ref().priv_key_policy {
+            PrivKeyPolicy::KeyPair(ref key_pair) => SignPolicy::WithKeyPair(key_pair),
+            PrivKeyPolicy::Trezor => {
+                let trezor_client = self.trezor_client().await?;
+                SignPolicy::WithTrezor(trezor_client)
+            },
+        };
+
+        self.task_handle
+            .update_in_progress_status(WithdrawInProgressStatus::WaitingForUserToConfirmSigning)?;
+        let signed = self.coin.sign_tx(sign_params, sign_policy).await?;
+
+        Ok(signed)
+    }
+}
+
+impl<'a, Coin> InitUtxoWithdraw<'a, Coin> {
+    pub async fn new(
+        ctx: MmArc,
+        coin: Coin,
+        req: WithdrawRequest,
+        task_handle: &'a WithdrawTaskHandle,
+    ) -> Result<InitUtxoWithdraw<'a, Coin>, MmError<WithdrawError>>
+    where
+        Coin: CoinWithDerivationMethod + GetWithdrawSenderAddress<Address = Address, Pubkey = PublicKey>,
+    {
+        let from = coin.get_withdraw_sender_address(&req).await?;
+        let from_address_string = from.address.display_address().map_to_mm(WithdrawError::InternalError)?;
+
+        let from_derivation_path = match from.derivation_path {
+            Some(der_path) => der_path,
+            // [`WithdrawSenderAddress::derivation_path`] is not set, but the coin is initialized with an HD wallet derivation method.
+            None if coin.has_hd_wallet_derivation_method() => {
+                let error = "Cannot determine 'from' address derivation path".to_owned();
+                return MmError::err(WithdrawError::UnexpectedFromAddress(error));
+            },
+            // Temporary initialize the derivation path by default since this field is not used without Trezor.
+            None => DerivationPath::default(),
+        };
+
+        Ok(InitUtxoWithdraw {
+            ctx,
+            coin,
+            task_handle,
+            req,
+            from_address: from.address,
+            from_address_string,
+            from_derivation_path,
+            from_pubkey: from.pubkey,
+        })
+    }
+
+    /// # Fail
+    ///
+    /// The method fails if [`CryptoCtx::hw_ctx`] is not initialized yet.
+    async fn trezor_client(&self) -> MmResult<TrezorClient, WithdrawError> {
+        let crypto_ctx = CryptoCtx::from_ctx(&self.ctx)?;
+        let hw_ctx = crypto_ctx
+            .hw_ctx()
+            .or_mm_err(|| WithdrawError::NoTrezorDeviceAvailable)?;
+
+        let trezor_connect_processor = TrezorRpcTaskConnectProcessor::new(self.task_handle, HwConnectStatuses {
+            on_connect: WithdrawInProgressStatus::WaitingForTrezorToConnect,
+            on_connected: WithdrawInProgressStatus::Preparing,
+            on_connection_failed: WithdrawInProgressStatus::Finishing,
+            on_button_request: WithdrawInProgressStatus::WaitingForUserToConfirmPubkey,
+            on_pin_request: WithdrawAwaitingStatus::WaitForTrezorPin,
+            on_ready: WithdrawInProgressStatus::Preparing,
+        })
+        .with_connect_timeout(TREZOR_CONNECT_TIMEOUT)
+        .with_pin_timeout(TREZOR_PIN_TIMEOUT);
+
+        hw_ctx
+            .trezor(&trezor_connect_processor)
+            .await
+            .mm_err(WithdrawError::from)
+    }
+}
+
+pub struct StandardUtxoWithdraw<Coin> {
+    coin: Coin,
+    req: WithdrawRequest,
+    my_address: Address,
+    my_address_string: String,
+}
+
+#[async_trait]
+impl<Coin> UtxoWithdraw<Coin> for StandardUtxoWithdraw<Coin>
+where
+    Coin: UtxoCommonOps + GetUtxoListOps,
+{
+    fn coin(&self) -> &Coin { &self.coin }
+
+    fn sender_address(&self) -> Address { self.my_address.clone() }
+
+    fn sender_address_string(&self) -> String { self.my_address_string.clone() }
+
+    fn request(&self) -> &WithdrawRequest { &self.req }
+
+    fn on_generating_transaction(&self) -> Result<(), MmError<WithdrawError>> { Ok(()) }
+
+    fn on_finishing(&self) -> Result<(), MmError<WithdrawError>> { Ok(()) }
+
+    async fn sign_tx(&self, unsigned_tx: TransactionInputSigner) -> Result<UtxoTx, MmError<WithdrawError>> {
+        let key_pair = self.coin.as_ref().priv_key_policy.key_pair_or_err()?;
+        Ok(with_key_pair::sign_tx(
+            unsigned_tx,
+            key_pair,
+            self.prev_script(),
+            self.signature_version(),
+            self.coin.as_ref().conf.fork_id,
+        )?)
+    }
+}
+
+impl<Coin> StandardUtxoWithdraw<Coin>
+where
+    Coin: AsRef<UtxoCoinFields> + MarketCoinOps,
+{
+    pub fn new(coin: Coin, req: WithdrawRequest) -> Result<Self, MmError<WithdrawError>> {
+        let my_address = coin.as_ref().derivation_method.iguana_or_err()?.clone();
+        let my_address_string = coin.my_address().map_to_mm(WithdrawError::InternalError)?;
+        Ok(StandardUtxoWithdraw {
+            coin,
+            req,
+            my_address,
+            my_address_string,
+        })
+    }
+}
diff --git a/mm2src/coins/utxo_signer/Cargo.toml b/mm2src/coins/utxo_signer/Cargo.toml
new file mode 100644
index 0000000000..db17cd348d
--- /dev/null
+++ b/mm2src/coins/utxo_signer/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "utxo_signer"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1"
+chain = { path = "../../mm2_bitcoin/chain" }
+common = { path = "../../common" }
+mm2_err_handle = { path = "../../mm2_err_handle" }
+crypto = { path = "../../crypto" }
+derive_more = "0.99"
+hex = "0.4.2"
+keys = { path = "../../mm2_bitcoin/keys" }
+primitives = { path = "../../mm2_bitcoin/primitives" }
+rpc = { path = "../../mm2_bitcoin/rpc" }
+script = { path = "../../mm2_bitcoin/script" }
+serialization = { path = "../../mm2_bitcoin/serialization" }
diff --git a/mm2src/coins/utxo_signer/src/lib.rs b/mm2src/coins/utxo_signer/src/lib.rs
new file mode 100644
index 0000000000..ce6d716d68
--- /dev/null
+++ b/mm2src/coins/utxo_signer/src/lib.rs
@@ -0,0 +1,156 @@
+use async_trait::async_trait;
+use chain::Transaction as UtxoTx;
+use crypto::trezor::client::TrezorClient;
+use crypto::trezor::utxo::TrezorUtxoCoin;
+use crypto::trezor::TrezorError;
+use derive_more::Display;
+use keys::bytes::Bytes;
+use keys::KeyPair;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::{Transaction as RpcTransaction, H256 as H256Json};
+use script::Script;
+
+mod sign_common;
+pub mod sign_params;
+pub mod with_key_pair;
+pub mod with_trezor;
+
+use crate::with_key_pair::UtxoSignWithKeyPairError;
+use sign_params::UtxoSignTxParams;
+
+pub type UtxoSignTxResult<T> = Result<T, MmError<UtxoSignTxError>>;
+
+type Signature = Bytes;
+
+pub enum TxProviderError {
+    Transport(String),
+    InvalidResponse(String),
+    Internal(String),
+}
+
+#[derive(Debug, Display)]
+pub enum UtxoSignTxError {
+    #[display(fmt = "Coin '{}' is not supported with Trezor", coin)]
+    CoinNotSupportedWithTrezor { coin: String },
+    #[display(fmt = "Trezor doesn't support P2WPKH outputs yet")]
+    TrezorDoesntSupportP2WPKH,
+    #[display(fmt = "Trezor client error: {}", _0)]
+    TrezorError(TrezorError),
+    #[display(fmt = "Encountered invalid parameter '{}': {}", param, description)]
+    InvalidSignParam { param: String, description: String },
+    #[display(
+        fmt = "Hardware Device returned an invalid number of signatures: '{}', number of inputs: '{}'",
+        actual,
+        expected
+    )]
+    InvalidSignaturesNumber { actual: usize, expected: usize },
+    #[display(fmt = "Error signing using a private key")]
+    ErrorSigning(keys::Error),
+    #[display(
+        fmt = "{} script '{}' built from input key pair doesn't match expected prev script '{}'",
+        script_type,
+        script,
+        prev_script
+    )]
+    MismatchScript {
+        script_type: String,
+        script: Script,
+        prev_script: Script,
+    },
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<TrezorError> for UtxoSignTxError {
+    fn from(e: TrezorError) -> Self { UtxoSignTxError::TrezorError(e) }
+}
+
+impl From<UtxoSignWithKeyPairError> for UtxoSignTxError {
+    fn from(error_with_key: UtxoSignWithKeyPairError) -> Self {
+        let error = error_with_key.to_string();
+        match error_with_key {
+            UtxoSignWithKeyPairError::MismatchScript {
+                script_type,
+                script,
+                prev_script,
+            } => UtxoSignTxError::MismatchScript {
+                script_type,
+                script,
+                prev_script,
+            },
+            // `with_key_pair` contains methods that checks parameters
+            // that are expected to be checked by [`sign_common::UtxoSignTxParamsBuilder::build`] already.
+            // So if this error happens, it's our internal error.
+            UtxoSignWithKeyPairError::InputIndexOutOfBound { .. } => UtxoSignTxError::Internal(error),
+            UtxoSignWithKeyPairError::ErrorSigning(sign) => UtxoSignTxError::ErrorSigning(sign),
+        }
+    }
+}
+
+impl From<keys::Error> for UtxoSignTxError {
+    fn from(e: keys::Error) -> Self { UtxoSignTxError::ErrorSigning(e) }
+}
+
+impl From<TxProviderError> for UtxoSignTxError {
+    fn from(e: TxProviderError) -> Self {
+        match e {
+            TxProviderError::Transport(transport) | TxProviderError::InvalidResponse(transport) => {
+                UtxoSignTxError::Transport(transport)
+            },
+            TxProviderError::Internal(internal) => UtxoSignTxError::Internal(internal),
+        }
+    }
+}
+
+/// The trait declares a transaction getter.
+/// The provider can use cache or RPC client.
+#[async_trait]
+pub trait TxProvider {
+    async fn get_rpc_transaction(&self, tx_hash: &H256Json) -> Result<RpcTransaction, MmError<TxProviderError>>;
+}
+
+pub enum SignPolicy<'a> {
+    WithTrezor(TrezorClient),
+    WithKeyPair(&'a KeyPair),
+}
+
+#[async_trait]
+pub trait UtxoSignerOps {
+    type TxGetter: TxProvider + Send + Sync;
+
+    fn trezor_coin(&self) -> UtxoSignTxResult<TrezorUtxoCoin>;
+
+    fn fork_id(&self) -> u32;
+
+    fn branch_id(&self) -> u32;
+
+    fn tx_provider(&self) -> Self::TxGetter;
+
+    async fn sign_tx(&self, params: UtxoSignTxParams, sign_policy: SignPolicy<'_>) -> UtxoSignTxResult<UtxoTx> {
+        match sign_policy {
+            SignPolicy::WithTrezor(trezor) => {
+                let signer = with_trezor::TrezorTxSigner {
+                    trezor,
+                    tx_provider: self.tx_provider(),
+                    trezor_coin: self.trezor_coin()?,
+                    params,
+                    fork_id: self.fork_id(),
+                    branch_id: self.branch_id(),
+                };
+                signer.sign_tx().await
+            },
+            SignPolicy::WithKeyPair(key_pair) => {
+                let signed = with_key_pair::sign_tx(
+                    params.unsigned_tx,
+                    key_pair,
+                    params.prev_script,
+                    params.signature_version,
+                    self.fork_id(),
+                )?;
+                Ok(signed)
+            },
+        }
+    }
+}
diff --git a/mm2src/coins/utxo_signer/src/sign_common.rs b/mm2src/coins/utxo_signer/src/sign_common.rs
new file mode 100644
index 0000000000..723367c7ea
--- /dev/null
+++ b/mm2src/coins/utxo_signer/src/sign_common.rs
@@ -0,0 +1,120 @@
+use crate::Signature;
+use chain::{Transaction as UtxoTx, TransactionInput};
+use keys::bytes::Bytes;
+use keys::Public as PublicKey;
+use primitives::hash::{H256, H512};
+use script::{Builder, Script, TransactionInputSigner, UnsignedTransactionInput};
+
+pub(crate) fn complete_tx(unsigned: TransactionInputSigner, signed_inputs: Vec<TransactionInput>) -> UtxoTx {
+    UtxoTx {
+        inputs: signed_inputs,
+        n_time: unsigned.n_time,
+        outputs: unsigned.outputs.clone(),
+        version: unsigned.version,
+        overwintered: unsigned.overwintered,
+        lock_time: unsigned.lock_time,
+        expiry_height: unsigned.expiry_height,
+        join_splits: vec![],
+        shielded_spends: vec![],
+        shielded_outputs: vec![],
+        value_balance: 0,
+        version_group_id: unsigned.version_group_id,
+        binding_sig: H512::default(),
+        join_split_sig: H512::default(),
+        join_split_pubkey: H256::default(),
+        zcash: unsigned.zcash,
+        str_d_zeel: unsigned.str_d_zeel,
+        tx_hash_algo: unsigned.hash_algo.into(),
+    }
+}
+
+pub(crate) fn p2pk_spend_with_signature(
+    unsigned_input: &UnsignedTransactionInput,
+    fork_id: u32,
+    signature: Signature,
+) -> TransactionInput {
+    let script_sig = script_sig(signature, fork_id);
+
+    TransactionInput {
+        previous_output: unsigned_input.previous_output,
+        script_sig: Builder::default().push_bytes(&script_sig).into_bytes(),
+        sequence: unsigned_input.sequence,
+        script_witness: vec![],
+    }
+}
+
+pub(crate) fn p2pkh_spend_with_signature(
+    unsigned_input: &UnsignedTransactionInput,
+    public_key: &PublicKey,
+    fork_id: u32,
+    signature: Signature,
+) -> TransactionInput {
+    let script_sig = script_sig_with_pub(public_key, fork_id, signature);
+
+    TransactionInput {
+        previous_output: unsigned_input.previous_output,
+        script_sig,
+        sequence: unsigned_input.sequence,
+        script_witness: vec![],
+    }
+}
+
+pub(crate) fn p2sh_spend_with_signature(
+    unsigned_input: &UnsignedTransactionInput,
+    redeem_script: Script,
+    script_data: Script,
+    fork_id: u32,
+    signature: Signature,
+) -> TransactionInput {
+    let script_sig = script_sig(signature, fork_id);
+
+    let mut resulting_script = Builder::default().push_data(&script_sig).into_bytes();
+    if !script_data.is_empty() {
+        resulting_script.extend_from_slice(&script_data);
+    }
+
+    let redeem_part = Builder::default().push_data(&redeem_script).into_bytes();
+    resulting_script.extend_from_slice(&redeem_part);
+
+    TransactionInput {
+        previous_output: unsigned_input.previous_output,
+        script_sig: resulting_script,
+        sequence: unsigned_input.sequence,
+        script_witness: vec![],
+    }
+}
+
+pub(crate) fn p2wpkh_spend_with_signature(
+    unsigned_input: &UnsignedTransactionInput,
+    public_key: &PublicKey,
+    fork_id: u32,
+    signature: Signature,
+) -> TransactionInput {
+    let script_sig = script_sig(signature, fork_id);
+
+    TransactionInput {
+        previous_output: unsigned_input.previous_output,
+        script_sig: Bytes::from(Vec::new()),
+        sequence: unsigned_input.sequence,
+        script_witness: vec![script_sig, Bytes::from(public_key.to_vec())],
+    }
+}
+
+pub(crate) fn script_sig_with_pub(public_key: &PublicKey, fork_id: u32, signature: Signature) -> Bytes {
+    let script_sig = script_sig(signature, fork_id);
+    let builder = Builder::default();
+    builder
+        .push_data(&script_sig)
+        .push_data(public_key.to_vec().as_slice())
+        .into_bytes()
+}
+
+pub(crate) fn script_sig(mut signature: Signature, fork_id: u32) -> Bytes {
+    let mut sig_script = Bytes::default();
+
+    sig_script.append(&mut signature);
+    // Using SIGHASH_ALL only for now
+    sig_script.append(&mut Bytes::from(vec![1 | fork_id as u8]));
+
+    sig_script
+}
diff --git a/mm2src/coins/utxo_signer/src/sign_params.rs b/mm2src/coins/utxo_signer/src/sign_params.rs
new file mode 100644
index 0000000000..545b951c67
--- /dev/null
+++ b/mm2src/coins/utxo_signer/src/sign_params.rs
@@ -0,0 +1,170 @@
+use crate::{UtxoSignTxError, UtxoSignTxResult};
+use chain::TransactionOutput;
+use crypto::trezor::utxo::TrezorOutputScriptType;
+use crypto::DerivationPath;
+use keys::Public as PublicKey;
+use mm2_err_handle::prelude::*;
+use script::{Script, SignatureVersion, TransactionInputSigner, UnsignedTransactionInput};
+
+impl UtxoSignTxError {
+    fn no_param(param: &str) -> UtxoSignTxError {
+        UtxoSignTxError::InvalidSignParam {
+            param: param.to_owned(),
+            description: "not set".to_owned(),
+        }
+    }
+}
+
+/// An additional info of a spending input.
+pub enum SpendingInputInfo {
+    P2PKH {
+        address_derivation_path: DerivationPath,
+        address_pubkey: PublicKey,
+    },
+    // The fields are used to generate `trezor::proto::messages_bitcoin::MultisigRedeemScriptType`
+    // P2SH {}
+}
+
+/// An additional info of a sending output.
+pub struct SendingOutputInfo {
+    pub destination_address: String,
+}
+
+impl SendingOutputInfo {
+    /// For now, returns [`TrezorOutputScriptType::PayToAddress`] since we don't support SLP tokens yet.
+    pub fn trezor_output_script_type(&self) -> TrezorOutputScriptType { TrezorOutputScriptType::PayToAddress }
+}
+
+pub struct UtxoSignTxParamsBuilder {
+    signature_version: Option<SignatureVersion>,
+    unsigned_tx: Option<TransactionInputSigner>,
+    /// The number of elements is expected to be the same as `unsigned_tx.inputs.len()`.
+    inputs_infos: Vec<SpendingInputInfo>,
+    /// The number of elements is expected to be the same as `unsigned_tx.outputs.len()`.
+    outputs_infos: Vec<SendingOutputInfo>,
+    /// This is used to check if a built from key pair matches the expected `prev_script`.
+    prev_script: Option<Script>,
+}
+
+impl Default for UtxoSignTxParamsBuilder {
+    fn default() -> Self { UtxoSignTxParamsBuilder::new() }
+}
+
+impl UtxoSignTxParamsBuilder {
+    pub fn new() -> UtxoSignTxParamsBuilder {
+        UtxoSignTxParamsBuilder {
+            signature_version: None,
+            unsigned_tx: None,
+            inputs_infos: Vec::new(),
+            outputs_infos: Vec::new(),
+            prev_script: None,
+        }
+    }
+
+    pub fn with_signature_version(&mut self, sig_ver: SignatureVersion) -> &mut UtxoSignTxParamsBuilder {
+        self.signature_version = Some(sig_ver);
+        self
+    }
+
+    pub fn with_unsigned_tx(&mut self, unsigned_tx: TransactionInputSigner) -> &mut UtxoSignTxParamsBuilder {
+        self.unsigned_tx = Some(unsigned_tx);
+        self
+    }
+
+    pub fn add_inputs_infos<I>(&mut self, inputs: I) -> &mut UtxoSignTxParamsBuilder
+    where
+        I: IntoIterator<Item = SpendingInputInfo>,
+    {
+        self.inputs_infos.extend(inputs);
+        self
+    }
+
+    pub fn add_outputs_infos<I>(&mut self, outputs: I) -> &mut UtxoSignTxParamsBuilder
+    where
+        I: IntoIterator<Item = SendingOutputInfo>,
+    {
+        self.outputs_infos.extend(outputs);
+        self
+    }
+
+    pub fn with_prev_script(&mut self, prev_script: Script) -> &mut UtxoSignTxParamsBuilder {
+        self.prev_script = Some(prev_script);
+        self
+    }
+
+    pub fn build(self) -> UtxoSignTxResult<UtxoSignTxParams> {
+        let unsigned_tx = self
+            .unsigned_tx
+            .or_mm_err(|| UtxoSignTxError::no_param("unsigned_tx"))?;
+
+        if self.inputs_infos.len() != unsigned_tx.inputs.len() {
+            let description = format!(
+                "found '{}' inputs, expected '{}'",
+                self.inputs_infos.len(),
+                unsigned_tx.inputs.len()
+            );
+            let param = "inputs_infos".to_owned();
+            return MmError::err(UtxoSignTxError::InvalidSignParam { param, description });
+        }
+
+        if self.outputs_infos.len() != unsigned_tx.outputs.len() {
+            let description = format!(
+                "found '{}' outputs, expected '{}'",
+                self.outputs_infos.len(),
+                unsigned_tx.outputs.len()
+            );
+            let param = "outputs_infos".to_owned();
+            return MmError::err(UtxoSignTxError::InvalidSignParam { param, description });
+        }
+
+        let params = UtxoSignTxParams {
+            signature_version: self
+                .signature_version
+                .or_mm_err(|| UtxoSignTxError::no_param("signature_version"))?,
+            unsigned_tx,
+            inputs_infos: self.inputs_infos,
+            outputs_infos: self.outputs_infos,
+            prev_script: self
+                .prev_script
+                .or_mm_err(|| UtxoSignTxError::no_param("prev_script"))?,
+        };
+        Ok(params)
+    }
+}
+
+pub struct UtxoSignTxParams {
+    pub(crate) signature_version: SignatureVersion,
+    pub(crate) unsigned_tx: TransactionInputSigner,
+    /// The number of elements is exactly the same as `unsigned_tx.inputs.len()`.
+    pub(crate) inputs_infos: Vec<SpendingInputInfo>,
+    /// The number of elements is exactly the same as `unsigned_tx.outputs.len()`.
+    pub(crate) outputs_infos: Vec<SendingOutputInfo>,
+    /// This is used to check if a built from key pair matches the expected `prev_script`.
+    pub(crate) prev_script: Script,
+}
+
+impl UtxoSignTxParams {
+    pub fn inputs_count(&self) -> usize { self.unsigned_tx.inputs.len() }
+
+    /// We are sure that the number of `unsigned_tx.inputs.len()` is the same as `inputs_infos.len()`.
+    /// Please see [`UtxoSignTxParamsBuilder::build`].
+    pub fn inputs(&self) -> impl Iterator<Item = (&UnsignedTransactionInput, &SpendingInputInfo)> {
+        assert_eq!(
+            self.unsigned_tx.inputs.len(),
+            self.inputs_infos.len(),
+            "'unsigned_tx.inputs' and 'inputs_infos' must be checked"
+        );
+        self.unsigned_tx.inputs.iter().zip(self.inputs_infos.iter())
+    }
+
+    /// We are sure that the number of `unsigned_tx.outputs.len()` is the same as `outputs_infos.len()`.
+    /// Please see [`UtxoSignTxParamsBuilder::build`].
+    pub fn outputs(&self) -> impl Iterator<Item = (&TransactionOutput, &SendingOutputInfo)> {
+        assert_eq!(
+            self.unsigned_tx.inputs.len(),
+            self.inputs_infos.len(),
+            "'unsigned_tx.outputs' and 'outputs_infos' must be checked"
+        );
+        self.unsigned_tx.outputs.iter().zip(self.outputs_infos.iter())
+    }
+}
diff --git a/mm2src/coins/utxo_signer/src/with_key_pair.rs b/mm2src/coins/utxo_signer/src/with_key_pair.rs
new file mode 100644
index 0000000000..3db094e2e8
--- /dev/null
+++ b/mm2src/coins/utxo_signer/src/with_key_pair.rs
@@ -0,0 +1,225 @@
+use crate::sign_common::{complete_tx, p2pk_spend_with_signature, p2pkh_spend_with_signature,
+                         p2sh_spend_with_signature, p2wpkh_spend_with_signature};
+use crate::Signature;
+use chain::{Transaction as UtxoTx, TransactionInput};
+use derive_more::Display;
+use keys::bytes::Bytes;
+use keys::KeyPair;
+use mm2_err_handle::prelude::*;
+use primitives::hash::H256;
+use script::{Builder, Script, SignatureVersion, TransactionInputSigner, UnsignedTransactionInput};
+
+pub type UtxoSignWithKeyPairResult<T> = Result<T, MmError<UtxoSignWithKeyPairError>>;
+
+#[derive(Debug, Display)]
+pub enum UtxoSignWithKeyPairError {
+    #[display(
+        fmt = "{} script '{}' built from input key pair doesn't match expected prev script '{}'",
+        script_type,
+        script,
+        prev_script
+    )]
+    MismatchScript {
+        script_type: String,
+        script: Script,
+        prev_script: Script,
+    },
+    #[display(fmt = "Input index '{}' is out of bound. Total length = {}", index, len)]
+    InputIndexOutOfBound { len: usize, index: usize },
+    #[display(fmt = "Error signing using a private key")]
+    ErrorSigning(keys::Error),
+}
+
+impl From<keys::Error> for UtxoSignWithKeyPairError {
+    fn from(sign: keys::Error) -> Self { UtxoSignWithKeyPairError::ErrorSigning(sign) }
+}
+
+pub fn sign_tx(
+    unsigned: TransactionInputSigner,
+    key_pair: &KeyPair,
+    prev_script: Script,
+    signature_version: SignatureVersion,
+    fork_id: u32,
+) -> UtxoSignWithKeyPairResult<UtxoTx> {
+    let mut signed_inputs = vec![];
+    match signature_version {
+        SignatureVersion::WitnessV0 => {
+            for (i, _) in unsigned.inputs.iter().enumerate() {
+                signed_inputs.push(p2wpkh_spend(
+                    &unsigned,
+                    i,
+                    key_pair,
+                    prev_script.clone(),
+                    signature_version,
+                    fork_id,
+                )?);
+            }
+        },
+        _ => {
+            for (i, _) in unsigned.inputs.iter().enumerate() {
+                signed_inputs.push(p2pkh_spend(
+                    &unsigned,
+                    i,
+                    key_pair,
+                    prev_script.clone(),
+                    signature_version,
+                    fork_id,
+                )?);
+            }
+        },
+    }
+    Ok(complete_tx(unsigned, signed_inputs))
+}
+
+/// Creates signed input spending p2pk output
+pub fn p2pk_spend(
+    signer: &TransactionInputSigner,
+    input_index: usize,
+    key_pair: &KeyPair,
+    signature_version: SignatureVersion,
+    fork_id: u32,
+) -> UtxoSignWithKeyPairResult<TransactionInput> {
+    let unsigned_input = get_input(signer, input_index)?;
+
+    let script = Builder::build_p2pk(key_pair.public());
+    let signature = calc_and_sign_sighash(signer, input_index, script, key_pair, signature_version, fork_id)?;
+    Ok(p2pk_spend_with_signature(unsigned_input, fork_id, signature))
+}
+
+/// Creates signed input spending p2pkh output
+pub fn p2pkh_spend(
+    signer: &TransactionInputSigner,
+    input_index: usize,
+    key_pair: &KeyPair,
+    prev_script: Script,
+    signature_version: SignatureVersion,
+    fork_id: u32,
+) -> UtxoSignWithKeyPairResult<TransactionInput> {
+    let unsigned_input = get_input(signer, input_index)?;
+
+    let script = Builder::build_p2pkh(&key_pair.public().address_hash().into());
+    if script != prev_script {
+        return MmError::err(UtxoSignWithKeyPairError::MismatchScript {
+            script_type: "P2PKH".to_owned(),
+            script,
+            prev_script,
+        });
+    }
+
+    let signature = calc_and_sign_sighash(signer, input_index, script, key_pair, signature_version, fork_id)?;
+    Ok(p2pkh_spend_with_signature(
+        unsigned_input,
+        key_pair.public(),
+        fork_id,
+        signature,
+    ))
+}
+
+/// Creates signed input spending hash time locked p2sh output
+pub fn p2sh_spend(
+    signer: &TransactionInputSigner,
+    input_index: usize,
+    key_pair: &KeyPair,
+    script_data: Script,
+    redeem_script: Script,
+    signature_version: SignatureVersion,
+    fork_id: u32,
+) -> UtxoSignWithKeyPairResult<TransactionInput> {
+    let unsigned_input = get_input(signer, input_index)?;
+
+    let signature = calc_and_sign_sighash(
+        signer,
+        input_index,
+        redeem_script.clone(),
+        key_pair,
+        signature_version,
+        fork_id,
+    )?;
+    Ok(p2sh_spend_with_signature(
+        unsigned_input,
+        redeem_script,
+        script_data,
+        fork_id,
+        signature,
+    ))
+}
+
+/// Creates signed input spending p2wpkh output
+pub fn p2wpkh_spend(
+    signer: &TransactionInputSigner,
+    input_index: usize,
+    key_pair: &KeyPair,
+    prev_script: Script,
+    signature_version: SignatureVersion,
+    fork_id: u32,
+) -> UtxoSignWithKeyPairResult<TransactionInput> {
+    let unsigned_input = get_input(signer, input_index)?;
+
+    let script = Builder::build_p2pkh(&key_pair.public().address_hash().into());
+    if script != prev_script {
+        return MmError::err(UtxoSignWithKeyPairError::MismatchScript {
+            script_type: "P2PKH".to_owned(),
+            script,
+            prev_script,
+        });
+    }
+
+    let signature = calc_and_sign_sighash(signer, input_index, script, key_pair, signature_version, fork_id)?;
+    Ok(p2wpkh_spend_with_signature(
+        unsigned_input,
+        key_pair.public(),
+        fork_id,
+        signature,
+    ))
+}
+
+/// Calculates the input script hash and sign it using `key_pair`.
+pub(crate) fn calc_and_sign_sighash(
+    signer: &TransactionInputSigner,
+    input_index: usize,
+    output_script: Script,
+    key_pair: &KeyPair,
+    signature_version: SignatureVersion,
+    fork_id: u32,
+) -> UtxoSignWithKeyPairResult<Signature> {
+    let sighash = signature_hash_to_sign(signer, input_index, output_script, signature_version, fork_id)?;
+    sign_message(&sighash, key_pair)
+}
+
+fn signature_hash_to_sign(
+    signer: &TransactionInputSigner,
+    input_index: usize,
+    output_script: Script,
+    signature_version: SignatureVersion,
+    fork_id: u32,
+) -> UtxoSignWithKeyPairResult<H256> {
+    let input_amount = get_input(signer, input_index)?.amount;
+
+    let sighash_type = 1 | fork_id;
+    Ok(signer.signature_hash(
+        input_index,
+        input_amount,
+        &output_script,
+        signature_version,
+        sighash_type,
+    ))
+}
+
+fn sign_message(message: &H256, key_pair: &KeyPair) -> UtxoSignWithKeyPairResult<Bytes> {
+    let signature = key_pair.private().sign(message)?;
+    Ok(Bytes::from(signature.to_vec()))
+}
+
+#[track_caller]
+fn get_input(
+    unsigned: &TransactionInputSigner,
+    input_index: usize,
+) -> UtxoSignWithKeyPairResult<&UnsignedTransactionInput> {
+    unsigned
+        .inputs
+        .get(input_index)
+        .or_mm_err(|| UtxoSignWithKeyPairError::InputIndexOutOfBound {
+            len: unsigned.inputs.len(),
+            index: input_index,
+        })
+}
diff --git a/mm2src/coins/utxo_signer/src/with_trezor.rs b/mm2src/coins/utxo_signer/src/with_trezor.rs
new file mode 100644
index 0000000000..c6cc9b1dfe
--- /dev/null
+++ b/mm2src/coins/utxo_signer/src/with_trezor.rs
@@ -0,0 +1,183 @@
+use crate::sign_common::{complete_tx, p2pkh_spend_with_signature};
+use crate::sign_params::{SendingOutputInfo, SpendingInputInfo, UtxoSignTxParams};
+use crate::{TxProvider, UtxoSignTxError, UtxoSignTxResult};
+use chain::{Transaction as UtxoTx, TransactionOutput};
+use common::log::debug;
+use crypto::trezor::utxo::{PrevTx, PrevTxInput, PrevTxOutput, TrezorInputScriptType, TrezorUtxoCoin, TxOutput,
+                           TxSignResult, UnsignedTxInput, UnsignedUtxoTx};
+use crypto::trezor::TrezorClient;
+use keys::bytes::Bytes;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::H256 as H256Json;
+use script::{SignatureVersion, UnsignedTransactionInput};
+use serialization::deserialize;
+
+pub struct TrezorTxSigner<TxP> {
+    pub trezor: TrezorClient,
+    pub tx_provider: TxP,
+    pub trezor_coin: TrezorUtxoCoin,
+    pub params: UtxoSignTxParams,
+    pub fork_id: u32,
+    pub branch_id: u32,
+}
+
+impl<TxP: TxProvider + Send + Sync> TrezorTxSigner<TxP> {
+    pub async fn sign_tx(self) -> UtxoSignTxResult<UtxoTx> {
+        if let SignatureVersion::WitnessV0 = self.params.signature_version {
+            return MmError::err(UtxoSignTxError::TrezorDoesntSupportP2WPKH);
+        }
+
+        let trezor_unsigned_tx = self.get_trezor_unsigned_tx().await?;
+        let mut session = self.trezor.session().await?;
+
+        let TxSignResult {
+            signatures,
+            serialized_tx,
+        } = session.sign_utxo_tx(trezor_unsigned_tx).await?;
+        debug!("Transaction signed by Trezor: {}", hex::encode(serialized_tx));
+        if signatures.len() != self.params.inputs_count() {
+            return MmError::err(UtxoSignTxError::InvalidSignaturesNumber {
+                actual: signatures.len(),
+                expected: self.params.inputs_count(),
+            });
+        }
+
+        let signed_inputs = self
+            .params
+            .inputs()
+            .zip(signatures.into_iter())
+            .map(|((unsigned_input, input_info), signature)| match input_info {
+                SpendingInputInfo::P2PKH { address_pubkey, .. } => {
+                    p2pkh_spend_with_signature(unsigned_input, address_pubkey, self.fork_id, Bytes::from(signature))
+                },
+            })
+            .collect();
+        Ok(complete_tx(self.params.unsigned_tx, signed_inputs))
+    }
+
+    async fn get_trezor_unsigned_tx(&self) -> UtxoSignTxResult<UnsignedUtxoTx> {
+        let mut inputs = Vec::with_capacity(self.params.unsigned_tx.inputs.len());
+        for (unsigned_input, input_info) in self.params.inputs() {
+            let unsigned_input = self.get_trezor_unsigned_input(unsigned_input, input_info).await?;
+            inputs.push(unsigned_input);
+        }
+
+        let outputs = self
+            .params
+            .outputs()
+            .map(|(tx_output, output_info)| self.get_trezor_output(tx_output, output_info))
+            .collect();
+
+        Ok(UnsignedUtxoTx {
+            coin: self.trezor_coin,
+            inputs,
+            outputs,
+            version: self.params.unsigned_tx.version as u32,
+            lock_time: self.params.unsigned_tx.lock_time,
+            version_group_id: self.version_group_id(),
+            branch_id: self.branch_id(),
+        })
+    }
+
+    fn get_trezor_output(&self, tx_output: &TransactionOutput, output_info: &SendingOutputInfo) -> TxOutput {
+        TxOutput {
+            address: output_info.destination_address.clone(),
+            amount: tx_output.value,
+            script_type: output_info.trezor_output_script_type(),
+        }
+    }
+
+    async fn get_trezor_unsigned_input(
+        &self,
+        unsigned_input: &UnsignedTransactionInput,
+        input_info: &SpendingInputInfo,
+    ) -> UtxoSignTxResult<UnsignedTxInput> {
+        let prev_tx_hash_json = H256Json::from(unsigned_input.previous_output.hash.reversed());
+        let prev_tx = self.get_trezor_prev_tx(&prev_tx_hash_json).await?;
+
+        let (address_derivation_path, input_script_type) = match input_info {
+            SpendingInputInfo::P2PKH {
+                address_derivation_path,
+                ..
+            } => (
+                Some(address_derivation_path.clone()),
+                TrezorInputScriptType::SpendAddress,
+            ),
+        };
+
+        Ok(UnsignedTxInput {
+            address_derivation_path,
+            prev_tx,
+            prev_hash: unsigned_input.previous_output.hash.reversed().to_vec(),
+            prev_index: unsigned_input.previous_output.index,
+            sequence: unsigned_input.sequence,
+            input_script_type,
+            amount: unsigned_input.amount,
+        })
+    }
+
+    async fn get_trezor_prev_tx(&self, prev_tx_hash: &H256Json) -> UtxoSignTxResult<PrevTx> {
+        let prev_verbose = self.tx_provider.get_rpc_transaction(prev_tx_hash).await?;
+        let prev_utxo: UtxoTx =
+            deserialize(prev_verbose.hex.as_slice()).map_to_mm(|e| UtxoSignTxError::Transport(e.to_string()))?;
+
+        let prev_tx_inputs = prev_utxo
+            .inputs
+            .into_iter()
+            .map(|prev_tx_input| PrevTxInput {
+                prev_hash: prev_tx_input.previous_output.hash.reversed().to_vec(),
+                prev_index: prev_tx_input.previous_output.index,
+                script_sig: prev_tx_input.script_sig.to_vec(),
+                sequence: prev_tx_input.sequence,
+            })
+            .collect();
+        let prev_tx_outputs = prev_utxo
+            .outputs
+            .into_iter()
+            .map(|prev_tx_output| PrevTxOutput {
+                amount: prev_tx_output.value,
+                script_pubkey: prev_tx_output.script_pubkey.to_vec(),
+            })
+            .collect();
+        Ok(PrevTx {
+            inputs: prev_tx_inputs,
+            outputs: prev_tx_outputs,
+            version: prev_utxo.version as u32,
+            lock_time: prev_utxo.lock_time,
+            version_group_id: self.version_group_id(),
+            branch_id: self.branch_id(),
+            extra_data: self.extra_data(),
+        })
+    }
+
+    /// `version_group_id` must be set for Zcash coins *only*.
+    fn version_group_id(&self) -> Option<u32> {
+        if self.is_overwinter_compatible() {
+            Some(self.params.unsigned_tx.version_group_id)
+        } else {
+            None
+        }
+    }
+
+    /// `branch_id` must be set for Zcash coins *only*.
+    fn branch_id(&self) -> Option<u32> {
+        if self.is_overwinter_compatible() {
+            Some(self.branch_id)
+        } else {
+            None
+        }
+    }
+
+    /// Temporary use `0000000000000000000000` extra data for Zcash coins *only*.
+    /// https://github.com/trezor/connect/issues/610#issuecomment-646022404
+    fn extra_data(&self) -> Vec<u8> {
+        if self.is_overwinter_compatible() {
+            vec![0; 11]
+        } else {
+            Vec::new()
+        }
+    }
+
+    /// https://github.com/trezor/trezor-utxo-lib/blob/trezor/src/transaction.js#L405
+    fn is_overwinter_compatible(&self) -> bool { self.params.unsigned_tx.version > 3 }
+}
diff --git a/mm2src/coins/z_coin.rs b/mm2src/coins/z_coin.rs
index 6f65b9d96b..f9b68bbf4b 100644
--- a/mm2src/coins/z_coin.rs
+++ b/mm2src/coins/z_coin.rs
@@ -1,154 +1,949 @@
-use crate::utxo::rpc_clients::{UnspentInfo, UtxoRpcClientEnum, UtxoRpcError, UtxoRpcResult};
-use crate::utxo::utxo_common::{payment_script, UtxoArcBuilder};
-use crate::utxo::{utxo_common, ActualTxFee, AdditionalTxData, Address, FeePolicy, GenerateTxResult, HistoryUtxoTx,
-                  HistoryUtxoTxMap, RecentlySpentOutPoints, UtxoArc, UtxoCoinBuilder, UtxoCoinFields, UtxoCommonOps,
+use crate::my_tx_history_v2::{MyTxHistoryErrorV2, MyTxHistoryRequestV2, MyTxHistoryResponseV2};
+use crate::rpc_command::init_withdraw::{InitWithdrawCoin, WithdrawInProgressStatus, WithdrawTaskHandle};
+use crate::utxo::rpc_clients::{ElectrumRpcRequest, UnspentInfo, UtxoRpcClientEnum, UtxoRpcError, UtxoRpcFut,
+                               UtxoRpcResult};
+use crate::utxo::utxo_builder::{UtxoCoinBuilderCommonOps, UtxoCoinWithIguanaPrivKeyBuilder,
+                                UtxoFieldsWithIguanaPrivKeyBuilder};
+use crate::utxo::utxo_common::{addresses_from_script, big_decimal_from_sat, big_decimal_from_sat_unsigned,
+                               payment_script};
+use crate::utxo::{sat_from_big_decimal, utxo_common, ActualTxFee, AdditionalTxData, Address, BroadcastTxErr,
+                  FeePolicy, GetUtxoListOps, HistoryUtxoTx, HistoryUtxoTxMap, MatureUnspentList,
+                  RecentlySpentOutPointsGuard, UtxoActivationParams, UtxoAddressFormat, UtxoArc, UtxoCoinFields,
+                  UtxoCommonOps, UtxoFeeDetails, UtxoRpcMode, UtxoTxBroadcastOps, UtxoTxGenerationOps,
                   VerboseTransactionFrom};
-use crate::{BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps, MmCoin,
-            NegotiateSwapContractAddrErr, SwapOps, TradeFee, TradePreimageFut, TradePreimageResult,
-            TradePreimageValue, TransactionDetails, TransactionEnum, TransactionFut, ValidateAddressResult,
-            WithdrawFut, WithdrawRequest};
+use crate::{BalanceError, BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps,
+            MmCoin, NegotiateSwapContractAddrErr, NumConversError, PrivKeyActivationPolicy, RawTransactionFut,
+            RawTransactionRequest, SearchForSwapTxSpendInput, SignatureError, SignatureResult, SwapOps, TradeFee,
+            TradePreimageFut, TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum,
+            TransactionFut, TxFeeDetails, UnexpectedDerivationMethod, ValidateAddressResult, ValidatePaymentInput,
+            VerificationError, VerificationResult, WithdrawFut, WithdrawRequest};
+use crate::{Transaction, WithdrawError};
 use async_trait::async_trait;
-use bitcrypto::dhash160;
+use bitcrypto::{dhash160, dhash256};
 use chain::constants::SEQUENCE_FINAL;
 use chain::{Transaction as UtxoTx, TransactionOutput};
-use common::jsonrpc_client::JsonRpcError;
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
-use common::mm_number::{BigDecimal, MmNumber};
-use common::now_ms;
-use derive_more::Display;
-use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
+use common::{async_blocking, calc_total_pages, log, PagingOptionsEnum};
+use crypto::privkey::{key_pair_from_secret, secp_privkey_from_hash};
+use db_common::sqlite::offset_by_id;
+use db_common::sqlite::rusqlite::{Error as SqlError, Row, NO_PARAMS};
+use db_common::sqlite::sql_builder::{name, SqlBuilder, SqlName};
+use futures::compat::Future01CompatExt;
+use futures::lock::Mutex as AsyncMutex;
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
-use keys::Public;
+use http::Uri;
+use keys::hash::H256;
+use keys::{KeyPair, Message, Public};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
+#[cfg(test)] use mocktopus::macros::*;
 use primitives::bytes::Bytes;
 use rpc::v1::types::{Bytes as BytesJson, Transaction as RpcTransaction, H256 as H256Json};
 use script::{Builder as ScriptBuilder, Opcode, Script, TransactionInputSigner};
 use serde_json::Value as Json;
-use serialization::deserialize;
+use serialization::CoinVariant;
+use std::collections::{HashMap, HashSet};
+use std::path::PathBuf;
+use std::str::FromStr;
 use std::sync::Arc;
-use zcash_client_backend::encoding::{encode_extended_spending_key, encode_payment_address};
-use zcash_primitives::{constants::mainnet as z_mainnet_constants, sapling::PaymentAddress, zip32::ExtendedSpendingKey};
+use zcash_client_backend::data_api::WalletRead;
+use zcash_client_backend::encoding::{decode_payment_address, encode_extended_spending_key, encode_payment_address};
+use zcash_client_backend::wallet::{AccountId, SpendableNote};
+use zcash_client_sqlite::error::SqliteClientError as ZcashClientError;
+use zcash_client_sqlite::error::SqliteClientError;
+use zcash_client_sqlite::wallet::get_balance;
+use zcash_client_sqlite::wallet::transact::get_spendable_notes;
+use zcash_primitives::consensus::{BlockHeight, NetworkUpgrade, Parameters, H0};
+use zcash_primitives::memo::MemoBytes;
+use zcash_primitives::sapling::keys::OutgoingViewingKey;
+use zcash_primitives::sapling::note_encryption::try_sapling_output_recovery;
+use zcash_primitives::transaction::builder::Builder as ZTxBuilder;
+use zcash_primitives::transaction::components::{Amount, TxOut};
+use zcash_primitives::transaction::Transaction as ZTransaction;
+use zcash_primitives::{consensus, constants::mainnet as z_mainnet_constants, sapling::PaymentAddress,
+                       zip32::ExtendedFullViewingKey, zip32::ExtendedSpendingKey};
 use zcash_proofs::prover::LocalTxProver;
 
 mod z_htlc;
 use z_htlc::{z_p2sh_spend, z_send_dex_fee, z_send_htlc};
 
 mod z_rpc;
-use z_rpc::ZRpcOps;
+pub use z_rpc::SyncStatus;
+use z_rpc::{init_light_client, SaplingSyncConnector, SaplingSyncGuard, WalletDbShared};
+
+mod z_coin_errors;
+pub use z_coin_errors::*;
+
+#[cfg(all(test, feature = "zhtlc-native-tests"))]
+mod z_coin_tests;
+
+/// `ZP2SHSpendError` compatible `TransactionErr` handling macro.
+macro_rules! try_ztx_s {
+    ($e: expr) => {
+        match $e {
+            Ok(ok) => ok,
+            Err(err) => {
+                if let Some(tx) = err.get_inner().get_tx() {
+                    return Err(crate::TransactionErr::TxRecoverable(
+                        tx,
+                        format!("{}:{}] {:?}", file!(), line!(), err),
+                    ));
+                }
+
+                return Err(crate::TransactionErr::Plain(ERRL!("{:?}", err)));
+            },
+        }
+    };
+}
+
+const DEX_FEE_OVK: OutgoingViewingKey = OutgoingViewingKey([7; 32]);
+const DEX_FEE_Z_ADDR: &str = "zs1rp6426e9r6jkq2nsanl66tkd34enewrmr0uvj0zelhkcwmsy0uvxz2fhm9eu9rl3ukxvgzy2v9f";
+const TRANSACTIONS_TABLE: &str = "transactions";
+const BLOCKS_TABLE: &str = "blocks";
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ZcoinConsensusParams {
+    // we don't support coins without overwinter and sapling active so these are mandatory
+    overwinter_activation_height: u32,
+    sapling_activation_height: u32,
+    // optional upgrades that we will possibly support in the future
+    blossom_activation_height: Option<u32>,
+    heartwood_activation_height: Option<u32>,
+    canopy_activation_height: Option<u32>,
+    coin_type: u32,
+    hrp_sapling_extended_spending_key: String,
+    hrp_sapling_extended_full_viewing_key: String,
+    hrp_sapling_payment_address: String,
+    b58_pubkey_address_prefix: [u8; 2],
+    b58_script_address_prefix: [u8; 2],
+}
+
+impl Parameters for ZcoinConsensusParams {
+    fn activation_height(&self, nu: NetworkUpgrade) -> Option<BlockHeight> {
+        match nu {
+            NetworkUpgrade::Overwinter => Some(BlockHeight::from(self.overwinter_activation_height)),
+            NetworkUpgrade::Sapling => Some(BlockHeight::from(self.sapling_activation_height)),
+            NetworkUpgrade::Blossom => self.blossom_activation_height.map(BlockHeight::from),
+            NetworkUpgrade::Heartwood => self.heartwood_activation_height.map(BlockHeight::from),
+            NetworkUpgrade::Canopy => self.canopy_activation_height.map(BlockHeight::from),
+        }
+    }
+
+    fn coin_type(&self) -> u32 { self.coin_type }
+
+    fn hrp_sapling_extended_spending_key(&self) -> &str { &self.hrp_sapling_extended_spending_key }
+
+    fn hrp_sapling_extended_full_viewing_key(&self) -> &str { &self.hrp_sapling_extended_full_viewing_key }
 
-#[cfg(test)] mod z_coin_tests;
+    fn hrp_sapling_payment_address(&self) -> &str { &self.hrp_sapling_payment_address }
+
+    fn b58_pubkey_address_prefix(&self) -> [u8; 2] { self.b58_pubkey_address_prefix }
+
+    fn b58_script_address_prefix(&self) -> [u8; 2] { self.b58_script_address_prefix }
+}
 
 pub struct ZCoinFields {
+    dex_fee_addr: PaymentAddress,
+    my_z_addr: PaymentAddress,
+    my_z_addr_encoded: String,
     z_spending_key: ExtendedSpendingKey,
-    z_addr: PaymentAddress,
-    z_addr_encoded: String,
-    z_tx_prover: LocalTxProver,
-    /// Mutex preventing concurrent transaction generation/same input usage
-    z_tx_mutex: AsyncMutex<()>,
+    evk: ExtendedFullViewingKey,
+    z_tx_prover: Arc<LocalTxProver>,
+    light_wallet_db: WalletDbShared,
+    consensus_params: ZcoinConsensusParams,
+    sync_state_connector: AsyncMutex<SaplingSyncConnector>,
 }
 
 impl std::fmt::Debug for ZCoinFields {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         write!(
             f,
-            "ZCoinFields {{ z_addr: {:?}, z_addr_encoded: {} }}",
-            self.z_addr, self.z_addr_encoded
+            "ZCoinFields {{ my_z_addr: {:?}, my_z_addr_encoded: {} }}",
+            self.my_z_addr, self.my_z_addr_encoded
         )
     }
 }
 
+impl Transaction for ZTransaction {
+    fn tx_hex(&self) -> Vec<u8> {
+        let mut hex = Vec::with_capacity(1024);
+        self.write(&mut hex).expect("Writing should not fail");
+        hex
+    }
+
+    fn tx_hash(&self) -> BytesJson {
+        let mut bytes = self.txid().0.to_vec();
+        bytes.reverse();
+        bytes.into()
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct ZCoin {
     utxo_arc: UtxoArc,
     z_fields: Arc<ZCoinFields>,
 }
 
+pub struct ZOutput {
+    pub to_addr: PaymentAddress,
+    pub amount: Amount,
+    pub viewing_key: Option<OutgoingViewingKey>,
+    pub memo: Option<MemoBytes>,
+}
+
+struct ZCoinSqlTxHistoryItem {
+    tx_hash: Vec<u8>,
+    internal_id: i64,
+    height: i64,
+    timestamp: i64,
+    received_amount: i64,
+    spent_amount: i64,
+}
+
+impl ZCoinSqlTxHistoryItem {
+    fn try_from_sql_row(row: &Row<'_>) -> Result<Self, SqlError> {
+        let mut tx_hash: Vec<u8> = row.get(0)?;
+        tx_hash.reverse();
+        Ok(ZCoinSqlTxHistoryItem {
+            tx_hash,
+            internal_id: row.get(1)?,
+            height: row.get(2)?,
+            timestamp: row.get(3)?,
+            received_amount: row.get(4)?,
+            spent_amount: row.get(5)?,
+        })
+    }
+}
+
+struct SqlTxHistoryRes {
+    transactions: Vec<ZCoinSqlTxHistoryItem>,
+    total_tx_count: u32,
+    skipped: usize,
+}
+
+#[derive(Serialize)]
+pub struct ZcoinTxDetails {
+    /// Transaction hash in hexadecimal format
+    tx_hash: String,
+    /// Coins are sent from these addresses
+    from: HashSet<String>,
+    /// Coins are sent to these addresses
+    to: HashSet<String>,
+    /// The amount spent from "my" address
+    spent_by_me: BigDecimal,
+    /// The amount received by "my" address
+    received_by_me: BigDecimal,
+    /// Resulting "my" balance change
+    my_balance_change: BigDecimal,
+    /// Block height
+    block_height: i64,
+    confirmations: i64,
+    /// Transaction timestamp
+    timestamp: i64,
+    transaction_fee: BigDecimal,
+    /// The coin transaction belongs to
+    coin: String,
+    /// Internal MM2 id used for internal transaction identification, for some coins it might be equal to transaction hash
+    internal_id: i64,
+}
+
 impl ZCoin {
-    pub fn z_rpc(&self) -> &(dyn ZRpcOps + Send + Sync) { self.utxo_arc.rpc_client.as_ref() }
+    #[inline]
+    pub fn utxo_rpc_client(&self) -> &UtxoRpcClientEnum { &self.utxo_arc.rpc_client }
+
+    #[inline]
+    pub fn my_z_address_encoded(&self) -> String { self.z_fields.my_z_addr_encoded.clone() }
+
+    #[inline]
+    pub fn consensus_params(&self) -> ZcoinConsensusParams { self.z_fields.consensus_params.clone() }
+
+    #[inline]
+    pub fn consensus_params_ref(&self) -> &ZcoinConsensusParams { &self.z_fields.consensus_params }
+
+    #[inline]
+    pub async fn sync_status(&self) -> Result<SyncStatus, MmError<BlockchainScanStopped>> {
+        self.z_fields
+            .sync_state_connector
+            .lock()
+            .await
+            .current_sync_status()
+            .await
+    }
+
+    #[inline]
+    fn secp_keypair(&self) -> &KeyPair {
+        self.utxo_arc
+            .priv_key_policy
+            .key_pair()
+            .expect("Zcoin doesn't support HW wallets")
+    }
+
+    async fn wait_for_gen_tx_blockchain_sync(&self) -> Result<SaplingSyncGuard<'_>, MmError<BlockchainScanStopped>> {
+        let mut connector_guard = self.z_fields.sync_state_connector.lock().await;
+        let sync_respawn_guard = connector_guard.wait_for_gen_tx_blockchain_sync().await?;
+        Ok(SaplingSyncGuard {
+            _connector_guard: connector_guard,
+            respawn_guard: sync_respawn_guard,
+        })
+    }
+
+    async fn my_balance_sat(&self) -> Result<u64, MmError<ZcashClientError>> {
+        let db = self.z_fields.light_wallet_db.clone();
+        async_blocking(move || {
+            let balance = get_balance(&db.lock(), AccountId::default())?.into();
+            Ok(balance)
+        })
+        .await
+    }
 
-    pub fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.utxo_arc.rpc_client }
+    async fn get_spendable_notes(&self) -> Result<Vec<SpendableNote>, MmError<ZcashClientError>> {
+        let db = self.z_fields.light_wallet_db.clone();
+        async_blocking(move || {
+            let guard = db.lock();
+            let latest_db_block = match guard.block_height_extrema()? {
+                Some((_, latest)) => latest,
+                None => return Ok(Vec::new()),
+            };
+            get_spendable_notes(&guard, AccountId::default(), latest_db_block).map_err(MmError::new)
+        })
+        .await
+    }
+
+    /// Returns spendable notes
+    async fn spendable_notes_ordered(&self) -> Result<Vec<SpendableNote>, MmError<SqliteClientError>> {
+        let mut unspents = self.get_spendable_notes().await?;
+
+        unspents.sort_unstable_by(|a, b| a.note_value.cmp(&b.note_value));
+        Ok(unspents)
+    }
+
+    async fn get_one_kbyte_tx_fee(&self) -> UtxoRpcResult<BigDecimal> {
+        let fee = self.get_tx_fee().await?;
+        match fee {
+            ActualTxFee::Dynamic(fee) | ActualTxFee::FixedPerKb(fee) => {
+                Ok(big_decimal_from_sat_unsigned(fee, self.decimals()))
+            },
+        }
+    }
+
+    /// Generates a tx sending outputs from our address
+    async fn gen_tx(
+        &self,
+        t_outputs: Vec<TxOut>,
+        z_outputs: Vec<ZOutput>,
+    ) -> Result<(ZTransaction, AdditionalTxData, SaplingSyncGuard<'_>), MmError<GenTxError>> {
+        let sync_guard = self.wait_for_gen_tx_blockchain_sync().await?;
+
+        let tx_fee = self.get_one_kbyte_tx_fee().await?;
+        let t_output_sat: u64 = t_outputs.iter().fold(0, |cur, out| cur + u64::from(out.value));
+        let z_output_sat: u64 = z_outputs.iter().fold(0, |cur, out| cur + u64::from(out.amount));
+        let total_output_sat = t_output_sat + z_output_sat;
+        let total_output = big_decimal_from_sat_unsigned(total_output_sat, self.utxo_arc.decimals);
+        let total_required = &total_output + &tx_fee;
+
+        let spendable_notes = self.spendable_notes_ordered().await?;
+        let mut total_input_amount = BigDecimal::from(0);
+        let mut change = BigDecimal::from(0);
+
+        let mut received_by_me = 0u64;
+
+        let mut tx_builder = ZTxBuilder::new(self.consensus_params(), sync_guard.respawn_guard.current_block());
+
+        for spendable_note in spendable_notes {
+            total_input_amount += big_decimal_from_sat_unsigned(spendable_note.note_value.into(), self.decimals());
+
+            let note = self
+                .z_fields
+                .my_z_addr
+                .create_note(spendable_note.note_value.into(), spendable_note.rseed)
+                .or_mm_err(|| GenTxError::FailedToCreateNote)?;
+            tx_builder.add_sapling_spend(
+                self.z_fields.z_spending_key.clone(),
+                *self.z_fields.my_z_addr.diversifier(),
+                note,
+                spendable_note
+                    .witness
+                    .path()
+                    .or_mm_err(|| GenTxError::FailedToGetMerklePath)?,
+            )?;
+
+            if total_input_amount >= total_required {
+                change = &total_input_amount - &total_required;
+                break;
+            }
+        }
+
+        if total_input_amount < total_required {
+            return MmError::err(GenTxError::InsufficientBalance {
+                coin: self.ticker().into(),
+                available: total_input_amount,
+                required: total_required,
+            });
+        }
+
+        for z_out in z_outputs {
+            if z_out.to_addr == self.z_fields.my_z_addr {
+                received_by_me += u64::from(z_out.amount);
+            }
+
+            tx_builder.add_sapling_output(z_out.viewing_key, z_out.to_addr, z_out.amount, z_out.memo)?;
+        }
+
+        if change > BigDecimal::from(0u8) {
+            let change_sat = sat_from_big_decimal(&change, self.utxo_arc.decimals)?;
+            received_by_me += change_sat;
+
+            tx_builder.add_sapling_output(
+                Some(self.z_fields.evk.fvk.ovk),
+                self.z_fields.my_z_addr.clone(),
+                Amount::from_u64(change_sat).map_to_mm(|_| {
+                    GenTxError::NumConversion(NumConversError(format!(
+                        "Failed to get ZCash amount from {}",
+                        change_sat
+                    )))
+                })?,
+                None,
+            )?;
+        }
+
+        for output in t_outputs {
+            tx_builder.add_tx_out(output);
+        }
+
+        let (tx, _) = async_blocking({
+            let prover = self.z_fields.z_tx_prover.clone();
+            move || tx_builder.build(consensus::BranchId::Sapling, prover.as_ref())
+        })
+        .await?;
+
+        let additional_data = AdditionalTxData {
+            received_by_me,
+            spent_by_me: sat_from_big_decimal(&total_input_amount, self.decimals())?,
+            fee_amount: sat_from_big_decimal(&tx_fee, self.decimals())?,
+            unused_change: None,
+            kmd_rewards: None,
+        };
+        Ok((tx, additional_data, sync_guard))
+    }
+
+    pub async fn send_outputs(
+        &self,
+        t_outputs: Vec<TxOut>,
+        z_outputs: Vec<ZOutput>,
+    ) -> Result<ZTransaction, MmError<SendOutputsErr>> {
+        let (tx, _, mut sync_guard) = self.gen_tx(t_outputs, z_outputs).await?;
+        let mut tx_bytes = Vec::with_capacity(1024);
+        tx.write(&mut tx_bytes).expect("Write should not fail");
+
+        self.utxo_rpc_client()
+            .send_raw_transaction(tx_bytes.into())
+            .compat()
+            .await?;
+
+        sync_guard.respawn_guard.watch_for_tx(tx.txid());
+        Ok(tx)
+    }
+
+    async fn tx_history_from_sql(
+        &self,
+        limit: usize,
+        paging_options: PagingOptionsEnum<i64>,
+    ) -> Result<SqlTxHistoryRes, MmError<SqlTxHistoryError>> {
+        let wallet_db = self.z_fields.light_wallet_db.clone();
+        async_blocking(move || {
+            let db_guard = wallet_db.lock();
+            let conn = db_guard.sql_conn();
+
+            let total_sql = SqlBuilder::select_from(TRANSACTIONS_TABLE)
+                .field("COUNT(id_tx)")
+                .sql()
+                .expect("valid SQL");
+            let total_tx_count = conn.query_row(&total_sql, NO_PARAMS, |row| row.get(0))?;
+
+            let mut sql_builder = SqlBuilder::select_from(name!(TRANSACTIONS_TABLE; "txes"));
+            sql_builder
+                .field("txes.txid")
+                .field("txes.id_tx as internal_id")
+                .field("txes.block as block");
+
+            let offset = match paging_options {
+                PagingOptionsEnum::PageNumber(page) => (page.get() - 1) * limit,
+                PagingOptionsEnum::FromId(id) => {
+                    offset_by_id(conn, &sql_builder, [id], "id_tx", "block DESC, id_tx ASC", "id_tx = ?1")?
+                        .ok_or(SqlTxHistoryError::FromIdDoesNotExist(id))?
+                },
+            };
+
+            let sql = sql_builder
+                .field("blocks.time")
+                .field("COALESCE(rn.received_amount, 0)")
+                .field("COALESCE(sn.sent_amount, 0)")
+                .left()
+                .join("(SELECT tx, SUM(value) as received_amount FROM received_notes GROUP BY tx) as rn")
+                .on("txes.id_tx = rn.tx")
+                // detecting spent amount by "spent" field in received_notes table
+                .join("(SELECT spent, SUM(value) as sent_amount FROM received_notes GROUP BY spent) as sn")
+                .on("txes.id_tx = sn.spent")
+                .join(BLOCKS_TABLE)
+                .on("txes.block = blocks.height")
+                .group_by("internal_id")
+                .order_by("block", true)
+                .order_by("internal_id", false)
+                .offset(offset)
+                .limit(limit)
+                .sql()
+                .expect("valid query");
+
+            let sql_items = conn
+                .prepare(&sql)?
+                .query_map(NO_PARAMS, ZCoinSqlTxHistoryItem::try_from_sql_row)?
+                .collect::<Result<Vec<_>, _>>()?;
+
+            Ok(SqlTxHistoryRes {
+                transactions: sql_items,
+                total_tx_count,
+                skipped: offset,
+            })
+        })
+        .await
+    }
+
+    async fn z_transactions_from_cache_or_rpc(
+        &self,
+        hashes: HashSet<H256Json>,
+    ) -> UtxoRpcResult<HashMap<H256Json, ZTransaction>> {
+        self.get_verbose_transactions_from_cache_or_rpc(hashes)
+            .compat()
+            .await?
+            .into_iter()
+            .map(|(hash, tx)| -> Result<_, std::io::Error> {
+                Ok((hash, ZTransaction::read(tx.into_inner().hex.as_slice())?))
+            })
+            .collect::<Result<_, _>>()
+            .map_to_mm(|e| UtxoRpcError::InvalidResponse(e.to_string()))
+    }
+
+    fn tx_details_from_sql_item(
+        &self,
+        sql_item: ZCoinSqlTxHistoryItem,
+        transactions: &mut HashMap<H256Json, ZTransaction>,
+        prev_transactions: &HashMap<H256Json, ZTransaction>,
+        current_block: u64,
+    ) -> Result<ZcoinTxDetails, MmError<NoInfoAboutTx>> {
+        let mut from = HashSet::new();
+
+        let mut confirmations = current_block as i64 - sql_item.height + 1;
+        if confirmations < 0 {
+            confirmations = 0;
+        }
+
+        let mut transparent_input_amount = Amount::zero();
+        let hash = H256Json::from(sql_item.tx_hash.as_slice());
+        let z_tx = transactions.remove(&hash).or_mm_err(|| NoInfoAboutTx(hash))?;
+        for input in z_tx.vin.iter() {
+            let mut hash = H256Json::from(*input.prevout.hash());
+            hash.0.reverse();
+            let prev_tx = prev_transactions.get(&hash).or_mm_err(|| NoInfoAboutTx(hash))?;
+
+            if let Some(spent_output) = prev_tx.vout.get(input.prevout.n() as usize) {
+                transparent_input_amount += spent_output.value;
+                if let Ok(addresses) = addresses_from_script(self, &spent_output.script_pubkey.0.clone().into()) {
+                    from.extend(addresses.into_iter().map(|a| a.to_string()));
+                }
+            }
+        }
+
+        let transparent_output_amount = z_tx
+            .vout
+            .iter()
+            .fold(Amount::zero(), |current, out| current + out.value);
+
+        let mut to = HashSet::new();
+        for out in z_tx.vout.iter() {
+            if let Ok(addresses) = addresses_from_script(self, &out.script_pubkey.0.clone().into()) {
+                to.extend(addresses.into_iter().map(|a| a.to_string()));
+            }
+        }
+
+        let fee_amount = z_tx.value_balance + transparent_input_amount - transparent_output_amount;
+        if sql_item.spent_amount > 0 {
+            from.insert(self.my_z_address_encoded());
+        }
+
+        if sql_item.received_amount > 0 {
+            to.insert(self.my_z_address_encoded());
+        }
+
+        for z_out in z_tx.shielded_outputs.iter() {
+            if let Some((_, address, _)) = try_sapling_output_recovery(
+                self.consensus_params_ref(),
+                BlockHeight::from_u32(current_block as u32),
+                &self.z_fields.evk.fvk.ovk,
+                z_out,
+            ) {
+                to.insert(encode_payment_address(
+                    self.consensus_params_ref().hrp_sapling_payment_address(),
+                    &address,
+                ));
+            }
+
+            if let Some((_, address, _)) = try_sapling_output_recovery(
+                self.consensus_params_ref(),
+                BlockHeight::from_u32(current_block as u32),
+                &DEX_FEE_OVK,
+                z_out,
+            ) {
+                to.insert(encode_payment_address(
+                    self.consensus_params_ref().hrp_sapling_payment_address(),
+                    &address,
+                ));
+            }
+        }
+
+        let spent_by_me = big_decimal_from_sat(sql_item.spent_amount, self.decimals());
+        let received_by_me = big_decimal_from_sat(sql_item.received_amount, self.decimals());
+        Ok(ZcoinTxDetails {
+            tx_hash: hex::encode(sql_item.tx_hash),
+            from,
+            to,
+            my_balance_change: &received_by_me - &spent_by_me,
+            spent_by_me,
+            received_by_me,
+            block_height: sql_item.height,
+            confirmations,
+            timestamp: sql_item.timestamp,
+            transaction_fee: big_decimal_from_sat(fee_amount.into(), self.decimals()),
+            coin: self.ticker().into(),
+            internal_id: sql_item.internal_id,
+        })
+    }
+
+    pub async fn tx_history(
+        &self,
+        request: MyTxHistoryRequestV2<i64>,
+    ) -> Result<MyTxHistoryResponseV2<ZcoinTxDetails, i64>, MmError<MyTxHistoryErrorV2>> {
+        let current_block = self.utxo_rpc_client().get_block_count().compat().await?;
+        let sql_result = self
+            .tx_history_from_sql(request.limit, request.paging_options.clone())
+            .await?;
+
+        let hashes_for_verbose = sql_result
+            .transactions
+            .iter()
+            .map(|item| H256Json::from(item.tx_hash.as_slice()))
+            .collect();
+        let mut transactions = self.z_transactions_from_cache_or_rpc(hashes_for_verbose).await?;
+
+        let prev_tx_hashes: HashSet<_> = transactions
+            .iter()
+            .flat_map(|(_, tx)| {
+                tx.vin.iter().map(|vin| {
+                    let mut hash = *vin.prevout.hash();
+                    hash.reverse();
+                    H256Json::from(hash)
+                })
+            })
+            .collect();
+        let prev_transactions = self.z_transactions_from_cache_or_rpc(prev_tx_hashes).await?;
+
+        let transactions = sql_result
+            .transactions
+            .into_iter()
+            .map(|sql_item| {
+                self.tx_details_from_sql_item(sql_item, &mut transactions, &prev_transactions, current_block)
+            })
+            .collect::<Result<_, _>>()?;
+
+        Ok(MyTxHistoryResponseV2 {
+            coin: self.ticker().into(),
+            current_block,
+            transactions,
+            // Zcoin is activated only after the state is synced
+            sync_status: HistorySyncState::Finished,
+            limit: request.limit,
+            skipped: sql_result.skipped,
+            total: sql_result.total_tx_count as usize,
+            total_pages: calc_total_pages(sql_result.total_tx_count as usize, request.limit),
+            paging_options: request.paging_options,
+        })
+    }
 }
 
 impl AsRef<UtxoCoinFields> for ZCoin {
     fn as_ref(&self) -> &UtxoCoinFields { &self.utxo_arc }
 }
 
-#[derive(Debug, Display)]
-pub enum ZCoinBuildError {
-    BuilderError(String),
-    GetAddressError,
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(tag = "rpc", content = "rpc_data")]
+pub enum ZcoinRpcMode {
+    Native,
+    Light {
+        electrum_servers: Vec<ElectrumRpcRequest>,
+        light_wallet_d_servers: Vec<String>,
+    },
 }
 
-pub async fn z_coin_from_conf_and_request(
+#[derive(Deserialize)]
+pub struct ZcoinActivationParams {
+    pub mode: ZcoinRpcMode,
+    pub required_confirmations: Option<u64>,
+    pub requires_notarization: Option<bool>,
+}
+
+pub async fn z_coin_from_conf_and_params(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
-    req: &Json,
+    params: &ZcoinActivationParams,
+    consensus_params: ZcoinConsensusParams,
     secp_priv_key: &[u8],
 ) -> Result<ZCoin, MmError<ZCoinBuildError>> {
     let z_key = ExtendedSpendingKey::master(secp_priv_key);
-    z_coin_from_conf_and_request_with_z_key(ctx, ticker, conf, req, secp_priv_key, z_key).await
+    let db_dir = ctx.dbdir();
+    z_coin_from_conf_and_params_with_z_key(
+        ctx,
+        ticker,
+        conf,
+        params,
+        secp_priv_key,
+        db_dir,
+        z_key,
+        consensus_params,
+    )
+    .await
 }
 
-async fn z_coin_from_conf_and_request_with_z_key(
+pub struct ZCoinBuilder<'a> {
+    ctx: &'a MmArc,
+    ticker: &'a str,
+    conf: &'a Json,
+    z_coin_params: &'a ZcoinActivationParams,
+    utxo_params: UtxoActivationParams,
+    secp_priv_key: &'a [u8],
+    db_dir_path: PathBuf,
+    z_spending_key: ExtendedSpendingKey,
+    consensus_params: ZcoinConsensusParams,
+}
+
+impl<'a> UtxoCoinBuilderCommonOps for ZCoinBuilder<'a> {
+    fn ctx(&self) -> &MmArc { self.ctx }
+
+    fn conf(&self) -> &Json { self.conf }
+
+    fn activation_params(&self) -> &UtxoActivationParams { &self.utxo_params }
+
+    fn ticker(&self) -> &str { self.ticker }
+}
+
+#[async_trait]
+impl<'a> UtxoFieldsWithIguanaPrivKeyBuilder for ZCoinBuilder<'a> {}
+
+#[async_trait]
+impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for ZCoinBuilder<'a> {
+    type ResultCoin = ZCoin;
+    type Error = ZCoinBuildError;
+
+    fn priv_key(&self) -> &[u8] { self.secp_priv_key }
+
+    async fn build(self) -> MmResult<Self::ResultCoin, Self::Error> {
+        let utxo = self.build_utxo_fields_with_iguana_priv_key(self.priv_key()).await?;
+        let utxo_arc = UtxoArc::new(utxo);
+
+        let (_, my_z_addr) = self
+            .z_spending_key
+            .default_address()
+            .map_err(|_| MmError::new(ZCoinBuildError::GetAddressError))?;
+
+        let dex_fee_addr = decode_payment_address(self.consensus_params.hrp_sapling_payment_address(), DEX_FEE_Z_ADDR)
+            .expect("DEX_FEE_Z_ADDR is a valid z-address")
+            .expect("DEX_FEE_Z_ADDR is a valid z-address");
+
+        let z_tx_prover = async_blocking(LocalTxProver::with_default_location)
+            .await
+            .or_mm_err(|| ZCoinBuildError::ZCashParamsNotFound)?;
+
+        let my_z_addr_encoded = encode_payment_address(self.consensus_params.hrp_sapling_payment_address(), &my_z_addr);
+
+        let evk = ExtendedFullViewingKey::from(&self.z_spending_key);
+        let (sync_state_connector, light_wallet_db) = match &self.z_coin_params.mode {
+            ZcoinRpcMode::Native => {
+                return MmError::err(ZCoinBuildError::NativeModeIsNotSupportedYet);
+            },
+            ZcoinRpcMode::Light {
+                light_wallet_d_servers, ..
+            } => {
+                let cache_db_path = self.db_dir_path.join(format!("{}_light_cache.db", self.ticker));
+                let wallet_db_path = self.db_dir_path.join(format!("{}_light_wallet.db", self.ticker));
+                // TODO multi lightwalletd servers support will be added on the next iteration
+                let uri = Uri::from_str(
+                    light_wallet_d_servers
+                        .first()
+                        .or_mm_err(|| ZCoinBuildError::EmptyLightwalletdUris)?,
+                )?;
+
+                init_light_client(uri, cache_db_path, wallet_db_path, self.consensus_params.clone(), evk).await?
+            },
+        };
+
+        let z_fields = ZCoinFields {
+            dex_fee_addr,
+            my_z_addr,
+            my_z_addr_encoded,
+            evk: ExtendedFullViewingKey::from(&self.z_spending_key),
+            z_spending_key: self.z_spending_key,
+            z_tx_prover: Arc::new(z_tx_prover),
+            light_wallet_db,
+            consensus_params: self.consensus_params,
+            sync_state_connector,
+        };
+
+        let z_coin = ZCoin {
+            utxo_arc,
+            z_fields: Arc::new(z_fields),
+        };
+
+        Ok(z_coin)
+    }
+}
+
+impl<'a> ZCoinBuilder<'a> {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        ctx: &'a MmArc,
+        ticker: &'a str,
+        conf: &'a Json,
+        z_coin_params: &'a ZcoinActivationParams,
+        secp_priv_key: &'a [u8],
+        db_dir_path: PathBuf,
+        z_spending_key: ExtendedSpendingKey,
+        consensus_params: ZcoinConsensusParams,
+    ) -> ZCoinBuilder<'a> {
+        let utxo_mode = match &z_coin_params.mode {
+            ZcoinRpcMode::Native => UtxoRpcMode::Native,
+            ZcoinRpcMode::Light { electrum_servers, .. } => UtxoRpcMode::Electrum {
+                servers: electrum_servers.clone(),
+            },
+        };
+        let utxo_params = UtxoActivationParams {
+            mode: utxo_mode,
+            utxo_merge_params: None,
+            tx_history: false,
+            required_confirmations: z_coin_params.required_confirmations,
+            requires_notarization: z_coin_params.requires_notarization,
+            address_format: None,
+            gap_limit: None,
+            scan_policy: Default::default(),
+            priv_key_policy: PrivKeyActivationPolicy::IguanaPrivKey,
+            check_utxo_maturity: None,
+        };
+        ZCoinBuilder {
+            ctx,
+            ticker,
+            conf,
+            z_coin_params,
+            utxo_params,
+            secp_priv_key,
+            db_dir_path,
+            z_spending_key,
+            consensus_params,
+        }
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+async fn z_coin_from_conf_and_params_with_z_key(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
-    req: &Json,
+    params: &ZcoinActivationParams,
     secp_priv_key: &[u8],
+    db_dir_path: PathBuf,
     z_spending_key: ExtendedSpendingKey,
+    consensus_params: ZcoinConsensusParams,
 ) -> Result<ZCoin, MmError<ZCoinBuildError>> {
-    let builder = UtxoArcBuilder::new(ctx, ticker, conf, req, secp_priv_key);
-    let utxo_arc = builder
-        .build()
-        .await
-        .map_err(|e| MmError::new(ZCoinBuildError::BuilderError(e)))?;
-
-    let (_, z_addr) = z_spending_key
-        .default_address()
-        .map_err(|_| MmError::new(ZCoinBuildError::GetAddressError))?;
-
-    let z_tx_prover = LocalTxProver::bundled();
-    let z_addr_encoded = encode_payment_address(z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS, &z_addr);
-    let z_fields = ZCoinFields {
+    let builder = ZCoinBuilder::new(
+        ctx,
+        ticker,
+        conf,
+        params,
+        secp_priv_key,
+        db_dir_path,
         z_spending_key,
-        z_addr,
-        z_addr_encoded,
-        z_tx_prover,
-        z_tx_mutex: AsyncMutex::new(()),
-    };
-    Ok(ZCoin {
-        utxo_arc,
-        z_fields: Arc::new(z_fields),
-    })
+        consensus_params,
+    );
+    builder.build().await
 }
 
 impl MarketCoinOps for ZCoin {
     fn ticker(&self) -> &str { &self.utxo_arc.conf.ticker }
 
-    fn my_address(&self) -> Result<String, String> { Ok(self.z_fields.z_addr_encoded.clone()) }
+    fn my_address(&self) -> Result<String, String> { Ok(self.z_fields.my_z_addr_encoded.clone()) }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        let pubkey = utxo_common::my_public_key(self.as_ref())?;
+        Ok(pubkey.to_string())
+    }
+
+    fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> { None }
+
+    fn sign_message(&self, _message: &str) -> SignatureResult<String> {
+        MmError::err(SignatureError::InvalidRequest(
+            "Message signing is not supported by the given coin type".to_string(),
+        ))
+    }
+
+    fn verify_message(&self, _signature_base64: &str, _message: &str, _address: &str) -> VerificationResult<bool> {
+        MmError::err(VerificationError::InvalidRequest(
+            "Message verification is not supported by the given coin type".to_string(),
+        ))
+    }
 
     fn my_balance(&self) -> BalanceFut<CoinBalance> {
-        let min_conf = 0;
-        let fut = self
-            .utxo_arc
-            .rpc_client
-            .as_ref()
-            .z_get_balance(&self.z_fields.z_addr_encoded, min_conf)
-            // at the moment Z coins do not have an unspendable balance
-            .map(|spendable| CoinBalance {
-                spendable: spendable.to_decimal(),
-                unspendable: BigDecimal::from(0),
-            })
-            .map_err(|e| e.into());
-        Box::new(fut)
+        let coin = self.clone();
+        let fut = async move {
+            let sat = coin
+                .my_balance_sat()
+                .await
+                .mm_err(|e| BalanceError::WalletStorageError(e.to_string()))?;
+            Ok(CoinBalance::new(big_decimal_from_sat_unsigned(sat, coin.decimals())))
+        };
+        Box::new(fut.boxed().compat())
     }
 
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> { utxo_common::base_coin_balance(self) }
 
+    fn platform_ticker(&self) -> &str { self.ticker() }
+
     fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
-        utxo_common::send_raw_tx(self.as_ref(), tx)
+        let tx_bytes = try_fus!(hex::decode(tx));
+        let z_tx = try_fus!(ZTransaction::read(tx_bytes.as_slice()));
+
+        let this = self.clone();
+        let tx = tx.to_owned();
+
+        let fut = async move {
+            let mut sync_guard = try_s!(this.wait_for_gen_tx_blockchain_sync().await);
+            let tx_hash = utxo_common::send_raw_tx(this.as_ref(), &tx).compat().await?;
+            sync_guard.respawn_guard.watch_for_tx(z_tx.txid());
+            Ok(tx_hash)
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        let z_tx = try_fus!(ZTransaction::read(tx));
+
+        let this = self.clone();
+        let tx = tx.to_owned();
+
+        let fut = async move {
+            let mut sync_guard = try_s!(this.wait_for_gen_tx_blockchain_sync().await);
+            let tx_hash = utxo_common::send_raw_tx_bytes(this.as_ref(), &tx).compat().await?;
+            sync_guard.respawn_guard.watch_for_tx(z_tx.txid());
+            Ok(tx_hash)
+        };
+        Box::new(fut.boxed().compat())
     }
 
     fn wait_for_confirmations(
@@ -179,39 +974,34 @@ impl MarketCoinOps for ZCoin {
     }
 
     fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
-        utxo_common::tx_enum_from_bytes(self.as_ref(), bytes)
+        ZTransaction::read(bytes).map(|tx| tx.into()).map_err(|e| e.to_string())
     }
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         utxo_common::current_block(&self.utxo_arc)
     }
 
-    fn display_priv_key(&self) -> String {
-        encode_extended_spending_key(
+    fn display_priv_key(&self) -> Result<String, String> {
+        Ok(encode_extended_spending_key(
             z_mainnet_constants::HRP_SAPLING_EXTENDED_SPENDING_KEY,
             &self.z_fields.z_spending_key,
-        )
+        ))
     }
 
     fn min_tx_amount(&self) -> BigDecimal { utxo_common::min_tx_amount(self.as_ref()) }
 
     fn min_trading_vol(&self) -> MmNumber { utxo_common::min_trading_vol(self.as_ref()) }
+
+    fn is_privacy(&self) -> bool { true }
 }
 
+#[async_trait]
 impl SwapOps for ZCoin {
-    fn send_taker_fee(&self, _fee_addr: &[u8], amount: BigDecimal) -> TransactionFut {
-        // TODO replace dummy locktime and watcher pub
+    fn send_taker_fee(&self, _fee_addr: &[u8], amount: BigDecimal, uuid: &[u8]) -> TransactionFut {
         let selfi = self.clone();
+        let uuid = uuid.to_owned();
         let fut = async move {
-            let (tx, _) = try_s!(
-                z_send_dex_fee(
-                    &selfi,
-                    (now_ms() / 1000) as u32,
-                    selfi.utxo_arc.key_pair.public(),
-                    amount
-                )
-                .await
-            );
+            let tx = try_tx_s!(z_send_dex_fee(&selfi, amount, &uuid).await);
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -224,12 +1014,24 @@ impl SwapOps for ZCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
         let selfi = self.clone();
-        let taker_pub = try_fus!(Public::from_slice(taker_pub));
+        let maker_key_pair = self.derive_htlc_key_pair(swap_unique_data);
+        let taker_pub = try_tx_fus!(Public::from_slice(taker_pub));
         let secret_hash = secret_hash.to_vec();
         let fut = async move {
-            let utxo_tx = try_s!(z_send_htlc(&selfi, time_lock, &taker_pub, &secret_hash, amount).await);
+            let utxo_tx = try_tx_s!(
+                z_send_htlc(
+                    &selfi,
+                    time_lock,
+                    maker_key_pair.public(),
+                    &taker_pub,
+                    &secret_hash,
+                    amount
+                )
+                .await
+            );
             Ok(utxo_tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -242,12 +1044,24 @@ impl SwapOps for ZCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
         let selfi = self.clone();
-        let maker_pub = try_fus!(Public::from_slice(maker_pub));
+        let taker_keypair = self.derive_htlc_key_pair(swap_unique_data);
+        let maker_pub = try_tx_fus!(Public::from_slice(maker_pub));
         let secret_hash = secret_hash.to_vec();
         let fut = async move {
-            let utxo_tx = try_s!(z_send_htlc(&selfi, time_lock, &maker_pub, &secret_hash, amount).await);
+            let utxo_tx = try_tx_s!(
+                z_send_htlc(
+                    &selfi,
+                    time_lock,
+                    taker_keypair.public(),
+                    &maker_pub,
+                    &secret_hash,
+                    amount
+                )
+                .await
+            );
             Ok(utxo_tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -260,13 +1074,15 @@ impl SwapOps for ZCoin {
         taker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UtxoTx = try_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let tx = try_tx_fus!(ZTransaction::read(taker_payment_tx));
+        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
         let redeem_script = payment_script(
             time_lock,
             &*dhash160(secret),
-            &Public::from_slice(taker_pub).unwrap(),
-            self.utxo_arc.key_pair.public(),
+            &try_tx_fus!(Public::from_slice(taker_pub)),
+            key_pair.public(),
         );
         let script_data = ScriptBuilder::default()
             .push_data(secret)
@@ -274,8 +1090,16 @@ impl SwapOps for ZCoin {
             .into_script();
         let selfi = self.clone();
         let fut = async move {
-            let tx_fut = z_p2sh_spend(&selfi, tx, time_lock, SEQUENCE_FINAL, redeem_script, script_data);
-            let tx = try_s!(tx_fut.await);
+            let tx_fut = z_p2sh_spend(
+                &selfi,
+                tx,
+                time_lock,
+                SEQUENCE_FINAL,
+                redeem_script,
+                script_data,
+                &key_pair,
+            );
+            let tx = try_ztx_s!(tx_fut.await);
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -288,13 +1112,15 @@ impl SwapOps for ZCoin {
         maker_pub: &[u8],
         secret: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UtxoTx = try_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let tx = try_tx_fus!(ZTransaction::read(maker_payment_tx));
+        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
         let redeem_script = payment_script(
             time_lock,
             &*dhash160(secret),
-            &Public::from_slice(maker_pub).unwrap(),
-            self.utxo_arc.key_pair.public(),
+            &try_tx_fus!(Public::from_slice(maker_pub)),
+            key_pair.public(),
         );
         let script_data = ScriptBuilder::default()
             .push_data(secret)
@@ -302,8 +1128,16 @@ impl SwapOps for ZCoin {
             .into_script();
         let selfi = self.clone();
         let fut = async move {
-            let tx_fut = z_p2sh_spend(&selfi, tx, time_lock, SEQUENCE_FINAL, redeem_script, script_data);
-            let tx = try_s!(tx_fut.await);
+            let tx_fut = z_p2sh_spend(
+                &selfi,
+                tx,
+                time_lock,
+                SEQUENCE_FINAL,
+                redeem_script,
+                script_data,
+                &key_pair,
+            );
+            let tx = try_ztx_s!(tx_fut.await);
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -316,19 +1150,29 @@ impl SwapOps for ZCoin {
         maker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UtxoTx = try_fus!(deserialize(taker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let tx = try_tx_fus!(ZTransaction::read(taker_payment_tx));
+        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
         let redeem_script = payment_script(
             time_lock,
             secret_hash,
-            self.utxo_arc.key_pair.public(),
-            &Public::from_slice(maker_pub).unwrap(),
+            key_pair.public(),
+            &try_tx_fus!(Public::from_slice(maker_pub)),
         );
         let script_data = ScriptBuilder::default().push_opcode(Opcode::OP_1).into_script();
         let selfi = self.clone();
         let fut = async move {
-            let tx_fut = z_p2sh_spend(&selfi, tx, time_lock, SEQUENCE_FINAL - 1, redeem_script, script_data);
-            let tx = try_s!(tx_fut.await);
+            let tx_fut = z_p2sh_spend(
+                &selfi,
+                tx,
+                time_lock,
+                SEQUENCE_FINAL - 1,
+                redeem_script,
+                script_data,
+                &key_pair,
+            );
+            let tx = try_ztx_s!(tx_fut.await);
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -341,19 +1185,29 @@ impl SwapOps for ZCoin {
         taker_pub: &[u8],
         secret_hash: &[u8],
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> TransactionFut {
-        let tx: UtxoTx = try_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let tx = try_tx_fus!(ZTransaction::read(maker_payment_tx));
+        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
         let redeem_script = payment_script(
             time_lock,
             secret_hash,
-            self.utxo_arc.key_pair.public(),
-            &Public::from_slice(taker_pub).unwrap(),
+            key_pair.public(),
+            &try_tx_fus!(Public::from_slice(taker_pub)),
         );
         let script_data = ScriptBuilder::default().push_opcode(Opcode::OP_1).into_script();
         let selfi = self.clone();
         let fut = async move {
-            let tx_fut = z_p2sh_spend(&selfi, tx, time_lock, SEQUENCE_FINAL - 1, redeem_script, script_data);
-            let tx = try_s!(tx_fut.await);
+            let tx_fut = z_p2sh_spend(
+                &selfi,
+                tx,
+                time_lock,
+                SEQUENCE_FINAL - 1,
+                redeem_script,
+                script_data,
+                &key_pair,
+            );
+            let tx = try_ztx_s!(tx_fut.await);
             Ok(tx.into())
         };
         Box::new(fut.boxed().compat())
@@ -361,38 +1215,95 @@ impl SwapOps for ZCoin {
 
     fn validate_fee(
         &self,
-        _fee_tx: &TransactionEnum,
+        fee_tx: &TransactionEnum,
         _expected_sender: &[u8],
         _fee_addr: &[u8],
-        _amount: &BigDecimal,
-        _min_block_number: u64,
+        amount: &BigDecimal,
+        min_block_number: u64,
+        uuid: &[u8],
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        // TODO avoid dummy implementation
-        Box::new(futures01::future::ok(()))
+        let z_tx = match fee_tx {
+            TransactionEnum::ZTransaction(t) => t.clone(),
+            _ => panic!("Unexpected tx {:?}", fee_tx),
+        };
+        let amount_sat = try_fus!(sat_from_big_decimal(amount, self.utxo_arc.decimals));
+        let expected_memo = MemoBytes::from_bytes(uuid).expect("Uuid length < 512");
+
+        let coin = self.clone();
+        let fut = async move {
+            let tx_hash = H256::from(z_tx.txid().0).reversed();
+            let tx_from_rpc = try_s!(
+                coin.utxo_rpc_client()
+                    .get_verbose_transaction(&tx_hash.into())
+                    .compat()
+                    .await
+            );
+            let mut encoded = Vec::with_capacity(1024);
+            z_tx.write(&mut encoded).expect("Writing should not fail");
+            if encoded != tx_from_rpc.hex.0 {
+                return ERR!(
+                    "Encoded transaction {:?} does not match the tx {:?} from RPC",
+                    encoded,
+                    tx_from_rpc
+                );
+            }
+
+            let block_height = match tx_from_rpc.height {
+                Some(h) => {
+                    if h < min_block_number {
+                        return ERR!("Dex fee tx {:?} confirmed before min block {}", z_tx, min_block_number);
+                    } else {
+                        BlockHeight::from_u32(h as u32)
+                    }
+                },
+                None => H0,
+            };
+
+            for shielded_out in z_tx.shielded_outputs.iter() {
+                if let Some((note, address, memo)) =
+                    try_sapling_output_recovery(coin.consensus_params_ref(), block_height, &DEX_FEE_OVK, shielded_out)
+                {
+                    if address != coin.z_fields.dex_fee_addr {
+                        let encoded =
+                            encode_payment_address(z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS, &address);
+                        let expected = encode_payment_address(
+                            z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS,
+                            &coin.z_fields.dex_fee_addr,
+                        );
+                        return ERR!(
+                            "Dex fee was sent to the invalid address {}, expected {}",
+                            encoded,
+                            expected
+                        );
+                    }
+
+                    if note.value != amount_sat {
+                        return ERR!("Dex fee has invalid amount {}, expected {}", note.value, amount_sat);
+                    }
+
+                    if memo != expected_memo {
+                        return ERR!("Dex fee has invalid memo {:?}, expected {:?}", memo, expected_memo);
+                    }
+
+                    return Ok(());
+                }
+            }
+
+            ERR!(
+                "The dex fee tx {:?} has no shielded outputs or outputs decryption failed",
+                z_tx
+            )
+        };
+
+        Box::new(fut.boxed().compat())
     }
 
-    fn validate_maker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        utxo_common::validate_maker_payment(self, payment_tx, time_lock, maker_pub, priv_bn_hash, amount)
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_maker_payment(self, input)
     }
 
-    fn validate_taker_payment(
-        &self,
-        payment_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        priv_bn_hash: &[u8],
-        amount: BigDecimal,
-        _swap_contract_address: &Option<BytesJson>,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        utxo_common::validate_taker_payment(self, payment_tx, time_lock, taker_pub, priv_bn_hash, amount)
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        utxo_common::validate_taker_payment(self, input)
     }
 
     fn check_if_my_payment_sent(
@@ -402,48 +1313,23 @@ impl SwapOps for ZCoin {
         secret_hash: &[u8],
         _search_from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
-        utxo_common::check_if_my_payment_sent(self.clone(), time_lock, other_pub, secret_hash)
+        utxo_common::check_if_my_payment_sent(self.clone(), time_lock, other_pub, secret_hash, swap_unique_data)
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_my(
-            self.as_ref(),
-            time_lock,
-            other_pub,
-            secret_hash,
-            tx,
-            utxo_common::DEFAULT_SWAP_VOUT,
-            search_from_block,
-        )
+        utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
-        time_lock: u32,
-        other_pub: &[u8],
-        secret_hash: &[u8],
-        tx: &[u8],
-        search_from_block: u64,
-        _swap_contract_address: &Option<BytesJson>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        utxo_common::search_for_swap_tx_spend_other(
-            self.as_ref(),
-            time_lock,
-            other_pub,
-            secret_hash,
-            tx,
-            utxo_common::DEFAULT_SWAP_VOUT,
-            search_from_block,
-        )
+        utxo_common::search_for_swap_tx_spend_other(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
     fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
@@ -456,41 +1342,90 @@ impl SwapOps for ZCoin {
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
         Ok(None)
     }
+
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        let message = Message::from(dhash256(swap_unique_data).take());
+        let signature = self.secp_keypair().private().sign(&message).expect("valid privkey");
+
+        let key = secp_privkey_from_hash(dhash256(&signature));
+        key_pair_from_secret(key.as_slice()).expect("valid privkey")
+    }
 }
 
+#[async_trait]
 impl MmCoin for ZCoin {
     fn is_asset_chain(&self) -> bool { self.utxo_arc.conf.asset_chain }
 
-    fn withdraw(&self, _req: WithdrawRequest) -> WithdrawFut { todo!() }
+    fn withdraw(&self, _req: WithdrawRequest) -> WithdrawFut {
+        Box::new(futures01::future::err(MmError::new(WithdrawError::InternalError(
+            "Zcoin doesn't support legacy withdraw".into(),
+        ))))
+    }
+
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
+    }
 
     fn decimals(&self) -> u8 { self.utxo_arc.decimals }
 
-    fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> { todo!() }
+    fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> {
+        Err(MmError::new("Address conversion is not available for ZCoin".to_string()).to_string())
+    }
 
-    fn validate_address(&self, _address: &str) -> ValidateAddressResult { todo!() }
+    fn validate_address(&self, address: &str) -> ValidateAddressResult {
+        match decode_payment_address(z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS, address) {
+            Ok(Some(_)) => ValidateAddressResult {
+                is_valid: true,
+                reason: None,
+            },
+            Ok(None) => ValidateAddressResult {
+                is_valid: false,
+                reason: Some("decode_payment_address returned None".to_owned()),
+            },
+            Err(e) => ValidateAddressResult {
+                is_valid: false,
+                reason: Some(format!("Error {} on decode_payment_address", e)),
+            },
+        }
+    }
 
-    fn process_history_loop(&self, _ctx: MmArc) { todo!() }
+    fn process_history_loop(&self, _ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> {
+        log::warn!("process_history_loop is not implemented for ZCoin yet!");
+        Box::new(futures01::future::err(()))
+    }
 
-    fn history_sync_status(&self) -> HistorySyncState { todo!() }
+    fn history_sync_status(&self) -> HistorySyncState { HistorySyncState::NotEnabled }
 
     fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> {
         utxo_common::get_trade_fee(self.clone())
     }
 
-    fn get_sender_trade_fee(&self, value: TradePreimageValue, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
-        utxo_common::get_sender_trade_fee(self.clone(), value, stage)
+    async fn get_sender_trade_fee(
+        &self,
+        _value: TradePreimageValue,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        Ok(TradeFee {
+            coin: self.ticker().to_owned(),
+            amount: self.get_one_kbyte_tx_fee().await?.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
     fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         utxo_common::get_receiver_trade_fee(self.clone())
     }
 
-    fn get_fee_to_send_taker_fee(
+    async fn get_fee_to_send_taker_fee(
         &self,
-        dex_fee_amount: BigDecimal,
-        stage: FeeApproxStage,
-    ) -> TradePreimageFut<TradeFee> {
-        utxo_common::get_fee_to_send_taker_fee(self.clone(), dex_fee_amount, stage)
+        _dex_fee_amount: BigDecimal,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        Ok(TradeFee {
+            coin: self.ticker().to_owned(),
+            amount: self.get_one_kbyte_tx_fee().await?.into(),
+            paid_from_trading_vol: false,
+        })
     }
 
     fn required_confirmations(&self) -> u64 { utxo_common::required_confirmations(&self.utxo_arc) }
@@ -509,57 +1444,90 @@ impl MmCoin for ZCoin {
 
     fn mature_confirmations(&self) -> Option<u32> { Some(self.utxo_arc.conf.mature_confirmations) }
 
-    fn coin_protocol_info(&self) -> Option<Vec<u8>> { utxo_common::coin_protocol_info(&self.utxo_arc) }
+    fn coin_protocol_info(&self) -> Vec<u8> { utxo_common::coin_protocol_info(self) }
 
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
-        utxo_common::is_coin_protocol_supported(&self.utxo_arc, info)
+        utxo_common::is_coin_protocol_supported(self, info)
     }
 }
 
 #[async_trait]
-impl UtxoCommonOps for ZCoin {
-    async fn get_tx_fee(&self) -> Result<ActualTxFee, JsonRpcError> { utxo_common::get_tx_fee(&self.utxo_arc).await }
+impl UtxoTxGenerationOps for ZCoin {
+    async fn get_tx_fee(&self) -> UtxoRpcResult<ActualTxFee> { utxo_common::get_tx_fee(&self.utxo_arc).await }
 
-    async fn get_htlc_spend_fee(&self) -> UtxoRpcResult<u64> { utxo_common::get_htlc_spend_fee(self).await }
+    async fn calc_interest_if_required(
+        &self,
+        unsigned: TransactionInputSigner,
+        data: AdditionalTxData,
+        my_script_pub: Bytes,
+    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
+        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
+    }
+}
+
+#[async_trait]
+impl UtxoTxBroadcastOps for ZCoin {
+    async fn broadcast_tx(&self, tx: &UtxoTx) -> Result<H256Json, MmError<BroadcastTxErr>> {
+        utxo_common::broadcast_tx(self, tx).await
+    }
+}
+
+/// Please note `ZCoin` is not assumed to work with transparent UTXOs.
+/// Remove implementation of the `GetUtxoListOps` trait for `ZCoin`
+/// when [`ZCoin::preimage_trade_fee_required_to_send_outputs`] is refactored.
+#[async_trait]
+#[cfg_attr(test, mockable)]
+impl GetUtxoListOps for ZCoin {
+    async fn get_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_unspent_ordered_list(self, address).await
+    }
+
+    async fn get_all_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(Vec<UnspentInfo>, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_all_unspent_ordered_list(self, address).await
+    }
+
+    async fn get_mature_unspent_ordered_list(
+        &self,
+        address: &Address,
+    ) -> UtxoRpcResult<(MatureUnspentList, RecentlySpentOutPointsGuard<'_>)> {
+        utxo_common::get_mature_unspent_ordered_list(self, address).await
+    }
+}
+
+#[async_trait]
+impl UtxoCommonOps for ZCoin {
+    async fn get_htlc_spend_fee(&self, tx_size: u64) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size).await
+    }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
-        utxo_common::addresses_from_script(&self.utxo_arc.conf, script)
+        utxo_common::addresses_from_script(self, script)
     }
 
     fn denominate_satoshis(&self, satoshi: i64) -> f64 { utxo_common::denominate_satoshis(&self.utxo_arc, satoshi) }
 
-    fn my_public_key(&self) -> &Public { self.utxo_arc.key_pair.public() }
+    fn my_public_key(&self) -> Result<&Public, MmError<UnexpectedDerivationMethod>> {
+        utxo_common::my_public_key(self.as_ref())
+    }
 
     fn address_from_str(&self, address: &str) -> Result<Address, String> {
-        utxo_common::checked_address_from_str(&self.utxo_arc.conf, address)
+        utxo_common::checked_address_from_str(self, address)
     }
 
-    async fn get_current_mtp(&self) -> UtxoRpcResult<u32> { utxo_common::get_current_mtp(&self.utxo_arc).await }
+    async fn get_current_mtp(&self) -> UtxoRpcResult<u32> {
+        utxo_common::get_current_mtp(&self.utxo_arc, CoinVariant::Standard).await
+    }
 
     fn is_unspent_mature(&self, output: &RpcTransaction) -> bool {
         utxo_common::is_unspent_mature(self.utxo_arc.conf.mature_confirmations, output)
     }
 
-    async fn generate_transaction(
-        &self,
-        utxos: Vec<UnspentInfo>,
-        outputs: Vec<TransactionOutput>,
-        fee_policy: FeePolicy,
-        fee: Option<ActualTxFee>,
-        gas_fee: Option<u64>,
-    ) -> GenerateTxResult {
-        utxo_common::generate_transaction(self, utxos, outputs, fee_policy, fee, gas_fee).await
-    }
-
-    async fn calc_interest_if_required(
-        &self,
-        unsigned: TransactionInputSigner,
-        data: AdditionalTxData,
-        my_script_pub: Bytes,
-    ) -> UtxoRpcResult<(TransactionInputSigner, AdditionalTxData)> {
-        utxo_common::calc_interest_if_required(self, unsigned, data, my_script_pub).await
-    }
-
     async fn calc_interest_of_tx(
         &self,
         _tx: &UtxoTx,
@@ -578,53 +1546,19 @@ impl UtxoCommonOps for ZCoin {
         utxo_common::get_mut_verbose_transaction_from_map_or_rpc(self, tx_hash, utxo_tx_map).await
     }
 
-    fn p2sh_spending_tx(
-        &self,
-        prev_transaction: UtxoTx,
-        redeem_script: Bytes,
-        outputs: Vec<TransactionOutput>,
-        script_data: Script,
-        sequence: u32,
-        lock_time: u32,
-    ) -> Result<UtxoTx, String> {
-        utxo_common::p2sh_spending_tx(
-            self,
-            prev_transaction,
-            redeem_script,
-            outputs,
-            script_data,
-            sequence,
-            lock_time,
-        )
-    }
-
-    async fn ordered_mature_unspents<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::ordered_mature_unspents(self, address).await
+    async fn p2sh_spending_tx(&self, input: utxo_common::P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String> {
+        utxo_common::p2sh_spending_tx(self, input).await
     }
 
-    fn get_verbose_transaction_from_cache_or_rpc(
+    fn get_verbose_transactions_from_cache_or_rpc(
         &self,
-        txid: H256Json,
-    ) -> Box<dyn Future<Item = VerboseTransactionFrom, Error = String> + Send> {
+        tx_ids: HashSet<H256Json>,
+    ) -> UtxoRpcFut<HashMap<H256Json, VerboseTransactionFrom>> {
         let selfi = self.clone();
-        let fut = async move { utxo_common::get_verbose_transaction_from_cache_or_rpc(&selfi.utxo_arc, txid).await };
+        let fut = async move { utxo_common::get_verbose_transactions_from_cache_or_rpc(&selfi.utxo_arc, tx_ids).await };
         Box::new(fut.boxed().compat())
     }
 
-    async fn cache_transaction_if_possible(&self, tx: &RpcTransaction) -> Result<(), String> {
-        utxo_common::cache_transaction_if_possible(&self.utxo_arc, tx).await
-    }
-
-    async fn list_unspent_ordered<'a>(
-        &'a self,
-        address: &Address,
-    ) -> UtxoRpcResult<(Vec<UnspentInfo>, AsyncMutexGuard<'a, RecentlySpentOutPoints>)> {
-        utxo_common::list_unspent_ordered(self, address).await
-    }
-
     async fn preimage_trade_fee_required_to_send_outputs(
         &self,
         outputs: Vec<TransactionOutput>,
@@ -632,21 +1566,116 @@ impl UtxoCommonOps for ZCoin {
         gas_fee: Option<u64>,
         stage: &FeeApproxStage,
     ) -> TradePreimageResult<BigDecimal> {
-        utxo_common::preimage_trade_fee_required_to_send_outputs(self, outputs, fee_policy, gas_fee, stage).await
+        utxo_common::preimage_trade_fee_required_to_send_outputs(
+            self,
+            self.ticker(),
+            outputs,
+            fee_policy,
+            gas_fee,
+            stage,
+        )
+        .await
     }
 
     fn increase_dynamic_fee_by_stage(&self, dynamic_fee: u64, stage: &FeeApproxStage) -> u64 {
         utxo_common::increase_dynamic_fee_by_stage(self, dynamic_fee, stage)
     }
 
-    fn p2sh_tx_locktime(&self, htlc_locktime: u32) -> u32 {
-        utxo_common::p2sh_tx_locktime(&self.utxo_arc.conf.ticker, htlc_locktime)
+    async fn p2sh_tx_locktime(&self, htlc_locktime: u32) -> Result<u32, MmError<UtxoRpcError>> {
+        utxo_common::p2sh_tx_locktime(self, self.ticker(), htlc_locktime).await
+    }
+
+    fn addr_format(&self) -> &UtxoAddressFormat { utxo_common::addr_format(self) }
+
+    fn addr_format_for_standard_scripts(&self) -> UtxoAddressFormat {
+        utxo_common::addr_format_for_standard_scripts(self)
+    }
+
+    fn address_from_pubkey(&self, pubkey: &Public) -> Address {
+        let conf = &self.utxo_arc.conf;
+        utxo_common::address_from_pubkey(
+            pubkey,
+            conf.pub_addr_prefix,
+            conf.pub_t_addr_prefix,
+            conf.checksum_type,
+            conf.bech32_hrp.clone(),
+            self.addr_format().clone(),
+        )
+    }
+}
+
+#[async_trait]
+impl InitWithdrawCoin for ZCoin {
+    async fn init_withdraw(
+        &self,
+        _ctx: MmArc,
+        req: WithdrawRequest,
+        task_handle: &WithdrawTaskHandle,
+    ) -> Result<TransactionDetails, MmError<WithdrawError>> {
+        if req.fee.is_some() {
+            return MmError::err(WithdrawError::InternalError(
+                "Setting a custom withdraw fee is not supported for ZCoin yet".to_owned(),
+            ));
+        }
+
+        let to_addr = decode_payment_address(z_mainnet_constants::HRP_SAPLING_PAYMENT_ADDRESS, &req.to)
+            .map_to_mm(|e| WithdrawError::InvalidAddress(format!("{}", e)))?
+            .or_mm_err(|| WithdrawError::InvalidAddress(format!("Address {} decoded to None", req.to)))?;
+        let amount = if req.max {
+            let fee = self.get_one_kbyte_tx_fee().await?;
+            let balance = self.my_balance().compat().await?;
+            balance.spendable - fee
+        } else {
+            req.amount
+        };
+
+        task_handle.update_in_progress_status(WithdrawInProgressStatus::GeneratingTransaction)?;
+        let satoshi = sat_from_big_decimal(&amount, self.decimals())?;
+        let z_output = ZOutput {
+            to_addr,
+            amount: Amount::from_u64(satoshi)
+                .map_to_mm(|_| NumConversError(format!("Failed to get ZCash amount from {}", amount)))?,
+            // TODO add optional viewing_key and memo fields to the WithdrawRequest
+            viewing_key: Some(self.z_fields.evk.fvk.ovk),
+            memo: None,
+        };
+
+        let (tx, data, _sync_guard) = self.gen_tx(vec![], vec![z_output]).await?;
+        let mut tx_bytes = Vec::with_capacity(1024);
+        tx.write(&mut tx_bytes)
+            .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+        let mut tx_hash = tx.txid().0.to_vec();
+        tx_hash.reverse();
+
+        let received_by_me = big_decimal_from_sat_unsigned(data.received_by_me, self.decimals());
+        let spent_by_me = big_decimal_from_sat_unsigned(data.spent_by_me, self.decimals());
+
+        Ok(TransactionDetails {
+            tx_hex: tx_bytes.into(),
+            tx_hash: hex::encode(&tx_hash),
+            from: vec![self.z_fields.my_z_addr_encoded.clone()],
+            to: vec![req.to],
+            my_balance_change: &received_by_me - &spent_by_me,
+            total_amount: spent_by_me.clone(),
+            spent_by_me,
+            received_by_me,
+            block_height: 0,
+            timestamp: 0,
+            fee_details: Some(TxFeeDetails::Utxo(UtxoFeeDetails {
+                coin: Some(self.ticker().to_owned()),
+                amount: big_decimal_from_sat_unsigned(data.fee_amount, self.decimals()),
+            })),
+            coin: self.ticker().to_owned(),
+            internal_id: tx_hash.into(),
+            kmd_rewards: None,
+            transaction_type: Default::default(),
+        })
     }
 }
 
 #[test]
 fn derive_z_key_from_mm_seed() {
-    use common::privkey::key_pair_from_seed;
+    use crypto::privkey::key_pair_from_seed;
     use zcash_client_backend::encoding::encode_extended_spending_key;
 
     let seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
diff --git a/mm2src/coins/z_coin/compact_formats.proto b/mm2src/coins/z_coin/compact_formats.proto
new file mode 100644
index 0000000000..e20c05a56b
--- /dev/null
+++ b/mm2src/coins/z_coin/compact_formats.proto
@@ -0,0 +1,48 @@
+syntax = "proto3";
+package cash.z.wallet.sdk.rpc;
+option go_package = "walletrpc";
+option swift_prefix = "";
+// Remember that proto3 fields are all optional. A field that is not present will be set to its zero value.
+// bytes fields of hashes are in canonical little-endian format.
+
+// CompactBlock is a packaging of ONLY the data from a block that's needed to:
+//   1. Detect a payment to your shielded Sapling address
+//   2. Detect a spend of your shielded Sapling notes
+//   3. Update your witnesses to generate new Sapling spend proofs.
+message CompactBlock {
+    uint32 protoVersion = 1; // the version of this wire format, for storage
+    uint64 height = 2; // the height of this block
+    bytes hash = 3;
+    bytes prevHash = 4;
+    uint32 time = 5;
+    bytes header = 6; // (hash, prevHash, and time) OR (full header)
+    repeated CompactTx vtx = 7; // compact transactions from this block
+}
+
+message CompactTx {
+    // Index and hash will allow the receiver to call out to chain
+    // explorers or other data structures to retrieve more information
+    // about this transaction.
+    uint64 index = 1;
+    bytes hash = 2;
+
+    // The transaction fee: present if server can provide. In the case of a
+    // stateless server and a transaction with transparent inputs, this will be
+    // unset because the calculation requires reference to prior transactions.
+    // in a pure-Sapling context, the fee will be calculable as:
+    //    valueBalance + (sum(vPubNew) - sum(vPubOld) - sum(tOut))
+    uint32 fee = 3;
+
+    repeated CompactSpend spends = 4;
+    repeated CompactOutput outputs = 5;
+}
+
+message CompactSpend {
+    bytes nf = 1;
+}
+
+message CompactOutput {
+    bytes cmu = 1;
+    bytes epk = 2;
+    bytes ciphertext = 3;
+}
diff --git a/mm2src/coins/z_coin/service.proto b/mm2src/coins/z_coin/service.proto
new file mode 100644
index 0000000000..d0a7085675
--- /dev/null
+++ b/mm2src/coins/z_coin/service.proto
@@ -0,0 +1,177 @@
+// Copyright (c) 2019-2020 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+syntax = "proto3";
+package cash.z.wallet.sdk.rpc;
+option go_package = ".;walletrpc";
+option swift_prefix = "";
+import "compact_formats.proto";
+
+// A BlockID message contains identifiers to select a block: a height or a
+// hash. Specification by hash is not implemented, but may be in the future.
+message BlockID {
+    uint64 height = 1;
+    bytes hash = 2;
+}
+
+// BlockRange specifies a series of blocks from start to end inclusive.
+// Both BlockIDs must be heights; specification by hash is not yet supported.
+message BlockRange {
+    BlockID start = 1;
+    BlockID end = 2;
+}
+
+// A TxFilter contains the information needed to identify a particular
+// transaction: either a block and an index, or a direct transaction hash.
+// Currently, only specification by hash is supported.
+message TxFilter {
+    BlockID block = 1;     // block identifier, height or hash
+    uint64 index = 2;      // index within the block
+    bytes hash = 3;        // transaction ID (hash, txid)
+}
+
+// RawTransaction contains the complete transaction data. It also optionally includes
+// the block height in which the transaction was included.
+message RawTransaction {
+    bytes data = 1;     // exact data returned by Zcash 'getrawtransaction'
+    uint64 height = 2;  // height that the transaction was mined (or -1)
+}
+
+// A SendResponse encodes an error code and a string. It is currently used
+// only by SendTransaction(). If error code is zero, the operation was
+// successful; if non-zero, it and the message specify the failure.
+message SendResponse {
+    int32 errorCode = 1;
+    string errorMessage = 2;
+}
+
+// Chainspec is a placeholder to allow specification of a particular chain fork.
+message ChainSpec {}
+
+// Empty is for gRPCs that take no arguments, currently only GetLightdInfo.
+message Empty {}
+
+// LightdInfo returns various information about this lightwalletd instance
+// and the state of the blockchain.
+message LightdInfo {
+    string version = 1;
+    string vendor = 2;
+    bool   taddrSupport = 3;            // true
+    string chainName = 4;               // either "main" or "test"
+    uint64 saplingActivationHeight = 5; // depends on mainnet or testnet
+    string consensusBranchId = 6;       // protocol identifier, see consensus/upgrades.cpp
+    uint64 blockHeight = 7;             // latest block on the best chain
+    string gitCommit = 8;
+    string branch = 9;
+    string buildDate = 10;
+    string buildUser = 11;
+    uint64 estimatedHeight = 12;        // less than tip height if zcashd is syncing
+    string zcashdBuild = 13;            // example: "v4.1.1-877212414"
+    string zcashdSubversion = 14;       // example: "/MagicBean:4.1.1/"
+}
+
+// TransparentAddressBlockFilter restricts the results to the given address
+// or block range.
+message TransparentAddressBlockFilter {
+    string address = 1;     // t-address
+    BlockRange range = 2;   // start, end heights
+}
+
+// Duration is currently used only for testing, so that the Ping rpc
+// can simulate a delay, to create many simultaneous connections. Units
+// are microseconds.
+message Duration {
+    int64 intervalUs = 1;
+}
+
+// PingResponse is used to indicate concurrency, how many Ping rpcs
+// are executing upon entry and upon exit (after the delay).
+// This rpc is used for testing only.
+message PingResponse {
+    int64 entry = 1;
+    int64 exit = 2;
+}
+
+message Address {
+    string address = 1;
+}
+message AddressList {
+    repeated string addresses = 1;
+}
+message Balance {
+    int64 valueZat = 1;
+}
+
+message Exclude {
+    repeated bytes txid = 1;
+}
+
+// The TreeState is derived from the Zcash z_gettreestate rpc.
+message TreeState {
+    string network = 1; // "main" or "test"
+    uint64 height = 2;
+    string hash = 3;    // block id
+    uint32 time = 4;    // Unix epoch time when the block was mined
+    string tree = 5;    // sapling commitment tree state
+}
+
+message GetAddressUtxosArg {
+    string address = 1;
+    uint64 startHeight = 2;
+    uint32 maxEntries = 3; // zero means unlimited
+}
+message GetAddressUtxosReply {
+    bytes txid = 1;
+    int32 index = 2;
+    bytes script = 3;
+    int64 valueZat = 4;
+    uint64 height = 5;
+}
+message GetAddressUtxosReplyList {
+    repeated GetAddressUtxosReply addressUtxos = 1;
+}
+
+service CompactTxStreamer {
+    // Return the height of the tip of the best chain
+    rpc GetLatestBlock(ChainSpec) returns (BlockID) {}
+    // Return the compact block corresponding to the given block identifier
+    rpc GetBlock(BlockID) returns (CompactBlock) {}
+    // Return a list of consecutive compact blocks
+    rpc GetBlockRange(BlockRange) returns (stream CompactBlock) {}
+
+    // Return the requested full (not compact) transaction (as from zcashd)
+    rpc GetTransaction(TxFilter) returns (RawTransaction) {}
+    // Submit the given transaction to the Zcash network
+    rpc SendTransaction(RawTransaction) returns (SendResponse) {}
+
+    // Return the txids corresponding to the given t-address within the given block range
+    rpc GetTaddressTxids(TransparentAddressBlockFilter) returns (stream RawTransaction) {}
+    rpc GetTaddressBalance(AddressList) returns (Balance) {}
+    rpc GetTaddressBalanceStream(stream Address) returns (Balance) {}
+
+    // Return the compact transactions currently in the mempool; the results
+    // can be a few seconds out of date. If the Exclude list is empty, return
+    // all transactions; otherwise return all *except* those in the Exclude list
+    // (if any); this allows the client to avoid receiving transactions that it
+    // already has (from an earlier call to this rpc). The transaction IDs in the
+    // Exclude list can be shortened to any number of bytes to make the request
+    // more bandwidth-efficient; if two or more transactions in the mempool
+    // match a shortened txid, they are all sent (none is excluded). Transactions
+    // in the exclude list that don't exist in the mempool are ignored.
+    rpc GetMempoolTx(Exclude) returns (stream CompactTx) {}
+
+    // GetTreeState returns the note commitment tree state corresponding to the given block.
+    // See section 3.7 of the Zcash protocol specification. It returns several other useful
+    // values also (even though they can be obtained using GetBlock).
+    // The block can be specified by either height or hash.
+    rpc GetTreeState(BlockID) returns (TreeState) {}
+
+    rpc GetAddressUtxos(GetAddressUtxosArg) returns (GetAddressUtxosReplyList) {}
+    rpc GetAddressUtxosStream(GetAddressUtxosArg) returns (stream GetAddressUtxosReply) {}
+
+    // Return information about this lightwalletd instance and the blockchain
+    rpc GetLightdInfo(Empty) returns (LightdInfo) {}
+    // Testing-only
+    rpc Ping(Duration) returns (PingResponse) {}
+}
diff --git a/mm2src/coins/z_coin/z_coin_errors.rs b/mm2src/coins/z_coin/z_coin_errors.rs
new file mode 100644
index 0000000000..bfe13b1b19
--- /dev/null
+++ b/mm2src/coins/z_coin/z_coin_errors.rs
@@ -0,0 +1,237 @@
+use crate::my_tx_history_v2::MyTxHistoryErrorV2;
+use crate::utxo::rpc_clients::UtxoRpcError;
+use crate::utxo::utxo_builder::UtxoCoinBuildError;
+use crate::WithdrawError;
+use crate::{NumConversError, PrivKeyNotAllowed};
+use db_common::sqlite::rusqlite::Error as SqliteError;
+use db_common::sqlite::rusqlite::Error as SqlError;
+use derive_more::Display;
+use http::uri::InvalidUri;
+use mm2_number::BigDecimal;
+use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
+use zcash_client_sqlite::error::SqliteClientError;
+use zcash_client_sqlite::error::SqliteClientError as ZcashClientError;
+use zcash_primitives::transaction::builder::Error as ZTxBuilderError;
+
+#[derive(Debug, Display)]
+#[non_exhaustive]
+pub enum UpdateBlocksCacheErr {
+    GrpcError(tonic::Status),
+    DbError(SqliteError),
+}
+
+impl From<tonic::Status> for UpdateBlocksCacheErr {
+    fn from(err: tonic::Status) -> Self { UpdateBlocksCacheErr::GrpcError(err) }
+}
+
+impl From<SqliteError> for UpdateBlocksCacheErr {
+    fn from(err: SqliteError) -> Self { UpdateBlocksCacheErr::DbError(err) }
+}
+
+#[derive(Debug, Display)]
+#[non_exhaustive]
+pub enum ZcoinLightClientInitError {
+    TlsConfigFailure(tonic::transport::Error),
+    ConnectionFailure(tonic::transport::Error),
+    BlocksDbInitFailure(SqliteError),
+    WalletDbInitFailure(SqliteError),
+    ZcashSqliteError(ZcashClientError),
+}
+
+impl From<ZcashClientError> for ZcoinLightClientInitError {
+    fn from(err: ZcashClientError) -> Self { ZcoinLightClientInitError::ZcashSqliteError(err) }
+}
+
+#[derive(Debug, Display)]
+#[display(fmt = "Blockchain scan process stopped")]
+pub struct BlockchainScanStopped {}
+
+#[derive(Debug, Display)]
+pub enum GenTxError {
+    DecryptedOutputNotFound,
+    GetWitnessErr(GetUnspentWitnessErr),
+    FailedToGetMerklePath,
+    #[display(
+        fmt = "Not enough {} to generate a tx: available {}, required at least {}",
+        coin,
+        available,
+        required
+    )]
+    InsufficientBalance {
+        coin: String,
+        available: BigDecimal,
+        required: BigDecimal,
+    },
+    NumConversion(NumConversError),
+    Rpc(UtxoRpcError),
+    PrevTxNotConfirmed,
+    TxBuilderError(ZTxBuilderError),
+    #[display(fmt = "Failed to read ZCash tx from bytes {:?} with error {}", hex, err)]
+    TxReadError {
+        hex: BytesJson,
+        err: std::io::Error,
+    },
+    BlockchainScanStopped,
+    LightClientErr(SqliteClientError),
+    FailedToCreateNote,
+}
+
+impl From<GetUnspentWitnessErr> for GenTxError {
+    fn from(err: GetUnspentWitnessErr) -> GenTxError { GenTxError::GetWitnessErr(err) }
+}
+
+impl From<NumConversError> for GenTxError {
+    fn from(err: NumConversError) -> GenTxError { GenTxError::NumConversion(err) }
+}
+
+impl From<UtxoRpcError> for GenTxError {
+    fn from(err: UtxoRpcError) -> GenTxError { GenTxError::Rpc(err) }
+}
+
+impl From<ZTxBuilderError> for GenTxError {
+    fn from(err: ZTxBuilderError) -> GenTxError { GenTxError::TxBuilderError(err) }
+}
+
+impl From<SqliteClientError> for GenTxError {
+    fn from(err: SqliteClientError) -> Self { GenTxError::LightClientErr(err) }
+}
+
+impl From<GenTxError> for WithdrawError {
+    fn from(gen_tx: GenTxError) -> WithdrawError {
+        match gen_tx {
+            GenTxError::InsufficientBalance {
+                coin,
+                available,
+                required,
+            } => WithdrawError::NotSufficientBalance {
+                coin,
+                available,
+                required,
+            },
+            GenTxError::Rpc(e) => WithdrawError::Transport(e.to_string()),
+            GenTxError::DecryptedOutputNotFound
+            | GenTxError::FailedToGetMerklePath
+            | GenTxError::PrevTxNotConfirmed
+            | GenTxError::GetWitnessErr(_)
+            | GenTxError::NumConversion(_)
+            | GenTxError::TxBuilderError(_)
+            | GenTxError::TxReadError { .. }
+            | GenTxError::BlockchainScanStopped
+            | GenTxError::LightClientErr(_)
+            | GenTxError::FailedToCreateNote => WithdrawError::InternalError(gen_tx.to_string()),
+        }
+    }
+}
+
+impl From<BlockchainScanStopped> for GenTxError {
+    #[inline]
+    fn from(_: BlockchainScanStopped) -> Self { GenTxError::BlockchainScanStopped }
+}
+
+#[derive(Debug, Display)]
+#[allow(clippy::large_enum_variant)]
+pub enum SendOutputsErr {
+    GenTxError(GenTxError),
+    NumConversion(NumConversError),
+    Rpc(UtxoRpcError),
+    TxNotMined(String),
+    PrivKeyNotAllowed(PrivKeyNotAllowed),
+}
+
+impl From<PrivKeyNotAllowed> for SendOutputsErr {
+    fn from(err: PrivKeyNotAllowed) -> Self { SendOutputsErr::PrivKeyNotAllowed(err) }
+}
+
+impl From<GenTxError> for SendOutputsErr {
+    fn from(err: GenTxError) -> SendOutputsErr { SendOutputsErr::GenTxError(err) }
+}
+
+impl From<NumConversError> for SendOutputsErr {
+    fn from(err: NumConversError) -> SendOutputsErr { SendOutputsErr::NumConversion(err) }
+}
+
+impl From<UtxoRpcError> for SendOutputsErr {
+    fn from(err: UtxoRpcError) -> SendOutputsErr { SendOutputsErr::Rpc(err) }
+}
+
+#[derive(Debug, Display)]
+pub enum GetUnspentWitnessErr {
+    EmptyDbResult,
+    TreeOrWitnessAppendFailed,
+    OutputCmuNotFoundInCache,
+    Sql(SqliteError),
+}
+
+impl From<SqliteError> for GetUnspentWitnessErr {
+    fn from(err: SqliteError) -> GetUnspentWitnessErr { GetUnspentWitnessErr::Sql(err) }
+}
+
+#[derive(Debug, Display)]
+pub enum ZCoinBuildError {
+    UtxoBuilderError(UtxoCoinBuildError),
+    GetAddressError,
+    SqliteError(SqliteError),
+    Rpc(UtxoRpcError),
+    #[display(fmt = "Sapling cache DB does not exist at {}. Please download it.", path)]
+    SaplingCacheDbDoesNotExist {
+        path: String,
+    },
+    Io(std::io::Error),
+    EmptyLightwalletdUris,
+    NativeModeIsNotSupportedYet,
+    InvalidLightwalletdUri(InvalidUri),
+    LightClientInitErr(ZcoinLightClientInitError),
+    ZCashParamsNotFound,
+}
+
+impl From<SqliteError> for ZCoinBuildError {
+    fn from(err: SqliteError) -> ZCoinBuildError { ZCoinBuildError::SqliteError(err) }
+}
+
+impl From<UtxoRpcError> for ZCoinBuildError {
+    fn from(err: UtxoRpcError) -> ZCoinBuildError { ZCoinBuildError::Rpc(err) }
+}
+
+impl From<UtxoCoinBuildError> for ZCoinBuildError {
+    fn from(err: UtxoCoinBuildError) -> Self { ZCoinBuildError::UtxoBuilderError(err) }
+}
+
+impl From<std::io::Error> for ZCoinBuildError {
+    fn from(err: std::io::Error) -> ZCoinBuildError { ZCoinBuildError::Io(err) }
+}
+
+impl From<InvalidUri> for ZCoinBuildError {
+    fn from(err: InvalidUri) -> Self { ZCoinBuildError::InvalidLightwalletdUri(err) }
+}
+
+impl From<ZcoinLightClientInitError> for ZCoinBuildError {
+    fn from(err: ZcoinLightClientInitError) -> Self { ZCoinBuildError::LightClientInitErr(err) }
+}
+
+pub(super) enum SqlTxHistoryError {
+    Sql(SqlError),
+    FromIdDoesNotExist(i64),
+}
+
+impl From<SqlError> for SqlTxHistoryError {
+    fn from(err: SqlError) -> Self { SqlTxHistoryError::Sql(err) }
+}
+
+impl From<SqlTxHistoryError> for MyTxHistoryErrorV2 {
+    fn from(err: SqlTxHistoryError) -> Self {
+        match err {
+            SqlTxHistoryError::Sql(sql) => MyTxHistoryErrorV2::StorageError(sql.to_string()),
+            SqlTxHistoryError::FromIdDoesNotExist(id) => {
+                MyTxHistoryErrorV2::StorageError(format!("from_id {} does not exist", id))
+            },
+        }
+    }
+}
+
+pub(super) struct NoInfoAboutTx(pub(super) H256Json);
+
+impl From<NoInfoAboutTx> for MyTxHistoryErrorV2 {
+    fn from(err: NoInfoAboutTx) -> Self {
+        MyTxHistoryErrorV2::RpcError(format!("No info about transaction {:02x}", err.0))
+    }
+}
diff --git a/mm2src/coins/z_coin/z_coin_tests.rs b/mm2src/coins/z_coin/z_coin_tests.rs
index 0c2abbce36..51957d8218 100644
--- a/mm2src/coins/z_coin/z_coin_tests.rs
+++ b/mm2src/coins/z_coin/z_coin_tests.rs
@@ -1,8 +1,9 @@
 use super::*;
 use crate::z_coin::z_htlc::z_send_dex_fee;
 use common::block_on;
-use common::mm_ctx::MmCtxBuilder;
 use common::now_ms;
+use mm2_core::mm_ctx::MmCtxBuilder;
+use std::time::Duration;
 use zcash_client_backend::encoding::decode_extended_spending_key;
 
 #[test]
@@ -24,22 +25,31 @@ fn zombie_coin_send_and_refund_maker_payment() {
     let priv_key = [1; 32];
     let z_key = decode_extended_spending_key(z_mainnet_constants::HRP_SAPLING_EXTENDED_SPENDING_KEY, "secret-extended-key-main1q0k2ga2cqqqqpq8m8j6yl0say83cagrqp53zqz54w38ezs8ly9ly5ptamqwfpq85u87w0df4k8t2lwyde3n9v0gcr69nu4ryv60t0kfcsvkr8h83skwqex2nf0vr32794fmzk89cpmjptzc22lgu5wfhhp8lgf3f5vn2l3sge0udvxnm95k6dtxj2jwlfyccnum7nz297ecyhmd5ph526pxndww0rqq0qly84l635mec0x4yedf95hzn6kcgq8yxts26k98j9g32kjc8y83fe").unwrap().unwrap();
 
-    let coin = block_on(z_coin_from_conf_and_request_with_z_key(
-        &ctx, "ZOMBIE", &conf, &req, &priv_key, z_key,
+    let db_dir = PathBuf::from("./for_tests");
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(z_coin_from_conf_and_params_with_z_key(
+        &ctx, "ZOMBIE", &conf, &params, &priv_key, db_dir, z_key,
     ))
     .unwrap();
 
     let lock_time = (now_ms() / 1000) as u32 - 3600;
-    let taker_pub = coin.utxo_arc.key_pair.public();
+    let taker_pub = coin.utxo_arc.priv_key_policy.key_pair_or_err().unwrap().public();
     let secret_hash = [0; 20];
     let tx = coin
-        .send_maker_payment(lock_time, &*taker_pub, &secret_hash, "0.01".parse().unwrap(), &None)
+        .send_maker_payment(
+            lock_time,
+            taker_pub,
+            taker_pub,
+            &secret_hash,
+            "0.01".parse().unwrap(),
+            &None,
+        )
         .wait()
         .unwrap();
     println!("swap tx {}", hex::encode(&tx.tx_hash().0));
 
     let refund_tx = coin
-        .send_maker_refunds_payment(&tx.tx_hex(), lock_time, &*taker_pub, &secret_hash, &None)
+        .send_maker_refunds_payment(&tx.tx_hex(), lock_time, &*taker_pub, &secret_hash, &priv_key, &None)
         .wait()
         .unwrap();
     println!("refund tx {}", hex::encode(&refund_tx.tx_hash().0));
@@ -64,31 +74,40 @@ fn zombie_coin_send_and_spend_maker_payment() {
     let priv_key = [1; 32];
     let z_key = decode_extended_spending_key(z_mainnet_constants::HRP_SAPLING_EXTENDED_SPENDING_KEY, "secret-extended-key-main1q0k2ga2cqqqqpq8m8j6yl0say83cagrqp53zqz54w38ezs8ly9ly5ptamqwfpq85u87w0df4k8t2lwyde3n9v0gcr69nu4ryv60t0kfcsvkr8h83skwqex2nf0vr32794fmzk89cpmjptzc22lgu5wfhhp8lgf3f5vn2l3sge0udvxnm95k6dtxj2jwlfyccnum7nz297ecyhmd5ph526pxndww0rqq0qly84l635mec0x4yedf95hzn6kcgq8yxts26k98j9g32kjc8y83fe").unwrap().unwrap();
 
-    let coin = block_on(z_coin_from_conf_and_request_with_z_key(
-        &ctx, "ZOMBIE", &conf, &req, &priv_key, z_key,
+    let db_dir = PathBuf::from("./for_tests");
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(z_coin_from_conf_and_params_with_z_key(
+        &ctx, "ZOMBIE", &conf, &params, &priv_key, db_dir, z_key,
     ))
     .unwrap();
 
     let lock_time = (now_ms() / 1000) as u32 - 1000;
-    let taker_pub = coin.utxo_arc.key_pair.public();
+    let taker_pub = coin.utxo_arc.priv_key_policy.key_pair_or_err().unwrap().public();
     let secret = [0; 32];
     let secret_hash = dhash160(&secret);
     let tx = coin
-        .send_maker_payment(lock_time, &*taker_pub, &*secret_hash, "0.01".parse().unwrap(), &None)
+        .send_maker_payment(
+            lock_time,
+            taker_pub,
+            taker_pub,
+            &*secret_hash,
+            "0.01".parse().unwrap(),
+            &None,
+        )
         .wait()
         .unwrap();
     println!("swap tx {}", hex::encode(&tx.tx_hash().0));
 
     let maker_pub = taker_pub;
     let spend_tx = coin
-        .send_taker_spends_maker_payment(&tx.tx_hex(), lock_time, &*maker_pub, &secret, &None)
+        .send_taker_spends_maker_payment(&tx.tx_hex(), lock_time, &*maker_pub, &secret, &priv_key, &None)
         .wait()
         .unwrap();
     println!("spend tx {}", hex::encode(&spend_tx.tx_hash().0));
 }
 
 #[test]
-fn zombie_coin_send_and_refund_dex_fee() {
+fn zombie_coin_send_dex_fee() {
     let conf = json!({
         "coin": "ZOMBIE",
         "asset": "ZOMBIE",
@@ -106,31 +125,50 @@ fn zombie_coin_send_and_refund_dex_fee() {
     let priv_key = [1; 32];
     let z_key = decode_extended_spending_key(z_mainnet_constants::HRP_SAPLING_EXTENDED_SPENDING_KEY, "secret-extended-key-main1q0k2ga2cqqqqpq8m8j6yl0say83cagrqp53zqz54w38ezs8ly9ly5ptamqwfpq85u87w0df4k8t2lwyde3n9v0gcr69nu4ryv60t0kfcsvkr8h83skwqex2nf0vr32794fmzk89cpmjptzc22lgu5wfhhp8lgf3f5vn2l3sge0udvxnm95k6dtxj2jwlfyccnum7nz297ecyhmd5ph526pxndww0rqq0qly84l635mec0x4yedf95hzn6kcgq8yxts26k98j9g32kjc8y83fe").unwrap().unwrap();
 
-    let coin = block_on(z_coin_from_conf_and_request_with_z_key(
-        &ctx, "ZOMBIE", &conf, &req, &priv_key, z_key,
+    let db_dir = PathBuf::from("./for_tests");
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(z_coin_from_conf_and_params_with_z_key(
+        &ctx, "ZOMBIE", &conf, &params, &priv_key, db_dir, z_key,
     ))
     .unwrap();
 
-    let lock_time = (now_ms() / 1000) as u32 - 1000;
-    let watcher_pub = coin.utxo_arc.key_pair.public();
-    let (tx, redeem_script) = block_on(z_send_dex_fee(&coin, lock_time, watcher_pub, "0.01".parse().unwrap())).unwrap();
-    println!("dex fee tx {}", hex::encode(&*tx.hash().reversed()));
-
-    let script_data = ScriptBuilder::default().push_opcode(Opcode::OP_1).into_script();
-    let refund = block_on(z_p2sh_spend(
-        &coin,
-        tx,
-        lock_time,
-        SEQUENCE_FINAL - 1,
-        redeem_script,
-        script_data,
+    let tx = block_on(z_send_dex_fee(&coin, "0.01".parse().unwrap(), &[1; 16])).unwrap();
+    println!("dex fee tx {}", tx.txid());
+}
+
+#[test]
+fn prepare_zombie_sapling_cache() {
+    let conf = json!({
+        "coin": "ZOMBIE",
+        "asset": "ZOMBIE",
+        "fname": "ZOMBIE",
+        "txversion": 4,
+        "overwintered": 1,
+        "mm2": 1,
+    });
+    let req = json!({
+        "method": "enable",
+        "coin": "ZOMBIE"
+    });
+
+    let ctx = MmCtxBuilder::default().into_mm_arc();
+    let priv_key = [1; 32];
+    let z_key = decode_extended_spending_key(z_mainnet_constants::HRP_SAPLING_EXTENDED_SPENDING_KEY, "secret-extended-key-main1q0k2ga2cqqqqpq8m8j6yl0say83cagrqp53zqz54w38ezs8ly9ly5ptamqwfpq85u87w0df4k8t2lwyde3n9v0gcr69nu4ryv60t0kfcsvkr8h83skwqex2nf0vr32794fmzk89cpmjptzc22lgu5wfhhp8lgf3f5vn2l3sge0udvxnm95k6dtxj2jwlfyccnum7nz297ecyhmd5ph526pxndww0rqq0qly84l635mec0x4yedf95hzn6kcgq8yxts26k98j9g32kjc8y83fe").unwrap().unwrap();
+
+    let db_dir = PathBuf::from("./for_tests");
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(z_coin_from_conf_and_params_with_z_key(
+        &ctx, "ZOMBIE", &conf, &params, &priv_key, db_dir, z_key,
     ))
     .unwrap();
-    println!("dex fee refund tx {}", hex::encode(&*refund.hash().reversed()));
+
+    while !coin.is_sapling_state_synced() {
+        std::thread::sleep(Duration::from_secs(1));
+    }
 }
 
 #[test]
-fn zombie_coin_send_and_spend_dex_fee() {
+fn zombie_coin_validate_dex_fee() {
     let conf = json!({
         "coin": "ZOMBIE",
         "asset": "ZOMBIE",
@@ -148,25 +186,45 @@ fn zombie_coin_send_and_spend_dex_fee() {
     let priv_key = [1; 32];
     let z_key = decode_extended_spending_key(z_mainnet_constants::HRP_SAPLING_EXTENDED_SPENDING_KEY, "secret-extended-key-main1q0k2ga2cqqqqpq8m8j6yl0say83cagrqp53zqz54w38ezs8ly9ly5ptamqwfpq85u87w0df4k8t2lwyde3n9v0gcr69nu4ryv60t0kfcsvkr8h83skwqex2nf0vr32794fmzk89cpmjptzc22lgu5wfhhp8lgf3f5vn2l3sge0udvxnm95k6dtxj2jwlfyccnum7nz297ecyhmd5ph526pxndww0rqq0qly84l635mec0x4yedf95hzn6kcgq8yxts26k98j9g32kjc8y83fe").unwrap().unwrap();
 
-    let coin = block_on(z_coin_from_conf_and_request_with_z_key(
-        &ctx, "ZOMBIE", &conf, &req, &priv_key, z_key,
+    let db_dir = PathBuf::from("./for_tests");
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(z_coin_from_conf_and_params_with_z_key(
+        &ctx, "ZOMBIE", &conf, &params, &priv_key, db_dir, z_key,
     ))
     .unwrap();
 
-    let lock_time = (now_ms() / 1000) as u32 - 1000;
-    let watcher_pub = coin.utxo_arc.key_pair.public();
-    let (tx, redeem_script) = block_on(z_send_dex_fee(&coin, lock_time, watcher_pub, "0.01".parse().unwrap())).unwrap();
-    println!("dex fee tx {}", hex::encode(&*tx.hash().reversed()));
-
-    let script_data = ScriptBuilder::default().push_opcode(Opcode::OP_0).into_script();
-    let spend = block_on(z_p2sh_spend(
-        &coin,
-        tx,
-        lock_time,
-        SEQUENCE_FINAL,
-        redeem_script,
-        script_data,
-    ))
-    .unwrap();
-    println!("dex fee spend tx {}", hex::encode(&*spend.hash().reversed()));
+    // https://zombie.explorer.lordofthechains.com/tx/ec620194c33eba004904f34c93f4f005a7544988771af1c5a527f65c08e4a4aa
+    let tx_hex = "0400008085202f89000000000000af330000e803000000000000015c3fc69c0eb25dc2b75593464af5b937da35816a2ffeb9b79f3da865c2187083a0b143011810109ab0ed410896aff77bcfbc8a8f5b9bfe0d273716095cfe401cbd97c66a999384aa12a571abc39508b113de0ad0816630fea67f18d68572c52be4364f812f9796e1084ee6c28d1419dac4767d12a7a33662536c2c1ffa7e221d843c9f2bf2601f34cc71a1e1c42041fab87e617ae00b796aa070280060e9cdc30e69e80367e6105e792bbefcd93f00c48ce8278c4eb36c8846cb94d5adcb273ce91decf79196461f7969d6a7031878c6c8e81edd4532a5c57bbaeeea4ed5f4440cef90f19020079c69e05325e63350e9cb9eac44a3d4937111a3c6dc00c79d4dfe72c1e73a6e00ad0aa1aded83f0b778ab92319fcdae19c2946c50c370d243fe6dfa4f92803dcec1992af0d91f0cda8ccbee2a5321f708fc0156d29b51a015b3fb70f543c7713b8547d24e6916caefca17edf1f4109099177498cb30f9305b5169ab1f2e3e4a83e789b5687f3f5f5013d917e2e6babc8ca4507cb349d1e5a30602f557bcbd6574c7fcb5779ce286bdd10fe5db58abadcacf5eaa9e5d3575e30e439d0c62494bc045456e7b6b03f5304a8ff8878f01883f8c473e066f8159bdc111a03d96670f4b29acd919d8b9674897e056c7ac6ef4da155ce7d923f2bedcd51f2198c2be360e03ef2373df94d1e63ba507effc2f9b2f1ccfed09f2f26b8c619415d4a90f556e4b9350099f58fb10a33986945a1512879fdae66e9ef94671764ecdc558ed2d760f7bd3ce2dedfdb4fc7e3aa26903288e16f34214632d8727f68d47389ff687f681b3b285896d3214b9eb60271d87f3223f20e4ddf39513c07fe3420eefa9e7372fff51c83468161d9ffe745533b02917e4ccf87a213c884042938511bb7ccbe6b54392897b1ba111d127ec2c16ba167bb5a65d7819295ceedc5b8faf493c71ed722b72578c62be7d59449bd218196e1f43c3a8bb4875c3bcce1adcb6c4afa6398a7276583c60dbe609c9819bf66385e6cff4b27090aa1dccd0a2f86ca3b3871f2077db44c17d57bba98f9809e6000676600ad70560cbf285354f979d24a5de6e8b0c65ee1a89e28f58f430d20988cae8b0a9690cf79519efc227d54ca739ce3dcde73ac6e624c00b120d6955b40b854b00b1b53dc18cc35cd4792716f3e0bc6552bf0ba4616d1b22900cebede31fbe4b722de1f11c0577abe2ca0614c9d6f24cb56e2b4c840b8573c503ca1d4bf9e671a583b04dd51af10cfc709e89965c5150d7fb6b8c924812e6c9d31025d30e8367defb39e71fda095a16c0e1a70b528799d8c4852b3adb700b113bf5de1d6ec6c7742a1ef678228930ec767e406b36a55fe4a8108236cf0487901e35b50312facad257fd9ba2be154fbc674b33240fffaffc149f26238c5b188107df049cc615289ab8ee6f12a868379f6e362b059ba7c3dde3f02a91a08316c194ad7e556d390d38e6442212502f84cb22fc7dbab262984d2155ebeee3e4109033e57e761e9ab701512cf2635fe92f12d42953ce33f020ad4606125477318f88f673517831f43e548c5ef1d6d4aef7d850fdc0d35bc38a69ac02ccc7436eb711c6303cd306b34931bf1a4cbaed6940ede588e2abf7835718e4afed606d71cdb48146598db31d024347ba9eb289f714bfa7a3670392b3a5e35b6359f6626ed07cca451f0389e4423bb531baf409c48279df489d0073ccf17676eb5c5caa732b104894c2bcf311774f1f8c0b8b6fa313437bc1209f29ee64ccb40a07bb0cf928c77ca6b6a4fe287b1dc6df678a32b8dda35876211d5f929f90a6cc772bd171d15f50da9de8f11a241be98d205b2c53a78a5ba1bce0e782ee88512c3fc815fe843c6b5ffae1b80f1bdd5132b84a813e5157d3096034011fec2f0543f9c30a119d87e8b66e9a857d833d45fe55352871f68aaf8757c03f3b82f1cbd13c56d1843b9d2ebf7fe42f41ab0493dc9491813456fd1e0466bfdfb87a684cba8944df2fd8d3703617383137613a853a3725b366079c3760bbce60f2a88fa2cc579a6ddc9813185cb26873e6c09e43b6db73e4a44d30eebdae38bdaae9f6f1c38941b342ba67822b039f35878e54aadc4b1861df8803494f739d07b0d8b7815d1b55932bcdda80f612f97e0a0c288a7daf3aee1eb0db33fa030082b439a6d0c8d1043a718747acc398913f89e09cb0c95be96fdc9b8aa01f8eba0bd543528035fb7442ce9c6fa5e5539d4dfe29f2a9400d2d122d61037b9df584c5738b851a0d8f6bb6cf553efbdeefc3db3718681a75cb90398fa54c8dd1e696de8dba5ec977c4e2909f4977fde39847f2c0d8f9f9927e9a6cc9466b90d7745e678baa32100cb1ca7d2969c6ec9f35b222f3f4126a7965c40e5da75f183f73d33d325f25a371f5767c6b5bca141c30ed409ffce5f8e073bfb0a85512d0594c96b80cd5d7b73ac3dca494aa9dc7085ad594b46eb28fd1df84afc8a71dd63bc5d23eaf21238706a205d643bd238fe01b32dcd50c93047498ed54bb01cf2108d326f7e3c0538a9e6cc79090ccee6cf47e7fd3cc5cf41aad6905c5d099cea22effdcd4bb7b8d85ba3e3d703c34863d2540936976c774e5c4cb020873873a186c3bab67b1a47c4029f2880cbadd1cd7d82a6c649b073aa0c938b5f28e9173a64c72c81745bc8df6706bf6e320b5e96820970322f21d633a2c28b23d79b8edbc8a13eafa2a5241d7bb59b341779fe6f5db2994567caefaec23b7b7c55a73dbc6614bb958bc1d62838c56197a3eceefeb1dc4f505645548f2dd8848e4046aca421548235f1945725f82f03b0ba5c774ddea6f9524cdcc302ee4712ef7d4bc1c16d7aa578d8fd8ceb680c16fcc6ca6a40afdcef6f89e81bd92f7d1f6e39c9c57f3239a1fcb23d649f8757348214572e53bc2c2c7ff8bce6d48df6e3c53ab7014a55c9296d05998a0d1b53749d9561541eb0cf6e1bfa65141ce9b6c30fe4f68cd8e869feba82675ec43bf953ab2994533d6d1af1705130243d9b9ee4088b635d6b4db5603b8784f4fe77d4b0d8a7935c06198d12fa0fc6e1ad2ddef96e7f9ab6103a2a29739ca3af9fe1736cdf49162e77d6f17d063f04dc2e1358af3da993fb3824e59575a9f15c7c429efd059477429be0c2a5b126078a8f8b1088d35aae59eac0897dfa4d45179947bad401c7417df2fac46f8782a2069f83cc18eda4d0070167878ad72f5d255e300a6368e0d390d3d0206aba68772b1e9d73c97406a0a5d80b7b8360502a9e7cb471fb5bd49ce9eee3a16f82aadca47327ccaa00a0575ed7191ffb710dd1ab7f801";
+    let tx_bytes = hex::decode(tx_hex).unwrap();
+    let tx = ZTransaction::read(tx_bytes.as_slice()).unwrap();
+    let tx = tx.into();
+
+    // Invalid amount should return an error
+    let err = coin
+        .validate_fee(&tx, &[], &[], &"0.001".parse().unwrap(), 12000, &[1; 16])
+        .wait()
+        .unwrap_err();
+    println!("{}", err);
+    assert!(err.contains("Dex fee has invalid amount"));
+
+    // Invalid memo should return an error
+    let err = coin
+        .validate_fee(&tx, &[], &[], &"0.01".parse().unwrap(), 12000, &[2; 16])
+        .wait()
+        .unwrap_err();
+    println!("{}", err);
+    assert!(err.contains("Dex fee has invalid memo"));
+
+    // Confirmed before min block
+    let err = coin
+        .validate_fee(&tx, &[], &[], &"0.01".parse().unwrap(), 14000, &[1; 16])
+        .wait()
+        .unwrap_err();
+    println!("{}", err);
+    assert!(err.contains("confirmed before min block"));
+
+    // Success validation
+    coin.validate_fee(&tx, &[], &[], &"0.01".parse().unwrap(), 12000, &[1; 16])
+        .wait()
+        .unwrap();
 }
diff --git a/mm2src/coins/z_coin/z_htlc.rs b/mm2src/coins/z_coin/z_htlc.rs
index 0cc344910b..ee286b90ab 100644
--- a/mm2src/coins/z_coin/z_htlc.rs
+++ b/mm2src/coins/z_coin/z_htlc.rs
@@ -5,237 +5,179 @@
 // taker payment spend - https://zombie.explorer.lordofthechains.com/tx/af6bb0f99f9a5a070a0c1f53d69e4189b0e9b68f9d66e69f201a6b6d9f93897e
 // maker payment spend - https://rick.explorer.dexstats.info/tx/6a2dcc866ad75cebecb780a02320073a88bcf5e57ddccbe2657494e7747d591e
 
-use super::z_rpc::{ZOperationStatus, ZOperationTxid, ZSendManyItem};
 use super::ZCoin;
 use crate::utxo::rpc_clients::{UtxoRpcClientEnum, UtxoRpcError};
-use crate::utxo::sat_from_big_decimal;
-use crate::utxo::utxo_common::{big_decimal_from_sat_unsigned, dex_fee_script, payment_script};
-use bigdecimal::BigDecimal;
+use crate::utxo::utxo_common::payment_script;
+use crate::utxo::{sat_from_big_decimal, UtxoAddressFormat};
+use crate::z_coin::{SendOutputsErr, ZOutput, DEX_FEE_OVK};
+use crate::{NumConversError, PrivKeyNotAllowed, TransactionEnum};
 use bitcrypto::dhash160;
-use chain::Transaction as UtxoTx;
-use common::executor::Timer;
-use common::mm_error::prelude::*;
-use common::now_ms;
+use common::async_blocking;
 use derive_more::Display;
 use futures::compat::Future01CompatExt;
-use keys::{Address, Public};
-use script::Script;
-use secp256k1_bindings::SecretKey;
-use serialization::deserialize;
+use keys::{Address, KeyPair, Public};
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use script::{Builder as ScriptBuilder, Opcode, Script};
+use secp256k1::SecretKey;
 use zcash_primitives::consensus;
 use zcash_primitives::legacy::Script as ZCashScript;
+use zcash_primitives::memo::MemoBytes;
 use zcash_primitives::transaction::builder::{Builder as ZTxBuilder, Error as ZTxBuilderError};
 use zcash_primitives::transaction::components::{Amount, OutPoint as ZCashOutpoint, TxOut};
+use zcash_primitives::transaction::Transaction as ZTransaction;
 
-#[derive(Debug, Display)]
-#[allow(clippy::large_enum_variant)]
-pub enum ZSendHtlcError {
-    #[display(fmt = "z operation failed with statuses {:?}", _0)]
-    ZOperationFailed(Vec<ZOperationStatus<ZOperationTxid>>),
-    ZOperationStatusesEmpty,
-    RpcError(UtxoRpcError),
-}
-
-impl From<UtxoRpcError> for ZSendHtlcError {
-    fn from(rpc: UtxoRpcError) -> ZSendHtlcError { ZSendHtlcError::RpcError(rpc) }
-}
-
-/// Sends HTLC output from the coin's z_addr
+/// Sends HTLC output from the coin's my_z_addr
 pub async fn z_send_htlc(
     coin: &ZCoin,
     time_lock: u32,
+    my_pub: &Public,
     other_pub: &Public,
     secret_hash: &[u8],
     amount: BigDecimal,
-) -> Result<UtxoTx, MmError<ZSendHtlcError>> {
-    let _lock = coin.z_fields.z_tx_mutex.lock().await;
-    let payment_script = payment_script(time_lock, secret_hash, coin.utxo_arc.key_pair.public(), &other_pub);
-    let hash = dhash160(&payment_script);
+) -> Result<ZTransaction, MmError<SendOutputsErr>> {
+    let payment_script = payment_script(time_lock, secret_hash, my_pub, other_pub);
+    let script_hash = dhash160(&payment_script);
     let htlc_address = Address {
         prefix: coin.utxo_arc.conf.p2sh_addr_prefix,
         t_addr_prefix: coin.utxo_arc.conf.p2sh_t_addr_prefix,
-        hash,
+        hash: script_hash.into(),
         checksum_type: coin.utxo_arc.conf.checksum_type,
+        addr_format: UtxoAddressFormat::Standard,
+        hrp: None,
     };
 
-    let amount_sat = sat_from_big_decimal(&amount, coin.utxo_arc.decimals).expect("temporary code");
-    let amount = big_decimal_from_sat_unsigned(amount_sat, coin.utxo_arc.decimals);
+    let amount_sat = sat_from_big_decimal(&amount, coin.utxo_arc.decimals)?;
     let address = htlc_address.to_string();
-    if let UtxoRpcClientEnum::Native(native) = coin.rpc_client() {
+    if let UtxoRpcClientEnum::Native(native) = coin.utxo_rpc_client() {
         native.import_address(&address, &address, false).compat().await.unwrap();
     }
 
-    let send_item = ZSendManyItem {
-        amount,
-        op_return: Some(payment_script.to_vec().into()),
-        address: htlc_address.to_string(),
+    let htlc_script = ScriptBuilder::build_p2sh(&script_hash.into()).to_bytes().take();
+    let htlc_output = TxOut {
+        value: Amount::from_u64(amount_sat).map_err(|_| NumConversError::new("Invalid ZCash amount".into()))?,
+        script_pubkey: ZCashScript(htlc_script),
     };
 
-    let op_id = coin
-        .z_rpc()
-        .z_send_many(&coin.z_fields.z_addr_encoded, vec![send_item])
-        .compat()
-        .await?;
-
-    loop {
-        let operation_statuses = coin.z_rpc().z_get_send_many_status(&[&op_id]).compat().await?;
-
-        match operation_statuses.first() {
-            Some(ZOperationStatus::Executing { .. }) | Some(ZOperationStatus::Queued { .. }) => {
-                Timer::sleep(1.).await;
-                continue;
-            },
-            Some(ZOperationStatus::Failed { .. }) => {
-                break Err(MmError::new(ZSendHtlcError::ZOperationFailed(operation_statuses)));
-            },
-            Some(ZOperationStatus::Success { result, .. }) => {
-                let tx_bytes = coin
-                    .rpc_client()
-                    .get_transaction_bytes(result.txid.clone())
-                    .compat()
-                    .await?;
-                let tx: UtxoTx = deserialize(tx_bytes.0.as_slice()).expect("rpc returns valid tx bytes");
-                break Ok(tx);
-            },
-            None => break Err(MmError::new(ZSendHtlcError::ZOperationStatusesEmpty)),
-        }
-    }
+    let opret_script = ScriptBuilder::default()
+        .push_opcode(Opcode::OP_RETURN)
+        .push_data(&payment_script)
+        .into_bytes()
+        .take();
+    let op_return_out = TxOut {
+        value: Amount::zero(),
+        script_pubkey: ZCashScript(opret_script),
+    };
+    let mm_tx = coin.send_outputs(vec![htlc_output, op_return_out], vec![]).await?;
+
+    Ok(mm_tx)
 }
 
-/// Sends HTLC output from the coin's z_addr
+/// Sends HTLC output from the coin's my_z_addr
 pub async fn z_send_dex_fee(
     coin: &ZCoin,
-    time_lock: u32,
-    watcher_pub: &Public,
     amount: BigDecimal,
-) -> Result<(UtxoTx, Script), MmError<ZSendHtlcError>> {
-    let _lock = coin.z_fields.z_tx_mutex.lock().await;
-    let payment_script = dex_fee_script([0; 16], time_lock, watcher_pub, coin.utxo_arc.key_pair.public());
-    let hash = dhash160(&payment_script);
-    let htlc_address = Address {
-        prefix: coin.utxo_arc.conf.p2sh_addr_prefix,
-        t_addr_prefix: coin.utxo_arc.conf.p2sh_t_addr_prefix,
-        hash,
-        checksum_type: coin.utxo_arc.conf.checksum_type,
+    uuid: &[u8],
+) -> Result<ZTransaction, MmError<SendOutputsErr>> {
+    let dex_fee_amount = sat_from_big_decimal(&amount, coin.utxo_arc.decimals)?;
+    let dex_fee_out = ZOutput {
+        to_addr: coin.z_fields.dex_fee_addr.clone(),
+        amount: Amount::from_u64(dex_fee_amount).map_err(|_| NumConversError::new("Invalid ZCash amount".into()))?,
+        viewing_key: Some(DEX_FEE_OVK),
+        memo: Some(MemoBytes::from_bytes(uuid).expect("uuid length < 512")),
     };
 
-    let amount_sat = sat_from_big_decimal(&amount, coin.utxo_arc.decimals).expect("temporary code");
-    let amount = big_decimal_from_sat_unsigned(amount_sat, coin.utxo_arc.decimals);
+    let tx = coin.send_outputs(vec![], vec![dex_fee_out]).await?;
 
-    let address = htlc_address.to_string();
-    if let UtxoRpcClientEnum::Native(native) = coin.rpc_client() {
-        native.import_address(&address, &address, false).compat().await.unwrap();
-    }
-
-    let send_item = ZSendManyItem {
-        amount,
-        op_return: Some(payment_script.to_vec().into()),
-        address,
-    };
-
-    let op_id = coin
-        .z_rpc()
-        .z_send_many(&coin.z_fields.z_addr_encoded, vec![send_item])
-        .compat()
-        .await?;
-
-    loop {
-        let operation_statuses = coin.z_rpc().z_get_send_many_status(&[&op_id]).compat().await?;
-
-        match operation_statuses.first() {
-            Some(ZOperationStatus::Executing { .. }) | Some(ZOperationStatus::Queued { .. }) => {
-                Timer::sleep(1.).await;
-                continue;
-            },
-            Some(ZOperationStatus::Failed { .. }) => {
-                break Err(MmError::new(ZSendHtlcError::ZOperationFailed(operation_statuses)));
-            },
-            Some(ZOperationStatus::Success { result, .. }) => {
-                let tx_bytes = coin
-                    .rpc_client()
-                    .get_transaction_bytes(result.txid.clone())
-                    .compat()
-                    .await?;
-                let tx: UtxoTx = deserialize(tx_bytes.0.as_slice()).expect("rpc returns valid tx bytes");
-
-                coin.rpc_client()
-                    .wait_for_confirmations(&tx, 1, false, now_ms() / 1000 + 120, 1)
-                    .compat()
-                    .await
-                    .unwrap();
-                break Ok((tx, payment_script));
-            },
-            None => break Err(MmError::new(ZSendHtlcError::ZOperationStatusesEmpty)),
-        }
-    }
+    Ok(tx)
 }
 
 #[derive(Debug, Display)]
-#[allow(clippy::large_enum_variant)]
+#[allow(clippy::large_enum_variant, clippy::upper_case_acronyms)]
 pub enum ZP2SHSpendError {
     ZTxBuilderError(ZTxBuilderError),
+    PrivKeyNotAllowed(PrivKeyNotAllowed),
     Rpc(UtxoRpcError),
+    #[display(fmt = "{:?} {}", _0, _1)]
+    TxRecoverable(TransactionEnum, String),
+    Io(std::io::Error),
 }
 
 impl From<ZTxBuilderError> for ZP2SHSpendError {
     fn from(tx_builder: ZTxBuilderError) -> ZP2SHSpendError { ZP2SHSpendError::ZTxBuilderError(tx_builder) }
 }
 
+impl From<PrivKeyNotAllowed> for ZP2SHSpendError {
+    fn from(err: PrivKeyNotAllowed) -> Self { ZP2SHSpendError::PrivKeyNotAllowed(err) }
+}
+
 impl From<UtxoRpcError> for ZP2SHSpendError {
     fn from(rpc: UtxoRpcError) -> ZP2SHSpendError { ZP2SHSpendError::Rpc(rpc) }
 }
 
-/// Spends P2SH output 0 to the coin's z_addr
+impl From<std::io::Error> for ZP2SHSpendError {
+    fn from(e: std::io::Error) -> Self { ZP2SHSpendError::Io(e) }
+}
+
+impl ZP2SHSpendError {
+    #[inline]
+    pub fn get_tx(&self) -> Option<TransactionEnum> {
+        match self {
+            ZP2SHSpendError::TxRecoverable(ref tx, _) => Some(tx.clone()),
+            _ => None,
+        }
+    }
+}
+
+/// Spends P2SH output 0 to the coin's my_z_addr
 pub async fn z_p2sh_spend(
     coin: &ZCoin,
-    p2sh_tx: UtxoTx,
+    p2sh_tx: ZTransaction,
     tx_locktime: u32,
     input_sequence: u32,
     redeem_script: Script,
     script_data: Script,
-) -> Result<UtxoTx, MmError<ZP2SHSpendError>> {
+    htlc_keypair: &KeyPair,
+) -> Result<ZTransaction, MmError<ZP2SHSpendError>> {
     let current_block = coin.utxo_arc.rpc_client.get_block_count().compat().await? as u32;
-    let mut tx_builder = ZTxBuilder::new(consensus::MAIN_NETWORK, current_block.into());
+    let mut tx_builder = ZTxBuilder::new(coin.consensus_params(), current_block.into());
     tx_builder.set_lock_time(tx_locktime);
 
-    let secp_secret =
-        SecretKey::from_slice(&*coin.utxo_arc.key_pair.private().secret).expect("Keypair contains a valid secret key");
+    let secp_secret = SecretKey::from_slice(htlc_keypair.private_ref()).expect("Keypair contains a valid secret key");
 
-    let outpoint = ZCashOutpoint::new(p2sh_tx.hash().into(), 0);
+    let outpoint = ZCashOutpoint::new(p2sh_tx.txid().0, 0);
     let tx_out = TxOut {
-        value: Amount::from_u64(p2sh_tx.outputs[0].value).expect("p2sh_tx transaction always contains valid amount"),
+        value: p2sh_tx.vout[0].value,
         script_pubkey: ZCashScript(redeem_script.to_vec()),
     };
-    tx_builder
-        .add_transparent_input(
-            secp_secret,
-            outpoint,
-            input_sequence,
-            ZCashScript(script_data.to_vec()),
-            tx_out,
-        )
-        .map_to_mm(ZP2SHSpendError::from)?;
-    tx_builder
-        .add_sapling_output(
-            None,
-            coin.z_fields.z_addr.clone(),
-            Amount::from_u64(p2sh_tx.outputs[0].value - 1000).unwrap(),
-            None,
-        )
-        .map_to_mm(ZP2SHSpendError::from)?;
-
-    let (zcash_tx, _) = tx_builder
-        .build(consensus::BranchId::Sapling, &coin.z_fields.z_tx_prover)
-        .map_to_mm(ZP2SHSpendError::from)?;
+    tx_builder.add_transparent_input(
+        secp_secret,
+        outpoint,
+        input_sequence,
+        ZCashScript(script_data.to_vec()),
+        tx_out,
+    )?;
+    tx_builder.add_sapling_output(
+        None,
+        coin.z_fields.my_z_addr.clone(),
+        // TODO use fee from coin here. Will do on next iteration, 1000 is default value that works fine
+        p2sh_tx.vout[0].value - Amount::from_i64(1000).expect("1000 will always succeed"),
+        None,
+    )?;
+
+    let (zcash_tx, _) = async_blocking({
+        let prover = coin.z_fields.z_tx_prover.clone();
+        move || tx_builder.build(consensus::BranchId::Sapling, prover.as_ref())
+    })
+    .await?;
 
     let mut tx_buffer = Vec::with_capacity(1024);
-    zcash_tx.write(&mut tx_buffer).unwrap();
-    let refund_tx: UtxoTx = deserialize(tx_buffer.as_slice()).expect("librustzcash should produce a valid tx");
+    zcash_tx.write(&mut tx_buffer)?;
 
-    coin.rpc_client()
+    coin.utxo_rpc_client()
         .send_raw_transaction(tx_buffer.into())
         .compat()
-        .await?;
-
-    Ok(refund_tx)
+        .await
+        .map(|_| zcash_tx.clone())
+        .mm_err(|e| ZP2SHSpendError::TxRecoverable(zcash_tx.into(), e.to_string()))
 }
diff --git a/mm2src/coins/z_coin/z_rpc.rs b/mm2src/coins/z_coin/z_rpc.rs
index 88130cd3d4..6a752bde42 100644
--- a/mm2src/coins/z_coin/z_rpc.rs
+++ b/mm2src/coins/z_coin/z_rpc.rs
@@ -1,104 +1,497 @@
-use crate::utxo::rpc_clients::{NativeClient, UtxoRpcClientEnum, UtxoRpcError, UtxoRpcFut};
-use bigdecimal::BigDecimal;
-use common::jsonrpc_client::{JsonRpcClient, JsonRpcRequest};
-use common::mm_error::prelude::*;
-use common::mm_number::MmNumber;
-use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json, H264 as H264Json};
-use serde_json::{self as json, Value as Json};
-
-#[derive(Debug, Serialize)]
-pub struct ZSendManyItem {
-    pub amount: BigDecimal,
-    #[serde(rename = "opreturn")]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub op_return: Option<BytesJson>,
-    pub address: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ZOperationTxid {
-    pub txid: H256Json,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ZOperationHex {
-    pub hex: BytesJson,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(tag = "status")]
-#[serde(rename_all = "lowercase")]
-pub enum ZOperationStatus<T> {
-    Queued {
-        id: String,
-        creation_time: u64,
-        method: String,
-        params: Json,
-    },
-    Executing {
-        id: String,
-        creation_time: u64,
-        method: String,
-        params: Json,
-    },
-    Success {
-        id: String,
-        creation_time: u64,
-        result: T,
-        execution_secs: f64,
-        method: String,
-        params: Json,
+use super::{z_coin_errors::*, ZcoinConsensusParams};
+use crate::utxo::utxo_common;
+use common::executor::Timer;
+use common::log::{debug, error, info};
+use common::{async_blocking, spawn_abortable, AbortOnDropHandle};
+use db_common::sqlite::rusqlite::{params, Connection, Error as SqliteError, NO_PARAMS};
+use db_common::sqlite::{query_single_row, run_optimization_pragmas};
+use futures::channel::mpsc::{channel, Receiver as AsyncReceiver, Sender as AsyncSender};
+use futures::channel::oneshot::{channel as oneshot_channel, Sender as OneshotSender};
+use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
+use futures::StreamExt;
+use http::Uri;
+use mm2_err_handle::prelude::*;
+use parking_lot::Mutex;
+use prost::Message;
+use protobuf::Message as ProtobufMessage;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use tokio::task::block_in_place;
+use tonic::transport::{Channel, ClientTlsConfig};
+use zcash_client_backend::data_api::chain::{scan_cached_blocks, validate_chain};
+use zcash_client_backend::data_api::error::Error as ChainError;
+use zcash_client_backend::data_api::{BlockSource, WalletRead, WalletWrite};
+use zcash_client_backend::proto::compact_formats::CompactBlock;
+use zcash_client_sqlite::error::SqliteClientError as ZcashClientError;
+use zcash_client_sqlite::wallet::init::{init_accounts_table, init_wallet_db};
+use zcash_client_sqlite::WalletDb;
+use zcash_primitives::consensus::BlockHeight;
+use zcash_primitives::transaction::TxId;
+use zcash_primitives::zip32::ExtendedFullViewingKey;
+
+mod z_coin_grpc {
+    tonic::include_proto!("cash.z.wallet.sdk.rpc");
+}
+use z_coin_grpc::compact_tx_streamer_client::CompactTxStreamerClient;
+use z_coin_grpc::{BlockId, BlockRange, ChainSpec, TxFilter};
+
+pub type WalletDbShared = Arc<Mutex<WalletDb<ZcoinConsensusParams>>>;
+
+struct CompactBlockRow {
+    height: BlockHeight,
+    data: Vec<u8>,
+}
+
+/// A wrapper for the SQLite connection to the block cache database.
+pub struct BlockDb(Connection);
+
+impl BlockDb {
+    /// Opens a connection to the wallet database stored at the specified path.
+    pub fn for_path<P: AsRef<Path>>(path: P) -> Result<Self, db_common::sqlite::rusqlite::Error> {
+        let conn = Connection::open(path)?;
+        run_optimization_pragmas(&conn)?;
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS compactblocks (
+            height INTEGER PRIMARY KEY,
+            data BLOB NOT NULL
+        )",
+            NO_PARAMS,
+        )?;
+        Ok(BlockDb(conn))
+    }
+
+    fn with_blocks<F>(
+        &self,
+        from_height: BlockHeight,
+        limit: Option<u32>,
+        mut with_row: F,
+    ) -> Result<(), ZcashClientError>
+    where
+        F: FnMut(CompactBlock) -> Result<(), ZcashClientError>,
+    {
+        // Fetch the CompactBlocks we need to scan
+        let mut stmt_blocks = self
+            .0
+            .prepare("SELECT height, data FROM compactblocks WHERE height > ? ORDER BY height ASC LIMIT ?")?;
+
+        let rows = stmt_blocks.query_map(
+            params![u32::from(from_height), limit.unwrap_or(u32::max_value()),],
+            |row| {
+                Ok(CompactBlockRow {
+                    height: BlockHeight::from_u32(row.get(0)?),
+                    data: row.get(1)?,
+                })
+            },
+        )?;
+
+        for row_result in rows {
+            let cbr = row_result?;
+            let block = CompactBlock::parse_from_bytes(&cbr.data)
+                .map_err(zcash_client_backend::data_api::error::Error::from)?;
+
+            if block.height() != cbr.height {
+                return Err(ZcashClientError::CorruptedData(format!(
+                    "Block height {} did not match row's height field value {}",
+                    block.height(),
+                    cbr.height
+                )));
+            }
+
+            with_row(block)?;
+        }
+
+        Ok(())
+    }
+
+    fn get_latest_block(&self) -> Result<i64, MmError<SqliteError>> {
+        Ok(query_single_row(
+            &self.0,
+            "SELECT height FROM compactblocks ORDER BY height DESC LIMIT 1",
+            db_common::sqlite::rusqlite::NO_PARAMS,
+            |row| row.get(0),
+        )?
+        .unwrap_or(0))
+    }
+
+    fn insert_block(
+        &self,
+        height: u32,
+        cb_bytes: Vec<u8>,
+    ) -> Result<usize, MmError<db_common::sqlite::rusqlite::Error>> {
+        self.0
+            .prepare("INSERT INTO compactblocks (height, data) VALUES (?, ?)")?
+            .execute(params![height, cb_bytes])
+            .map_err(MmError::new)
+    }
+
+    fn rewind_to_height(&self, height: u32) -> Result<usize, MmError<SqliteError>> {
+        self.0
+            .execute("DELETE from compactblocks WHERE height > ?1", [height])
+            .map_err(MmError::new)
+    }
+}
+
+impl BlockSource for BlockDb {
+    type Error = ZcashClientError;
+
+    fn with_blocks<F>(&self, from_height: BlockHeight, limit: Option<u32>, with_row: F) -> Result<(), Self::Error>
+    where
+        F: FnMut(CompactBlock) -> Result<(), Self::Error>,
+    {
+        self.with_blocks(from_height, limit, with_row)
+    }
+}
+
+pub(super) async fn init_light_client(
+    lightwalletd_url: Uri,
+    cache_db_path: PathBuf,
+    wallet_db_path: PathBuf,
+    consensus_params: ZcoinConsensusParams,
+    evk: ExtendedFullViewingKey,
+) -> Result<(AsyncMutex<SaplingSyncConnector>, WalletDbShared), MmError<ZcoinLightClientInitError>> {
+    let blocks_db =
+        async_blocking(|| BlockDb::for_path(cache_db_path).map_to_mm(ZcoinLightClientInitError::BlocksDbInitFailure))
+            .await?;
+
+    let wallet_db = async_blocking({
+        let consensus_params = consensus_params.clone();
+        move || -> Result<_, MmError<ZcoinLightClientInitError>> {
+            let db = WalletDb::for_path(wallet_db_path, consensus_params)
+                .map_to_mm(ZcoinLightClientInitError::WalletDbInitFailure)?;
+            run_optimization_pragmas(db.sql_conn()).map_to_mm(ZcoinLightClientInitError::WalletDbInitFailure)?;
+            init_wallet_db(&db).map_to_mm(ZcoinLightClientInitError::WalletDbInitFailure)?;
+            if db.get_extended_full_viewing_keys()?.is_empty() {
+                init_accounts_table(&db, &[evk])?;
+            }
+            Ok(db)
+        }
+    })
+    .await?;
+
+    let tonic_channel = Channel::builder(lightwalletd_url)
+        .tls_config(ClientTlsConfig::new())
+        .map_to_mm(ZcoinLightClientInitError::TlsConfigFailure)?
+        .connect()
+        .await
+        .map_to_mm(ZcoinLightClientInitError::ConnectionFailure)?;
+    let grpc_client = CompactTxStreamerClient::new(tonic_channel);
+
+    let (sync_status_notifier, sync_watcher) = channel(1);
+    let (on_tx_gen_notifier, on_tx_gen_watcher) = channel(1);
+
+    let wallet_db = Arc::new(Mutex::new(wallet_db));
+    let sync_handle = SaplingSyncLoopHandle {
+        current_block: BlockHeight::from_u32(0),
+        grpc_client,
+        blocks_db,
+        wallet_db: wallet_db.clone(),
+        consensus_params,
+        sync_status_notifier,
+        on_tx_gen_watcher,
+        watch_for_tx: None,
+    };
+    let abort_handle = spawn_abortable(light_wallet_db_sync_loop(sync_handle));
+
+    Ok((
+        SaplingSyncConnector::new_mutex_wrapped(sync_watcher, on_tx_gen_notifier, abort_handle),
+        wallet_db,
+    ))
+}
+
+fn is_tx_imported(conn: &Connection, tx_id: TxId) -> bool {
+    const QUERY: &str = "SELECT id_tx FROM transactions WHERE txid = ?1;";
+    match query_single_row(conn, QUERY, [tx_id.0.to_vec()], |row| row.get::<_, i64>(0)) {
+        Ok(Some(_)) => true,
+        Ok(None) | Err(_) => false,
+    }
+}
+
+pub struct SaplingSyncRespawnGuard {
+    pub(super) sync_handle: Option<SaplingSyncLoopHandle>,
+    pub(super) abort_handle: Arc<Mutex<AbortOnDropHandle>>,
+}
+
+impl Drop for SaplingSyncRespawnGuard {
+    fn drop(&mut self) {
+        if let Some(handle) = self.sync_handle.take() {
+            *self.abort_handle.lock() = spawn_abortable(light_wallet_db_sync_loop(handle));
+        }
+    }
+}
+
+impl SaplingSyncRespawnGuard {
+    pub(super) fn watch_for_tx(&mut self, tx_id: TxId) {
+        if let Some(ref mut handle) = self.sync_handle {
+            handle.watch_for_tx = Some(tx_id);
+        }
+    }
+
+    #[inline]
+    pub(super) fn current_block(&self) -> BlockHeight { self.sync_handle.as_ref().expect("always Some").current_block }
+}
+
+pub enum SyncStatus {
+    UpdatingBlocksCache {
+        current_scanned_block: u64,
+        latest_block: u64,
     },
-    Failed {
-        id: String,
-        creation_time: u64,
-        method: String,
-        params: Json,
-        error: Json,
+    BuildingWalletDb,
+    Finished {
+        block_number: u64,
     },
 }
 
-#[derive(Debug, Serialize)]
-pub struct ZSendManyHtlcParams {
-    pub pubkey: H264Json,
-    pub refund_pubkey: H264Json,
-    pub secret_hash: BytesJson,
-    pub input_txid: H256Json,
-    pub input_index: usize,
-    pub input_amount: BigDecimal,
-    pub locktime: u32,
+pub struct SaplingSyncLoopHandle {
+    current_block: BlockHeight,
+    grpc_client: CompactTxStreamerClient<Channel>,
+    blocks_db: BlockDb,
+    wallet_db: WalletDbShared,
+    consensus_params: ZcoinConsensusParams,
+    /// Notifies about sync status without stopping the loop, e.g. on coin activation
+    sync_status_notifier: AsyncSender<SyncStatus>,
+    /// If new tx is required to be generated, we stop the sync and respawn it after tx is sent
+    /// This watcher waits for such notification
+    on_tx_gen_watcher: AsyncReceiver<OneshotSender<Self>>,
+    watch_for_tx: Option<TxId>,
 }
 
-pub trait ZRpcOps {
-    fn z_get_balance(&self, address: &str, min_conf: u32) -> UtxoRpcFut<MmNumber>;
+impl SaplingSyncLoopHandle {
+    fn notify_blocks_cache_status(&mut self, current_scanned_block: u64, latest_block: u64) {
+        if self
+            .sync_status_notifier
+            .try_send(SyncStatus::UpdatingBlocksCache {
+                current_scanned_block,
+                latest_block,
+            })
+            .is_err()
+        {
+            debug!("No one seems interested in SyncStatus");
+        }
+    }
 
-    fn z_get_send_many_status(&self, op_ids: &[&str]) -> UtxoRpcFut<Vec<ZOperationStatus<ZOperationTxid>>>;
+    fn notify_building_wallet_db(&mut self) {
+        if self
+            .sync_status_notifier
+            .try_send(SyncStatus::BuildingWalletDb)
+            .is_err()
+        {
+            debug!("No one seems interested in SyncStatus");
+        }
+    }
 
-    fn z_send_many(&self, from_address: &str, send_to: Vec<ZSendManyItem>) -> UtxoRpcFut<String>;
-}
+    fn notify_sync_finished(&mut self) {
+        if self
+            .sync_status_notifier
+            .try_send(SyncStatus::Finished {
+                block_number: self.current_block.into(),
+            })
+            .is_err()
+        {
+            debug!("No one seems interested in SyncStatus");
+        }
+    }
+
+    async fn update_blocks_cache(&mut self) -> Result<(), MmError<UpdateBlocksCacheErr>> {
+        let request = tonic::Request::new(ChainSpec {});
+        let current_blockchain_block = self.grpc_client.get_latest_block(request).await?;
+        let current_block_in_db = block_in_place(|| self.blocks_db.get_latest_block())?;
+
+        let from_block = current_block_in_db as u64 + 1;
+        let current_block: u64 = current_blockchain_block.into_inner().height;
 
-impl ZRpcOps for NativeClient {
-    fn z_get_balance(&self, address: &str, min_conf: u32) -> UtxoRpcFut<MmNumber> {
-        let fut = rpc_func!(self, "z_getbalance", address, min_conf);
-        Box::new(fut.map_to_mm_fut(UtxoRpcError::from))
+        if current_block >= from_block {
+            let request = tonic::Request::new(BlockRange {
+                start: Some(BlockId {
+                    height: from_block,
+                    hash: Vec::new(),
+                }),
+                end: Some(BlockId {
+                    height: current_block,
+                    hash: Vec::new(),
+                }),
+            });
+
+            let mut response = self.grpc_client.get_block_range(request).await?;
+
+            while let Some(block) = response.get_mut().message().await? {
+                debug!("Got block {:?}", block);
+                block_in_place(|| self.blocks_db.insert_block(block.height as u32, block.encode_to_vec()))?;
+                self.notify_blocks_cache_status(block.height, current_block);
+            }
+        }
+
+        self.current_block = BlockHeight::from_u32(current_block as u32);
+        Ok(())
     }
 
-    fn z_get_send_many_status(&self, op_ids: &[&str]) -> UtxoRpcFut<Vec<ZOperationStatus<ZOperationTxid>>> {
-        let fut = rpc_func!(self, "z_getoperationstatus", op_ids);
-        Box::new(fut.map_to_mm_fut(UtxoRpcError::from))
+    /// Scans cached blocks, validates the chain and updates WalletDb.
+    /// For more notes on the process, check https://github.com/zcash/librustzcash/blob/master/zcash_client_backend/src/data_api/chain.rs#L2
+    fn scan_blocks(&mut self) -> Result<(), MmError<ZcashClientError>> {
+        let wallet_guard = self.wallet_db.lock();
+        let mut wallet_ops = wallet_guard.get_update_ops().expect("get_update_ops always returns Ok");
+
+        if let Err(e) = validate_chain(
+            &self.consensus_params,
+            &self.blocks_db,
+            wallet_ops.get_max_height_hash()?,
+        ) {
+            match e {
+                ZcashClientError::BackendError(ChainError::InvalidChain(lower_bound, _)) => {
+                    let rewind_height = if lower_bound > BlockHeight::from_u32(10) {
+                        lower_bound - 10
+                    } else {
+                        BlockHeight::from_u32(0)
+                    };
+                    wallet_ops.rewind_to_height(rewind_height)?;
+                    self.blocks_db.rewind_to_height(rewind_height.into())?;
+                },
+                e => return MmError::err(e),
+            }
+        }
+
+        scan_cached_blocks(&self.consensus_params, &self.blocks_db, &mut wallet_ops, None)?;
+        Ok(())
     }
 
-    fn z_send_many(&self, from_address: &str, send_to: Vec<ZSendManyItem>) -> UtxoRpcFut<String> {
-        let fut = rpc_func!(self, "z_sendmany", from_address, send_to);
-        Box::new(fut.map_to_mm_fut(UtxoRpcError::from))
+    async fn check_watch_for_tx_existence(&mut self) {
+        if let Some(tx_id) = self.watch_for_tx {
+            let mut attempts = 0;
+            loop {
+                let filter = TxFilter {
+                    block: None,
+                    index: 0,
+                    hash: tx_id.0.into(),
+                };
+                let request = tonic::Request::new(filter);
+                match self.grpc_client.get_transaction(request).await {
+                    Ok(_) => break,
+                    Err(e) => {
+                        error!("Error on getting tx {}", tx_id);
+                        if e.message().contains(utxo_common::NO_TX_ERROR_CODE) {
+                            if attempts >= 3 {
+                                self.watch_for_tx = None;
+                                return;
+                            }
+                            attempts += 1;
+                        }
+                        Timer::sleep(30.).await;
+                    },
+                }
+            }
+        }
     }
 }
 
-impl AsRef<dyn ZRpcOps + Send + Sync> for UtxoRpcClientEnum {
-    fn as_ref(&self) -> &(dyn ZRpcOps + Send + Sync + 'static) {
-        match self {
-            UtxoRpcClientEnum::Native(native) => native,
-            UtxoRpcClientEnum::Electrum(_) => panic!("Electrum client does not support ZRpcOps"),
+/// For more info on shielded light client protocol, please check the https://zips.z.cash/zip-0307
+///
+/// It's important to note that unlike standard UTXOs, shielded outputs are not spendable until the transaction is confirmed.
+///
+/// For AtomicDEX, we have additional requirements for the sync process:
+/// 1. Coin should not be usable until initial sync is finished.
+/// 2. During concurrent transaction generation (several simultaneous swaps using the same coin), we should prevent the same input usage.
+/// 3. Once the transaction is sent, we have to wait until it's confirmed for the change to become spendable.
+///
+/// So the following was implemented:
+/// 1. On the coin initialization, `init_light_client` creates `SaplingSyncLoopHandle`, spawns sync loop
+///     and returns mutex-wrapped `SaplingSyncConnector` to interact with it.
+/// 2. During sync process, the `SaplingSyncLoopHandle` notifies external code about status using `sync_status_notifier`.
+/// 3. Once the sync completes, the coin becomes usable.
+/// 4. When transaction is about to be generated, the external code locks the `SaplingSyncConnector` mutex,
+///     and calls `SaplingSyncConnector::wait_for_gen_tx_blockchain_sync`.
+///     This actually stops the loop and returns `SaplingSyncGuard`, which contains MutexGuard<SaplingSyncConnector> and `SaplingSyncRespawnGuard`.
+/// 5. `SaplingSyncRespawnGuard` in its turn contains `SaplingSyncLoopHandle` that is used to respawn the sync when the guard is dropped.
+/// 6. Once the transaction is generated and sent, `SaplingSyncRespawnGuard::watch_for_tx` is called to update `SaplingSyncLoopHandle` state.
+/// 7. Once the loop is respawned, it will check that broadcast tx is imported (or not available anymore) before stopping in favor of
+///     next wait_for_gen_tx_blockchain_sync call.
+async fn light_wallet_db_sync_loop(mut sync_handle: SaplingSyncLoopHandle) {
+    // this loop is spawned as standalone task so it's safe to use block_in_place here
+    loop {
+        if let Err(e) = sync_handle.update_blocks_cache().await {
+            error!("Error {} on blocks cache update", e);
+            Timer::sleep(10.).await;
+            continue;
         }
+
+        sync_handle.notify_building_wallet_db();
+
+        if let Err(e) = block_in_place(|| sync_handle.scan_blocks()) {
+            error!("Error {} on scan_blocks", e);
+            Timer::sleep(10.).await;
+            continue;
+        }
+
+        sync_handle.notify_sync_finished();
+
+        sync_handle.check_watch_for_tx_existence().await;
+
+        if let Some(tx_id) = sync_handle.watch_for_tx {
+            if !block_in_place(|| is_tx_imported(sync_handle.wallet_db.lock().sql_conn(), tx_id)) {
+                info!("Tx {} is not imported yet", tx_id);
+                Timer::sleep(10.).await;
+                continue;
+            }
+            sync_handle.watch_for_tx = None;
+        }
+
+        if let Ok(Some(sender)) = sync_handle.on_tx_gen_watcher.try_next() {
+            match sender.send(sync_handle) {
+                Ok(_) => break,
+                Err(handle_from_channel) => {
+                    sync_handle = handle_from_channel;
+                },
+            }
+        }
+
+        Timer::sleep(10.).await;
+    }
+}
+
+type SyncWatcher = AsyncReceiver<SyncStatus>;
+type NewTxNotifier = AsyncSender<OneshotSender<SaplingSyncLoopHandle>>;
+
+pub(super) struct SaplingSyncConnector {
+    sync_watcher: SyncWatcher,
+    on_tx_gen_notifier: NewTxNotifier,
+    abort_handle: Arc<Mutex<AbortOnDropHandle>>,
+}
+
+impl SaplingSyncConnector {
+    #[inline]
+    pub(super) fn new_mutex_wrapped(
+        simple_sync_watcher: SyncWatcher,
+        on_tx_gen_notifier: NewTxNotifier,
+        abort_handle: AbortOnDropHandle,
+    ) -> AsyncMutex<Self> {
+        AsyncMutex::new(SaplingSyncConnector {
+            sync_watcher: simple_sync_watcher,
+            on_tx_gen_notifier,
+            abort_handle: Arc::new(Mutex::new(abort_handle)),
+        })
     }
+
+    #[inline]
+    pub(super) async fn current_sync_status(&mut self) -> Result<SyncStatus, MmError<BlockchainScanStopped>> {
+        self.sync_watcher.next().await.or_mm_err(|| BlockchainScanStopped {})
+    }
+
+    pub(super) async fn wait_for_gen_tx_blockchain_sync(
+        &mut self,
+    ) -> Result<SaplingSyncRespawnGuard, MmError<BlockchainScanStopped>> {
+        let (sender, receiver) = oneshot_channel();
+        self.on_tx_gen_notifier
+            .try_send(sender)
+            .map_to_mm(|_| BlockchainScanStopped {})?;
+        receiver
+            .await
+            .map(|handle| SaplingSyncRespawnGuard {
+                sync_handle: Some(handle),
+                abort_handle: self.abort_handle.clone(),
+            })
+            .map_to_mm(|_| BlockchainScanStopped {})
+    }
+}
+
+pub(super) struct SaplingSyncGuard<'a> {
+    pub(super) _connector_guard: AsyncMutexGuard<'a, SaplingSyncConnector>,
+    pub(super) respawn_guard: SaplingSyncRespawnGuard,
 }
diff --git a/mm2src/coins_activation/Cargo.toml b/mm2src/coins_activation/Cargo.toml
new file mode 100644
index 0000000000..e95895aa99
--- /dev/null
+++ b/mm2src/coins_activation/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "coins_activation"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1"
+coins = { path = "../coins" }
+common = { path = "../common" }
+mm2_core = { path = "../mm2_core" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_number = { path = "../mm2_number" }
+crypto = { path = "../crypto" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
+hex = "0.4.2"
+rpc = { path = "../mm2_bitcoin/rpc" }
+rpc_task = { path = "../rpc_task" }
+ser_error = { path = "../derives/ser_error" }
+ser_error_derive = { path = "../derives/ser_error_derive" }
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
\ No newline at end of file
diff --git a/mm2src/coins_activation/src/bch_with_tokens_activation.rs b/mm2src/coins_activation/src/bch_with_tokens_activation.rs
new file mode 100644
index 0000000000..e0f3102b47
--- /dev/null
+++ b/mm2src/coins_activation/src/bch_with_tokens_activation.rs
@@ -0,0 +1,291 @@
+use crate::platform_coin_with_tokens::*;
+use crate::prelude::*;
+use crate::slp_token_activation::SlpActivationRequest;
+use async_trait::async_trait;
+use coins::my_tx_history_v2::TxHistoryStorage;
+use coins::utxo::bch::{bch_coin_from_conf_and_params, BchActivationRequest, BchCoin, CashAddrPrefix};
+use coins::utxo::bch_and_slp_tx_history::bch_and_slp_history_loop;
+use coins::utxo::rpc_clients::UtxoRpcError;
+use coins::utxo::slp::{SlpProtocolConf, SlpToken};
+use coins::utxo::UtxoCommonOps;
+use coins::{CoinBalance, CoinProtocol, MarketCoinOps, MmCoin, PrivKeyNotAllowed, UnexpectedDerivationMethod};
+use common::executor::spawn;
+use common::log::info;
+use common::mm_metrics::MetricsArc;
+use common::Future01CompatExt;
+use futures::future::{abortable, AbortHandle};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::collections::HashMap;
+use std::str::FromStr;
+
+pub struct SlpTokenInitializer {
+    platform_coin: BchCoin,
+}
+
+impl TokenOf for SlpToken {
+    type PlatformCoin = BchCoin;
+}
+
+#[async_trait]
+impl TokenInitializer for SlpTokenInitializer {
+    type Token = SlpToken;
+    type TokenActivationRequest = SlpActivationRequest;
+    type TokenProtocol = SlpProtocolConf;
+    type InitTokensError = std::convert::Infallible;
+
+    fn tokens_requests_from_platform_request(
+        platform_params: &BchWithTokensActivationRequest,
+    ) -> Vec<TokenActivationRequest<Self::TokenActivationRequest>> {
+        platform_params.slp_tokens_requests.clone()
+    }
+
+    async fn enable_tokens(
+        &self,
+        activation_params: Vec<TokenActivationParams<SlpActivationRequest, SlpProtocolConf>>,
+    ) -> Result<Vec<SlpToken>, MmError<std::convert::Infallible>> {
+        let tokens = activation_params
+            .into_iter()
+            .map(|params| {
+                // confirmation settings from RPC request have the highest priority
+                let required_confirmations = params.activation_request.required_confirmations.unwrap_or_else(|| {
+                    params
+                        .protocol
+                        .required_confirmations
+                        .unwrap_or_else(|| self.platform_coin.required_confirmations())
+                });
+
+                SlpToken::new(
+                    params.protocol.decimals,
+                    params.ticker,
+                    params.protocol.token_id,
+                    self.platform_coin.clone(),
+                    required_confirmations,
+                )
+            })
+            .collect();
+
+        Ok(tokens)
+    }
+
+    fn platform_coin(&self) -> &BchCoin { &self.platform_coin }
+}
+
+impl RegisterTokenInfo<SlpToken> for BchCoin {
+    fn register_token_info(&self, token: &SlpToken) { self.add_slp_token_info(token.ticker().into(), token.get_info()) }
+}
+
+impl From<BchWithTokensActivationError> for EnablePlatformCoinWithTokensError {
+    fn from(err: BchWithTokensActivationError) -> Self {
+        match err {
+            BchWithTokensActivationError::PlatformCoinCreationError { ticker, error } => {
+                EnablePlatformCoinWithTokensError::PlatformCoinCreationError { ticker, error }
+            },
+            BchWithTokensActivationError::InvalidSlpPrefix { ticker, prefix, error } => {
+                EnablePlatformCoinWithTokensError::Internal(format!(
+                    "Invalid slp prefix {} configured for {}. Error: {}",
+                    prefix, ticker, error
+                ))
+            },
+            BchWithTokensActivationError::PrivKeyNotAllowed(e) => {
+                EnablePlatformCoinWithTokensError::PrivKeyNotAllowed(e)
+            },
+            BchWithTokensActivationError::UnexpectedDerivationMethod(e) => {
+                EnablePlatformCoinWithTokensError::UnexpectedDerivationMethod(e)
+            },
+            BchWithTokensActivationError::Transport(e) => EnablePlatformCoinWithTokensError::Transport(e),
+            BchWithTokensActivationError::Internal(e) => EnablePlatformCoinWithTokensError::Internal(e),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct BchWithTokensActivationRequest {
+    #[serde(flatten)]
+    platform_request: BchActivationRequest,
+    slp_tokens_requests: Vec<TokenActivationRequest<SlpActivationRequest>>,
+}
+
+impl TxHistory for BchWithTokensActivationRequest {
+    fn tx_history(&self) -> bool { self.platform_request.utxo_params.tx_history }
+}
+
+pub struct BchProtocolInfo {
+    slp_prefix: String,
+}
+
+impl TryFromCoinProtocol for BchProtocolInfo {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::BCH { slp_prefix } => Ok(BchProtocolInfo { slp_prefix }),
+            protocol => MmError::err(protocol),
+        }
+    }
+}
+
+#[derive(Debug, Serialize)]
+pub struct BchWithTokensActivationResult {
+    current_block: u64,
+    bch_addresses_infos: HashMap<String, CoinAddressInfo<CoinBalance>>,
+    slp_addresses_infos: HashMap<String, CoinAddressInfo<TokenBalances>>,
+}
+
+impl GetPlatformBalance for BchWithTokensActivationResult {
+    fn get_platform_balance(&self) -> BigDecimal {
+        self.bch_addresses_infos
+            .iter()
+            .fold(BigDecimal::from(0), |total, (_, addr_info)| {
+                &total + &addr_info.balances.get_total()
+            })
+    }
+}
+
+impl CurrentBlock for BchWithTokensActivationResult {
+    fn current_block(&self) -> u64 { self.current_block }
+}
+
+#[derive(Debug)]
+pub enum BchWithTokensActivationError {
+    PlatformCoinCreationError {
+        ticker: String,
+        error: String,
+    },
+    InvalidSlpPrefix {
+        ticker: String,
+        prefix: String,
+        error: String,
+    },
+    PrivKeyNotAllowed(String),
+    UnexpectedDerivationMethod(String),
+    Transport(String),
+    Internal(String),
+}
+
+impl From<UtxoRpcError> for BchWithTokensActivationError {
+    fn from(err: UtxoRpcError) -> Self { BchWithTokensActivationError::Transport(err.to_string()) }
+}
+
+impl From<UnexpectedDerivationMethod> for BchWithTokensActivationError {
+    fn from(e: UnexpectedDerivationMethod) -> Self {
+        BchWithTokensActivationError::UnexpectedDerivationMethod(e.to_string())
+    }
+}
+
+impl From<PrivKeyNotAllowed> for BchWithTokensActivationError {
+    fn from(e: PrivKeyNotAllowed) -> Self { BchWithTokensActivationError::PrivKeyNotAllowed(e.to_string()) }
+}
+
+#[async_trait]
+impl PlatformWithTokensActivationOps for BchCoin {
+    type ActivationRequest = BchWithTokensActivationRequest;
+    type PlatformProtocolInfo = BchProtocolInfo;
+    type ActivationResult = BchWithTokensActivationResult;
+    type ActivationError = BchWithTokensActivationError;
+
+    async fn enable_platform_coin(
+        ctx: MmArc,
+        ticker: String,
+        platform_conf: Json,
+        activation_request: Self::ActivationRequest,
+        protocol_conf: Self::PlatformProtocolInfo,
+        priv_key: &[u8],
+    ) -> Result<Self, MmError<Self::ActivationError>> {
+        let slp_prefix = CashAddrPrefix::from_str(&protocol_conf.slp_prefix).map_to_mm(|error| {
+            BchWithTokensActivationError::InvalidSlpPrefix {
+                ticker: ticker.clone(),
+                prefix: protocol_conf.slp_prefix,
+                error,
+            }
+        })?;
+
+        let platform_coin = bch_coin_from_conf_and_params(
+            &ctx,
+            &ticker,
+            &platform_conf,
+            activation_request.platform_request,
+            slp_prefix,
+            priv_key,
+        )
+        .await
+        .map_to_mm(|error| BchWithTokensActivationError::PlatformCoinCreationError { ticker, error })?;
+        Ok(platform_coin)
+    }
+
+    fn token_initializers(
+        &self,
+    ) -> Vec<Box<dyn TokenAsMmCoinInitializer<PlatformCoin = Self, ActivationRequest = Self::ActivationRequest>>> {
+        vec![Box::new(SlpTokenInitializer {
+            platform_coin: self.clone(),
+        })]
+    }
+
+    async fn get_activation_result(
+        &self,
+    ) -> Result<BchWithTokensActivationResult, MmError<BchWithTokensActivationError>> {
+        let my_address = self.as_ref().derivation_method.iguana_or_err()?;
+        let my_slp_address = self
+            .get_my_slp_address()
+            .map_to_mm(BchWithTokensActivationError::Internal)?
+            .encode()
+            .map_to_mm(BchWithTokensActivationError::Internal)?;
+
+        let current_block = self.as_ref().rpc_client.get_block_count().compat().await?;
+
+        let bch_unspents = self.bch_unspents_for_display(my_address).await?;
+        let bch_balance = bch_unspents.platform_balance(self.decimals());
+
+        let mut token_balances = HashMap::new();
+        for (token_ticker, info) in self.get_slp_tokens_infos().iter() {
+            let token_balance = bch_unspents.slp_token_balance(&info.token_id, info.decimals);
+            token_balances.insert(token_ticker.clone(), token_balance);
+        }
+
+        let mut result = BchWithTokensActivationResult {
+            current_block,
+            bch_addresses_infos: HashMap::new(),
+            slp_addresses_infos: HashMap::new(),
+        };
+
+        result
+            .bch_addresses_infos
+            .insert(my_address.to_string(), CoinAddressInfo {
+                derivation_method: DerivationMethod::Iguana,
+                pubkey: self.my_public_key()?.to_string(),
+                balances: bch_balance,
+            });
+
+        result.slp_addresses_infos.insert(my_slp_address, CoinAddressInfo {
+            derivation_method: DerivationMethod::Iguana,
+            pubkey: self.my_public_key()?.to_string(),
+            balances: token_balances,
+        });
+        Ok(result)
+    }
+
+    fn start_history_background_fetching(
+        &self,
+        metrics: MetricsArc,
+        storage: impl TxHistoryStorage + Send + 'static,
+        initial_balance: BigDecimal,
+    ) -> AbortHandle {
+        let ticker = self.ticker().to_owned();
+        let (fut, abort_handle) = abortable(bch_and_slp_history_loop(
+            self.clone(),
+            storage,
+            metrics,
+            initial_balance,
+        ));
+        spawn(async move {
+            if let Err(e) = fut.await {
+                info!("bch_and_slp_history_loop stopped for {}, reason {}", ticker, e);
+            }
+        });
+        abort_handle
+    }
+}
diff --git a/mm2src/coins_activation/src/context.rs b/mm2src/coins_activation/src/context.rs
new file mode 100644
index 0000000000..8af083b2e2
--- /dev/null
+++ b/mm2src/coins_activation/src/context.rs
@@ -0,0 +1,27 @@
+use crate::utxo_activation::{QtumTaskManagerShared, UtxoStandardTaskManagerShared};
+#[cfg(not(target_arch = "wasm32"))]
+use crate::z_coin_activation::ZcoinTaskManagerShared;
+use mm2_core::mm_ctx::{from_ctx, MmArc};
+use rpc_task::RpcTaskManager;
+use std::sync::Arc;
+
+pub struct CoinsActivationContext {
+    pub(crate) init_utxo_standard_task_manager: UtxoStandardTaskManagerShared,
+    pub(crate) init_qtum_task_manager: QtumTaskManagerShared,
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) init_z_coin_task_manager: ZcoinTaskManagerShared,
+}
+
+impl CoinsActivationContext {
+    /// Obtains a reference to this crate context, creating it if necessary.
+    pub fn from_ctx(ctx: &MmArc) -> Result<Arc<CoinsActivationContext>, String> {
+        from_ctx(&ctx.coins_activation_ctx, move || {
+            Ok(CoinsActivationContext {
+                init_utxo_standard_task_manager: RpcTaskManager::new_shared(),
+                init_qtum_task_manager: RpcTaskManager::new_shared(),
+                #[cfg(not(target_arch = "wasm32"))]
+                init_z_coin_task_manager: RpcTaskManager::new_shared(),
+            })
+        })
+    }
+}
diff --git a/mm2src/coins_activation/src/l2.rs b/mm2src/coins_activation/src/l2.rs
new file mode 100644
index 0000000000..69f5e9a0c6
--- /dev/null
+++ b/mm2src/coins_activation/src/l2.rs
@@ -0,0 +1,153 @@
+/// Contains L2 activation traits and their implementations for various coins
+///
+use crate::prelude::*;
+use async_trait::async_trait;
+use coins::{lp_coinfind, lp_coinfind_or_err, CoinProtocol, CoinsContext, MmCoinEnum};
+use common::{HttpStatusCode, StatusCode};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use ser_error_derive::SerializeErrorType;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::Value as Json;
+
+pub trait L2ProtocolParams {
+    fn platform_coin_ticker(&self) -> &str;
+}
+
+#[async_trait]
+pub trait L2ActivationOps: Into<MmCoinEnum> {
+    type PlatformCoin: TryPlatformCoinFromMmCoinEnum;
+    type ActivationParams;
+    type ProtocolInfo: L2ProtocolParams + TryFromCoinProtocol;
+    type ValidatedParams;
+    type CoinConf;
+    type ActivationResult;
+    type ActivationError: NotMmError;
+
+    fn coin_conf_from_json(json: Json) -> Result<Self::CoinConf, MmError<Self::ActivationError>>;
+
+    fn validate_platform_configuration(
+        platform_coin: &Self::PlatformCoin,
+    ) -> Result<(), MmError<Self::ActivationError>>;
+
+    fn validate_activation_params(
+        activation_params: Self::ActivationParams,
+    ) -> Result<Self::ValidatedParams, MmError<Self::ActivationError>>;
+
+    async fn enable_l2(
+        ctx: &MmArc,
+        platform_coin: Self::PlatformCoin,
+        validated_params: Self::ValidatedParams,
+        protocol_conf: Self::ProtocolInfo,
+        coin_conf: Self::CoinConf,
+    ) -> Result<(Self, Self::ActivationResult), MmError<Self::ActivationError>>;
+}
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum EnableL2Error {
+    #[display(fmt = "Layer 2 {} is already activated", _0)]
+    L2IsAlreadyActivated(String),
+    #[display(fmt = "Layer 2 {} config is not found", _0)]
+    L2ConfigIsNotFound(String),
+    #[display(fmt = "Layer 2 {} protocol parsing failed: {}", ticker, error)]
+    L2ProtocolParseError {
+        ticker: String,
+        error: String,
+    },
+    #[display(fmt = "Unexpected layer 2 protocol {:?} for {}", protocol, ticker)]
+    UnexpectedL2Protocol {
+        ticker: String,
+        protocol: CoinProtocol,
+    },
+    #[display(fmt = "Platform coin {} is not activated", _0)]
+    PlatformCoinIsNotActivated(String),
+    #[display(fmt = "{} is not a platform coin for layer 2 {}", platform_coin_ticker, l2_ticker)]
+    UnsupportedPlatformCoin {
+        platform_coin_ticker: String,
+        l2_ticker: String,
+    },
+    #[display(fmt = "Layer 2 configuration parsing failed: {}", _0)]
+    L2ConfigParseError(String),
+    Transport(String),
+    Internal(String),
+}
+
+impl From<CoinConfWithProtocolError> for EnableL2Error {
+    fn from(err: CoinConfWithProtocolError) -> Self {
+        match err {
+            CoinConfWithProtocolError::ConfigIsNotFound(ticker) => EnableL2Error::L2ConfigIsNotFound(ticker),
+            CoinConfWithProtocolError::CoinProtocolParseError { ticker, err } => EnableL2Error::L2ProtocolParseError {
+                ticker,
+                error: err.to_string(),
+            },
+            CoinConfWithProtocolError::UnexpectedProtocol { ticker, protocol } => {
+                EnableL2Error::UnexpectedL2Protocol { ticker, protocol }
+            },
+        }
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct EnableL2Request<T> {
+    ticker: String,
+    activation_params: T,
+}
+
+pub async fn enable_l2<L2>(
+    ctx: MmArc,
+    req: EnableL2Request<L2::ActivationParams>,
+) -> Result<L2::ActivationResult, MmError<EnableL2Error>>
+where
+    L2: L2ActivationOps,
+    EnableL2Error: From<L2::ActivationError>,
+    (L2::ActivationError, EnableL2Error): NotEqual,
+{
+    if let Ok(Some(_)) = lp_coinfind(&ctx, &req.ticker).await {
+        return MmError::err(EnableL2Error::L2IsAlreadyActivated(req.ticker));
+    }
+
+    let (coin_conf_json, l2_protocol): (Json, L2::ProtocolInfo) = coin_conf_with_protocol(&ctx, &req.ticker)?;
+    let coin_conf = L2::coin_conf_from_json(coin_conf_json)?;
+
+    let platform_coin = lp_coinfind_or_err(&ctx, l2_protocol.platform_coin_ticker())
+        .await
+        .mm_err(|_| EnableL2Error::PlatformCoinIsNotActivated(req.ticker.clone()))?;
+
+    let platform_coin =
+        L2::PlatformCoin::try_from_mm_coin(platform_coin).or_mm_err(|| EnableL2Error::UnsupportedPlatformCoin {
+            platform_coin_ticker: l2_protocol.platform_coin_ticker().into(),
+            l2_ticker: req.ticker.clone(),
+        })?;
+
+    L2::validate_platform_configuration(&platform_coin)?;
+
+    let validated_params = L2::validate_activation_params(req.activation_params)?;
+
+    let (l2, activation_result) = L2::enable_l2(&ctx, platform_coin, validated_params, l2_protocol, coin_conf).await?;
+
+    let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+    coins_ctx
+        .add_coin(l2.into())
+        .await
+        .mm_err(|e| EnableL2Error::L2IsAlreadyActivated(e.ticker))?;
+
+    Ok(activation_result)
+}
+
+impl HttpStatusCode for EnableL2Error {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            EnableL2Error::L2IsAlreadyActivated(_)
+            | EnableL2Error::PlatformCoinIsNotActivated(_)
+            | EnableL2Error::L2ConfigIsNotFound { .. }
+            | EnableL2Error::UnexpectedL2Protocol { .. } => StatusCode::BAD_REQUEST,
+            EnableL2Error::L2ProtocolParseError { .. }
+            | EnableL2Error::UnsupportedPlatformCoin { .. }
+            | EnableL2Error::L2ConfigParseError(_)
+            | EnableL2Error::Transport(_)
+            | EnableL2Error::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
diff --git a/mm2src/coins_activation/src/lib.rs b/mm2src/coins_activation/src/lib.rs
new file mode 100644
index 0000000000..5b6b9321da
--- /dev/null
+++ b/mm2src/coins_activation/src/lib.rs
@@ -0,0 +1,19 @@
+mod bch_with_tokens_activation;
+mod context;
+mod l2;
+#[cfg(not(target_arch = "wasm32"))] mod lightning_activation;
+mod platform_coin_with_tokens;
+mod prelude;
+mod slp_token_activation;
+#[cfg(not(target_arch = "wasm32"))]
+mod solana_with_tokens_activation;
+#[cfg(not(target_arch = "wasm32"))] mod spl_token_activation;
+mod standalone_coin;
+mod token;
+mod utxo_activation;
+#[cfg(not(target_arch = "wasm32"))] mod z_coin_activation;
+
+pub use l2::enable_l2;
+pub use platform_coin_with_tokens::enable_platform_coin_with_tokens;
+pub use standalone_coin::{init_standalone_coin, init_standalone_coin_status, init_standalone_coin_user_action};
+pub use token::enable_token;
diff --git a/mm2src/coins_activation/src/lightning_activation.rs b/mm2src/coins_activation/src/lightning_activation.rs
new file mode 100644
index 0000000000..5572755d09
--- /dev/null
+++ b/mm2src/coins_activation/src/lightning_activation.rs
@@ -0,0 +1,208 @@
+use crate::l2::{EnableL2Error, L2ActivationOps, L2ProtocolParams};
+use crate::prelude::*;
+use async_trait::async_trait;
+use coins::lightning::ln_conf::{LightningCoinConf, LightningProtocolConf};
+use coins::lightning::ln_errors::EnableLightningError;
+use coins::lightning::{start_lightning, LightningCoin, LightningParams};
+use coins::utxo::utxo_standard::UtxoStandardCoin;
+use coins::utxo::UtxoCommonOps;
+use coins::{BalanceError, CoinBalance, CoinProtocol, MarketCoinOps, MmCoinEnum};
+use derive_more::Display;
+use futures::compat::Future01CompatExt;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use ser_error_derive::SerializeErrorType;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::{self as json, Value as Json};
+
+const DEFAULT_LISTENING_PORT: u16 = 9735;
+
+impl TryPlatformCoinFromMmCoinEnum for UtxoStandardCoin {
+    fn try_from_mm_coin(coin: MmCoinEnum) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        match coin {
+            MmCoinEnum::UtxoCoin(coin) => Some(coin),
+            _ => None,
+        }
+    }
+}
+
+impl TryFromCoinProtocol for LightningProtocolConf {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::LIGHTNING {
+                platform,
+                network,
+                confirmations,
+            } => Ok(LightningProtocolConf {
+                platform_coin_ticker: platform,
+                network,
+                confirmations,
+            }),
+            proto => MmError::err(proto),
+        }
+    }
+}
+
+impl L2ProtocolParams for LightningProtocolConf {
+    fn platform_coin_ticker(&self) -> &str { &self.platform_coin_ticker }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct LightningActivationParams {
+    // The listening port for the p2p LN node
+    pub listening_port: Option<u16>,
+    // Printable human-readable string to describe this node to other users.
+    pub name: String,
+    // Node's HEX color. This is used for showing the node in a network graph with the desired color.
+    pub color: Option<String>,
+    // The number of payment retries that should be done before considering a payment failed or partially failed.
+    pub payment_retries: Option<usize>,
+    // Node's backup path for channels and other data that requires backup.
+    pub backup_path: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum LightningValidationErr {
+    #[display(fmt = "Platform coin {} activated in {} mode", _0, _1)]
+    UnexpectedMethod(String, String),
+    #[display(fmt = "{} is only supported in {} mode", _0, _1)]
+    UnsupportedMode(String, String),
+    #[display(fmt = "Invalid request: {}", _0)]
+    InvalidRequest(String),
+    #[display(fmt = "Invalid address: {}", _0)]
+    InvalidAddress(String),
+}
+
+#[derive(Debug, Serialize)]
+pub struct LightningInitResult {
+    platform_coin: String,
+    address: String,
+    balance: CoinBalance,
+}
+
+#[derive(Debug)]
+pub enum LightningInitError {
+    InvalidConfiguration(String),
+    EnableLightningError(EnableLightningError),
+    LightningValidationErr(LightningValidationErr),
+    MyBalanceError(BalanceError),
+    MyAddressError(String),
+}
+
+impl From<LightningInitError> for EnableL2Error {
+    fn from(err: LightningInitError) -> Self {
+        match err {
+            LightningInitError::InvalidConfiguration(err) => EnableL2Error::L2ConfigParseError(err),
+            LightningInitError::EnableLightningError(enable_err) => match enable_err {
+                EnableLightningError::RpcError(rpc_err) => EnableL2Error::Transport(rpc_err),
+                enable_error => EnableL2Error::Internal(enable_error.to_string()),
+            },
+            LightningInitError::LightningValidationErr(req_err) => EnableL2Error::Internal(req_err.to_string()),
+            LightningInitError::MyBalanceError(balance_err) => match balance_err {
+                BalanceError::Transport(e) => EnableL2Error::Transport(e),
+                balance_error => EnableL2Error::Internal(balance_error.to_string()),
+            },
+            LightningInitError::MyAddressError(e) => EnableL2Error::Internal(e),
+        }
+    }
+}
+
+impl From<EnableLightningError> for LightningInitError {
+    fn from(err: EnableLightningError) -> Self { LightningInitError::EnableLightningError(err) }
+}
+
+impl From<LightningValidationErr> for LightningInitError {
+    fn from(err: LightningValidationErr) -> Self { LightningInitError::LightningValidationErr(err) }
+}
+
+#[async_trait]
+impl L2ActivationOps for LightningCoin {
+    type PlatformCoin = UtxoStandardCoin;
+    type ActivationParams = LightningActivationParams;
+    type ProtocolInfo = LightningProtocolConf;
+    type ValidatedParams = LightningParams;
+    type CoinConf = LightningCoinConf;
+    type ActivationResult = LightningInitResult;
+    type ActivationError = LightningInitError;
+
+    fn coin_conf_from_json(json: Json) -> Result<Self::CoinConf, MmError<Self::ActivationError>> {
+        json::from_value::<LightningCoinConf>(json)
+            .map_to_mm(|e| LightningInitError::InvalidConfiguration(e.to_string()))
+    }
+
+    fn validate_platform_configuration(
+        platform_coin: &Self::PlatformCoin,
+    ) -> Result<(), MmError<Self::ActivationError>> {
+        // Channel funding transactions need to spend segwit outputs
+        // and while the witness script can be generated from pubkey and be used
+        // it's better for the coin to be enabled in segwit to check if balance is enough for funding transaction, etc...
+        if !platform_coin.addr_format().is_segwit() {
+            return MmError::err(
+                LightningValidationErr::UnsupportedMode("Lightning network".into(), "segwit".into()).into(),
+            );
+        }
+        Ok(())
+    }
+
+    fn validate_activation_params(
+        activation_params: Self::ActivationParams,
+    ) -> Result<Self::ValidatedParams, MmError<Self::ActivationError>> {
+        if activation_params.name.len() > 32 {
+            return MmError::err(
+                LightningValidationErr::InvalidRequest("Node name length can't be more than 32 characters".into())
+                    .into(),
+            );
+        }
+        let mut node_name = [b' '; 32];
+        node_name[0..activation_params.name.len()].copy_from_slice(activation_params.name.as_bytes());
+
+        let mut node_color = [0u8; 3];
+        hex::decode_to_slice(
+            activation_params.color.unwrap_or_else(|| "000000".into()),
+            &mut node_color as &mut [u8],
+        )
+        .map_to_mm(|_| LightningValidationErr::InvalidRequest("Invalid Hex Color".into()))?;
+
+        let listening_port = activation_params.listening_port.unwrap_or(DEFAULT_LISTENING_PORT);
+
+        Ok(LightningParams {
+            listening_port,
+            node_name,
+            node_color,
+            payment_retries: activation_params.payment_retries,
+            backup_path: activation_params.backup_path,
+        })
+    }
+
+    async fn enable_l2(
+        ctx: &MmArc,
+        platform_coin: Self::PlatformCoin,
+        validated_params: Self::ValidatedParams,
+        protocol_conf: Self::ProtocolInfo,
+        coin_conf: Self::CoinConf,
+    ) -> Result<(Self, Self::ActivationResult), MmError<Self::ActivationError>> {
+        let lightning_coin =
+            start_lightning(ctx, platform_coin.clone(), protocol_conf, coin_conf, validated_params).await?;
+        let address = lightning_coin
+            .my_address()
+            .map_to_mm(LightningInitError::MyAddressError)?;
+        let balance = lightning_coin
+            .my_balance()
+            .compat()
+            .await
+            .mm_err(LightningInitError::MyBalanceError)?;
+        let init_result = LightningInitResult {
+            platform_coin: platform_coin.ticker().into(),
+            address,
+            balance,
+        };
+        Ok((lightning_coin, init_result))
+    }
+}
diff --git a/mm2src/coins_activation/src/platform_coin_with_tokens.rs b/mm2src/coins_activation/src/platform_coin_with_tokens.rs
new file mode 100644
index 0000000000..c27a440008
--- /dev/null
+++ b/mm2src/coins_activation/src/platform_coin_with_tokens.rs
@@ -0,0 +1,333 @@
+use crate::prelude::*;
+use async_trait::async_trait;
+use coins::my_tx_history_v2::TxHistoryStorage;
+use coins::tx_history_storage::{CreateTxHistoryStorageError, TxHistoryStorageBuilder};
+use coins::{lp_coinfind, CoinProtocol, CoinsContext, MmCoinEnum};
+use common::mm_metrics::MetricsArc;
+use common::{log, HttpStatusCode, StatusCode};
+use derive_more::Display;
+use futures::future::AbortHandle;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use ser_error_derive::SerializeErrorType;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::convert::Infallible;
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct TokenActivationRequest<Req> {
+    ticker: String,
+    #[serde(flatten)]
+    request: Req,
+}
+
+pub trait TokenOf: Into<MmCoinEnum> {
+    type PlatformCoin: PlatformWithTokensActivationOps + RegisterTokenInfo<Self>;
+}
+
+pub struct TokenActivationParams<Req, Protocol> {
+    pub(crate) ticker: String,
+    pub(crate) activation_request: Req,
+    pub(crate) protocol: Protocol,
+}
+
+#[async_trait]
+pub trait TokenInitializer {
+    type Token: TokenOf;
+    type TokenActivationRequest: Send;
+    type TokenProtocol: TryFromCoinProtocol + Send;
+    type InitTokensError: NotMmError;
+
+    fn tokens_requests_from_platform_request(
+        platform_request: &<<Self::Token as TokenOf>::PlatformCoin as PlatformWithTokensActivationOps>::ActivationRequest,
+    ) -> Vec<TokenActivationRequest<Self::TokenActivationRequest>>;
+
+    async fn enable_tokens(
+        &self,
+        params: Vec<TokenActivationParams<Self::TokenActivationRequest, Self::TokenProtocol>>,
+    ) -> Result<Vec<Self::Token>, MmError<Self::InitTokensError>>;
+
+    fn platform_coin(&self) -> &<Self::Token as TokenOf>::PlatformCoin;
+}
+
+#[async_trait]
+pub trait TokenAsMmCoinInitializer: Send + Sync {
+    type PlatformCoin;
+    type ActivationRequest;
+
+    async fn enable_tokens_as_mm_coins(
+        &self,
+        ctx: MmArc,
+        request: &Self::ActivationRequest,
+    ) -> Result<Vec<MmCoinEnum>, MmError<InitTokensAsMmCoinsError>>;
+}
+
+pub enum InitTokensAsMmCoinsError {
+    TokenConfigIsNotFound(String),
+    InvalidPubkey(String),
+    TokenProtocolParseError { ticker: String, error: String },
+    UnexpectedTokenProtocol { ticker: String, protocol: CoinProtocol },
+}
+
+impl From<CoinConfWithProtocolError> for InitTokensAsMmCoinsError {
+    fn from(err: CoinConfWithProtocolError) -> Self {
+        match err {
+            CoinConfWithProtocolError::ConfigIsNotFound(e) => InitTokensAsMmCoinsError::TokenConfigIsNotFound(e),
+            CoinConfWithProtocolError::CoinProtocolParseError { ticker, err } => {
+                InitTokensAsMmCoinsError::TokenProtocolParseError {
+                    ticker,
+                    error: err.to_string(),
+                }
+            },
+            CoinConfWithProtocolError::UnexpectedProtocol { ticker, protocol } => {
+                InitTokensAsMmCoinsError::UnexpectedTokenProtocol { ticker, protocol }
+            },
+        }
+    }
+}
+
+pub trait RegisterTokenInfo<T: TokenOf<PlatformCoin = Self>> {
+    fn register_token_info(&self, token: &T);
+}
+
+impl From<std::convert::Infallible> for InitTokensAsMmCoinsError {
+    fn from(e: Infallible) -> Self { match e {} }
+}
+
+#[async_trait]
+impl<T> TokenAsMmCoinInitializer for T
+where
+    T: TokenInitializer + Send + Sync,
+    InitTokensAsMmCoinsError: From<T::InitTokensError>,
+    (T::InitTokensError, InitTokensAsMmCoinsError): NotEqual,
+{
+    type PlatformCoin = <T::Token as TokenOf>::PlatformCoin;
+    type ActivationRequest = <Self::PlatformCoin as PlatformWithTokensActivationOps>::ActivationRequest;
+
+    async fn enable_tokens_as_mm_coins(
+        &self,
+        ctx: MmArc,
+        request: &Self::ActivationRequest,
+    ) -> Result<Vec<MmCoinEnum>, MmError<InitTokensAsMmCoinsError>> {
+        let tokens_requests = T::tokens_requests_from_platform_request(request);
+        let token_params = tokens_requests
+            .into_iter()
+            .map(|req| -> Result<_, MmError<CoinConfWithProtocolError>> {
+                let (_, protocol): (_, T::TokenProtocol) = coin_conf_with_protocol(&ctx, &req.ticker)?;
+                Ok(TokenActivationParams {
+                    ticker: req.ticker,
+                    activation_request: req.request,
+                    protocol,
+                })
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        let tokens = self.enable_tokens(token_params).await?;
+        for token in tokens.iter() {
+            self.platform_coin().register_token_info(token);
+        }
+        Ok(tokens.into_iter().map(Into::into).collect())
+    }
+}
+
+pub trait GetPlatformBalance {
+    fn get_platform_balance(&self) -> BigDecimal;
+}
+
+#[async_trait]
+pub trait PlatformWithTokensActivationOps: Into<MmCoinEnum> {
+    type ActivationRequest: Clone + Send + Sync + TxHistory;
+    type PlatformProtocolInfo: TryFromCoinProtocol;
+    type ActivationResult: GetPlatformBalance + CurrentBlock;
+    type ActivationError: NotMmError;
+
+    /// Initializes the platform coin itself
+    async fn enable_platform_coin(
+        ctx: MmArc,
+        ticker: String,
+        coin_conf: Json,
+        activation_request: Self::ActivationRequest,
+        protocol_conf: Self::PlatformProtocolInfo,
+        priv_key: &[u8],
+    ) -> Result<Self, MmError<Self::ActivationError>>;
+
+    fn token_initializers(
+        &self,
+    ) -> Vec<Box<dyn TokenAsMmCoinInitializer<PlatformCoin = Self, ActivationRequest = Self::ActivationRequest>>>;
+
+    async fn get_activation_result(&self) -> Result<Self::ActivationResult, MmError<Self::ActivationError>>;
+
+    fn start_history_background_fetching(
+        &self,
+        metrics: MetricsArc,
+        storage: impl TxHistoryStorage,
+        initial_balance: BigDecimal,
+    ) -> AbortHandle;
+}
+
+#[derive(Debug, Deserialize)]
+pub struct EnablePlatformCoinWithTokensReq<T: Clone> {
+    ticker: String,
+    #[serde(flatten)]
+    request: T,
+}
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum EnablePlatformCoinWithTokensError {
+    PlatformIsAlreadyActivated(String),
+    #[display(fmt = "Platform {} config is not found", _0)]
+    PlatformConfigIsNotFound(String),
+    #[display(fmt = "Platform coin {} protocol parsing failed: {}", ticker, error)]
+    CoinProtocolParseError {
+        ticker: String,
+        error: String,
+    },
+    #[display(fmt = "Unexpected platform protocol {:?} for {}", protocol, ticker)]
+    UnexpectedPlatformProtocol {
+        ticker: String,
+        protocol: CoinProtocol,
+    },
+    #[display(fmt = "Token {} config is not found", _0)]
+    TokenConfigIsNotFound(String),
+    #[display(fmt = "Token {} protocol parsing failed: {}", ticker, error)]
+    TokenProtocolParseError {
+        ticker: String,
+        error: String,
+    },
+    #[display(fmt = "Unexpected token protocol {:?} for {}", protocol, ticker)]
+    UnexpectedTokenProtocol {
+        ticker: String,
+        protocol: CoinProtocol,
+    },
+    #[display(fmt = "Error on platform coin {} creation: {}", ticker, error)]
+    PlatformCoinCreationError {
+        ticker: String,
+        error: String,
+    },
+    #[display(fmt = "Private key is not allowed: {}", _0)]
+    PrivKeyNotAllowed(String),
+    #[display(fmt = "Unexpected derivation method: {}", _0)]
+    UnexpectedDerivationMethod(String),
+    Transport(String),
+    Internal(String),
+}
+
+impl From<CoinConfWithProtocolError> for EnablePlatformCoinWithTokensError {
+    fn from(err: CoinConfWithProtocolError) -> Self {
+        match err {
+            CoinConfWithProtocolError::ConfigIsNotFound(ticker) => {
+                EnablePlatformCoinWithTokensError::PlatformConfigIsNotFound(ticker)
+            },
+            CoinConfWithProtocolError::UnexpectedProtocol { ticker, protocol } => {
+                EnablePlatformCoinWithTokensError::UnexpectedPlatformProtocol { ticker, protocol }
+            },
+            CoinConfWithProtocolError::CoinProtocolParseError { ticker, err } => {
+                EnablePlatformCoinWithTokensError::CoinProtocolParseError {
+                    ticker,
+                    error: err.to_string(),
+                }
+            },
+        }
+    }
+}
+
+impl From<InitTokensAsMmCoinsError> for EnablePlatformCoinWithTokensError {
+    fn from(err: InitTokensAsMmCoinsError) -> Self {
+        match err {
+            InitTokensAsMmCoinsError::TokenConfigIsNotFound(ticker) => {
+                EnablePlatformCoinWithTokensError::TokenConfigIsNotFound(ticker)
+            },
+            InitTokensAsMmCoinsError::TokenProtocolParseError { ticker, error } => {
+                EnablePlatformCoinWithTokensError::TokenProtocolParseError { ticker, error }
+            },
+            InitTokensAsMmCoinsError::UnexpectedTokenProtocol { ticker, protocol } => {
+                EnablePlatformCoinWithTokensError::UnexpectedTokenProtocol { ticker, protocol }
+            },
+            InitTokensAsMmCoinsError::InvalidPubkey(e) => EnablePlatformCoinWithTokensError::Internal(e),
+        }
+    }
+}
+
+impl From<CreateTxHistoryStorageError> for EnablePlatformCoinWithTokensError {
+    fn from(e: CreateTxHistoryStorageError) -> Self {
+        match e {
+            CreateTxHistoryStorageError::Internal(internal) => EnablePlatformCoinWithTokensError::Internal(internal),
+        }
+    }
+}
+
+impl HttpStatusCode for EnablePlatformCoinWithTokensError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            EnablePlatformCoinWithTokensError::CoinProtocolParseError { .. }
+            | EnablePlatformCoinWithTokensError::TokenProtocolParseError { .. }
+            | EnablePlatformCoinWithTokensError::PlatformCoinCreationError { .. }
+            | EnablePlatformCoinWithTokensError::PrivKeyNotAllowed(_)
+            | EnablePlatformCoinWithTokensError::UnexpectedDerivationMethod(_)
+            | EnablePlatformCoinWithTokensError::Transport(_)
+            | EnablePlatformCoinWithTokensError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            EnablePlatformCoinWithTokensError::PlatformIsAlreadyActivated(_)
+            | EnablePlatformCoinWithTokensError::PlatformConfigIsNotFound(_)
+            | EnablePlatformCoinWithTokensError::TokenConfigIsNotFound(_)
+            | EnablePlatformCoinWithTokensError::UnexpectedPlatformProtocol { .. }
+            | EnablePlatformCoinWithTokensError::UnexpectedTokenProtocol { .. } => StatusCode::BAD_REQUEST,
+        }
+    }
+}
+
+pub async fn enable_platform_coin_with_tokens<Platform>(
+    ctx: MmArc,
+    req: EnablePlatformCoinWithTokensReq<Platform::ActivationRequest>,
+) -> Result<Platform::ActivationResult, MmError<EnablePlatformCoinWithTokensError>>
+where
+    Platform: PlatformWithTokensActivationOps,
+    EnablePlatformCoinWithTokensError: From<Platform::ActivationError>,
+    (Platform::ActivationError, EnablePlatformCoinWithTokensError): NotEqual,
+{
+    if let Ok(Some(_)) = lp_coinfind(&ctx, &req.ticker).await {
+        return MmError::err(EnablePlatformCoinWithTokensError::PlatformIsAlreadyActivated(
+            req.ticker,
+        ));
+    }
+
+    let (platform_conf, platform_protocol) = coin_conf_with_protocol(&ctx, &req.ticker)?;
+
+    let priv_key = &*ctx.secp256k1_key_pair().private().secret;
+
+    let platform_coin = Platform::enable_platform_coin(
+        ctx.clone(),
+        req.ticker.clone(),
+        platform_conf,
+        req.request.clone(),
+        platform_protocol,
+        priv_key,
+    )
+    .await?;
+    let mut mm_tokens = Vec::new();
+    for initializer in platform_coin.token_initializers() {
+        let tokens = initializer.enable_tokens_as_mm_coins(ctx.clone(), &req.request).await?;
+        mm_tokens.extend(tokens);
+    }
+
+    let activation_result = platform_coin.get_activation_result().await?;
+    log::info!("{} current block {}", req.ticker, activation_result.current_block());
+
+    if req.request.tx_history() {
+        let abort_handler = platform_coin.start_history_background_fetching(
+            ctx.metrics.clone(),
+            TxHistoryStorageBuilder::new(&ctx).build()?,
+            activation_result.get_platform_balance(),
+        );
+        ctx.abort_handlers.lock().unwrap().push(abort_handler);
+    }
+
+    let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+    coins_ctx
+        .add_platform_with_tokens(platform_coin.into(), mm_tokens)
+        .await
+        .mm_err(|e| EnablePlatformCoinWithTokensError::PlatformIsAlreadyActivated(e.ticker))?;
+
+    Ok(activation_result)
+}
diff --git a/mm2src/coins_activation/src/prelude.rs b/mm2src/coins_activation/src/prelude.rs
new file mode 100644
index 0000000000..63014af89e
--- /dev/null
+++ b/mm2src/coins_activation/src/prelude.rs
@@ -0,0 +1,88 @@
+use coins::utxo::UtxoActivationParams;
+#[cfg(not(target_arch = "wasm32"))]
+use coins::z_coin::ZcoinActivationParams;
+use coins::{coin_conf, CoinBalance, CoinProtocol, MmCoinEnum};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use serde_derive::Serialize;
+use serde_json::{self as json, Value as Json};
+use std::collections::HashMap;
+
+pub trait CurrentBlock {
+    fn current_block(&self) -> u64;
+}
+
+pub trait TxHistory {
+    fn tx_history(&self) -> bool;
+}
+
+impl TxHistory for UtxoActivationParams {
+    fn tx_history(&self) -> bool { self.tx_history }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl TxHistory for ZcoinActivationParams {
+    fn tx_history(&self) -> bool { false }
+}
+
+#[derive(Clone, Debug, Serialize)]
+#[serde(tag = "type", content = "data")]
+pub enum DerivationMethod {
+    /// Legacy iguana's privkey derivation, used by default
+    Iguana,
+    /// HD wallet derivation path, String is temporary here
+    #[allow(dead_code)]
+    HDWallet(String),
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct CoinAddressInfo<Balance> {
+    pub(crate) derivation_method: DerivationMethod,
+    pub(crate) pubkey: String,
+    pub(crate) balances: Balance,
+}
+
+pub type TokenBalances = HashMap<String, CoinBalance>;
+
+pub trait TryPlatformCoinFromMmCoinEnum {
+    fn try_from_mm_coin(coin: MmCoinEnum) -> Option<Self>
+    where
+        Self: Sized;
+}
+
+pub trait TryFromCoinProtocol {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized;
+}
+
+#[derive(Debug)]
+pub enum CoinConfWithProtocolError {
+    ConfigIsNotFound(String),
+    CoinProtocolParseError { ticker: String, err: json::Error },
+    UnexpectedProtocol { ticker: String, protocol: CoinProtocol },
+}
+
+pub fn coin_conf_with_protocol<T: TryFromCoinProtocol>(
+    ctx: &MmArc,
+    coin: &str,
+) -> Result<(Json, T), MmError<CoinConfWithProtocolError>> {
+    let conf = coin_conf(ctx, coin);
+    if conf.is_null() {
+        return MmError::err(CoinConfWithProtocolError::ConfigIsNotFound(coin.into()));
+    }
+
+    let coin_protocol: CoinProtocol = json::from_value(conf["protocol"].clone()).map_to_mm(|err| {
+        CoinConfWithProtocolError::CoinProtocolParseError {
+            ticker: coin.into(),
+            err,
+        }
+    })?;
+
+    let coin_protocol =
+        T::try_from_coin_protocol(coin_protocol).mm_err(|protocol| CoinConfWithProtocolError::UnexpectedProtocol {
+            ticker: coin.into(),
+            protocol,
+        })?;
+    Ok((conf, coin_protocol))
+}
diff --git a/mm2src/coins_activation/src/slp_token_activation.rs b/mm2src/coins_activation/src/slp_token_activation.rs
new file mode 100644
index 0000000000..55c08c8ac0
--- /dev/null
+++ b/mm2src/coins_activation/src/slp_token_activation.rs
@@ -0,0 +1,120 @@
+use crate::prelude::*;
+use crate::token::{EnableTokenError, TokenActivationOps, TokenProtocolParams};
+use async_trait::async_trait;
+use coins::utxo::bch::BchCoin;
+use coins::utxo::rpc_clients::UtxoRpcError;
+use coins::utxo::slp::{SlpProtocolConf, SlpToken};
+use coins::{CoinBalance, CoinProtocol, MarketCoinOps, MmCoin, MmCoinEnum};
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::H256 as H256Json;
+use serde_derive::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+impl TryPlatformCoinFromMmCoinEnum for BchCoin {
+    fn try_from_mm_coin(coin: MmCoinEnum) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        match coin {
+            MmCoinEnum::Bch(coin) => Some(coin),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct SlpActivationRequest {
+    pub required_confirmations: Option<u64>,
+}
+
+impl TryFromCoinProtocol for SlpProtocolConf {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::SLPTOKEN {
+                platform,
+                token_id,
+                decimals,
+                required_confirmations,
+            } => Ok(SlpProtocolConf {
+                platform_coin_ticker: platform,
+                token_id: token_id.into(),
+                decimals,
+                required_confirmations,
+            }),
+            proto => MmError::err(proto),
+        }
+    }
+}
+
+impl TokenProtocolParams for SlpProtocolConf {
+    fn platform_coin_ticker(&self) -> &str { &self.platform_coin_ticker }
+}
+
+impl From<SlpInitError> for EnableTokenError {
+    fn from(err: SlpInitError) -> Self {
+        match err {
+            SlpInitError::GetBalanceError(rpc_err) => rpc_err.into(),
+            SlpInitError::MyAddressError(e) => EnableTokenError::Internal(e),
+        }
+    }
+}
+
+#[derive(Debug, Serialize)]
+pub struct SlpInitResult {
+    balances: HashMap<String, CoinBalance>,
+    token_id: H256Json,
+    platform_coin: String,
+    required_confirmations: u64,
+}
+
+#[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum SlpInitError {
+    GetBalanceError(UtxoRpcError),
+    MyAddressError(String),
+}
+
+#[async_trait]
+impl TokenActivationOps for SlpToken {
+    type PlatformCoin = BchCoin;
+    type ActivationParams = SlpActivationRequest;
+    type ProtocolInfo = SlpProtocolConf;
+    type ActivationResult = SlpInitResult;
+    type ActivationError = SlpInitError;
+
+    async fn enable_token(
+        ticker: String,
+        platform_coin: Self::PlatformCoin,
+        activation_params: Self::ActivationParams,
+        protocol_conf: Self::ProtocolInfo,
+    ) -> Result<(Self, Self::ActivationResult), MmError<Self::ActivationError>> {
+        // confirmation settings from activation params have the highest priority
+        let required_confirmations = activation_params.required_confirmations.unwrap_or_else(|| {
+            protocol_conf
+                .required_confirmations
+                .unwrap_or_else(|| platform_coin.required_confirmations())
+        });
+
+        let token = Self::new(
+            protocol_conf.decimals,
+            ticker,
+            protocol_conf.token_id,
+            platform_coin,
+            required_confirmations,
+        );
+        let balance = token.my_coin_balance().await.mm_err(SlpInitError::GetBalanceError)?;
+        let my_address = token.my_address().map_to_mm(SlpInitError::MyAddressError)?;
+        let mut balances = HashMap::new();
+        balances.insert(my_address, balance);
+        let init_result = SlpInitResult {
+            balances,
+            token_id: (*token.token_id()).into(),
+            platform_coin: token.platform_ticker().into(),
+            required_confirmations: token.required_confirmations(),
+        };
+        Ok((token, init_result))
+    }
+}
diff --git a/mm2src/coins_activation/src/solana_with_tokens_activation.rs b/mm2src/coins_activation/src/solana_with_tokens_activation.rs
new file mode 100644
index 0000000000..71fdcf4027
--- /dev/null
+++ b/mm2src/coins_activation/src/solana_with_tokens_activation.rs
@@ -0,0 +1,233 @@
+use crate::platform_coin_with_tokens::{EnablePlatformCoinWithTokensError, GetPlatformBalance,
+                                       InitTokensAsMmCoinsError, PlatformWithTokensActivationOps, RegisterTokenInfo,
+                                       TokenActivationParams, TokenActivationRequest, TokenAsMmCoinInitializer,
+                                       TokenInitializer, TokenOf};
+use crate::prelude::*;
+use crate::prelude::{CoinAddressInfo, TokenBalances, TryFromCoinProtocol, TxHistory};
+use crate::spl_token_activation::SplActivationRequest;
+use async_trait::async_trait;
+use coins::my_tx_history_v2::TxHistoryStorage;
+use coins::solana::spl::{SplProtocolConf, SplTokenCreationError};
+use coins::{solana_coin_from_conf_and_params, BalanceError, CoinBalance, CoinProtocol, MarketCoinOps,
+            SolanaActivationParams, SolanaCoin, SplToken};
+use common::mm_metrics::MetricsArc;
+use common::Future01CompatExt;
+use futures::future::AbortHandle;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::collections::HashMap;
+
+pub struct SplTokenInitializer {
+    platform_coin: SolanaCoin,
+}
+
+impl TokenOf for SplToken {
+    type PlatformCoin = SolanaCoin;
+}
+
+#[async_trait]
+impl TokenInitializer for SplTokenInitializer {
+    type Token = SplToken;
+    type TokenActivationRequest = SplActivationRequest;
+    type TokenProtocol = SplProtocolConf;
+    type InitTokensError = SplTokenCreationError;
+
+    fn tokens_requests_from_platform_request(
+        platform_params: &SolanaWithTokensActivationRequest,
+    ) -> Vec<TokenActivationRequest<Self::TokenActivationRequest>> {
+        platform_params.spl_tokens_requests.clone()
+    }
+
+    async fn enable_tokens(
+        &self,
+        activation_params: Vec<TokenActivationParams<SplActivationRequest, SplProtocolConf>>,
+    ) -> Result<Vec<SplToken>, MmError<Self::InitTokensError>> {
+        let tokens = activation_params
+            .into_iter()
+            .map(|param| {
+                SplToken::new(
+                    param.protocol.decimals,
+                    param.ticker,
+                    param.protocol.token_contract_address,
+                    self.platform_coin.clone(),
+                )
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+        Ok(tokens)
+    }
+
+    fn platform_coin(&self) -> &SolanaCoin { &self.platform_coin }
+}
+
+impl RegisterTokenInfo<SplToken> for SolanaCoin {
+    fn register_token_info(&self, token: &SplToken) { self.add_spl_token_info(token.ticker().into(), token.get_info()) }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct SolanaWithTokensActivationRequest {
+    #[serde(flatten)]
+    platform_request: SolanaActivationParams,
+    spl_tokens_requests: Vec<TokenActivationRequest<SplActivationRequest>>,
+}
+
+impl TxHistory for SolanaWithTokensActivationRequest {
+    fn tx_history(&self) -> bool { false }
+}
+
+#[derive(Debug, Serialize)]
+pub struct SolanaWithTokensActivationResult {
+    current_block: u64,
+    solana_addresses_infos: HashMap<String, CoinAddressInfo<CoinBalance>>,
+    spl_addresses_infos: HashMap<String, CoinAddressInfo<TokenBalances>>,
+}
+
+impl GetPlatformBalance for SolanaWithTokensActivationResult {
+    fn get_platform_balance(&self) -> BigDecimal {
+        self.solana_addresses_infos
+            .iter()
+            .fold(BigDecimal::from(0), |total, (_, addr_info)| {
+                &total + &addr_info.balances.get_total()
+            })
+    }
+}
+
+impl CurrentBlock for SolanaWithTokensActivationResult {
+    fn current_block(&self) -> u64 { self.current_block }
+}
+
+#[derive(Debug)]
+pub enum SolanaWithTokensActivationError {
+    PlatformCoinCreationError { ticker: String, error: String },
+    UnableToRetrieveMyAddress(String),
+    GetBalanceError(BalanceError),
+    Transport(String),
+    Internal(String),
+}
+
+impl From<SolanaWithTokensActivationError> for EnablePlatformCoinWithTokensError {
+    fn from(e: SolanaWithTokensActivationError) -> Self {
+        match e {
+            SolanaWithTokensActivationError::PlatformCoinCreationError { ticker, error } => {
+                EnablePlatformCoinWithTokensError::PlatformCoinCreationError { ticker, error }
+            },
+            SolanaWithTokensActivationError::UnableToRetrieveMyAddress(e) => {
+                EnablePlatformCoinWithTokensError::Internal(e)
+            },
+            SolanaWithTokensActivationError::GetBalanceError(e) => {
+                EnablePlatformCoinWithTokensError::Internal(format!("{:?}", e))
+            },
+            SolanaWithTokensActivationError::Transport(e) => EnablePlatformCoinWithTokensError::Transport(e),
+            SolanaWithTokensActivationError::Internal(e) => EnablePlatformCoinWithTokensError::Internal(e),
+        }
+    }
+}
+
+impl From<BalanceError> for SolanaWithTokensActivationError {
+    fn from(e: BalanceError) -> Self { SolanaWithTokensActivationError::GetBalanceError(e) }
+}
+
+pub struct SolanaProtocolInfo {}
+
+impl TryFromCoinProtocol for SolanaProtocolInfo {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::SOLANA {} => Ok(SolanaProtocolInfo {}),
+            protocol => MmError::err(protocol),
+        }
+    }
+}
+
+impl From<SplTokenCreationError> for InitTokensAsMmCoinsError {
+    fn from(error: SplTokenCreationError) -> Self {
+        match error {
+            SplTokenCreationError::InvalidPubkey(e) => InitTokensAsMmCoinsError::InvalidPubkey(e),
+        }
+    }
+}
+
+#[async_trait]
+impl PlatformWithTokensActivationOps for SolanaCoin {
+    type ActivationRequest = SolanaWithTokensActivationRequest;
+    type PlatformProtocolInfo = SolanaProtocolInfo;
+    type ActivationResult = SolanaWithTokensActivationResult;
+    type ActivationError = SolanaWithTokensActivationError;
+
+    async fn enable_platform_coin(
+        _ctx: MmArc,
+        ticker: String,
+        platform_conf: Json,
+        activation_request: Self::ActivationRequest,
+        _protocol_conf: Self::PlatformProtocolInfo,
+        priv_key: &[u8],
+    ) -> Result<Self, MmError<Self::ActivationError>> {
+        let platform_coin =
+            solana_coin_from_conf_and_params(&ticker, &platform_conf, activation_request.platform_request, priv_key)
+                .await
+                .map_to_mm(|error| SolanaWithTokensActivationError::PlatformCoinCreationError { ticker, error })?;
+        Ok(platform_coin)
+    }
+
+    fn token_initializers(
+        &self,
+    ) -> Vec<Box<dyn TokenAsMmCoinInitializer<PlatformCoin = Self, ActivationRequest = Self::ActivationRequest>>> {
+        vec![Box::new(SplTokenInitializer {
+            platform_coin: self.clone(),
+        })]
+    }
+
+    async fn get_activation_result(&self) -> Result<Self::ActivationResult, MmError<Self::ActivationError>> {
+        let my_address = self
+            .my_address()
+            .map_to_mm(Self::ActivationError::UnableToRetrieveMyAddress)?;
+        let current_block = self
+            .current_block()
+            .compat()
+            .await
+            .map_to_mm(Self::ActivationError::Internal)?;
+        let solana_balance = self
+            .my_balance()
+            .compat()
+            .await
+            .map_err(|e| Self::ActivationError::GetBalanceError(e.into_inner()))?;
+        let mut token_balances = HashMap::new();
+        let token_infos = self.get_spl_tokens_infos();
+        for (token_ticker, info) in token_infos.into_iter() {
+            let balance = self.my_balance_spl(&info.clone()).await?;
+            token_balances.insert(token_ticker.to_owned(), balance);
+        }
+        let mut result = SolanaWithTokensActivationResult {
+            current_block,
+            solana_addresses_infos: HashMap::new(),
+            spl_addresses_infos: HashMap::new(),
+        };
+        result
+            .solana_addresses_infos
+            .insert(my_address.clone(), CoinAddressInfo {
+                derivation_method: DerivationMethod::Iguana,
+                pubkey: my_address.clone(),
+                balances: solana_balance,
+            });
+
+        result.spl_addresses_infos.insert(my_address.clone(), CoinAddressInfo {
+            derivation_method: DerivationMethod::Iguana,
+            pubkey: my_address,
+            balances: token_balances,
+        });
+        Ok(result)
+    }
+
+    fn start_history_background_fetching(
+        &self,
+        _metrics: MetricsArc,
+        _storage: impl TxHistoryStorage + Send + 'static,
+        _initial_balance: BigDecimal,
+    ) -> AbortHandle {
+        todo!()
+    }
+}
diff --git a/mm2src/coins_activation/src/spl_token_activation.rs b/mm2src/coins_activation/src/spl_token_activation.rs
new file mode 100644
index 0000000000..4f690116b0
--- /dev/null
+++ b/mm2src/coins_activation/src/spl_token_activation.rs
@@ -0,0 +1,114 @@
+use crate::prelude::{TryFromCoinProtocol, TryPlatformCoinFromMmCoinEnum};
+use crate::token::{EnableTokenError, TokenActivationOps, TokenProtocolParams};
+use async_trait::async_trait;
+use coins::solana::spl::{SplProtocolConf, SplTokenCreationError};
+use coins::{BalanceError, CoinBalance, CoinProtocol, MarketCoinOps, MmCoinEnum, SolanaCoin, SplToken};
+use common::Future01CompatExt;
+use mm2_err_handle::prelude::*;
+use serde_derive::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+impl TryPlatformCoinFromMmCoinEnum for SolanaCoin {
+    fn try_from_mm_coin(coin: MmCoinEnum) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        match coin {
+            MmCoinEnum::SolanaCoin(coin) => Some(coin),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct SplActivationRequest {}
+
+impl TryFromCoinProtocol for SplProtocolConf {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::SPLTOKEN {
+                platform,
+                token_contract_address,
+                decimals,
+            } => Ok(SplProtocolConf {
+                platform_coin_ticker: platform,
+                decimals,
+                token_contract_address,
+            }),
+            proto => MmError::err(proto),
+        }
+    }
+}
+
+impl TokenProtocolParams for SplProtocolConf {
+    fn platform_coin_ticker(&self) -> &str { &self.platform_coin_ticker }
+}
+
+#[derive(Debug, Serialize)]
+pub struct SplInitResult {
+    balances: HashMap<String, CoinBalance>,
+    token_contract_address: String,
+    platform_coin: String,
+}
+
+#[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum SplInitError {
+    GetBalanceError(BalanceError),
+    TokenCreationFailed(SplTokenCreationError),
+    MyAddressError(String),
+}
+
+impl From<SplTokenCreationError> for SplInitError {
+    fn from(e: SplTokenCreationError) -> Self { SplInitError::TokenCreationFailed(e) }
+}
+
+impl From<SplInitError> for EnableTokenError {
+    fn from(err: SplInitError) -> Self {
+        match err {
+            SplInitError::GetBalanceError(rpc_err) => rpc_err.into(),
+            SplInitError::TokenCreationFailed(e) => EnableTokenError::Internal(format! {"{:?}", e}),
+            SplInitError::MyAddressError(e) => EnableTokenError::Internal(e),
+        }
+    }
+}
+
+#[async_trait]
+impl TokenActivationOps for SplToken {
+    type PlatformCoin = SolanaCoin;
+    type ActivationParams = SplActivationRequest;
+    type ProtocolInfo = SplProtocolConf;
+    type ActivationResult = SplInitResult;
+    type ActivationError = SplInitError;
+
+    async fn enable_token(
+        ticker: String,
+        platform_coin: Self::PlatformCoin,
+        _activation_params: Self::ActivationParams,
+        protocol_conf: Self::ProtocolInfo,
+    ) -> Result<(Self, Self::ActivationResult), MmError<Self::ActivationError>> {
+        let token = Self::new(
+            protocol_conf.decimals,
+            ticker,
+            protocol_conf.token_contract_address,
+            platform_coin,
+        )?;
+        let balance = token
+            .my_balance()
+            .compat()
+            .await
+            .map_err(|e| SplInitError::GetBalanceError(e.into_inner()))?;
+        let my_address = token.my_address().map_to_mm(SplInitError::MyAddressError)?;
+        let mut balances = HashMap::new();
+        balances.insert(my_address, balance);
+        let init_result = SplInitResult {
+            balances,
+            token_contract_address: token.conf.token_contract_address.to_string(),
+            platform_coin: token.platform_coin.ticker().to_owned(),
+        };
+        Ok((token, init_result))
+    }
+}
diff --git a/mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs b/mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs
new file mode 100644
index 0000000000..e3d0b57d63
--- /dev/null
+++ b/mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs
@@ -0,0 +1,186 @@
+use crate::context::CoinsActivationContext;
+use crate::prelude::*;
+use crate::standalone_coin::init_standalone_coin_error::{InitStandaloneCoinError, InitStandaloneCoinStatusError,
+                                                         InitStandaloneCoinUserActionError};
+use async_trait::async_trait;
+use coins::{lp_coinfind, lp_register_coin, MmCoinEnum, RegisterCoinError, RegisterCoinParams};
+use common::{log, SuccessResponse};
+use crypto::trezor::trezor_rpc_task::RpcTaskHandle;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{InitRpcTaskResponse, RpcTaskStatusRequest, RpcTaskUserActionRequest};
+use rpc_task::{RpcTask, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+use serde_derive::Deserialize;
+use serde_json::Value as Json;
+
+pub type InitStandaloneCoinResponse = InitRpcTaskResponse;
+pub type InitStandaloneCoinStatusRequest = RpcTaskStatusRequest;
+pub type InitStandaloneCoinUserActionRequest<UserAction> = RpcTaskUserActionRequest<UserAction>;
+pub type InitStandaloneCoinTaskManagerShared<Standalone> = RpcTaskManagerShared<InitStandaloneCoinTask<Standalone>>;
+pub type InitStandaloneCoinTaskHandle<Standalone> = RpcTaskHandle<InitStandaloneCoinTask<Standalone>>;
+
+#[derive(Debug, Deserialize)]
+pub struct InitStandaloneCoinReq<T> {
+    ticker: String,
+    activation_params: T,
+}
+
+#[async_trait]
+pub trait InitStandaloneCoinActivationOps: Into<MmCoinEnum> + Send + Sync + 'static {
+    type ActivationRequest: TxHistory + Sync + Send;
+    type StandaloneProtocol: TryFromCoinProtocol + Send;
+    // The following types are related to `RpcTask` management.
+    type ActivationResult: serde::Serialize + Clone + CurrentBlock + Send + Sync + 'static;
+    type ActivationError: From<RegisterCoinError>
+        + Into<InitStandaloneCoinError>
+        + SerMmErrorType
+        + NotEqual
+        + Clone
+        + Send
+        + Sync
+        + 'static;
+    type InProgressStatus: InitStandaloneCoinInitialStatus + serde::Serialize + Clone + Send + Sync + 'static;
+    type AwaitingStatus: serde::Serialize + Clone + Send + Sync + 'static;
+    type UserAction: serde::de::DeserializeOwned + NotMmError + Send + Sync + 'static;
+
+    fn rpc_task_manager(activation_ctx: &CoinsActivationContext) -> &InitStandaloneCoinTaskManagerShared<Self>;
+
+    /// Initialization of the standalone coin spawned as `RpcTask`.
+    async fn init_standalone_coin(
+        ctx: MmArc,
+        ticker: String,
+        coin_conf: Json,
+        activation_request: &Self::ActivationRequest,
+        protocol_info: Self::StandaloneProtocol,
+        task_handle: &InitStandaloneCoinTaskHandle<Self>,
+    ) -> Result<Self, MmError<Self::ActivationError>>;
+
+    async fn get_activation_result(
+        &self,
+        ctx: MmArc,
+        task_handle: &InitStandaloneCoinTaskHandle<Self>,
+        activation_request: &Self::ActivationRequest,
+    ) -> Result<Self::ActivationResult, MmError<Self::ActivationError>>;
+}
+
+pub async fn init_standalone_coin<Standalone>(
+    ctx: MmArc,
+    request: InitStandaloneCoinReq<Standalone::ActivationRequest>,
+) -> MmResult<InitStandaloneCoinResponse, InitStandaloneCoinError>
+where
+    Standalone: InitStandaloneCoinActivationOps + Send + Sync + 'static,
+    Standalone::InProgressStatus: InitStandaloneCoinInitialStatus,
+    InitStandaloneCoinError: From<Standalone::ActivationError>,
+    (Standalone::ActivationError, InitStandaloneCoinError): NotEqual,
+{
+    if let Ok(Some(_)) = lp_coinfind(&ctx, &request.ticker).await {
+        return MmError::err(InitStandaloneCoinError::CoinIsAlreadyActivated { ticker: request.ticker });
+    }
+
+    let (coin_conf, protocol_info) = coin_conf_with_protocol(&ctx, &request.ticker)?;
+
+    let coins_act_ctx = CoinsActivationContext::from_ctx(&ctx).map_to_mm(InitStandaloneCoinError::Internal)?;
+    let task = InitStandaloneCoinTask::<Standalone> {
+        ctx,
+        request,
+        coin_conf,
+        protocol_info,
+    };
+    let task_manager = Standalone::rpc_task_manager(&coins_act_ctx);
+
+    let task_id = RpcTaskManager::spawn_rpc_task(task_manager, task)
+        .mm_err(|e| InitStandaloneCoinError::Internal(e.to_string()))?;
+
+    Ok(InitStandaloneCoinResponse { task_id })
+}
+
+pub async fn init_standalone_coin_status<Standalone: InitStandaloneCoinActivationOps>(
+    ctx: MmArc,
+    req: InitStandaloneCoinStatusRequest,
+) -> MmResult<
+    RpcTaskStatus<
+        Standalone::ActivationResult,
+        InitStandaloneCoinError,
+        Standalone::InProgressStatus,
+        Standalone::AwaitingStatus,
+    >,
+    InitStandaloneCoinStatusError,
+>
+where
+    InitStandaloneCoinError: From<Standalone::ActivationError>,
+{
+    let coins_act_ctx = CoinsActivationContext::from_ctx(&ctx).map_to_mm(InitStandaloneCoinStatusError::Internal)?;
+    let mut task_manager = Standalone::rpc_task_manager(&coins_act_ctx)
+        .lock()
+        .map_to_mm(|poison| InitStandaloneCoinStatusError::Internal(poison.to_string()))?;
+    task_manager
+        .task_status(req.task_id, req.forget_if_finished)
+        .or_mm_err(|| InitStandaloneCoinStatusError::NoSuchTask(req.task_id))
+        .map(|rpc_task| rpc_task.map_err(InitStandaloneCoinError::from))
+}
+
+pub async fn init_standalone_coin_user_action<Standalone: InitStandaloneCoinActivationOps>(
+    ctx: MmArc,
+    req: InitStandaloneCoinUserActionRequest<Standalone::UserAction>,
+) -> MmResult<SuccessResponse, InitStandaloneCoinUserActionError> {
+    let coins_act_ctx =
+        CoinsActivationContext::from_ctx(&ctx).map_to_mm(InitStandaloneCoinUserActionError::Internal)?;
+    let mut task_manager = Standalone::rpc_task_manager(&coins_act_ctx)
+        .lock()
+        .map_to_mm(|poison| InitStandaloneCoinUserActionError::Internal(poison.to_string()))?;
+    task_manager.on_user_action(req.task_id, req.user_action)?;
+    Ok(SuccessResponse::new())
+}
+
+pub struct InitStandaloneCoinTask<Standalone: InitStandaloneCoinActivationOps> {
+    ctx: MmArc,
+    request: InitStandaloneCoinReq<Standalone::ActivationRequest>,
+    coin_conf: Json,
+    protocol_info: Standalone::StandaloneProtocol,
+}
+
+impl<Standalone: InitStandaloneCoinActivationOps> RpcTaskTypes for InitStandaloneCoinTask<Standalone> {
+    type Item = Standalone::ActivationResult;
+    type Error = Standalone::ActivationError;
+    type InProgressStatus = Standalone::InProgressStatus;
+    type AwaitingStatus = Standalone::AwaitingStatus;
+    type UserAction = Standalone::UserAction;
+}
+
+#[async_trait]
+impl<Standalone> RpcTask for InitStandaloneCoinTask<Standalone>
+where
+    Standalone: InitStandaloneCoinActivationOps,
+{
+    fn initial_status(&self) -> Self::InProgressStatus {
+        <Standalone::InProgressStatus as InitStandaloneCoinInitialStatus>::initial_status()
+    }
+
+    async fn run(self, task_handle: &RpcTaskHandle<Self>) -> Result<Self::Item, MmError<Self::Error>> {
+        let ticker = self.request.ticker.clone();
+        let coin = Standalone::init_standalone_coin(
+            self.ctx.clone(),
+            ticker.clone(),
+            self.coin_conf,
+            &self.request.activation_params,
+            self.protocol_info,
+            task_handle,
+        )
+        .await?;
+
+        let result = coin
+            .get_activation_result(self.ctx.clone(), task_handle, &self.request.activation_params)
+            .await?;
+        log::info!("{} current block {}", ticker, result.current_block());
+
+        let tx_history = self.request.activation_params.tx_history();
+
+        lp_register_coin(&self.ctx, coin.into(), RegisterCoinParams { ticker, tx_history }).await?;
+
+        Ok(result)
+    }
+}
+
+pub trait InitStandaloneCoinInitialStatus {
+    fn initial_status() -> Self;
+}
diff --git a/mm2src/coins_activation/src/standalone_coin/init_standalone_coin_error.rs b/mm2src/coins_activation/src/standalone_coin/init_standalone_coin_error.rs
new file mode 100644
index 0000000000..0224603cb7
--- /dev/null
+++ b/mm2src/coins_activation/src/standalone_coin/init_standalone_coin_error.rs
@@ -0,0 +1,94 @@
+use crate::prelude::CoinConfWithProtocolError;
+use coins::CoinProtocol;
+use common::{HttpStatusCode, StatusCode};
+use derive_more::Display;
+use rpc_task::rpc_common::{RpcTaskStatusError, RpcTaskUserActionError};
+use rpc_task::{RpcTaskError, TaskId};
+use ser_error_derive::SerializeErrorType;
+use serde_derive::Serialize;
+use std::time::Duration;
+
+pub type InitStandaloneCoinStatusError = RpcTaskStatusError;
+pub type InitStandaloneCoinUserActionError = RpcTaskUserActionError;
+
+#[derive(Clone, Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum InitStandaloneCoinError {
+    NoSuchTask(TaskId),
+    #[display(fmt = "Initialization task has timed out {:?}", duration)]
+    TaskTimedOut {
+        duration: Duration,
+    },
+    CoinIsAlreadyActivated {
+        ticker: String,
+    },
+    #[display(fmt = "Coin {} config is not found", _0)]
+    CoinConfigIsNotFound(String),
+    #[display(fmt = "Coin {} protocol parsing failed: {}", ticker, error)]
+    CoinProtocolParseError {
+        ticker: String,
+        error: String,
+    },
+    #[display(fmt = "Unexpected platform protocol {:?} for {}", protocol, ticker)]
+    UnexpectedCoinProtocol {
+        ticker: String,
+        protocol: CoinProtocol,
+    },
+    #[display(fmt = "Error on platform coin {} creation: {}", ticker, error)]
+    CoinCreationError {
+        ticker: String,
+        error: String,
+    },
+    #[display(fmt = "Private key is not allowed: {}", _0)]
+    PrivKeyNotAllowed(String),
+    #[display(fmt = "Unexpected derivation method: {}", _0)]
+    UnexpectedDerivationMethod(String),
+    Transport(String),
+    Internal(String),
+}
+
+impl From<CoinConfWithProtocolError> for InitStandaloneCoinError {
+    fn from(e: CoinConfWithProtocolError) -> Self {
+        match e {
+            CoinConfWithProtocolError::ConfigIsNotFound(error) => InitStandaloneCoinError::CoinConfigIsNotFound(error),
+            CoinConfWithProtocolError::CoinProtocolParseError { ticker, err } => {
+                InitStandaloneCoinError::CoinProtocolParseError {
+                    ticker,
+                    error: err.to_string(),
+                }
+            },
+            CoinConfWithProtocolError::UnexpectedProtocol { ticker, protocol } => {
+                InitStandaloneCoinError::UnexpectedCoinProtocol { ticker, protocol }
+            },
+        }
+    }
+}
+
+impl From<RpcTaskError> for InitStandaloneCoinError {
+    fn from(e: RpcTaskError) -> Self {
+        match e {
+            RpcTaskError::NoSuchTask(task_id) => InitStandaloneCoinError::NoSuchTask(task_id),
+            RpcTaskError::Timeout(duration) => InitStandaloneCoinError::TaskTimedOut { duration },
+            rpc_internal => InitStandaloneCoinError::Internal(rpc_internal.to_string()),
+        }
+    }
+}
+
+impl HttpStatusCode for InitStandaloneCoinError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            InitStandaloneCoinError::NoSuchTask(_)
+            | InitStandaloneCoinError::CoinIsAlreadyActivated { .. }
+            | InitStandaloneCoinError::CoinConfigIsNotFound { .. }
+            | InitStandaloneCoinError::CoinProtocolParseError { .. }
+            | InitStandaloneCoinError::UnexpectedCoinProtocol { .. }
+            | InitStandaloneCoinError::CoinCreationError { .. }
+            | InitStandaloneCoinError::PrivKeyNotAllowed(_)
+            | InitStandaloneCoinError::UnexpectedDerivationMethod(_) => StatusCode::BAD_REQUEST,
+            InitStandaloneCoinError::TaskTimedOut { .. } => StatusCode::REQUEST_TIMEOUT,
+            InitStandaloneCoinError::Transport(_) | InitStandaloneCoinError::Internal(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
diff --git a/mm2src/coins_activation/src/standalone_coin/mod.rs b/mm2src/coins_activation/src/standalone_coin/mod.rs
new file mode 100644
index 0000000000..44f71c4ac7
--- /dev/null
+++ b/mm2src/coins_activation/src/standalone_coin/mod.rs
@@ -0,0 +1,8 @@
+mod init_standalone_coin;
+mod init_standalone_coin_error;
+
+pub use init_standalone_coin::{init_standalone_coin, init_standalone_coin_status, init_standalone_coin_user_action,
+                               InitStandaloneCoinActivationOps, InitStandaloneCoinInitialStatus,
+                               InitStandaloneCoinTask, InitStandaloneCoinTaskHandle,
+                               InitStandaloneCoinTaskManagerShared};
+pub use init_standalone_coin_error::InitStandaloneCoinError;
diff --git a/mm2src/coins_activation/src/token.rs b/mm2src/coins_activation/src/token.rs
new file mode 100644
index 0000000000..544c1e0b9b
--- /dev/null
+++ b/mm2src/coins_activation/src/token.rs
@@ -0,0 +1,162 @@
+/// Contains token activation traits and their implementations for various coins
+///
+use crate::prelude::*;
+use async_trait::async_trait;
+use coins::utxo::rpc_clients::UtxoRpcError;
+use coins::{lp_coinfind, lp_coinfind_or_err, BalanceError, CoinProtocol, CoinsContext, MmCoinEnum,
+            UnexpectedDerivationMethod};
+use common::{HttpStatusCode, StatusCode};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use ser_error_derive::SerializeErrorType;
+use serde_derive::{Deserialize, Serialize};
+
+pub trait TokenProtocolParams {
+    fn platform_coin_ticker(&self) -> &str;
+}
+
+#[async_trait]
+pub trait TokenActivationOps: Into<MmCoinEnum> {
+    type PlatformCoin: TryPlatformCoinFromMmCoinEnum;
+    type ActivationParams;
+    type ProtocolInfo: TokenProtocolParams + TryFromCoinProtocol;
+    type ActivationResult;
+    type ActivationError: NotMmError;
+
+    async fn enable_token(
+        ticker: String,
+        platform_coin: Self::PlatformCoin,
+        activation_params: Self::ActivationParams,
+        protocol_conf: Self::ProtocolInfo,
+    ) -> Result<(Self, Self::ActivationResult), MmError<Self::ActivationError>>;
+}
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum EnableTokenError {
+    #[display(fmt = "Token {} is already activated", _0)]
+    TokenIsAlreadyActivated(String),
+    #[display(fmt = "Token {} config is not found", _0)]
+    TokenConfigIsNotFound(String),
+    #[display(fmt = "Token {} protocol parsing failed: {}", ticker, error)]
+    TokenProtocolParseError {
+        ticker: String,
+        error: String,
+    },
+    #[display(fmt = "Unexpected token protocol {:?} for {}", protocol, ticker)]
+    UnexpectedTokenProtocol {
+        ticker: String,
+        protocol: CoinProtocol,
+    },
+    #[display(fmt = "Platform coin {} is not activated", _0)]
+    PlatformCoinIsNotActivated(String),
+    #[display(fmt = "{} is not a platform coin for token {}", platform_coin_ticker, token_ticker)]
+    UnsupportedPlatformCoin {
+        platform_coin_ticker: String,
+        token_ticker: String,
+    },
+    #[display(fmt = "{}", _0)]
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+    Transport(String),
+    Internal(String),
+}
+
+impl From<CoinConfWithProtocolError> for EnableTokenError {
+    fn from(err: CoinConfWithProtocolError) -> Self {
+        match err {
+            CoinConfWithProtocolError::ConfigIsNotFound(ticker) => EnableTokenError::TokenConfigIsNotFound(ticker),
+            CoinConfWithProtocolError::CoinProtocolParseError { ticker, err } => {
+                EnableTokenError::TokenProtocolParseError {
+                    ticker,
+                    error: err.to_string(),
+                }
+            },
+            CoinConfWithProtocolError::UnexpectedProtocol { ticker, protocol } => {
+                EnableTokenError::UnexpectedTokenProtocol { ticker, protocol }
+            },
+        }
+    }
+}
+
+impl From<BalanceError> for EnableTokenError {
+    fn from(e: BalanceError) -> Self {
+        match e {
+            BalanceError::Transport(e) | BalanceError::InvalidResponse(e) => EnableTokenError::Transport(e),
+            BalanceError::UnexpectedDerivationMethod(e) => EnableTokenError::UnexpectedDerivationMethod(e),
+            BalanceError::Internal(e) | BalanceError::WalletStorageError(e) => EnableTokenError::Internal(e),
+        }
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct EnableTokenRequest<T> {
+    ticker: String,
+    activation_params: T,
+}
+
+pub async fn enable_token<Token>(
+    ctx: MmArc,
+    req: EnableTokenRequest<Token::ActivationParams>,
+) -> Result<Token::ActivationResult, MmError<EnableTokenError>>
+where
+    Token: TokenActivationOps,
+    EnableTokenError: From<Token::ActivationError>,
+    (Token::ActivationError, EnableTokenError): NotEqual,
+{
+    if let Ok(Some(_)) = lp_coinfind(&ctx, &req.ticker).await {
+        return MmError::err(EnableTokenError::TokenIsAlreadyActivated(req.ticker));
+    }
+
+    let (_, token_protocol): (_, Token::ProtocolInfo) = coin_conf_with_protocol(&ctx, &req.ticker)?;
+
+    let platform_coin = lp_coinfind_or_err(&ctx, token_protocol.platform_coin_ticker())
+        .await
+        .mm_err(|_| EnableTokenError::PlatformCoinIsNotActivated(token_protocol.platform_coin_ticker().to_owned()))?;
+
+    let platform_coin = Token::PlatformCoin::try_from_mm_coin(platform_coin).or_mm_err(|| {
+        EnableTokenError::UnsupportedPlatformCoin {
+            platform_coin_ticker: token_protocol.platform_coin_ticker().into(),
+            token_ticker: req.ticker.clone(),
+        }
+    })?;
+
+    let (token, activation_result) =
+        Token::enable_token(req.ticker, platform_coin, req.activation_params, token_protocol).await?;
+
+    let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+    coins_ctx
+        .add_coin(token.into())
+        .await
+        .mm_err(|e| EnableTokenError::TokenIsAlreadyActivated(e.ticker))?;
+
+    Ok(activation_result)
+}
+
+impl From<UtxoRpcError> for EnableTokenError {
+    fn from(err: UtxoRpcError) -> Self {
+        match err {
+            UtxoRpcError::Transport(e) | UtxoRpcError::ResponseParseError(e) => {
+                EnableTokenError::Transport(e.to_string())
+            },
+            UtxoRpcError::InvalidResponse(e) => EnableTokenError::Transport(e),
+            UtxoRpcError::Internal(e) => EnableTokenError::Internal(e),
+        }
+    }
+}
+
+impl HttpStatusCode for EnableTokenError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            EnableTokenError::TokenIsAlreadyActivated(_)
+            | EnableTokenError::PlatformCoinIsNotActivated(_)
+            | EnableTokenError::TokenConfigIsNotFound { .. }
+            | EnableTokenError::UnexpectedTokenProtocol { .. } => StatusCode::BAD_REQUEST,
+            EnableTokenError::TokenProtocolParseError { .. }
+            | EnableTokenError::UnsupportedPlatformCoin { .. }
+            | EnableTokenError::UnexpectedDerivationMethod(_)
+            | EnableTokenError::Transport(_)
+            | EnableTokenError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
diff --git a/mm2src/coins_activation/src/utxo_activation/common_impl.rs b/mm2src/coins_activation/src/utxo_activation/common_impl.rs
new file mode 100644
index 0000000000..7e216104fd
--- /dev/null
+++ b/mm2src/coins_activation/src/utxo_activation/common_impl.rs
@@ -0,0 +1,77 @@
+use crate::standalone_coin::{InitStandaloneCoinActivationOps, InitStandaloneCoinTaskHandle};
+use crate::utxo_activation::init_utxo_standard_activation_error::InitUtxoStandardError;
+use crate::utxo_activation::init_utxo_standard_statuses::{UtxoStandardAwaitingStatus, UtxoStandardInProgressStatus,
+                                                          UtxoStandardUserAction};
+use crate::utxo_activation::utxo_standard_activation_result::UtxoStandardActivationResult;
+use coins::coin_balance::EnableCoinBalanceOps;
+use coins::hd_pubkey::RpcTaskXPubExtractor;
+use coins::utxo::UtxoActivationParams;
+use coins::{MarketCoinOps, PrivKeyActivationPolicy, PrivKeyBuildPolicy};
+use crypto::hw_rpc_task::HwConnectStatuses;
+use crypto::CryptoCtx;
+use futures::compat::Future01CompatExt;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+pub async fn get_activation_result<Coin>(
+    ctx: &MmArc,
+    coin: &Coin,
+    task_handle: &InitStandaloneCoinTaskHandle<Coin>,
+    activation_params: &UtxoActivationParams,
+) -> MmResult<UtxoStandardActivationResult, InitUtxoStandardError>
+where
+    Coin: InitStandaloneCoinActivationOps<
+            ActivationError = InitUtxoStandardError,
+            InProgressStatus = UtxoStandardInProgressStatus,
+            AwaitingStatus = UtxoStandardAwaitingStatus,
+            UserAction = UtxoStandardUserAction,
+        > + EnableCoinBalanceOps
+        + MarketCoinOps,
+{
+    let current_block =
+        coin.current_block()
+            .compat()
+            .await
+            .map_to_mm(|error| InitUtxoStandardError::CoinCreationError {
+                ticker: coin.ticker().to_owned(),
+                error,
+            })?;
+
+    // Construct an Xpub extractor without checking if the MarketMaker supports HD wallet ops.
+    // [`EnableCoinBalanceOps::enable_coin_balance`] won't just use `xpub_extractor`
+    // if the coin has been initialized with an Iguana priv key.
+    let xpub_extractor = RpcTaskXPubExtractor::new_unchecked(ctx, task_handle, xpub_extractor_rpc_statuses());
+    task_handle.update_in_progress_status(UtxoStandardInProgressStatus::RequestingWalletBalance)?;
+    let wallet_balance = coin
+        .enable_coin_balance(&xpub_extractor, activation_params.scan_policy)
+        .await
+        .mm_err(|error| InitUtxoStandardError::CoinCreationError {
+            ticker: coin.ticker().to_owned(),
+            error: error.to_string(),
+        })?;
+    task_handle.update_in_progress_status(UtxoStandardInProgressStatus::ActivatingCoin)?;
+
+    let result = UtxoStandardActivationResult {
+        current_block,
+        wallet_balance,
+    };
+    Ok(result)
+}
+
+pub fn xpub_extractor_rpc_statuses() -> HwConnectStatuses<UtxoStandardInProgressStatus, UtxoStandardAwaitingStatus> {
+    HwConnectStatuses {
+        on_connect: UtxoStandardInProgressStatus::WaitingForTrezorToConnect,
+        on_connected: UtxoStandardInProgressStatus::ActivatingCoin,
+        on_connection_failed: UtxoStandardInProgressStatus::Finishing,
+        on_button_request: UtxoStandardInProgressStatus::WaitingForUserToConfirmPubkey,
+        on_pin_request: UtxoStandardAwaitingStatus::WaitForTrezorPin,
+        on_ready: UtxoStandardInProgressStatus::ActivatingCoin,
+    }
+}
+
+pub fn priv_key_build_policy(crypto_ctx: &CryptoCtx, activation_policy: PrivKeyActivationPolicy) -> PrivKeyBuildPolicy {
+    match activation_policy {
+        PrivKeyActivationPolicy::IguanaPrivKey => PrivKeyBuildPolicy::iguana_priv_key(crypto_ctx),
+        PrivKeyActivationPolicy::Trezor => PrivKeyBuildPolicy::Trezor,
+    }
+}
diff --git a/mm2src/coins_activation/src/utxo_activation/init_qtum_activation.rs b/mm2src/coins_activation/src/utxo_activation/init_qtum_activation.rs
new file mode 100644
index 0000000000..116f8cf4f5
--- /dev/null
+++ b/mm2src/coins_activation/src/utxo_activation/init_qtum_activation.rs
@@ -0,0 +1,77 @@
+use crate::context::CoinsActivationContext;
+use crate::prelude::TryFromCoinProtocol;
+use crate::standalone_coin::{InitStandaloneCoinActivationOps, InitStandaloneCoinTaskHandle,
+                             InitStandaloneCoinTaskManagerShared};
+use crate::utxo_activation::common_impl::{get_activation_result, priv_key_build_policy};
+use crate::utxo_activation::init_utxo_standard_activation_error::InitUtxoStandardError;
+use crate::utxo_activation::init_utxo_standard_statuses::{UtxoStandardAwaitingStatus, UtxoStandardInProgressStatus,
+                                                          UtxoStandardUserAction};
+use crate::utxo_activation::utxo_standard_activation_result::UtxoStandardActivationResult;
+use async_trait::async_trait;
+use coins::utxo::qtum::{QtumCoin, QtumCoinBuilder};
+use coins::utxo::utxo_builder::UtxoCoinBuilder;
+use coins::utxo::UtxoActivationParams;
+use coins::CoinProtocol;
+use crypto::CryptoCtx;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+
+pub type QtumTaskManagerShared = InitStandaloneCoinTaskManagerShared<QtumCoin>;
+pub type QtumRpcTaskHandle = InitStandaloneCoinTaskHandle<QtumCoin>;
+
+pub struct QtumProtocolInfo;
+
+impl TryFromCoinProtocol for QtumProtocolInfo {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::QTUM => Ok(QtumProtocolInfo),
+            protocol => MmError::err(protocol),
+        }
+    }
+}
+
+#[async_trait]
+impl InitStandaloneCoinActivationOps for QtumCoin {
+    type ActivationRequest = UtxoActivationParams;
+    type StandaloneProtocol = QtumProtocolInfo;
+    type ActivationResult = UtxoStandardActivationResult;
+    type ActivationError = InitUtxoStandardError;
+    type InProgressStatus = UtxoStandardInProgressStatus;
+    type AwaitingStatus = UtxoStandardAwaitingStatus;
+    type UserAction = UtxoStandardUserAction;
+
+    fn rpc_task_manager(activation_ctx: &CoinsActivationContext) -> &QtumTaskManagerShared {
+        &activation_ctx.init_qtum_task_manager
+    }
+
+    async fn init_standalone_coin(
+        ctx: MmArc,
+        ticker: String,
+        coin_conf: Json,
+        activation_request: &Self::ActivationRequest,
+        _protocol_info: Self::StandaloneProtocol,
+        _task_handle: &QtumRpcTaskHandle,
+    ) -> Result<Self, MmError<Self::ActivationError>> {
+        let crypto_ctx = CryptoCtx::from_ctx(&ctx)?;
+        let priv_key_policy = priv_key_build_policy(&crypto_ctx, activation_request.priv_key_policy);
+
+        let coin = QtumCoinBuilder::new(&ctx, &ticker, &coin_conf, activation_request, priv_key_policy)
+            .build()
+            .await
+            .mm_err(|e| InitUtxoStandardError::from_build_err(e, ticker.clone()))?;
+        Ok(coin)
+    }
+
+    async fn get_activation_result(
+        &self,
+        ctx: MmArc,
+        task_handle: &QtumRpcTaskHandle,
+        activation_request: &Self::ActivationRequest,
+    ) -> MmResult<Self::ActivationResult, InitUtxoStandardError> {
+        get_activation_result(&ctx, self, task_handle, activation_request).await
+    }
+}
diff --git a/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation.rs b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation.rs
new file mode 100644
index 0000000000..26cbd372c2
--- /dev/null
+++ b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation.rs
@@ -0,0 +1,84 @@
+use crate::context::CoinsActivationContext;
+use crate::prelude::TryFromCoinProtocol;
+use crate::standalone_coin::{InitStandaloneCoinActivationOps, InitStandaloneCoinTaskHandle,
+                             InitStandaloneCoinTaskManagerShared};
+use crate::utxo_activation::common_impl::{get_activation_result, priv_key_build_policy};
+use crate::utxo_activation::init_utxo_standard_activation_error::InitUtxoStandardError;
+use crate::utxo_activation::init_utxo_standard_statuses::{UtxoStandardAwaitingStatus, UtxoStandardInProgressStatus,
+                                                          UtxoStandardUserAction};
+use crate::utxo_activation::utxo_standard_activation_result::UtxoStandardActivationResult;
+use async_trait::async_trait;
+use coins::utxo::utxo_builder::{UtxoArcBuilder, UtxoCoinBuilder};
+use coins::utxo::utxo_standard::UtxoStandardCoin;
+use coins::utxo::UtxoActivationParams;
+use coins::CoinProtocol;
+use crypto::CryptoCtx;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+
+pub type UtxoStandardTaskManagerShared = InitStandaloneCoinTaskManagerShared<UtxoStandardCoin>;
+pub type UtxoStandardRpcTaskHandle = InitStandaloneCoinTaskHandle<UtxoStandardCoin>;
+
+pub struct UtxoStandardProtocolInfo;
+
+impl TryFromCoinProtocol for UtxoStandardProtocolInfo {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::UTXO => Ok(UtxoStandardProtocolInfo),
+            protocol => MmError::err(protocol),
+        }
+    }
+}
+
+#[async_trait]
+impl InitStandaloneCoinActivationOps for UtxoStandardCoin {
+    type ActivationRequest = UtxoActivationParams;
+    type StandaloneProtocol = UtxoStandardProtocolInfo;
+    type ActivationResult = UtxoStandardActivationResult;
+    type ActivationError = InitUtxoStandardError;
+    type InProgressStatus = UtxoStandardInProgressStatus;
+    type AwaitingStatus = UtxoStandardAwaitingStatus;
+    type UserAction = UtxoStandardUserAction;
+
+    fn rpc_task_manager(activation_ctx: &CoinsActivationContext) -> &UtxoStandardTaskManagerShared {
+        &activation_ctx.init_utxo_standard_task_manager
+    }
+
+    async fn init_standalone_coin(
+        ctx: MmArc,
+        ticker: String,
+        coin_conf: Json,
+        activation_request: &Self::ActivationRequest,
+        _protocol_info: Self::StandaloneProtocol,
+        _task_handle: &UtxoStandardRpcTaskHandle,
+    ) -> MmResult<Self, InitUtxoStandardError> {
+        let crypto_ctx = CryptoCtx::from_ctx(&ctx)?;
+        let priv_key_policy = priv_key_build_policy(&crypto_ctx, activation_request.priv_key_policy);
+
+        let coin = UtxoArcBuilder::new(
+            &ctx,
+            &ticker,
+            &coin_conf,
+            activation_request,
+            priv_key_policy,
+            UtxoStandardCoin::from,
+        )
+        .build()
+        .await
+        .mm_err(|e| InitUtxoStandardError::from_build_err(e, ticker.clone()))?;
+        Ok(coin)
+    }
+
+    async fn get_activation_result(
+        &self,
+        ctx: MmArc,
+        task_handle: &UtxoStandardRpcTaskHandle,
+        activation_request: &Self::ActivationRequest,
+    ) -> MmResult<Self::ActivationResult, InitUtxoStandardError> {
+        get_activation_result(&ctx, self, task_handle, activation_request).await
+    }
+}
diff --git a/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation_error.rs b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation_error.rs
new file mode 100644
index 0000000000..6e8fac4834
--- /dev/null
+++ b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation_error.rs
@@ -0,0 +1,79 @@
+use crate::standalone_coin::InitStandaloneCoinError;
+use coins::utxo::utxo_builder::UtxoCoinBuildError;
+use coins::RegisterCoinError;
+use crypto::CryptoInitError;
+use derive_more::Display;
+use rpc_task::RpcTaskError;
+use ser_error_derive::SerializeErrorType;
+use serde_derive::Serialize;
+use std::time::Duration;
+
+#[derive(Clone, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum InitUtxoStandardError {
+    #[display(fmt = "Initialization task has timed out {:?}", duration)]
+    TaskTimedOut {
+        duration: Duration,
+    },
+    CoinIsAlreadyActivated {
+        ticker: String,
+    },
+    #[display(fmt = "Error on platform coin {} creation: {}", ticker, error)]
+    CoinCreationError {
+        ticker: String,
+        error: String,
+    },
+    Internal(String),
+}
+
+impl From<RpcTaskError> for InitUtxoStandardError {
+    fn from(rpc_err: RpcTaskError) -> Self {
+        match rpc_err {
+            RpcTaskError::Timeout(duration) => InitUtxoStandardError::TaskTimedOut { duration },
+            internal_error => InitUtxoStandardError::Internal(internal_error.to_string()),
+        }
+    }
+}
+
+impl From<CryptoInitError> for InitUtxoStandardError {
+    /// `CryptoCtx` is expected to be initialized already.
+    fn from(crypto_err: CryptoInitError) -> Self { InitUtxoStandardError::Internal(crypto_err.to_string()) }
+}
+
+impl From<InitUtxoStandardError> for InitStandaloneCoinError {
+    fn from(e: InitUtxoStandardError) -> Self {
+        match e {
+            InitUtxoStandardError::TaskTimedOut { duration } => InitStandaloneCoinError::TaskTimedOut { duration },
+            InitUtxoStandardError::CoinIsAlreadyActivated { ticker } => {
+                InitStandaloneCoinError::CoinIsAlreadyActivated { ticker }
+            },
+            InitUtxoStandardError::CoinCreationError { ticker, error } => {
+                InitStandaloneCoinError::CoinCreationError { ticker, error }
+            },
+            InitUtxoStandardError::Internal(internal) => InitStandaloneCoinError::Internal(internal),
+        }
+    }
+}
+
+impl InitUtxoStandardError {
+    pub fn from_build_err(build_err: UtxoCoinBuildError, ticker: String) -> Self {
+        match build_err {
+            UtxoCoinBuildError::Internal(internal) => InitUtxoStandardError::Internal(internal),
+            build_err => InitUtxoStandardError::CoinCreationError {
+                ticker,
+                error: build_err.to_string(),
+            },
+        }
+    }
+}
+
+impl From<RegisterCoinError> for InitUtxoStandardError {
+    fn from(reg_err: RegisterCoinError) -> InitUtxoStandardError {
+        match reg_err {
+            RegisterCoinError::CoinIsInitializedAlready { coin } => {
+                InitUtxoStandardError::CoinIsAlreadyActivated { ticker: coin }
+            },
+            RegisterCoinError::Internal(internal) => InitUtxoStandardError::Internal(internal),
+        }
+    }
+}
diff --git a/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_statuses.rs b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_statuses.rs
new file mode 100644
index 0000000000..92ab03da56
--- /dev/null
+++ b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_statuses.rs
@@ -0,0 +1,21 @@
+use crate::standalone_coin::InitStandaloneCoinInitialStatus;
+use crypto::hw_rpc_task::{HwRpcTaskAwaitingStatus, HwRpcTaskUserAction};
+use serde_derive::Serialize;
+
+pub type UtxoStandardAwaitingStatus = HwRpcTaskAwaitingStatus;
+pub type UtxoStandardUserAction = HwRpcTaskUserAction;
+
+#[derive(Clone, Serialize)]
+pub enum UtxoStandardInProgressStatus {
+    ActivatingCoin,
+    RequestingWalletBalance,
+    Finishing,
+    /// This status doesn't require the user to send `UserAction`,
+    /// but it tells the user that he should confirm/decline an address on his device.
+    WaitingForTrezorToConnect,
+    WaitingForUserToConfirmPubkey,
+}
+
+impl InitStandaloneCoinInitialStatus for UtxoStandardInProgressStatus {
+    fn initial_status() -> Self { UtxoStandardInProgressStatus::ActivatingCoin }
+}
diff --git a/mm2src/coins_activation/src/utxo_activation/mod.rs b/mm2src/coins_activation/src/utxo_activation/mod.rs
new file mode 100644
index 0000000000..ef86599a76
--- /dev/null
+++ b/mm2src/coins_activation/src/utxo_activation/mod.rs
@@ -0,0 +1,9 @@
+mod common_impl;
+mod init_qtum_activation;
+mod init_utxo_standard_activation;
+mod init_utxo_standard_activation_error;
+mod init_utxo_standard_statuses;
+mod utxo_standard_activation_result;
+
+pub use init_qtum_activation::QtumTaskManagerShared;
+pub use init_utxo_standard_activation::UtxoStandardTaskManagerShared;
diff --git a/mm2src/coins_activation/src/utxo_activation/utxo_standard_activation_result.rs b/mm2src/coins_activation/src/utxo_activation/utxo_standard_activation_result.rs
new file mode 100644
index 0000000000..152a4786d8
--- /dev/null
+++ b/mm2src/coins_activation/src/utxo_activation/utxo_standard_activation_result.rs
@@ -0,0 +1,13 @@
+use crate::prelude::CurrentBlock;
+use coins::coin_balance::EnableCoinBalance;
+use serde_derive::Serialize;
+
+#[derive(Clone, Serialize)]
+pub struct UtxoStandardActivationResult {
+    pub current_block: u64,
+    pub wallet_balance: EnableCoinBalance,
+}
+
+impl CurrentBlock for UtxoStandardActivationResult {
+    fn current_block(&self) -> u64 { self.current_block }
+}
diff --git a/mm2src/coins_activation/src/z_coin_activation.rs b/mm2src/coins_activation/src/z_coin_activation.rs
new file mode 100644
index 0000000000..532bb0fc0f
--- /dev/null
+++ b/mm2src/coins_activation/src/z_coin_activation.rs
@@ -0,0 +1,231 @@
+use crate::context::CoinsActivationContext;
+use crate::prelude::*;
+use crate::standalone_coin::{InitStandaloneCoinActivationOps, InitStandaloneCoinError,
+                             InitStandaloneCoinInitialStatus, InitStandaloneCoinTaskHandle,
+                             InitStandaloneCoinTaskManagerShared};
+use async_trait::async_trait;
+use coins::coin_balance::{EnableCoinBalance, IguanaWalletBalance};
+use coins::z_coin::{z_coin_from_conf_and_params, BlockchainScanStopped, SyncStatus, ZCoin, ZCoinBuildError,
+                    ZcoinActivationParams, ZcoinConsensusParams};
+use coins::{BalanceError, CoinProtocol, MarketCoinOps, RegisterCoinError};
+use crypto::hw_rpc_task::{HwRpcTaskAwaitingStatus, HwRpcTaskUserAction};
+use crypto::CryptoInitError;
+use derive_more::Display;
+use futures::compat::Future01CompatExt;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::RpcTaskError;
+use ser_error_derive::SerializeErrorType;
+use serde_derive::Serialize;
+use serde_json::Value as Json;
+use std::time::Duration;
+
+pub type ZcoinTaskManagerShared = InitStandaloneCoinTaskManagerShared<ZCoin>;
+pub type ZcoinRpcTaskHandle = InitStandaloneCoinTaskHandle<ZCoin>;
+pub type ZcoinAwaitingStatus = HwRpcTaskAwaitingStatus;
+pub type ZcoinUserAction = HwRpcTaskUserAction;
+
+#[derive(Clone, Serialize)]
+pub struct ZcoinActivationResult {
+    pub ticker: String,
+    pub current_block: u64,
+    pub wallet_balance: EnableCoinBalance,
+}
+
+impl CurrentBlock for ZcoinActivationResult {
+    fn current_block(&self) -> u64 { self.current_block }
+}
+
+#[derive(Clone, Serialize)]
+#[non_exhaustive]
+pub enum ZcoinInProgressStatus {
+    ActivatingCoin,
+    UpdatingBlocksCache {
+        current_scanned_block: u64,
+        latest_block: u64,
+    },
+    BuildingWalletDb,
+    RequestingWalletBalance,
+    Finishing,
+    /// This status doesn't require the user to send `UserAction`,
+    /// but it tells the user that he should confirm/decline an address on his device.
+    WaitingForTrezorToConnect,
+    WaitingForUserToConfirmPubkey,
+}
+
+impl InitStandaloneCoinInitialStatus for ZcoinInProgressStatus {
+    fn initial_status() -> Self { ZcoinInProgressStatus::ActivatingCoin }
+}
+
+#[derive(Clone, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+#[non_exhaustive]
+pub enum ZcoinInitError {
+    #[display(fmt = "Error on coin {} creation: {}", ticker, error)]
+    CoinCreationError {
+        ticker: String,
+        error: String,
+    },
+    CoinIsAlreadyActivated {
+        ticker: String,
+    },
+    HardwareWalletsAreNotSupportedYet,
+    #[display(fmt = "Initialization task has timed out {:?}", duration)]
+    TaskTimedOut {
+        duration: Duration,
+    },
+    CouldNotGetBalance(String),
+    CouldNotGetBlockCount(String),
+    Internal(String),
+}
+
+impl ZcoinInitError {
+    pub fn from_build_err(build_err: ZCoinBuildError, ticker: String) -> Self {
+        ZcoinInitError::CoinCreationError {
+            ticker,
+            error: build_err.to_string(),
+        }
+    }
+}
+
+impl From<BalanceError> for ZcoinInitError {
+    fn from(err: BalanceError) -> Self { ZcoinInitError::CouldNotGetBalance(err.to_string()) }
+}
+
+impl From<RegisterCoinError> for ZcoinInitError {
+    fn from(reg_err: RegisterCoinError) -> ZcoinInitError {
+        match reg_err {
+            RegisterCoinError::CoinIsInitializedAlready { coin } => {
+                ZcoinInitError::CoinIsAlreadyActivated { ticker: coin }
+            },
+            RegisterCoinError::Internal(internal) => ZcoinInitError::Internal(internal),
+        }
+    }
+}
+
+impl From<RpcTaskError> for ZcoinInitError {
+    fn from(rpc_err: RpcTaskError) -> Self {
+        match rpc_err {
+            RpcTaskError::Timeout(duration) => ZcoinInitError::TaskTimedOut { duration },
+            internal_error => ZcoinInitError::Internal(internal_error.to_string()),
+        }
+    }
+}
+
+impl From<CryptoInitError> for ZcoinInitError {
+    fn from(err: CryptoInitError) -> Self { ZcoinInitError::Internal(err.to_string()) }
+}
+
+impl From<BlockchainScanStopped> for ZcoinInitError {
+    fn from(e: BlockchainScanStopped) -> Self { ZcoinInitError::Internal(e.to_string()) }
+}
+
+impl From<ZcoinInitError> for InitStandaloneCoinError {
+    fn from(err: ZcoinInitError) -> Self {
+        match err {
+            ZcoinInitError::CoinCreationError { ticker, error } => {
+                InitStandaloneCoinError::CoinCreationError { ticker, error }
+            },
+            ZcoinInitError::CoinIsAlreadyActivated { ticker } => {
+                InitStandaloneCoinError::CoinIsAlreadyActivated { ticker }
+            },
+            ZcoinInitError::HardwareWalletsAreNotSupportedYet => {
+                InitStandaloneCoinError::Internal("Hardware wallets are not supported yet".into())
+            },
+            ZcoinInitError::TaskTimedOut { duration } => InitStandaloneCoinError::TaskTimedOut { duration },
+            ZcoinInitError::CouldNotGetBalance(e) | ZcoinInitError::CouldNotGetBlockCount(e) => {
+                InitStandaloneCoinError::Transport(e)
+            },
+            ZcoinInitError::Internal(e) => InitStandaloneCoinError::Internal(e),
+        }
+    }
+}
+
+impl TryFromCoinProtocol for ZcoinConsensusParams {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::ZHTLC { consensus_params } => Ok(consensus_params),
+            protocol => MmError::err(protocol),
+        }
+    }
+}
+
+#[async_trait]
+impl InitStandaloneCoinActivationOps for ZCoin {
+    type ActivationRequest = ZcoinActivationParams;
+    type StandaloneProtocol = ZcoinConsensusParams;
+    type ActivationResult = ZcoinActivationResult;
+    type ActivationError = ZcoinInitError;
+    type InProgressStatus = ZcoinInProgressStatus;
+    type AwaitingStatus = ZcoinAwaitingStatus;
+    type UserAction = ZcoinUserAction;
+
+    fn rpc_task_manager(activation_ctx: &CoinsActivationContext) -> &ZcoinTaskManagerShared {
+        &activation_ctx.init_z_coin_task_manager
+    }
+
+    async fn init_standalone_coin(
+        ctx: MmArc,
+        ticker: String,
+        coin_conf: Json,
+        activation_request: &ZcoinActivationParams,
+        protocol_info: ZcoinConsensusParams,
+        task_handle: &ZcoinRpcTaskHandle,
+    ) -> MmResult<Self, ZcoinInitError> {
+        let secp_privkey = ctx.secp256k1_key_pair().private().secret;
+        let coin = z_coin_from_conf_and_params(
+            &ctx,
+            &ticker,
+            &coin_conf,
+            activation_request,
+            protocol_info,
+            secp_privkey.as_slice(),
+        )
+        .await
+        .mm_err(|e| ZcoinInitError::from_build_err(e, ticker))?;
+
+        loop {
+            let in_progress_status = match coin.sync_status().await? {
+                SyncStatus::UpdatingBlocksCache {
+                    current_scanned_block,
+                    latest_block,
+                } => ZcoinInProgressStatus::UpdatingBlocksCache {
+                    current_scanned_block,
+                    latest_block,
+                },
+                SyncStatus::BuildingWalletDb => ZcoinInProgressStatus::BuildingWalletDb,
+                SyncStatus::Finished { .. } => break,
+            };
+            task_handle.update_in_progress_status(in_progress_status)?;
+        }
+
+        Ok(coin)
+    }
+
+    async fn get_activation_result(
+        &self,
+        _ctx: MmArc,
+        task_handle: &ZcoinRpcTaskHandle,
+        _activation_request: &Self::ActivationRequest,
+    ) -> MmResult<Self::ActivationResult, ZcoinInitError> {
+        task_handle.update_in_progress_status(ZcoinInProgressStatus::RequestingWalletBalance)?;
+        let current_block = self
+            .current_block()
+            .compat()
+            .await
+            .map_to_mm(ZcoinInitError::CouldNotGetBlockCount)?;
+
+        let balance = self.my_balance().compat().await?;
+        Ok(ZcoinActivationResult {
+            ticker: self.ticker().into(),
+            current_block,
+            wallet_balance: EnableCoinBalance::Iguana(IguanaWalletBalance {
+                address: self.my_z_address_encoded(),
+                balance,
+            }),
+        })
+    }
+}
diff --git a/mm2src/common/Cargo.toml b/mm2src/common/Cargo.toml
index d7fe88d098..ddb1e0015c 100644
--- a/mm2src/common/Cargo.toml
+++ b/mm2src/common/Cargo.toml
@@ -9,62 +9,51 @@ name = "common"
 path = "common.rs"
 doctest = false
 
+[features]
+track-ctx-pointer = ["shared_ref_counter/enable", "shared_ref_counter/log"]
+
 [dependencies]
 arrayref = "0.3"
-async-std = { version = "1.5", features = ["unstable"] }
 async-trait = "0.1"
 backtrace = "0.3"
 base64 = "0.10.0"
-bigdecimal = { version = "0.1", features = ["serde"] }
-bitcrypto = { path = "../mm2_bitcoin/crypto" }
-bytes = "0.4"
+bytes = "1.1"
 cfg-if = "1.0"
 crossbeam = "0.7"
-derive_more = "0.99"
-findshlibs = "0.5"
 fnv = "1.0.6"
-fomat-macros = "0.2"
 futures01 = { version = "0.1", package = "futures" }
 futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
 futures-cpupool = "0.1"
-hex = "0.3.2"
+hex = "0.4.2"
 http = "0.2"
 http-body = "0.1"
-itertools = "0.8"
-keys = { path = "../mm2_bitcoin/keys" }
+itertools = "0.10"
 lazy_static = "1.4"
+lightning = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106" }
 log = "0.4.8"
-num-bigint = { version = "0.2", features = ["serde", "std"] }
-num-rational = { version = "0.2", features = ["serde", "bigint", "bigint-std"] }
-num-traits = "0.2"
-parking_lot = { version = "0.11", features = ["nightly"] }
+parking_lot = { version = "0.12.0", features = ["nightly"] }
 parking_lot_core = { version = "0.6", features = ["nightly"] }
-paste = "1.0"
-primitives = { path = "../mm2_bitcoin/primitives" }
 rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
-regex = "1"
 serde = "1"
-serde_bytes = "0.11"
 serde_derive = "1"
-serde_json = { version = "1.0", features = ["raw_value", "preserve_order"] }
-serde_repr = "0.1.6"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
 ser_error = { path = "../derives/ser_error" }
 ser_error_derive = { path = "../derives/ser_error_derive" }
+shared_ref_counter = { path = "shared_ref_counter", optional = true }
 uuid = { version = "0.7", features = ["serde", "v4"] }
 wasm-timer = "0.2.4"
-winapi = "0.3"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 chrono = { version = "0.4", features = ["wasmbind"] }
 getrandom = { version = "0.2", features = ["js"] } # see https://docs.rs/getrandom/0.2.0/getrandom/#webassembly-support
 gstuff = { version = "0.7", features = ["nightly"] }
-indexmap = "=1.6.0" # see https://github.com/KomodoPlatform/atomicDEX-API/issues/1042
 js-sys = "0.3.27"
-serde_bencode = "0.2"
-wasm-bindgen = { version = "0.2.50", features = ["serde-serialize", "nightly"] }
+serde_repr = "0.1.6"
+serde-wasm-bindgen = "0.4.3"
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
 wasm-bindgen-futures = "0.4.21"
 wasm-bindgen-test = { version = "0.3.2" }
-web-sys = { version = "0.3.4", features = ["console", "CloseEvent", "DomException", "ErrorEvent", "IdbDatabase", "IdbFactory", "IdbIndex", "IdbIndexParameters", "IdbObjectStore", "IdbObjectStoreParameters", "IdbOpenDbRequest", "IdbTransaction", "IdbTransactionMode", "IdbVersionChangeEvent", "MessageEvent", "WebSocket"] }
+web-sys = { version = "0.3.55", features = ["console", "CloseEvent", "DomException", "ErrorEvent", "IdbDatabase", "IdbCursor", "IdbCursorWithValue", "IdbFactory", "IdbIndex", "IdbIndexParameters", "IdbObjectStore", "IdbObjectStoreParameters", "IdbOpenDbRequest", "IdbKeyRange", "IdbTransaction", "IdbTransactionMode", "IdbVersionChangeEvent", "MessageEvent", "WebSocket"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 anyhow = "1.0"
@@ -75,17 +64,21 @@ hdrhistogram = { version = "7.0", default-features = false, features = ["sync"]
 hyper = { version = "0.14.11", features = ["client", "http2", "server", "tcp"] }
 # using webpki-tokio to avoid rejecting valid certificates
 # got "invalid certificate: UnknownIssuer" for https://ropsten.infura.io on iOS using default-features
-hyper-rustls = { version = "0.22", default-features = false, features = ["webpki-tokio"] }
+hyper-rustls = { version = "0.23", default-features = false, features = ["http1", "http2", "webpki-tokio"] }
 libc = { version = "0.2" }
-log4rs = { version = "1.0" }
+log4rs = { version = "1.0", default-features = false, features = ["console_appender", "pattern_encoder"] }
 metrics = { version = "0.12" }
 metrics-runtime = { version = "0.13", default-features = false, features = ["metrics-observer-prometheus"] }
 metrics-core = { version = "0.5" }
 metrics-util = { version = "0.3" }
-rusqlite = { version = "0.24.2", features = ["bundled"] }
 tokio = { version = "1.7", features = ["io-util", "rt-multi-thread", "net"] }
 
+[target.'cfg(windows)'.dependencies]
+winapi = "0.3"
+
+[target.'cfg(not(windows))'.dependencies]
+findshlibs = "0.5"
+
 [build-dependencies]
 cc = "1.0"
-fomat-macros = "0.3"
 gstuff = { version = "0.7", features = ["nightly"] }
diff --git a/mm2src/common/build.rs b/mm2src/common/build.rs
index 2236e5916d..2e9125e3ab 100644
--- a/mm2src/common/build.rs
+++ b/mm2src/common/build.rs
@@ -9,8 +9,6 @@
 
 #![allow(uncommon_codepoints)]
 
-#[macro_use] extern crate fomat_macros;
-
 use gstuff::{last_modified_sec, slurp};
 use std::env::{self};
 use std::fs;
@@ -34,7 +32,7 @@ fn _in_place(path: &dyn AsRef<Path>, update: &mut dyn FnMut(Vec<u8>) -> Vec<u8>)
     }
     let updated = update(bulk.clone());
     if bulk != updated {
-        let tmp = dir.join(fomat! ((name) ".tmp"));
+        let tmp = dir.join(format!("{}.tmp", name));
         {
             let mut file = fs::File::create(&tmp).unwrap();
             file.write_all(&updated).unwrap();
@@ -104,6 +102,6 @@ fn main() {
     // cf. https://github.com/rust-lang/cargo/issues/4514#issuecomment-330976605
     //     https://github.com/rust-lang/cargo/issues/4213#issuecomment-310697337
     // `RUST_LOG=cargo::core::compiler::fingerprint cargo build` shows the fingerprit files used.
-
+    println!("cargo:rerun-if-changed=seh.c");
     build_c_code();
 }
diff --git a/mm2src/common/common.rs b/mm2src/common/common.rs
index d6c94fdb87..4ab31475c3 100644
--- a/mm2src/common/common.rs
+++ b/mm2src/common/common.rs
@@ -19,28 +19,11 @@
 #![feature(drain_filter)]
 
 #[macro_use] extern crate arrayref;
-#[macro_use] extern crate fomat_macros;
 #[macro_use] extern crate gstuff;
 #[macro_use] extern crate lazy_static;
 #[macro_use] pub extern crate serde_derive;
 #[macro_use] pub extern crate serde_json;
-#[cfg(test)]
-#[macro_use]
-extern crate ser_error_derive;
-
-/// Fills a C character array with a zero-terminated C string,
-/// returning an error if the string is too large.
-#[macro_export]
-#[allow(unused_unsafe)]
-macro_rules! safecopy {
-    ($to: expr, $format: expr, $($args: tt)+) => {{
-        use ::std::io::Write;
-        let to: &mut [i8] = &mut $to[..];  // Check the type.
-        let to: &mut [u8] = unsafe {::std::mem::transmute (to)};  // c_char to Rust.
-        let mut wr = ::std::io::Cursor::new (to);
-        write! (&mut wr, concat! ($format, "\0"), $($args)+)
-    }}
-}
+#[macro_use] extern crate ser_error_derive;
 
 /// Implements a `From` for `enum` with a variant name matching the name of the type stored.
 ///
@@ -58,6 +41,16 @@ macro_rules! ifrom {
     };
 }
 
+/// This macro is used to implement `From<$t>` for `$name`, where `$name($inner)`.
+#[macro_export]
+macro_rules! ifrom_inner {
+    ($name:ident, $inner:ident, $($t:ty)*) => ($(
+        impl From<$t> for $name {
+            fn from(num: $t) -> $name { $name($inner::from(num)) }
+        }
+    )*);
+}
+
 #[macro_export]
 macro_rules! cfg_wasm32 {
     ($($tokens:tt)*) => {
@@ -80,6 +73,17 @@ macro_rules! cfg_native {
     };
 }
 
+/// Returns a JSON error HyRes on a failure.
+#[macro_export]
+macro_rules! try_h {
+    ($e: expr) => {
+        match $e {
+            Ok(ok) => ok,
+            Err(err) => return $crate::rpc_err_response(500, &ERRL!("{}", err)),
+        }
+    };
+}
+
 #[macro_use]
 pub mod jsonrpc_client;
 #[macro_use]
@@ -87,76 +91,67 @@ pub mod log;
 #[macro_use]
 pub mod mm_metrics;
 
-pub mod big_int_str;
 pub mod crash_reports;
 pub mod custom_futures;
+pub mod custom_iter;
 pub mod duplex_mutex;
-pub mod file_lock;
-#[cfg(not(target_arch = "wasm32"))] pub mod for_c;
-pub mod iguana_utils;
-pub mod mm_ctx;
-#[path = "mm_error/mm_error.rs"] pub mod mm_error;
-pub mod mm_number;
-pub mod privkey;
 pub mod seri;
 #[path = "patterns/state_machine.rs"] pub mod state_machine;
 pub mod time_cache;
 
-#[cfg(target_arch = "wasm32")] pub mod wasm_indexed_db;
-#[cfg(target_arch = "wasm32")] pub mod wasm_rpc;
+#[cfg(not(target_arch = "wasm32"))]
+#[path = "executor/native_executor.rs"]
+pub mod executor;
+
+#[cfg(not(target_arch = "wasm32"))]
+#[path = "wio.rs"]
+pub mod wio;
+
 #[cfg(target_arch = "wasm32")]
-#[path = "transport/wasm_ws.rs"]
-pub mod wasm_ws;
-
-use bigdecimal::BigDecimal;
-use futures::compat::Future01CompatExt;
-use futures::future::FutureExt;
-use futures::task::Waker;
-use futures01::{future, task::Task, Future};
-use gstuff::binprint;
-use hex::FromHex;
+#[path = "executor/wasm_executor.rs"]
+pub mod executor;
+
+#[cfg(target_arch = "wasm32")] pub mod wasm;
+#[cfg(target_arch = "wasm32")] pub use wasm::*;
+
+use backtrace::SymbolName;
+pub use futures::compat::Future01CompatExt;
+use futures::future::{abortable, AbortHandle, FutureExt};
+use futures01::{future, Future};
 use http::header::{HeaderValue, CONTENT_TYPE};
-use http::{HeaderMap, Request, Response, StatusCode};
+use http::Response;
 use parking_lot::{Mutex as PaMutex, MutexGuard as PaMutexGuard};
 use rand::{rngs::SmallRng, SeedableRng};
 use serde::{de, ser};
-use serde_bytes::ByteBuf;
 use serde_json::{self as json, Value as Json};
-use std::collections::HashMap;
-use std::ffi::{CStr, OsStr};
 use std::fmt::{self, Write as FmtWrite};
-use std::fs;
-use std::fs::DirEntry;
 use std::future::Future as Future03;
 use std::io::Write;
 use std::iter::Peekable;
-use std::mem::{forget, size_of, zeroed};
-use std::net::SocketAddr;
+use std::mem::{forget, zeroed};
+use std::num::NonZeroUsize;
 use std::ops::{Add, Deref, Div, RangeInclusive};
-use std::os::raw::{c_char, c_void};
-use std::path::{Path, PathBuf};
+use std::os::raw::c_void;
+use std::panic::{set_hook, PanicInfo};
 use std::ptr::read_volatile;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-use std::sync::{Arc, Mutex};
+use std::sync::atomic::Ordering;
 use uuid::Uuid;
 
+use crate::executor::spawn;
+pub use http::StatusCode;
 pub use serde;
 
 cfg_native! {
     pub use gstuff::{now_float, now_ms};
-    pub use rusqlite;
-
     #[cfg(not(windows))]
     use findshlibs::{IterationControl, Segment, SharedLibrary, TargetSharedLibrary};
-    use libc::{free, malloc};
     use std::env;
-    use std::io::Read;
+    use std::path::PathBuf;
+    use std::sync::Mutex;
 }
 
 cfg_wasm32! {
-    use futures::task::{Context, Poll as Poll03};
-    use std::pin::Pin;
-    use wasm_bindgen::prelude::*;
+    use std::sync::atomic::AtomicUsize;
 }
 
 pub const SATOSHIS: u64 = 100_000_000;
@@ -169,6 +164,8 @@ lazy_static! {
 
 pub auto trait NotSame {}
 impl<X> !NotSame for (X, X) {}
+// Makes the error conversion work for structs/enums containing Box<dyn ...>
+impl<T: ?Sized> NotSame for Box<T> {}
 
 /// Converts u64 satoshis to f64
 pub fn sat_to_f(sat: u64) -> f64 { sat as f64 / SATOSHIS as f64 }
@@ -262,83 +259,6 @@ impl From<[u8; 32]> for bits256 {
     fn from(bytes: [u8; 32]) -> Self { bits256 { bytes } }
 }
 
-impl bits256 {
-    /// Returns true if the hash is not zero.  
-    /// Port of `#define bits256_nonz`.
-    pub fn nonz(&self) -> bool { self.bytes.iter().any(|ch| *ch != 0) }
-}
-
-pub fn nonz(k: [u8; 32]) -> bool { k.iter().any(|ch| *ch != 0) }
-
-/// Decodes a HEX string into a 32-bytes array.  
-/// But only if the HEX string is 64 characters long, returning a zeroed array otherwise.  
-/// (Use `fn nonz` to check if the array is zeroed).  
-/// A port of cJSON.c/jbits256.
-pub fn jbits256(json: &Json) -> Result<bits256, String> {
-    if let Some(hex) = json.as_str() {
-        if hex.len() == 64 {
-            //try_s! (::common::iguana_utils::decode_hex (unsafe {&mut hash.bytes[..]}, hex.as_bytes()));
-            let bytes: [u8; 32] = try_s!(FromHex::from_hex(hex));
-            return Ok(bits256::from(bytes));
-        }
-    }
-    Ok(unsafe { zeroed() })
-}
-
-pub const SATOSHIDEN: i64 = 100_000_000;
-pub fn dstr(x: i64, decimals: u8) -> f64 { x as f64 / 10.0_f64.powf(decimals as f64) }
-
-/// Apparently helps to workaround `double` fluctuations occuring on *certain* systems.
-/// cf. https://stackoverflow.com/questions/19804472/double-randomly-adds-0-000000000000001.
-/// Not sure it's needed in Rust, the floating point operations should be determenistic here,
-/// but better safe than sorry.
-pub const SMALLVAL: f64 = 0.000_000_000_000_001; // 1e-15f64
-
-/// Helps sharing a string slice with C code by allocating a zero-terminated string with the C standard library allocator.
-///
-/// The difference from `CString` is that the memory is then *owned* by the C code instead of being temporarily borrowed,
-/// that is it doesn't need to be recycled in Rust.
-/// Plus we don't check the slice for zeroes, most of our code doesn't need that extra check.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn str_to_malloc(s: &str) -> *mut c_char { slice_to_malloc(s.as_bytes()) as *mut c_char }
-
-/// Helps sharing a byte slice with C code by allocating a zero-terminated string with the C standard library allocator.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn slice_to_malloc(bytes: &[u8]) -> *mut u8 {
-    unsafe {
-        let buf = malloc(bytes.len() + 1) as *mut u8;
-        std::intrinsics::copy(bytes.as_ptr(), buf, bytes.len());
-        *buf.add(bytes.len()) = 0;
-        buf
-    }
-}
-
-/// Converts *mut c_char to Rust String
-/// Doesn't free the allocated memory
-/// It's responsibility of the caller to free the memory when required
-/// Returns error in case of null pointer input
-#[allow(clippy::missing_safety_doc)]
-pub unsafe fn c_char_to_string(ptr: *mut c_char) -> Result<String, String> {
-    if !ptr.is_null() {
-        let res_str = try_s!(CStr::from_ptr(ptr).to_str());
-        let res_str = String::from(res_str);
-        Ok(res_str)
-    } else {
-        ERR!("Tried to convert null pointer to Rust String!")
-    }
-}
-
-/// Frees C raw pointer
-/// Does nothing in case of null pointer input
-#[cfg(not(target_arch = "wasm32"))]
-pub fn free_c_ptr(ptr: *mut c_void) {
-    unsafe {
-        if !ptr.is_null() {
-            free(ptr as *mut libc::c_void);
-        }
-    }
-}
-
 /// Use the value, preventing the compiler and linker from optimizing it away.
 pub fn black_box<T>(v: T) -> T {
     // https://github.com/rust-lang/rfcs/issues/1484#issuecomment-240853111
@@ -349,16 +269,6 @@ pub fn black_box<T>(v: T) -> T {
     ret
 }
 
-/// Attempts to remove the `Path` on `drop`.
-#[derive(Debug)]
-pub struct RaiiRm<'a>(pub &'a Path);
-impl<'a> AsRef<Path> for RaiiRm<'a> {
-    fn as_ref(&self) -> &Path { self.0 }
-}
-impl<'a> Drop for RaiiRm<'a> {
-    fn drop(&mut self) { let _ = fs::remove_file(self); }
-}
-
 /// Using a static buffer in order to minimize the chance of heap and stack allocations in the signal handler.
 fn trace_buf() -> PaMutexGuard<'static, [u8; 256]> {
     static TRACE_BUF: PaMutex<[u8; 256]> = PaMutex::new([0; 256]);
@@ -370,6 +280,31 @@ fn trace_name_buf() -> PaMutexGuard<'static, [u8; 128]> {
     TRACE_NAME_BUF.lock()
 }
 
+/// Shortcut to path->filename conversion.
+///
+/// # Notes
+///
+/// Returns the file name without extension if only the file name ends on `.rs`.
+/// Returns the unchanged `path` if there is a character encoding error or something.
+///
+/// Inspired by https://docs.rs/gstuff/latest/gstuff/fn.filename.html
+pub fn filename(path: &str) -> &str {
+    // NB: `Path::new (path) .file_name()` only works for file separators of the current operating system,
+    // whereas the error trace might be coming from another operating system.
+    // In particular, I see `file_name` failing with WASM.
+
+    let name = match path.rfind(|ch| ch == '/' || ch == '\\') {
+        Some(ofs) => &path[ofs + 1..],
+        None => path,
+    };
+
+    if name.ends_with(".rs") {
+        &name[0..name.len() - 3]
+    } else {
+        name
+    }
+}
+
 /// Formats a stack frame.
 /// Some common and less than useful frames are skipped.
 pub fn stack_trace_frame(instr_ptr: *mut c_void, buf: &mut dyn Write, symbol: &backtrace::Symbol) {
@@ -493,13 +428,25 @@ fn output_pc_mem_addr(output: &mut dyn FnMut(&str)) {
     });
 }
 
+/// Set up a panic hook that prints the panic location, the message and the backtrace.
+/// (The default Rust handler doesn't have the means to print the message).
+#[cfg(target_arch = "wasm32")]
+pub fn set_panic_hook() {
+    set_hook(Box::new(|info: &PanicInfo| {
+        let mut trace = String::new();
+        stack_trace(&mut stack_trace_frame, &mut |l| trace.push_str(l));
+        console_err!("{}", info);
+        console_err!("backtrace\n{}", trace);
+    }))
+}
+
 /// Sets our own panic handler using patched backtrace crate. It was discovered that standard Rust panic
 /// handlers print only "unknown" in Android backtraces which is not helpful.
 /// Using custom hook with patched backtrace version solves this issue.
 /// NB: https://github.com/rust-lang/backtrace-rs/issues/227
 #[cfg(not(target_arch = "wasm32"))]
 pub fn set_panic_hook() {
-    use std::panic::{set_hook, PanicInfo};
+    use std::sync::atomic::AtomicBool;
 
     thread_local! {static ENTERED: AtomicBool = AtomicBool::new(false);}
 
@@ -516,8 +463,8 @@ pub fn set_panic_hook() {
 
         let mut trace = String::new();
         stack_trace(&mut stack_trace_frame, &mut |l| trace.push_str(l));
-        log!((info));
-        log!("backtrace\n"(trace));
+        log::info!("{}", info);
+        log::info!("backtrace\n{}", trace);
 
         let _ = ENTERED.try_with(|e| e.compare_exchange(true, false, Ordering::Relaxed, Ordering::Relaxed));
     }))
@@ -536,1190 +483,200 @@ pub fn double_panic_crash() {
     drop(panicker) // Delays the drop.
 }
 
-/// Tries to detect if we're running under a test, allowing us to be lazy and *delay* some costly operations.
-///
-/// Note that the code SHOULD behave uniformely regardless of where it's invoked from
-/// (nondeterminism breaks POLA and we don't know how the code will be used in the future)
-/// but in certain cases we have a leeway of adjusting to being run from a test
-/// without breaking any invariants or expectations.
-/// For instance, DHT might take unknown time to initialize, and by delaying this initialization in the tests
-/// we can avoid the unnecessary overhead of DHT initializaion and destruction while maintaining the contract.
-pub fn is_a_test_drill() -> bool {
-    // Stack tracing would sometimes crash on Windows, doesn't worth the risk here.
-    if cfg!(windows) {
-        return false;
-    }
-
-    let mut trace = String::with_capacity(1024);
-    stack_trace(
-        &mut |_ptr, mut fwr, sym| {
-            if let Some(name) = sym.name() {
-                let _ = witeln!(fwr, (name));
-            }
-        },
-        &mut |tr| trace.push_str(tr),
-    );
-
-    if trace.contains("\nmm2::main\n") || trace.contains("\nmm2::run_lp_main\n") {
-        return false;
-    }
-
-    if let Some(executable) = std::env::args().next() {
-        if executable.ends_with(r"\mm2.exe") {
-            return false;
-        }
-        if executable.ends_with("/mm2") {
-            return false;
-        }
-    }
-
-    true
-}
-
-pub type SlurpRes = Result<(StatusCode, HeaderMap, Vec<u8>), String>;
-
 /// RPC response, returned by the RPC handlers.  
 /// NB: By default the future is executed on the shared asynchronous reactor (`CORE`),
 /// the handler is responsible for spawning the future on another reactor if it doesn't fit the `CORE` well.
 pub type HyRes = Box<dyn Future<Item = Response<Vec<u8>>, Error = String> + Send>;
 
+pub type BoxFut<T, E> = Box<dyn Future<Item = T, Error = E> + Send>;
+
 pub trait HttpStatusCode {
     fn status_code(&self) -> StatusCode;
 }
 
-#[derive(Debug, Deserialize, Serialize)]
-struct HostedHttpRequest {
-    method: String,
-    uri: String,
-    headers: HashMap<String, String>,
-    body: Vec<u8>,
+/// Wraps a JSON string into the `HyRes` RPC response future.
+pub fn rpc_response<T>(status: u16, body: T) -> HyRes
+where
+    Vec<u8>: From<T>,
+{
+    let rf = match Response::builder()
+        .status(status)
+        .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
+        .body(Vec::from(body))
+    {
+        Ok(r) => future::ok::<Response<Vec<u8>>, String>(r),
+        Err(err) => {
+            let err = ERRL!("{}", err);
+            future::err::<Response<Vec<u8>>, String>(json!({ "error": err }).to_string())
+        },
+    };
+    Box::new(rf)
 }
 
-#[derive(Debug, Deserialize, Serialize)]
-struct HostedHttpResponse {
-    status: u16,
-    headers: HashMap<String, String>,
-    body: Vec<u8>,
+/// An mmrpc 2.0 compatible error variant that is used when the serialization of an RPC response is failed.
+#[derive(Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum SerializationError {
+    InternalError(String),
 }
 
-// To improve git history and ease of exploratory refactoring
-// we're splitting the code in place with conditional compilation.
-// wio stands for "web I/O" or "wasm I/O",
-// it contains the parts which aren't directly available with WASM.
-
-#[cfg(target_arch = "wasm32")]
-pub mod wio {
-    use super::SlurpRes;
-    use http::header::{HeaderName, HeaderValue};
-    use http::{HeaderMap, Request, StatusCode};
-    use serde_bencode::de::from_bytes as bdecode;
-    use serde_bencode::ser::to_bytes as bencode;
-    use std::str::FromStr;
-
-    pub async fn slurp_reqʹ(request: Request<Vec<u8>>) -> Result<(StatusCode, HeaderMap, Vec<u8>), String> {
-        let (parts, body) = request.into_parts();
-
-        let hhreq = super::HostedHttpRequest {
-            method: parts.method.as_str().to_owned(),
-            uri: fomat!((parts.uri)),
-            headers: parts
-                .headers
-                .iter()
-                .filter_map(|(name, value)| {
-                    let name = name.as_str().to_owned();
-                    let v = match value.to_str() {
-                        Ok(ascii) => ascii,
-                        Err(err) => {
-                            log! ("!ascii '" (name) "': " (err));
-                            return None;
-                        },
-                    };
-                    Some((name, v.to_owned()))
-                })
-                .collect(),
-            body,
-        };
-
-        let hhreq = try_s!(bencode(&hhreq));
-        let hhres = try_s!(super::helperᶜ("slurp_req", hhreq).await);
-        let hhres: super::HostedHttpResponse = try_s!(bdecode(&hhres));
-        let status = try_s!(StatusCode::from_u16(hhres.status));
-
-        let mut headers = HeaderMap::<HeaderValue>::with_capacity(hhres.headers.len());
-        for (n, v) in hhres.headers {
-            headers.insert(
-                try_s!(HeaderName::from_str(&n[..])),
-                try_s!(HeaderValue::from_str(&v[..])),
-            );
+impl fmt::Display for SerializationError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SerializationError::InternalError(internal) => {
+                write!(f, "Internal error: Couldn't serialize an RPC response: {}", internal)
+            },
         }
-
-        Ok((status, headers, hhres.body))
     }
+}
 
-    pub async fn slurp_req(request: Request<Vec<u8>>) -> SlurpRes { slurp_reqʹ(request).await }
+impl SerializationError {
+    pub fn from_error<E: serde::ser::Error>(e: E) -> SerializationError {
+        SerializationError::InternalError(e.to_string())
+    }
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-pub mod wio {
-    use crate::SlurpRes;
-    use futures::compat::Future01CompatExt;
-    use futures::executor::ThreadPool;
-    use futures01::sync::oneshot::{self, Receiver};
-    use futures01::{Async, Future, Poll};
-    use futures_cpupool::CpuPool;
-    use gstuff::{duration_to_float, now_float};
-    use http::{HeaderMap, Request, StatusCode};
-    use hyper::client::HttpConnector;
-    use hyper::{Body, Client};
-    use hyper_rustls::HttpsConnector;
-    use std::fmt;
-    use std::sync::Mutex;
-    use std::thread::JoinHandle;
-    use std::time::Duration;
-    use tokio::runtime::Runtime;
+#[derive(Clone, Serialize)]
+pub struct SuccessResponse(&'static str);
 
-    fn start_core_thread() -> Mm2Runtime { Mm2Runtime(Runtime::new().unwrap()) }
+impl SuccessResponse {
+    pub fn new() -> SuccessResponse { SuccessResponse("success") }
+}
 
-    pub struct Mm2Runtime(pub Runtime);
+impl Default for SuccessResponse {
+    fn default() -> Self { SuccessResponse::new() }
+}
 
-    lazy_static! {
-        /// Shared asynchronous reactor.
-        pub static ref CORE: Mm2Runtime = start_core_thread();
-        /// Shared CPU pool to run intensive/sleeping requests on a separate thread.
-        ///
-        /// Deprecated, prefer the futures 0.3 `POOL` instead.
-        pub static ref CPUPOOL: CpuPool = CpuPool::new(8);
-        /// Shared CPU pool to run intensive/sleeping requests on s separate thread.
-        pub static ref POOL: Mutex<ThreadPool> = Mutex::new(ThreadPool::builder()
-            .pool_size(8)
-            .name_prefix("POOL")
-            .create().expect("!ThreadPool"));
-    }
+#[derive(Serialize)]
+struct ErrResponse {
+    error: String,
+}
 
-    impl<Fut: std::future::Future<Output = ()> + Send + 'static> hyper::rt::Executor<Fut> for &Mm2Runtime {
-        fn execute(&self, fut: Fut) { self.0.spawn(fut); }
-    }
+/// Converts the given `err` message into the `{error: $err}` JSON string.
+pub fn err_to_rpc_json_string(err: &str) -> String {
+    let err = ErrResponse { error: err.to_owned() };
+    json::to_string(&err).unwrap()
+}
 
-    /// With a shared reactor drives the future `f` to completion.
-    ///
-    /// NB: This function is only useful if you need to get the results of the execution.
-    /// If the results are not necessary then a future can be scheduled directly on the reactor:
-    ///
-    ///     CORE.spawn (|_| f);
-    pub fn drive<F, R, E>(f: F) -> Receiver<Result<R, E>>
-    where
-        F: Future<Item = R, Error = E> + Send + 'static,
-        R: Send + 'static,
-        E: Send + 'static,
-    {
-        let (sx, rx) = oneshot::channel();
-        CORE.0.spawn(
-            f.then(move |fr: Result<R, E>| -> Result<(), ()> {
-                let _ = sx.send(fr);
-                Ok(())
-            })
-            .compat(),
-        );
-        rx
-    }
+pub fn err_tp_rpc_json(error: String) -> Json { json::to_value(ErrResponse { error }).unwrap() }
 
-    pub fn drive03<F, O>(f: F) -> futures::channel::oneshot::Receiver<O>
-    where
-        F: std::future::Future<Output = O> + Send + 'static,
-        O: Send + 'static,
-    {
-        let (sx, rx) = futures::channel::oneshot::channel();
-        CORE.0.spawn(async move {
-            let res = f.await;
-            if sx.send(res).is_err() {
-                log!("drive03 receiver is dropped");
-            };
-        });
-        rx
-    }
+/// Returns the `{error: $msg}` JSON response with the given HTTP `status`.
+/// Also logs the error (if possible).
+pub fn rpc_err_response(status: u16, msg: &str) -> HyRes {
+    // TODO: Like in most other places, we should check for a thread-local access to the proper log here.
+    // Might be a good idea to use emoji too, like "🤒" or "🤐" or "😕".
+    // TODO: Consider turning this into a macros or merging with `try_h` in order to retain the `line!`.
+    log::error!("RPC error response: {}", msg);
 
-    /// With a shared reactor drives the future `f` to completion.
-    ///
-    /// Similar to `fn drive`, but returns a stringified error,
-    /// allowing us to collapse the `Receiver` and return the `R` directly.
-    pub fn drive_s<F, R, E>(f: F) -> impl Future<Item = R, Error = String>
-    where
-        F: Future<Item = R, Error = E> + Send + 'static,
-        R: Send + 'static,
-        E: fmt::Display + Send + 'static,
-    {
-        drive(f).then(move |r| -> Result<R, String> {
-            let r = try_s!(r); // Peel the `Receiver`.
-            let r = try_s!(r); // `E` to `String`.
-            Ok(r)
-        })
-    }
+    rpc_response(status, err_to_rpc_json_string(msg))
+}
 
-    /// Finishes with the "timeout" error if the underlying future isn't ready withing the given timeframe.
-    ///
-    /// NB: Tokio timers (in `tokio::timer`) only seem to work under the Tokio runtime,
-    /// which is unfortunate as we want the different futures executed on the different reactors
-    /// depending on how much they're I/O-bound, CPU-bound or blocking.
-    /// Unlike the Tokio timers this `Timeout` implementation works with any reactor.
-    /// Another option to consider is https://github.com/alexcrichton/futures-timer.
-    /// P.S. The older `0.1` version of the `tokio::timer` might work NP, it works in other parts of our code.
-    ///      The new version, on the other hand, requires the Tokio runtime (https://tokio.rs/blog/2018-03-timers/).
-    /// P.S. We could try using the `futures-timer` crate instead, but note that it is currently under-maintained,
-    ///      https://github.com/rustasync/futures-timer/issues/9#issuecomment-400802515.
-    pub struct Timeout<R> {
-        fut: Box<dyn Future<Item = R, Error = String>>,
-        started: f64,
-        timeout: f64,
-        monitor: Option<JoinHandle<()>>,
-    }
-    impl<R> Future for Timeout<R> {
-        type Item = R;
-        type Error = String;
-        fn poll(&mut self) -> Poll<R, String> {
-            match self.fut.poll() {
-                Err(err) => Err(err),
-                Ok(Async::Ready(r)) => Ok(Async::Ready(r)),
-                Ok(Async::NotReady) => {
-                    let now = now_float();
-                    if now >= self.started + self.timeout {
-                        Err(format!("timeout ({:.1} > {:.1})", now - self.started, self.timeout))
-                    } else {
-                        // Start waking up this future until it has a chance to timeout.
-                        // For now it's just a basic separate thread. Will probably optimize later.
-                        if self.monitor.is_none() {
-                            let task = futures01::task::current();
-                            let deadline = self.started + self.timeout;
-                            self.monitor = Some(
-                                std::thread::Builder::new()
-                                    .name("timeout monitor".into())
-                                    .spawn(move || loop {
-                                        std::thread::sleep(Duration::from_secs(1));
-                                        task.notify();
-                                        if now_float() > deadline + 2. {
-                                            break;
-                                        }
-                                    })
-                                    .unwrap(),
-                            );
-                        }
-                        Ok(Async::NotReady)
-                    }
-                },
-            }
-        }
-    }
-    impl<R> Timeout<R> {
-        pub fn new(fut: Box<dyn Future<Item = R, Error = String>>, timeout: Duration) -> Timeout<R> {
-            Timeout {
-                fut,
-                started: now_float(),
-                timeout: duration_to_float(timeout),
-                monitor: None,
-            }
-        }
+#[cfg(not(target_arch = "wasm32"))]
+pub fn var(name: &str) -> Result<String, String> {
+    match std::env::var(name) {
+        Ok(v) => Ok(v),
+        Err(_err) => ERR!("No {}", name),
     }
+}
 
-    unsafe impl<R> Send for Timeout<R> {}
+/// TODO make it wasm32 only
+#[cfg(target_arch = "wasm32")]
+pub fn var(_name: &str) -> Result<String, String> { ERR!("Environment variable not supported in WASM") }
 
-    /// Initialize the crate.
-    pub fn init() {
-        // Pre-allocate the stack trace buffer in order to avoid allocating it from a signal handler.
-        super::black_box(&*super::trace_buf());
-        super::black_box(&*super::trace_name_buf());
+#[cfg(not(target_arch = "wasm32"))]
+pub fn block_on<F>(f: F) -> F::Output
+where
+    F: Future03,
+{
+    if var("TRACE_BLOCK_ON").map(|v| v == "true") == Ok(true) {
+        let mut trace = String::with_capacity(4096);
+        stack_trace(&mut stack_trace_frame, &mut |l| trace.push_str(l));
+        log::info!("block_on at\n{}", trace);
     }
 
-    lazy_static! {
-        /// NB: With a shared client there is a possibility that keep-alive connections will be reused.
-        pub static ref HYPER: Client<HttpsConnector<HttpConnector>> = {
-            // Please note there was a problem on iOS if [`HttpsConnector::with_native_roots`] is used instead.
-            let https = HttpsConnector::with_webpki_roots();
-            Client::builder()
-                .executor(&*CORE)
-                // Hyper had a lot of Keep-Alive bugs over the years and I suspect
-                // that with the shared client we might be getting errno 10054
-                // due to a closed Keep-Alive connection mismanagement.
-                // (To solve this problem Hyper should proactively close the Keep-Alive
-                // connections after a configurable amount of time has passed since
-                // their creation, thus saving us from trying to use the connections
-                // closed on the other side. I wonder if we can implement this strategy
-                // ourselves with a custom connector or something).
-                // Performance of Keep-Alive in the Hyper client is questionable as well,
-                // should measure it on a case-by-case basis when we need it.
-                .pool_max_idle_per_host(0)
-                .build(https)
-        };
-    }
+    wio::CORE.0.block_on(f)
+}
 
-    /// Executes a Hyper request, returning the response status, headers and body.
-    pub async fn slurp_req(request: Request<Vec<u8>>) -> SlurpRes {
-        let (head, body) = request.into_parts();
-        let request = Request::from_parts(head, Body::from(body));
-
-        let request_f = HYPER.request(request);
-        let response = try_s!(try_s!(drive03(request_f).await));
-        let status = response.status();
-        let headers = response.headers().clone();
-        let body = response.into_body();
-        let output = try_s!(hyper::body::to_bytes(body).await);
-        Ok((status, headers, output.to_vec()))
-    }
+#[cfg(target_arch = "wasm32")]
+pub fn block_on<F>(_f: F) -> F::Output
+where
+    F: Future03,
+{
+    panic!("block_on is not supported in WASM!");
+}
 
-    pub async fn slurp_reqʹ(request: Request<Vec<u8>>) -> Result<(StatusCode, HeaderMap, Vec<u8>), String> {
-        slurp_req(request).await
-    }
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn async_blocking<F, R>(blocking_fn: F) -> R
+where
+    F: FnOnce() -> R + Send + 'static,
+    R: Send + 'static,
+{
+    tokio::task::spawn_blocking(blocking_fn)
+        .await
+        .expect("spawn_blocking to succeed")
 }
 
-pub mod lazy {
-    #[cfg(test)] use super::block_on;
-    use async_trait::async_trait;
-    use std::future::Future;
+#[cfg(target_arch = "wasm32")]
+pub fn now_ms() -> u64 { js_sys::Date::now() as u64 }
 
-    /// Wrapper of lazily evaluated variables.
-    /// A `LazyLocal` object initializes the [`LazyLocal::inner`] value once
-    /// on [`LazyLocal::get()`] or [`LazyLocal::get_mut()`] calls using [`LazyLocal::constructor`] callback.
-    pub struct LazyLocal<'a, T> {
-        inner: Option<T>,
-        constructor: Option<Box<dyn FnOnce() -> T + 'a>>,
-    }
+#[cfg(target_arch = "wasm32")]
+pub fn now_float() -> f64 {
+    use gstuff::duration_to_float;
+    use std::time::Duration;
+    duration_to_float(Duration::from_millis(now_ms()))
+}
 
-    impl<'a, T> LazyLocal<'a, T> {
-        pub fn with_constructor(constructor: impl FnOnce() -> T + 'a) -> Self {
-            Self {
-                inner: None,
-                constructor: Some(Box::new(constructor)),
-            }
-        }
+#[cfg(not(target_arch = "wasm32"))]
+pub fn temp_dir() -> PathBuf { env::temp_dir() }
 
-        pub fn is_initialized(&self) -> bool { self.inner.is_some() }
-
-        /// Initialize the [`LazyLocal::inner`] value if it is not yet and get the immutable reference on it.
-        pub fn get(&mut self) -> &T { self.get_mut() }
-
-        /// Initialize the [`LazyLocal::inner`] value if it is not yet and get the mutable reference on it.
-        pub fn get_mut(&mut self) -> &mut T {
-            match self.inner {
-                Some(ref mut inner) => inner,
-                None => {
-                    let mut constructor = None;
-                    std::mem::swap(&mut self.constructor, &mut constructor);
-                    let constructor = constructor.expect("constructor is used already");
-                    self.inner = Some(constructor());
-                    self.inner.as_mut().unwrap()
-                },
-            }
-        }
-    }
+/// If the `MM_LOG` variable is present then tries to open that file.  
+/// Prints a warning to `stdout` if there's a problem opening the file.  
+/// Returns `None` if `MM_LOG` variable is not present or if the specified path can't be opened.
+#[cfg(not(target_arch = "wasm32"))]
+fn open_log_file() -> Option<std::fs::File> {
+    let mm_log = match var("MM_LOG") {
+        Ok(v) => v,
+        Err(_) => return None,
+    };
 
-    /// Searches for an element of an iterator that satisfies a predicate function.
-    /// `find_lazy()` takes a closure that returns `true` or `false`.
-    /// It applies this closure to each execution result of the futures stored within iterator, and if any of them return
-    /// `true`, then `find_lazy()` returns [`Some(element)`]. If they all return
-    /// `false`, it returns [`None`].
-    #[async_trait]
-    pub trait FindLazy: Iterator {
-        type FutureOutput;
-
-        async fn find_lazy<F>(self, f: F) -> Option<Self::FutureOutput>
-        where
-            F: FnMut(&Self::FutureOutput) -> bool + Send;
+    // For security reasons we want the log path to always end with ".log".
+    if !mm_log.ends_with(".log") {
+        println!("open_log_file] MM_LOG doesn't end with '.log'");
+        return None;
     }
 
-    /// Is equivalent to `FindLazy` except a predicate function can modify a return element.
-    #[async_trait]
-    pub trait FindMapLazy: Iterator {
-        type FutureOutput;
-
-        async fn find_map_lazy<M, F>(self, f: F) -> Option<M>
-        where
-            F: FnMut(Self::FutureOutput) -> Option<M> + Send;
+    match std::fs::OpenOptions::new().append(true).create(true).open(&mm_log) {
+        Ok(f) => Some(f),
+        Err(err) => {
+            println!("open_log_file] Can't open {}: {}", mm_log, err);
+            None
+        },
     }
+}
 
-    /// Implement the `FindLazy` for iterator of futures.
-    #[async_trait]
-    impl<T, I> FindLazy for I
-    where
-        T: Future + Send + 'static,
-        I: Iterator<Item = T> + Send,
-    {
-        type FutureOutput = T::Output;
+#[cfg(not(target_arch = "wasm32"))]
+pub fn writeln(line: &str) {
+    use std::panic::catch_unwind;
 
-        async fn find_lazy<F>(mut self, mut f: F) -> Option<Self::FutureOutput>
-        where
-            F: FnMut(&Self::FutureOutput) -> bool + Send,
-        {
-            for item in self {
-                let result = item.await;
-                if f(&result) {
-                    return Some(result);
-                }
-            }
-            None
-        }
+    lazy_static! {
+        static ref LOG_FILE: Mutex<Option<std::fs::File>> = Mutex::new(open_log_file());
     }
 
-    /// Implement the `FindMapLazy` for iterators of futures.
-    #[async_trait]
-    impl<T, I> FindMapLazy for I
-    where
-        T: Future + Send + 'static,
-        I: Iterator<Item = T> + Send,
-    {
-        type FutureOutput = T::Output;
-
-        async fn find_map_lazy<M, F>(mut self, mut f: F) -> Option<M>
-        where
-            F: FnMut(Self::FutureOutput) -> Option<M> + Send,
-        {
-            for item in self {
-                let mres = f(item.await);
-                if mres.is_some() {
-                    return mres;
-                }
+    // `catch_unwind` protects the tests from error
+    //
+    //     thread 'CORE' panicked at 'cannot access stdout during shutdown'
+    //
+    // (which might be related to https://github.com/rust-lang/rust/issues/29488).
+    let _ = catch_unwind(|| {
+        if let Ok(mut log_file) = LOG_FILE.lock() {
+            if let Some(ref mut log_file) = *log_file {
+                writeln!(log_file, "{}", line).ok();
+                return;
             }
-            None
         }
-    }
-
-    #[cfg(test)]
-    async fn future_helper(msg: &str, panic: bool) -> String {
-        if panic {
-            panic!("This future must not be executed");
-        }
-
-        msg.into()
-    }
-
-    #[test]
-    fn test_lazy_local() {
-        let template = "Default".to_string();
-        let mut local = LazyLocal::with_constructor(|| template.clone());
-
-        assert!(!local.is_initialized());
-        assert!(local.constructor.is_some());
-        assert_eq!(local.inner, None);
-
-        assert_eq!(local.get(), &template);
-        assert!(local.is_initialized());
-        assert!(local.constructor.is_none());
-        assert_eq!(local.get_mut(), &template);
-
-        *local.get_mut() = "Another string".into();
-        assert_eq!(local.get(), "Another string");
-    }
-
-    #[test]
-    fn test_find_lazy() {
-        let futures = vec![
-            future_helper("say", false),
-            future_helper("hello", false),
-            future_helper("world", true), // this future must not be executed
-        ];
-
-        let actual = block_on(futures.into_iter().find_lazy(|x| x == "hello"));
-        assert_eq!(actual, Some("hello".into()));
-    }
-
-    #[test]
-    fn test_find_map_lazy() {
-        let futures = vec![
-            future_helper("say", false),
-            future_helper("hello", false),
-            future_helper("world", true), // this future must not be executed
-        ];
-
-        let actual =
-            block_on(
-                futures
-                    .into_iter()
-                    .find_map_lazy(|x| if x == "hello" { Some(x.to_uppercase()) } else { None }),
-            );
-        assert_eq!(actual, Some("HELLO".into()));
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub mod executor {
-    use futures::task::Context;
-    use futures::task::Poll as Poll03;
-    use futures::Future as Future03;
-    use gstuff::now_float;
-    use std::pin::Pin;
-    use std::thread;
-    use std::time::Duration;
-
-    pub fn spawn(future: impl Future03<Output = ()> + Send + 'static) { crate::wio::CORE.0.spawn(future); }
-
-    pub fn spawn_boxed(future: Box<dyn Future03<Output = ()> + Send + Unpin + 'static>) { spawn(future); }
-
-    /// Schedule the given `future` to be executed shortly after the given `utc` time is reached.
-    pub fn spawn_after(utc: f64, future: impl Future03<Output = ()> + Send + 'static) {
-        use crossbeam::channel;
-        use gstuff::Constructible;
-        use std::collections::BTreeMap;
-        use std::sync::Once;
-
-        type SheduleChannelItem = (f64, Pin<Box<dyn Future03<Output = ()> + Send + 'static>>);
-        static START: Once = Once::new();
-        static SCHEDULE: Constructible<channel::Sender<SheduleChannelItem>> = Constructible::new();
-        START.call_once(|| {
-            thread::Builder::new()
-                .name("spawn_after".into())
-                .spawn(move || {
-                    let (tx, rx) = channel::bounded(0);
-                    SCHEDULE.pin(tx).expect("spawn_after] Can't pin the channel");
-                    type Task = Pin<Box<dyn Future03<Output = ()> + Send + 'static>>;
-                    let mut tasks: BTreeMap<Duration, Vec<Task>> = BTreeMap::new();
-                    let mut ready = Vec::with_capacity(4);
-                    loop {
-                        let now = Duration::from_secs_f64(now_float());
-                        let mut next_stop = Duration::from_secs_f64(0.1);
-                        for (utc, _) in tasks.iter() {
-                            if *utc <= now {
-                                ready.push(*utc)
-                            } else {
-                                next_stop = *utc - now;
-                                break;
-                            }
-                        }
-                        for utc in ready.drain(..) {
-                            let v = match tasks.remove(&utc) {
-                                Some(v) => v,
-                                None => continue,
-                            };
-                            //log! ("spawn_after] spawning " (v.len()) " tasks at " [utc]);
-                            for f in v {
-                                spawn(f)
-                            }
-                        }
-                        let (utc, f) = match rx.recv_timeout(next_stop) {
-                            Ok(t) => t,
-                            Err(channel::RecvTimeoutError::Disconnected) => break,
-                            Err(channel::RecvTimeoutError::Timeout) => continue,
-                        };
-                        tasks
-                            .entry(Duration::from_secs_f64(utc))
-                            .or_insert_with(Vec::new)
-                            .push(f)
-                    }
-                })
-                .expect("Can't spawn a spawn_after thread");
-        });
-        loop {
-            match SCHEDULE.as_option() {
-                None => {
-                    thread::yield_now();
-                    continue;
-                },
-                Some(tx) => {
-                    tx.send((utc, Box::pin(future))).expect("Can't reach spawn_after");
-                    break;
-                },
-            }
-        }
-    }
-
-    /// A future that completes at a given time.  
-    pub struct Timer {
-        till_utc: f64,
-    }
-
-    impl Timer {
-        pub fn till(till_utc: f64) -> Timer { Timer { till_utc } }
-        pub fn sleep(seconds: f64) -> Timer {
-            Timer {
-                till_utc: now_float() + seconds,
-            }
-        }
-        pub fn till_utc(&self) -> f64 { self.till_utc }
-    }
-
-    impl Future03 for Timer {
-        type Output = ();
-        fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll03<Self::Output> {
-            let delta = self.till_utc - now_float();
-            if delta <= 0. {
-                return Poll03::Ready(());
-            }
-            // NB: We should get a new `Waker` on every `poll` in case the future migrates between executors.
-            // cf. https://rust-lang.github.io/async-book/02_execution/03_wakeups.html
-            let waker = cx.waker().clone();
-            spawn_after(self.till_utc, async move { waker.wake() });
-            Poll03::Pending
-        }
-    }
-
-    #[test]
-    fn test_timer() {
-        let started = now_float();
-        let ti = Timer::sleep(0.2);
-        let delta = now_float() - started;
-        assert!(delta < 0.04, "{}", delta);
-        super::block_on(ti);
-        let delta = now_float() - started;
-        println!("time delta is {}", delta);
-        assert!(delta > 0.2);
-        assert!(delta < 0.4)
-    }
-}
-
-#[cfg(target_arch = "wasm32")] pub mod executor;
-
-/// Returns a JSON error HyRes on a failure.
-#[macro_export]
-macro_rules! try_h {
-    ($e: expr) => {
-        match $e {
-            Ok(ok) => ok,
-            Err(err) => return $crate::rpc_err_response(500, &ERRL!("{}", err)),
-        }
-    };
-}
-
-/// Executes a GET request, returning the response status, headers and body.
-pub async fn slurp_url(url: &str) -> SlurpRes {
-    wio::slurp_req(try_s!(Request::builder().uri(url).body(Vec::new()))).await
-}
-
-#[test]
-fn test_slurp_req() {
-    let (status, headers, body) = block_on(slurp_url("https://httpbin.org/get")).unwrap();
-    assert!(status.is_success(), "{:?} {:?} {:?}", status, headers, body);
-}
-
-/// Fetch URL by HTTPS and parse JSON response
-pub async fn fetch_json<T>(url: &str) -> Result<T, String>
-where
-    T: serde::de::DeserializeOwned + Send + 'static,
-{
-    let result = try_s!(slurp_url(url).await);
-    let result = try_s!(serde_json::from_slice(&result.2));
-    Ok(result)
-}
-
-/// Send POST JSON HTTPS request and parse response
-pub async fn post_json<T>(url: &str, json: String) -> Result<T, String>
-where
-    T: serde::de::DeserializeOwned + Send + 'static,
-{
-    let request = try_s!(Request::builder()
-        .method("POST")
-        .uri(url)
-        .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
-        .body(json.into()));
-
-    let result = try_s!(wio::slurp_req(request).await);
-    let result = try_s!(serde_json::from_slice(&result.2));
-    Ok(result)
-}
-
-/// Wraps a JSON string into the `HyRes` RPC response future.
-pub fn rpc_response<T>(status: u16, body: T) -> HyRes
-where
-    Vec<u8>: From<T>,
-{
-    let rf = match Response::builder()
-        .status(status)
-        .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
-        .body(Vec::from(body))
-    {
-        Ok(r) => future::ok::<Response<Vec<u8>>, String>(r),
-        Err(err) => {
-            let err = ERRL!("{}", err);
-            future::err::<Response<Vec<u8>>, String>(json!({ "error": err }).to_string())
-        },
-    };
-    Box::new(rf)
-}
-
-#[derive(Serialize)]
-struct ErrResponse {
-    error: String,
-}
-
-/// Converts the given `err` message into the `{error: $err}` JSON string.
-pub fn err_to_rpc_json_string(err: &str) -> String {
-    let err = ErrResponse { error: err.to_owned() };
-    json::to_string(&err).unwrap()
-}
-
-pub fn err_tp_rpc_json(error: String) -> Json { json::to_value(ErrResponse { error }).unwrap() }
-
-/// Returns the `{error: $msg}` JSON response with the given HTTP `status`.
-/// Also logs the error (if possible).
-pub fn rpc_err_response(status: u16, msg: &str) -> HyRes {
-    // TODO: Like in most other places, we should check for a thread-local access to the proper log here.
-    // Might be a good idea to use emoji too, like "🤒" or "🤐" or "😕".
-    // TODO: Consider turning this into a macros or merging with `try_h` in order to retain the `line!`.
-    log! ({"RPC error response: {}", msg});
-
-    rpc_response(status, err_to_rpc_json_string(msg))
-}
-
-/// A closure that would (re)start a `Future` to synchronize with an external resource in `RefreshedExternalResource`.
-type ExternalResourceSync<R> =
-    Box<dyn Fn() -> Box<dyn Future<Item = R, Error = String> + Send + 'static> + Send + 'static>;
-
-/// Memory space accessible to the `Future` tail spawned by the `RefreshedExternalResource`.
-struct RerShelf<R: Send + 'static> {
-    /// The time when the `Future` generated by `sync` has filled this shell.
-    time: f64,
-    /// Results of the `sync`-generated `Future`.
-    result: Result<R, String>,
-}
-
-/// Often we have an external resource that we need a fresh copy of.
-/// (Or the other way around, when there is an external resource that we need to periodically update or synchronize with).
-/// Particular property of such resources is that they might be unavailable,
-/// might be slow due to resource overload or network congestion,
-/// need to be resynchronized periodically
-/// while being nice to the resource by maintaining rate limits.
-///
-/// Some of these resources are naturally singleton.
-/// For exampe, we have only one "bittrex.com" and we need not multiple copies of its market data withing the process.
-///
-/// This helper here will organize the handling of such synchronization, periodically starting the synchronization `Future`,
-/// restarting it on timeout, maintaining rate limits.
-pub struct RefreshedExternalResource<R: Send + 'static> {
-    sync: Mutex<ExternalResourceSync<R>>,
-    /// Rate limit in the form of the desired number of seconds between the syncs.
-    every_n_sec: f64,
-    /// Start a new `Future` and drop the old one if it fails to finish after this number of seconds.
-    timeout_sec: f64,
-    /// The time (in f64 seconds) when we last (re)started the `sync`.
-    /// We want `AtomicU64` but it isn't yet stable.
-    last_start: AtomicUsize,
-    shelf: Arc<Mutex<Option<RerShelf<R>>>>,
-    /// The `Future`s interested in the next update.  
-    /// When there is an updated the `Task::notify` gets invoked once and then the `Task` is removed from the `listeners` list.
-    listeners: Arc<Mutex<Vec<Task>>>,
-}
-impl<R: Send + 'static> RefreshedExternalResource<R> {
-    /// New instance of the external resource tracker.
-    ///
-    /// * `every_n_sec` - Desired number of seconds between the syncs.
-    /// * `timeout_sec` - Start a new `sync` and drop the old `Future` if it fails to finish after this number of seconds.
-    ///                   Automatically bumped to be at least `every_n_sec` large.
-    /// * `sync` - Generates the `Future` that should synchronize with the external resource in background.
-    ///            Note that we'll tail the `Future`, polling the tail from the shared asynchronous reactor;
-    ///            *spawn* the `Future` onto a different reactor if the shared asynchronous reactor is not the best option.
-    pub fn new(every_n_sec: f64, timeout_sec: f64, sync: ExternalResourceSync<R>) -> RefreshedExternalResource<R> {
-        assert_eq!(size_of::<usize>(), 8);
-        RefreshedExternalResource {
-            sync: Mutex::new(sync),
-            every_n_sec,
-            timeout_sec: timeout_sec.max(every_n_sec),
-            last_start: AtomicUsize::new(0f64.to_bits() as usize),
-            shelf: Arc::new(Mutex::new(None)),
-            listeners: Arc::new(Mutex::new(Vec::new())),
-        }
-    }
-
-    pub fn add_listeners(&self, mut tasks: Vec<Task>) -> Result<(), String> {
-        let mut listeners = try_s!(self.listeners.lock());
-        listeners.append(&mut tasks);
-        Ok(())
-    }
-
-    /// Performs the maintenance operations necessary to periodically refresh the resource.
-    pub fn tick(&self) -> Result<(), String> {
-        let now = now_float();
-        let last_finish = match *try_s!(self.shelf.lock()) {
-            Some(ref rer_shelf) => rer_shelf.time,
-            None => 0.,
-        };
-        let last_start = f64::from_bits(self.last_start.load(Ordering::Relaxed) as u64);
-
-        if now - last_start > self.timeout_sec || (last_finish > last_start && now - last_start > self.every_n_sec) {
-            self.last_start.store(now.to_bits() as usize, Ordering::Relaxed);
-            let sync = try_s!(self.sync.lock());
-            let f = (*sync)();
-            let shelf_tx = self.shelf.clone();
-            let listeners = self.listeners.clone();
-            let f = f.then(move |result| -> Result<(), ()> {
-                let mut shelf = match shelf_tx.lock() {
-                    Ok(l) => l,
-                    Err(err) => {
-                        log! ({"RefreshedExternalResource::tick] Can't lock the shelf: {}", err});
-                        return Err(());
-                    },
-                };
-                let shelf_time = match *shelf {
-                    Some(ref r) => r.time,
-                    None => 0.,
-                };
-                if now > shelf_time {
-                    // This check prevents out-of-order shelf updates.
-                    *shelf = Some(RerShelf {
-                        time: now_float(),
-                        result,
-                    });
-                    drop(shelf); // Don't hold the lock unnecessarily.
-                    {
-                        let mut listeners = match listeners.lock() {
-                            Ok(l) => l,
-                            Err(err) => {
-                                log! ({"RefreshedExternalResource::tick] Can't lock the listeners: {}", err});
-                                return Err(());
-                            },
-                        };
-                        for task in listeners.drain(..) {
-                            task.notify()
-                        }
-                    }
-                }
-                Ok(())
-            });
-            executor::spawn(f.compat().map(|_| ())); // Polls `f` in background.
-        }
-
-        Ok(())
-    }
-
-    /// The time, in seconds since UNIX epoch, when the refresh `Future` resolved.
-    pub fn last_finish(&self) -> Result<f64, String> {
-        Ok(match *try_s!(self.shelf.lock()) {
-            Some(ref rer_shelf) => rer_shelf.time,
-            None => 0.,
-        })
-    }
-
-    pub fn with_result<V, F: FnMut(Option<&Result<R, String>>) -> Result<V, String>>(
-        &self,
-        mut cb: F,
-    ) -> Result<V, String> {
-        let shelf = try_s!(self.shelf.lock());
-        match *shelf {
-            Some(ref rer_shelf) => cb(Some(&rer_shelf.result)),
-            None => cb(None),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct P2PMessage {
-    pub from: SocketAddr,
-    pub content: String,
-}
-
-impl P2PMessage {
-    pub fn from_string_with_default_addr(content: String) -> P2PMessage {
-        P2PMessage {
-            from: SocketAddr::new([0; 4].into(), 0),
-            content,
-        }
-    }
-
-    pub fn from_serialize_with_default_addr<T: serde::Serialize>(msg: &T) -> P2PMessage {
-        P2PMessage {
-            from: SocketAddr::new([0; 4].into(), 0),
-            content: serde_json::to_string(msg).unwrap(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct QueuedCommand {
-    pub response_sock: i32,
-    pub stats_json_only: i32,
-    pub queue_id: u32,
-    pub msg: P2PMessage,
-    // retstrp: *mut *mut c_char,
-}
-
-pub fn var(name: &str) -> Result<String, String> {
-    /// Obtains the environment variable `name` from the host, copying it into `rbuf`.
-    /// Returns the length of the value copied to `rbuf` or -1 if there was an error.
-    #[cfg(target_arch = "wasm32")]
-    #[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-    extern "C" {
-        pub fn host_env(name: *const c_char, nameˡ: i32, rbuf: *mut c_char, rcap: i32) -> i32;
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        match std::env::var(name) {
-            Ok(v) => Ok(v),
-            Err(_err) => ERR!("No {}", name),
-        }
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    {
-        // Get the environment variable from the host.
-        use std::str::from_utf8;
-
-        let mut buf: [u8; 4096] = unsafe { zeroed() };
-        let rc = host_env(
-            name.as_ptr() as *const c_char,
-            name.len() as i32,
-            buf.as_mut_ptr() as *mut c_char,
-            buf.len() as i32,
-        );
-        if rc <= 0 {
-            return ERR!("No {}", name);
-        }
-        let s = try_s!(from_utf8(&buf[0..rc as usize]));
-        Ok(String::from(s))
-    }
-}
-
-/// TODO make it wasm32 only
-/// #[cfg(not(target_arch = "wasm32"))]
-pub fn block_on<F>(f: F) -> F::Output
-where
-    F: Future03,
-{
-    if var("TRACE_BLOCK_ON").map(|v| v == "true") == Ok(true) {
-        let mut trace = String::with_capacity(4096);
-        stack_trace(&mut stack_trace_frame, &mut |l| trace.push_str(l));
-        log!("block_on at\n"(trace));
-    }
-
-    futures::executor::block_on(f)
-}
-
-use backtrace::SymbolName;
-
-#[cfg(target_arch = "wasm32")]
-pub fn now_ms() -> u64 { js_sys::Date::now() as u64 }
-
-#[cfg(target_arch = "wasm32")]
-pub fn now_float() -> f64 {
-    use gstuff::duration_to_float;
-    use std::time::Duration;
-    duration_to_float(Duration::from_millis(now_ms()))
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub fn slurp(path: &dyn AsRef<Path>) -> Result<Vec<u8>, String> { Ok(gstuff::slurp(path)) }
-
-#[cfg(not(target_arch = "wasm32"))]
-pub fn safe_slurp(path: &dyn AsRef<Path>) -> Result<Vec<u8>, String> {
-    let mut file = match std::fs::File::open(path) {
-        Ok(f) => f,
-        Err(ref err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(Vec::new()),
-        Err(err) => return ERR!("Can't open {:?}: {}", path.as_ref(), err),
-    };
-    let mut buf = Vec::new();
-    try_s!(file.read_to_end(&mut buf));
-    Ok(buf)
-}
-
-#[cfg(target_arch = "wasm32")]
-pub fn slurp(path: &dyn AsRef<Path>) -> Result<Vec<u8>, String> {
-    use std::mem::MaybeUninit;
-
-    #[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-    extern "C" {
-        pub fn host_slurp(path_p: *const c_char, path_l: i32, rbuf: *mut c_char, rcap: i32) -> i32;
-    }
-
-    let path = try_s!(path.as_ref().to_str().ok_or("slurp: path not unicode"));
-    let mut rbuf: [u8; 262144] = unsafe { MaybeUninit::uninit().assume_init() };
-    let rc = host_slurp(
-        path.as_ptr() as *const c_char,
-        path.len() as i32,
-        rbuf.as_mut_ptr() as *mut c_char,
-        rbuf.len() as i32,
-    );
-    if rc < 0 {
-        return ERR!("!host_slurp: {}", rc);
-    }
-    Ok(Vec::from(&rbuf[..rc as usize]))
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub fn temp_dir() -> PathBuf { env::temp_dir() }
-
-#[cfg(target_arch = "wasm32")]
-pub fn temp_dir() -> PathBuf {
-    #[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-    extern "C" {
-        pub fn temp_dir(rbuf: *mut c_char, rcap: i32) -> i32;
-    }
-    let mut buf: [u8; 4096] = unsafe { zeroed() };
-    let rc = temp_dir(buf.as_mut_ptr() as *mut c_char, buf.len() as i32);
-    if rc <= 0 {
-        panic!("!temp_dir")
-    }
-    let path = std::str::from_utf8(&buf[0..rc as usize]).unwrap();
-    Path::new(path).into()
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub fn remove_file(path: &dyn AsRef<Path>) -> Result<(), String> {
-    try_s!(fs::remove_file(path));
-    Ok(())
-}
-
-#[cfg(target_arch = "wasm32")]
-pub fn remove_file(path: &dyn AsRef<Path>) -> Result<(), String> {
-    #[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-    extern "C" {
-        pub fn host_rm(ptr: *const c_char, len: i32) -> i32;
-    }
-
-    let path = try_s!(path.as_ref().to_str().ok_or("Non-unicode path"));
-    let rc = host_rm(path.as_ptr() as *const c_char, path.len() as i32);
-    if rc != 0 {
-        return ERR!("!host_rm: {}", rc);
-    }
-    Ok(())
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub fn write(path: &dyn AsRef<Path>, contents: &dyn AsRef<[u8]>) -> Result<(), String> {
-    try_s!(fs::write(path, contents));
-    Ok(())
-}
-
-#[cfg(target_arch = "wasm32")]
-pub fn write(path: &dyn AsRef<Path>, contents: &dyn AsRef<[u8]>) -> Result<(), String> {
-    #[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-    extern "C" {
-        pub fn host_write(path_p: *const c_char, path_l: i32, ptr: *const c_char, len: i32) -> i32;
-    }
-
-    let path = try_s!(path.as_ref().to_str().ok_or("Non-unicode path"));
-    let content = contents.as_ref();
-    let rc = host_write(
-        path.as_ptr() as *const c_char,
-        path.len() as i32,
-        content.as_ptr() as *const c_char,
-        content.len() as i32,
-    );
-    if rc != 0 {
-        return ERR!("!host_write: {}", rc);
-    }
-    Ok(())
-}
-
-/// Read a folder and return a list of files with their last-modified ms timestamps.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn read_dir(dir: &dyn AsRef<Path>) -> Result<Vec<(u64, PathBuf)>, String> {
-    use std::time::UNIX_EPOCH;
-
-    let entries = try_s!(dir.as_ref().read_dir())
-        .filter_map(|dir_entry| {
-            let entry = match dir_entry {
-                Ok(ent) => ent,
-                Err(e) => {
-                    log!("Error " (e) " reading from dir " (dir.as_ref().display()));
-                    return None;
-                },
-            };
-
-            let metadata = match entry.metadata() {
-                Ok(m) => m,
-                Err(e) => {
-                    log!("Error " (e) " getting file " (entry.path().display()) " meta");
-                    return None;
-                },
-            };
-
-            let m_time = match metadata.modified() {
-                Ok(time) => time,
-                Err(e) => {
-                    log!("Error " (e) " getting file " (entry.path().display()) " m_time");
-                    return None;
-                },
-            };
-
-            let lm = m_time.duration_since(UNIX_EPOCH).expect("!duration_since").as_millis();
-            assert!(lm < u64::max_value() as u128);
-            let lm = lm as u64;
-
-            let path = entry.path();
-            if path.extension() == Some(OsStr::new("json")) {
-                Some((lm, path))
-            } else {
-                None
-            }
-        })
-        .collect();
-
-    Ok(entries)
-}
-
-#[cfg(target_arch = "wasm32")]
-pub fn read_dir(dir: &dyn AsRef<Path>) -> Result<Vec<(u64, PathBuf)>, String> {
-    use std::mem::MaybeUninit;
-
-    #[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-    extern "C" {
-        pub fn host_read_dir(path_p: *const c_char, path_l: i32, rbuf: *mut c_char, rcap: i32) -> i32;
-    }
-
-    let path = try_s!(dir.as_ref().to_str().ok_or("read_dir: dir path not unicode"));
-    let mut rbuf: [u8; 262144] = unsafe { MaybeUninit::uninit().assume_init() };
-    let rc = host_read_dir(
-        path.as_ptr() as *const c_char,
-        path.len() as i32,
-        rbuf.as_mut_ptr() as *mut c_char,
-        rbuf.len() as i32,
-    );
-    if rc <= 0 {
-        return ERR!("!host_read_dir: {}", rc);
-    }
-    let jens: Vec<(u64, String)> = try_s!(json::from_slice(&rbuf[..rc as usize]));
-
-    let mut entries: Vec<(u64, PathBuf)> = Vec::with_capacity(jens.len());
-    for (lm, name) in jens {
-        let path = dir.as_ref().join(name);
-        entries.push((lm, path))
-    }
-
-    Ok(entries)
-}
-
-/// If the `MM_LOG` variable is present then tries to open that file.  
-/// Prints a warning to `stdout` if there's a problem opening the file.  
-/// Returns `None` if `MM_LOG` variable is not present or if the specified path can't be opened.
-#[cfg(not(target_arch = "wasm32"))]
-fn open_log_file() -> Option<fs::File> {
-    let mm_log = match var("MM_LOG") {
-        Ok(v) => v,
-        Err(_) => return None,
-    };
-
-    // For security reasons we want the log path to always end with ".log".
-    if !mm_log.ends_with(".log") {
-        println!("open_log_file] MM_LOG doesn't end with '.log'");
-        return None;
-    }
-
-    match fs::OpenOptions::new().append(true).create(true).open(&mm_log) {
-        Ok(f) => Some(f),
-        Err(err) => {
-            println!("open_log_file] Can't open {}: {}", mm_log, err);
-            None
-        },
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub fn writeln(line: &str) {
-    use std::panic::catch_unwind;
-
-    lazy_static! {
-        static ref LOG_FILE: Mutex<Option<fs::File>> = Mutex::new(open_log_file());
-    }
-
-    // `catch_unwind` protects the tests from error
-    //
-    //     thread 'CORE' panicked at 'cannot access stdout during shutdown'
-    //
-    // (which might be related to https://github.com/rust-lang/rust/issues/29488).
-    let _ = catch_unwind(|| {
-        if let Ok(mut log_file) = LOG_FILE.lock() {
-            if let Some(ref mut log_file) = *log_file {
-                let _ = witeln!(log_file, (line));
-                return;
-            }
-        }
-        println!("{}", line);
-    });
-}
+        println!("{}", line);
+    });
+}
 
 #[cfg(target_arch = "wasm32")]
 static mut PROCESS_LOG_TAIL: [u8; 0x10000] = [0; 0x10000];
@@ -1758,137 +715,8 @@ pub fn writeln(line: &str) {
     append_log_tail(line);
 }
 
-/// Set up a panic hook that prints the panic location and the message.  
-/// (The default Rust handler doesn't have the means to print the message.
-///  Note that we're also getting the stack trace from Node.js and rustfilt).
-#[cfg(target_arch = "wasm32")]
-#[no_mangle]
-pub extern "C" fn set_panic_hook() {
-    use std::panic::{set_hook, PanicInfo};
-
-    set_hook(Box::new(|info: &PanicInfo| {
-        let mut msg = String::with_capacity(256);
-        let _ = wite!(&mut msg, (info));
-        writeln(&msg)
-    }))
-}
-
 pub fn small_rng() -> SmallRng { SmallRng::seed_from_u64(now_ms()) }
 
-/// Ask the WASM host to send HTTP request to the native helpers.
-/// Returns request ID used to wait for the reply.
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-extern "C" {
-    fn http_helper_if(helper: *const u8, helper_len: i32, payload: *const u8, payload_len: i32, timeout_ms: i32)
-        -> i32;
-}
-
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-extern "C" {
-    /// Check with the WASM host to see if the given HTTP request is ready.
-    ///
-    /// Returns the amount of bytes copied to rbuf,  
-    /// or `-1` if the request is not yet finished,  
-    /// or `0 - amount of bytes` in case the intended size was larger than the `rcap`.
-    ///
-    /// The bytes copied to rbuf are in the bencode format,
-    /// `{status: $number, ct: $bytes, cs: $bytes, body: $bytes}`
-    /// (the `HelperResponse`).
-    ///
-    /// * `helper_request_id` - Request ID previously returned by `http_helper_if`.
-    /// * `rbuf` - The buffer to copy the response payload into if the request is finished.
-    /// * `rcap` - The size of the `rbuf` buffer.
-    pub fn http_helper_check(helper_request_id: i32, rbuf: *mut u8, rcap: i32) -> i32;
-}
-
-lazy_static! {
-    /// Maps helper request ID to the corresponding Waker,
-    /// allowing WASM host to wake the `HelperReply`.
-    static ref HELPER_REQUESTS: Mutex<HashMap<i32, Waker>> = Mutex::new (HashMap::new());
-}
-
-/// WASM host invokes this method to signal the readiness of the HTTP request.
-#[no_mangle]
-#[cfg(target_arch = "wasm32")]
-pub extern "C" fn http_ready(helper_request_id: i32) {
-    let mut helper_requests = HELPER_REQUESTS.lock().unwrap();
-    if let Some(waker) = helper_requests.remove(&helper_request_id) {
-        waker.wake()
-    }
-}
-
-#[derive(Deserialize, Debug)]
-pub struct HelperResponse {
-    pub status: u32,
-    #[serde(rename = "ct")]
-    pub content_type: Option<ByteBuf>,
-    #[serde(rename = "cs")]
-    pub checksum: Option<ByteBuf>,
-    pub body: ByteBuf,
-}
-/// Mostly used to log the errors coming from the other side.
-impl fmt::Display for HelperResponse {
-    fn fmt(&self, ft: &mut fmt::Formatter) -> fmt::Result {
-        wite! (ft, (self.status) ", " (binprint (&self.body, b'.')))
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-pub async fn helperᶜ(helper: &'static str, args: Vec<u8>) -> Result<Vec<u8>, String> {
-    use serde_bencode::de::from_bytes as bdecode;
-
-    let helper_request_id = http_helper_if(
-        helper.as_ptr(),
-        helper.len() as i32,
-        args.as_ptr(),
-        args.len() as i32,
-        9999,
-    );
-
-    struct HelperReply {
-        helper_request_id: i32,
-    }
-    impl std::future::Future for HelperReply {
-        type Output = Result<Vec<u8>, String>;
-        fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll03<Self::Output> {
-            let mut buf: [u8; 65535] = unsafe { std::mem::MaybeUninit::uninit().assume_init() };
-            let rlen = http_helper_check(self.helper_request_id, buf.as_mut_ptr(), buf.len() as i32);
-            if rlen < -1 {
-                // Response is larger than capacity.
-                return Poll03::Ready(ERR!("Helper result is too large ({})", rlen));
-            }
-            if rlen >= 0 {
-                return Poll03::Ready(Ok(Vec::from(&buf[0..rlen as usize])));
-            }
-
-            // NB: Need a fresh waker each time `Pending` is returned, to support switching tasks.
-            // cf. https://rust-lang.github.io/async-book/02_execution/03_wakeups.html
-            let waker = cx.waker().clone();
-            HELPER_REQUESTS.lock().unwrap().insert(self.helper_request_id, waker);
-
-            Poll03::Pending
-        }
-    }
-    impl Drop for HelperReply {
-        fn drop(&mut self) { HELPER_REQUESTS.lock().unwrap().remove(&self.helper_request_id); }
-    }
-    let rv: Vec<u8> = try_s!(HelperReply { helper_request_id }.await);
-    let rv: HelperResponse = try_s!(bdecode(&rv));
-    if rv.status != 200 {
-        return ERR!("!{}: {}", helper, rv);
-    }
-    // TODO: Check `rv.checksum` if present.
-    Ok(rv.body.into_vec())
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct BroadcastP2pMessageArgs {
-    pub ctx: u32,
-    pub msg: String,
-}
-
 #[derive(Debug, Clone)]
 /// Ordered from low to height inclusive range.
 pub struct OrdRange<T>(RangeInclusive<T>);
@@ -1915,268 +743,28 @@ impl<T: Copy> OrdRange<T> {
     pub fn flatten(&self) -> Vec<T> { vec![*self.start(), *self.end()] }
 }
 
-/// Invokes callback `cb_id` in the WASM host, passing a `(ptr,len)` string to it.
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-extern "C" {
-    pub fn call_back(cb_id: i32, ptr: *const c_char, len: i32);
-}
-pub mod for_tests;
-
-fn without_trailing_zeroes(decimal: &str, dot: usize) -> &str {
-    let mut pos = decimal.len() - 1;
-    loop {
-        let ch = decimal.as_bytes()[pos];
-        if ch != b'0' {
-            break &decimal[0..=pos];
-        }
-        if pos == dot {
-            break &decimal[0..pos];
-        }
-        pos -= 1
-    }
-}
-
-/// Round half away from zero (aka commercial rounding).
-pub fn round_to(bd: &BigDecimal, places: u8) -> String {
-    // Normally we'd do
-    //
-    //     let divisor = pow (10, places)
-    //     round (self * divisor) / divisor
-    //
-    // But we don't have a `round` function in `BigDecimal` at present, so we're on our own.
-
-    let bds = format!("{}", bd);
-    let bda = bds.as_bytes();
-    let dot = bda.iter().position(|&ch| ch == b'.');
-    let dot = match dot {
-        Some(dot) => dot,
-        None => return bds,
-    };
-
-    if bda.len() - dot <= places as usize {
-        return String::from(without_trailing_zeroes(&bds, dot));
-    }
-
-    let mut pos = bda.len() - 1;
-    let mut ch = bda[pos];
-    let mut prev_digit = 0;
-    loop {
-        let digit = ch - b'0';
-        let rounded = if prev_digit > 5 { digit + 1 } else { digit };
-        //println! ("{} at {}: prev_digit {}, digit {}, rounded {}", bds, pos, prev_digit, digit, rounded);
-
-        if pos < dot {
-            //println! ("{}, pos < dot, stopping at pos {}", bds, pos);
-            let mut integer: i64 = (&bds[0..=pos]).parse().unwrap();
-            if prev_digit > 5 {
-                if bda[0] == b'-' {
-                    integer = integer.checked_sub(1).unwrap()
-                } else {
-                    integer = integer.checked_add(1).unwrap()
-                }
-            }
-            return format!("{}", integer);
-        }
-
-        if pos == dot + places as usize && rounded < 10 {
-            //println! ("{}, stopping at pos {}", bds, pos);
-            break format!("{}{}", &bds[0..pos], rounded);
-        }
-
-        pos -= 1;
-        if pos == dot {
-            pos -= 1
-        } // Skip over the dot.
-        ch = bda[pos];
-        prev_digit = rounded
-    }
-}
-
-#[test]
-fn test_round_to() {
-    assert_eq!(round_to(&BigDecimal::from(0.999), 2), "1");
-    assert_eq!(round_to(&BigDecimal::from(-0.999), 2), "-1");
-
-    assert_eq!(round_to(&BigDecimal::from(10.999), 2), "11");
-    assert_eq!(round_to(&BigDecimal::from(-10.999), 2), "-11");
-
-    assert_eq!(round_to(&BigDecimal::from(99.9), 1), "99.9");
-    assert_eq!(round_to(&BigDecimal::from(-99.9), 1), "-99.9");
-
-    assert_eq!(round_to(&BigDecimal::from(99.9), 0), "100");
-    assert_eq!(round_to(&BigDecimal::from(-99.9), 0), "-100");
-
-    let ouch = BigDecimal::from(1) / BigDecimal::from(7);
-    assert_eq!(round_to(&ouch, 3), "0.143");
+pub const fn true_f() -> bool { true }
 
-    let ouch = BigDecimal::from(1) / BigDecimal::from(3);
-    assert_eq!(round_to(&ouch, 0), "0");
-    assert_eq!(round_to(&ouch, 1), "0.3");
-    assert_eq!(round_to(&ouch, 2), "0.33");
-    assert_eq!(round_to(&ouch, 9), "0.333333333");
+pub const fn ten() -> usize { 10 }
 
-    assert_eq!(round_to(&BigDecimal::from(0.123), 99), "0.123");
-    assert_eq!(round_to(&BigDecimal::from(-0.123), 99), "-0.123");
+pub const fn ten_f64() -> f64 { 10. }
 
-    assert_eq!(round_to(&BigDecimal::from(0), 99), "0");
-    assert_eq!(round_to(&BigDecimal::from(-0), 99), "0");
+pub const fn one_hundred() -> usize { 100 }
 
-    assert_eq!(round_to(&BigDecimal::from(0.123), 0), "0");
-    assert_eq!(round_to(&BigDecimal::from(-0.123), 0), "0");
+pub fn one() -> NonZeroUsize { NonZeroUsize::new(1).unwrap() }
 
-    assert_eq!(round_to(&BigDecimal::from(0), 0), "0");
-    assert_eq!(round_to(&BigDecimal::from(-0), 0), "0");
+#[derive(Debug, Deserialize)]
+pub struct PagingOptions {
+    #[serde(default = "ten")]
+    pub limit: usize,
+    #[serde(default = "one")]
+    pub page_number: NonZeroUsize,
+    pub from_uuid: Option<Uuid>,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn new_uuid() -> Uuid { Uuid::new_v4() }
 
-#[cfg(target_arch = "wasm32")]
-pub fn new_uuid() -> Uuid {
-    use rand::RngCore;
-    use uuid::{Builder, Variant, Version};
-
-    let mut rng = small_rng();
-    let mut bytes = [0; 16];
-
-    rng.fill_bytes(&mut bytes);
-
-    Builder::from_bytes(bytes)
-        .set_variant(Variant::RFC4122)
-        .set_version(Version::Random)
-        .build()
-}
-
-/// Get only the first line of the error.
-/// Generally, the `JsValue` error contains the stack trace of an error.
-/// This function cuts off the stack trace.
-#[cfg(target_arch = "wasm32")]
-pub fn stringify_js_error(error: &JsValue) -> String {
-    format!("{:?}", error)
-        .lines()
-        .next()
-        .map(|e| e.to_owned())
-        .unwrap_or_default()
-}
-
-/// The function helper for the `WasmUnwrapExt`, `WasmUnwrapErrExt` traits.
-#[cfg(target_arch = "wasm32")]
-#[track_caller]
-fn caller_file_line() -> (&'static str, u32) {
-    let location = std::panic::Location::caller();
-    let file = gstuff::filename(location.file());
-    let line = location.line();
-    (file, line)
-}
-
-#[cfg(target_arch = "wasm32")]
-pub trait WasmUnwrapExt<T> {
-    fn unwrap_w(self) -> T;
-    fn expect_w(self, description: &str) -> T;
-}
-
-#[cfg(target_arch = "wasm32")]
-pub trait WasmUnwrapErrExt<E> {
-    fn unwrap_err_w(self) -> E;
-    fn expect_err_w(self, description: &str) -> E;
-}
-
-#[cfg(target_arch = "wasm32")]
-impl<T, E: fmt::Debug> WasmUnwrapExt<T> for Result<T, E> {
-    #[track_caller]
-    fn unwrap_w(self) -> T {
-        match self {
-            Ok(t) => t,
-            Err(e) => {
-                let (file, line) = caller_file_line();
-                let error = format!(
-                    "{}:{}] 'Result::unwrap_w' called on an 'Err' value: {:?}",
-                    file, line, e
-                );
-                wasm_bindgen::throw_str(&error)
-            },
-        }
-    }
-
-    #[track_caller]
-    fn expect_w(self, description: &str) -> T {
-        match self {
-            Ok(t) => t,
-            Err(e) => {
-                let (file, line) = caller_file_line();
-                let error = format!("{}:{}] {}: {:?}", file, line, description, e);
-                wasm_bindgen::throw_str(&error)
-            },
-        }
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-impl<T> WasmUnwrapExt<T> for Option<T> {
-    #[track_caller]
-    fn unwrap_w(self) -> T {
-        match self {
-            Some(t) => t,
-            None => {
-                let (file, line) = caller_file_line();
-                let error = format!("{}:{}] 'Option::unwrap_w' called on a 'None' value", file, line);
-                wasm_bindgen::throw_str(&error)
-            },
-        }
-    }
-
-    #[track_caller]
-    fn expect_w(self, description: &str) -> T {
-        match self {
-            Some(t) => t,
-            None => {
-                let (file, line) = caller_file_line();
-                let error = format!("{}:{}] {}", file, line, description);
-                wasm_bindgen::throw_str(&error)
-            },
-        }
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-impl<T: fmt::Debug, E> WasmUnwrapErrExt<E> for Result<T, E> {
-    #[track_caller]
-    fn unwrap_err_w(self) -> E {
-        match self {
-            Ok(t) => {
-                let (file, line) = caller_file_line();
-                let error = format!(
-                    "{}:{}] 'Result::unwrap_err_w' called on an 'Ok' value: {:?}",
-                    file, line, t
-                );
-                wasm_bindgen::throw_str(&error)
-            },
-            Err(e) => e,
-        }
-    }
-
-    #[track_caller]
-    fn expect_err_w(self, description: &str) -> E {
-        match self {
-            Ok(t) => {
-                let (file, line) = caller_file_line();
-                let error = format!("{}:{}] {}: {:?}", file, line, description, t);
-                wasm_bindgen::throw_str(&error)
-            },
-            Err(e) => e,
-        }
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-#[track_caller]
-pub fn panic_w(description: &str) {
-    let (file, line) = caller_file_line();
-    let error = format!("{}:{}] 'panic_w' called: {:?}", file, line, description);
-    wasm_bindgen::throw_str(&error)
-}
-
 pub fn first_char_to_upper(input: &str) -> String {
     let mut v: Vec<char> = input.chars().collect();
     if let Some(c) = v.first_mut() {
@@ -2193,26 +781,6 @@ fn test_first_char_to_upper() {
     assert_eq!(".komodo", first_char_to_upper(".komodo"));
 }
 
-pub fn json_dir_entries(path: &dyn AsRef<Path>) -> Result<Vec<DirEntry>, String> {
-    Ok(try_s!(path.as_ref().read_dir())
-        .filter_map(|dir_entry| {
-            let entry = match dir_entry {
-                Ok(ent) => ent,
-                Err(e) => {
-                    log!("Error " (e) " reading from dir " (path.as_ref().display()));
-                    return None;
-                },
-            };
-
-            if entry.path().extension() == Some(OsStr::new("json")) {
-                Some(entry)
-            } else {
-                None
-            }
-        })
-        .collect())
-}
-
 /// Calculates the median of the set represented as slice
 pub fn median<T: Add<Output = T> + Div<Output = T> + Copy + From<u8> + Ord>(input: &mut [T]) -> Option<T> {
     // median is undefined on empty sets
@@ -2336,3 +904,39 @@ fn test_is_acceptable_input_on_repeated_characters() {
         false
     );
 }
+
+#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
+pub enum PagingOptionsEnum<Id> {
+    FromId(Id),
+    PageNumber(NonZeroUsize),
+}
+
+impl<Id> PagingOptionsEnum<Id> {
+    pub fn map<U, F>(self, f: F) -> PagingOptionsEnum<U>
+    where
+        F: FnOnce(Id) -> U,
+    {
+        match self {
+            PagingOptionsEnum::FromId(id) => PagingOptionsEnum::FromId(f(id)),
+            PagingOptionsEnum::PageNumber(s) => PagingOptionsEnum::PageNumber(s),
+        }
+    }
+}
+
+impl<Id> Default for PagingOptionsEnum<Id> {
+    fn default() -> Self { PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).expect("1 > 0")) }
+}
+
+/// The AbortHandle that aborts on drop
+pub struct AbortOnDropHandle(AbortHandle);
+
+impl Drop for AbortOnDropHandle {
+    #[inline(always)]
+    fn drop(&mut self) { self.0.abort(); }
+}
+
+pub fn spawn_abortable(fut: impl Future03<Output = ()> + Send + 'static) -> AbortOnDropHandle {
+    let (abortable, handle) = abortable(fut);
+    spawn(abortable.then(|_| async {}));
+    AbortOnDropHandle(handle)
+}
diff --git a/mm2src/common/crash_reports.rs b/mm2src/common/crash_reports.rs
index 5713b44053..4d5afe39c9 100644
--- a/mm2src/common/crash_reports.rs
+++ b/mm2src/common/crash_reports.rs
@@ -63,7 +63,7 @@ extern "C" fn signal_handler(sig: c_int) {
         libc::SIGBUS => "SIGBUS",
         libc::SIGSYS => "SIGSYS",
         sig => {
-            sigˢ = fomat!((sig));
+            sigˢ = sig.to_string();
             &sigˢ[..]
         },
     };
@@ -87,7 +87,7 @@ fn init_signal_handling() {
         let mut prev = MaybeUninit::<libc::sigaction>::uninit();
         let rc = unsafe { libc::sigaction(signal, &sa, prev.as_mut_ptr()) };
         if rc != 0 {
-            log!("Error " (rc) " invoking sigaction on " (signal))
+            log::error!("Error {} invoking sigaction on {}", rc, signal)
         }
     }
 }
@@ -96,38 +96,6 @@ fn init_signal_handling() {
 #[cfg(not(unix))]
 fn init_signal_handling() {}
 
-/// Check that access violation stack traces are being reported to stderr under macOS and Linux.
-#[test]
-fn test_crash_handling() {
-    /* TODO: Implement without `cmd!` (without `duct`).
-        let executable = env::args().next());
-        let executable = Path::new (&executable) .canonicalize());
-
-        if env::var ("_MM2_TEST_CRASH_HANDLING_IS_CHILD") != Ok ("1".into()) {
-            log!("test_crash_handling] Spawning a child...");
-            let output = cmd!(&executable, "test_crash_handling", "--nocapture")
-                .env ("_MM2_TEST_CRASH_HANDLING_IS_CHILD", "1")
-                .dir (executable.parent()))  // Might help finding libcurl.dll and pthreadVC2.dll.
-                .stdout_capture().stderr_capture().unchecked().run());
-            let stderr = String::from_utf8_lossy (&output.stderr);
-            log!({"Obtained stderr is: ---\n{}", stderr});
-
-            if cfg!(windows) {
-              assert!(stderr.contains ("SEH caught!"));
-            } else {
-              assert!(stderr.contains ("Signal caught!"));
-            }
-
-            assert!(stderr.contains ("] mm2::mm2::crash_reports::access_violation"));
-            assert!(stderr.contains ("] mm2::mm2::crash_reports::call_access_violation"));
-        } else {
-            log!("test_crash_handling] Hi from the child.");
-            init_crash_reports();
-            call_access_violation();
-        }
-    */
-}
-
 /// Setup the crash handlers.
 #[allow(dead_code)]
 #[cfg(not(target_arch = "wasm32"))]
diff --git a/mm2src/common/custom_futures.rs b/mm2src/common/custom_futures.rs
index 96c21c9a0f..f6b43bf042 100644
--- a/mm2src/common/custom_futures.rs
+++ b/mm2src/common/custom_futures.rs
@@ -235,7 +235,7 @@ impl<T> TimedAsyncMutex<T> {
 
 #[derive(Debug)]
 pub struct TimeoutError {
-    duration: Duration,
+    pub duration: Duration,
 }
 
 impl fmt::Display for TimeoutError {
@@ -298,7 +298,7 @@ where
     }
 }
 
-unsafe impl<F> Send for Timeout<F> {}
+unsafe impl<F> Send for Timeout<F> where F: Send {}
 
 #[test]
 fn test_timeout() {
diff --git a/mm2src/common/custom_iter.rs b/mm2src/common/custom_iter.rs
new file mode 100644
index 0000000000..4a26d4b336
--- /dev/null
+++ b/mm2src/common/custom_iter.rs
@@ -0,0 +1,112 @@
+use std::collections::HashMap;
+use std::hash::Hash;
+use std::iter::FromIterator;
+
+pub trait CollectInto {
+    /// Collects `FromB` from an `IntoIterator<Item=A>` given the fact that `A: Into<B>`.
+    ///
+    /// # Usage
+    ///
+    /// ```rust
+    /// let actual: Vec<String> = vec!["foo", "bar"].collect_into();
+    /// let expected = vec!["foo".to_owned(), "bar".to_owned()];
+    /// assert_eq!(actual, expected);
+    /// ```
+    #[inline]
+    fn collect_into<A, B, FromB>(self) -> FromB
+    where
+        Self: IntoIterator<Item = A> + Sized,
+        A: Into<B>,
+        FromB: FromIterator<B>,
+    {
+        self.into_iter().map(A::into).collect()
+    }
+}
+
+impl<T> CollectInto for T {}
+
+pub trait TryIntoGroupMap {
+    /// An iterator method that unwraps the given `Result<(Key, Value), Err>` items yielded by the input iterator
+    /// and collects `(Key, Value)` tuple pairs into a `HashMap` of keys mapped to `Vec`s of values until an `Err` error is encountered.
+    fn try_into_group_map<K, V, Err>(self) -> Result<HashMap<K, Vec<V>>, Err>
+    where
+        Self: Iterator<Item = Result<(K, V), Err>> + Sized,
+        K: Hash + Eq,
+    {
+        let (lower, upper) = self.size_hint();
+        let capacity = upper.unwrap_or(lower);
+
+        let mut lookup = HashMap::with_capacity(capacity);
+        for res in self {
+            let (key, val) = res?;
+            lookup.entry(key).or_insert_with(Vec::new).push(val);
+        }
+        Ok(lookup)
+    }
+}
+
+impl<T> TryIntoGroupMap for T {}
+
+pub trait TryUnzip<A, B, E>
+where
+    Self: Iterator<Item = Result<(A, B), E>> + Sized,
+{
+    /// An iterator method that unwraps the given `Result<(A, B), Err>` items yielded by the input iterator
+    /// and collects `(A, B)` tuple pairs into the pair of `(FromA, FromB)` containers until a `E` error is encountered.
+    fn try_unzip<FromA, FromB>(self) -> Result<(FromA, FromB), E>
+    where
+        FromA: Default + Extend<A>,
+        FromB: Default + Extend<B>,
+    {
+        let (mut from_a, mut from_b) = (FromA::default(), FromB::default());
+        for res in self {
+            let (a, b) = res?;
+            from_a.extend(Some(a));
+            from_b.extend(Some(b));
+        }
+        Ok((from_a, from_b))
+    }
+}
+
+impl<T, A, B, E> TryUnzip<A, B, E> for T where T: Iterator<Item = Result<(A, B), E>> {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_collect_into() {
+        let actual: Vec<String> = vec!["foo", "bar"].collect_into();
+        let expected = vec!["foo".to_owned(), "bar".to_owned()];
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_try_into_group_map() {
+        let actual: Result<_, &'static str> = vec![Ok(("foo", 1)), Ok(("bar", 2)), Ok(("foo", 3))]
+            .into_iter()
+            .try_into_group_map();
+        let expected: HashMap<_, _> = vec![("foo", vec![1, 3]), ("bar", vec![2])].into_iter().collect();
+        assert_eq!(actual, Ok(expected));
+
+        let err = vec![Ok(("foo", 1)), Ok(("bar", 2)), Err("Error"), Ok(("foo", 3))]
+            .into_iter()
+            .try_into_group_map()
+            .unwrap_err();
+        assert_eq!(err, "Error");
+    }
+
+    #[test]
+    fn test_try_unzip() {
+        let actual: Result<(Vec<_>, Vec<_>), &'static str> = vec![Ok(("foo", 1)), Ok(("bar", 2)), Ok(("foo", 3))]
+            .into_iter()
+            .try_unzip();
+        assert_eq!(actual, Ok((vec!["foo", "bar", "foo"], vec![1, 2, 3])));
+
+        let err = vec![Ok(("foo", 1)), Ok(("bar", 2)), Err("Error"), Ok(("foo", 3))]
+            .into_iter()
+            .try_unzip::<Vec<_>, Vec<_>>()
+            .unwrap_err();
+        assert_eq!(err, "Error");
+    }
+}
diff --git a/mm2src/common/duplex_mutex.rs b/mm2src/common/duplex_mutex.rs
index 18324449c6..639cd62f85 100644
--- a/mm2src/common/duplex_mutex.rs
+++ b/mm2src/common/duplex_mutex.rs
@@ -36,13 +36,13 @@ impl<T: fmt::Display> fmt::Display for DuplexMutexGuard<'_, T> {
     fn fmt(&self, ft: &mut fmt::Formatter<'_>) -> fmt::Result { (**self).fmt(ft) }
 }
 
-struct Impl<T> {
+pub struct Impl<T> {
     locked: AtomicUsize,
     data: UnsafeCell<T>,
 }
 
 // We're only using `Impl::data` behind an `Arc` and a lock.
-unsafe impl<T> Send for Impl<T> {}
+unsafe impl<T> Send for Impl<T> where T: Send {}
 unsafe impl<T> Sync for Impl<T> {}
 
 impl<T> Impl<T> {
@@ -130,7 +130,7 @@ pub struct DuplexMutex<T> {
     pimpl: Arc<Impl<T>>,
 }
 
-unsafe impl<T> Send for DuplexMutex<T> {}
+unsafe impl<T> Send for DuplexMutex<T> where Arc<Impl<T>>: Send {}
 
 impl<T> Clone for DuplexMutex<T> {
     fn clone(&self) -> DuplexMutex<T> {
diff --git a/mm2src/common/executor/native_executor.rs b/mm2src/common/executor/native_executor.rs
new file mode 100644
index 0000000000..7dfe275665
--- /dev/null
+++ b/mm2src/common/executor/native_executor.rs
@@ -0,0 +1,127 @@
+use futures::task::Context;
+use futures::task::Poll as Poll03;
+use futures::Future as Future03;
+use gstuff::now_float;
+use std::pin::Pin;
+use std::thread;
+use std::time::Duration;
+
+pub fn spawn(future: impl Future03<Output = ()> + Send + 'static) { crate::wio::CORE.0.spawn(future); }
+
+pub fn spawn_boxed(future: Box<dyn Future03<Output = ()> + Send + Unpin + 'static>) { spawn(future); }
+
+/// Schedule the given `future` to be executed shortly after the given `utc` time is reached.
+pub fn spawn_after(utc: f64, future: impl Future03<Output = ()> + Send + 'static) {
+    use crossbeam::channel;
+    use gstuff::Constructible;
+    use std::collections::BTreeMap;
+    use std::sync::Once;
+
+    type SheduleChannelItem = (f64, Pin<Box<dyn Future03<Output = ()> + Send + 'static>>);
+    static START: Once = Once::new();
+    static SCHEDULE: Constructible<channel::Sender<SheduleChannelItem>> = Constructible::new();
+    START.call_once(|| {
+        thread::Builder::new()
+            .name("spawn_after".into())
+            .spawn(move || {
+                let (tx, rx) = channel::bounded(0);
+                SCHEDULE.pin(tx).expect("spawn_after] Can't pin the channel");
+                type Task = Pin<Box<dyn Future03<Output = ()> + Send + 'static>>;
+                let mut tasks: BTreeMap<Duration, Vec<Task>> = BTreeMap::new();
+                let mut ready = Vec::with_capacity(4);
+                loop {
+                    let now = Duration::from_secs_f64(now_float());
+                    let mut next_stop = Duration::from_secs_f64(0.1);
+                    for (utc, _) in tasks.iter() {
+                        if *utc <= now {
+                            ready.push(*utc)
+                        } else {
+                            next_stop = *utc - now;
+                            break;
+                        }
+                    }
+                    for utc in ready.drain(..) {
+                        let v = match tasks.remove(&utc) {
+                            Some(v) => v,
+                            None => continue,
+                        };
+                        //log! ("spawn_after] spawning " (v.len()) " tasks at " [utc]);
+                        for f in v {
+                            spawn(f)
+                        }
+                    }
+                    let (utc, f) = match rx.recv_timeout(next_stop) {
+                        Ok(t) => t,
+                        Err(channel::RecvTimeoutError::Disconnected) => break,
+                        Err(channel::RecvTimeoutError::Timeout) => continue,
+                    };
+                    tasks
+                        .entry(Duration::from_secs_f64(utc))
+                        .or_insert_with(Vec::new)
+                        .push(f)
+                }
+            })
+            .expect("Can't spawn a spawn_after thread");
+    });
+    loop {
+        match SCHEDULE.as_option() {
+            None => {
+                thread::yield_now();
+                continue;
+            },
+            Some(tx) => {
+                tx.send((utc, Box::pin(future))).expect("Can't reach spawn_after");
+                break;
+            },
+        }
+    }
+}
+
+/// A future that completes at a given time.  
+pub struct Timer {
+    till_utc: f64,
+}
+
+impl Timer {
+    pub fn till(till_utc: f64) -> Timer { Timer { till_utc } }
+    pub fn sleep(seconds: f64) -> Timer {
+        Timer {
+            till_utc: now_float() + seconds,
+        }
+    }
+    pub fn sleep_ms(ms: u32) -> Timer {
+        let seconds = gstuff::duration_to_float(Duration::from_millis(ms as u64));
+        Timer {
+            till_utc: now_float() + seconds,
+        }
+    }
+    pub fn till_utc(&self) -> f64 { self.till_utc }
+}
+
+impl Future03 for Timer {
+    type Output = ();
+    fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll03<Self::Output> {
+        let delta = self.till_utc - now_float();
+        if delta <= 0. {
+            return Poll03::Ready(());
+        }
+        // NB: We should get a new `Waker` on every `poll` in case the future migrates between executors.
+        // cf. https://rust-lang.github.io/async-book/02_execution/03_wakeups.html
+        let waker = cx.waker().clone();
+        spawn_after(self.till_utc, async move { waker.wake() });
+        Poll03::Pending
+    }
+}
+
+#[test]
+fn test_timer() {
+    let started = now_float();
+    let ti = Timer::sleep(0.2);
+    let delta = now_float() - started;
+    assert!(delta < 0.04, "{}", delta);
+    super::block_on(ti);
+    let delta = now_float() - started;
+    println!("time delta is {}", delta);
+    assert!(delta > 0.2);
+    assert!(delta < 0.4)
+}
diff --git a/mm2src/common/executor/wasm_executor.rs b/mm2src/common/executor/wasm_executor.rs
new file mode 100644
index 0000000000..c31f582371
--- /dev/null
+++ b/mm2src/common/executor/wasm_executor.rs
@@ -0,0 +1,113 @@
+use crate::now_float;
+use futures::task::{Context, Poll};
+use std::future::Future;
+use std::pin::Pin;
+use std::sync::{Arc, Mutex};
+use std::task::Waker;
+use std::time::Duration;
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+extern "C" {
+    /// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout
+    fn setTimeout(closure: &Closure<dyn FnMut()>, delay_ms: u32) -> i32;
+
+    /// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/clearTimeout
+    fn clearTimeout(id: i32);
+}
+
+pub fn spawn(future: impl Future<Output = ()> + Send + 'static) { spawn_local(future) }
+
+pub fn spawn_boxed(future: Box<dyn Future<Output = ()> + Send + Unpin + 'static>) { spawn_local(future) }
+
+pub fn spawn_local(future: impl Future<Output = ()> + 'static) { wasm_bindgen_futures::spawn_local(future) }
+
+/// The timer uses [`setTimeout`] and [`clearTimeout`] for scheduling.
+/// See the [example](https://rustwasm.github.io/docs/wasm-bindgen/reference/passing-rust-closures-to-js.html#heap-allocated-closures).
+///
+/// According to the [blogpost](https://rustwasm.github.io/2018/10/24/multithreading-rust-and-wasm.html),
+/// very few types in [`wasm_bindgen`] are `Send` and `Sync`, and [`wasm_bindgen::closure::Closure`] is not an exception.
+/// Although wasm is currently single-threaded, we can implement the `Send` trait for the `Timer`,
+/// but it won't be safe when wasm becomes multi-threaded.
+#[must_use = "futures do nothing unless polled"]
+pub struct Timer {
+    timeout_id: i32,
+    _closure: Closure<dyn FnMut()>,
+    state: Arc<Mutex<TimerState>>,
+}
+
+unsafe impl Send for Timer {}
+
+impl Timer {
+    pub fn till(till_utc: f64) -> Timer {
+        let secs = till_utc - now_float();
+        Timer::sleep(secs)
+    }
+
+    pub fn sleep(secs: f64) -> Timer {
+        let dur = Duration::from_secs_f64(secs);
+        let delay_ms = gstuff::duration_to_ms(dur) as u32;
+        Timer::sleep_ms(delay_ms)
+    }
+
+    pub fn sleep_ms(delay_ms: u32) -> Timer {
+        fn on_timeout(state: &Arc<Mutex<TimerState>>) {
+            let mut state = match state.lock() {
+                Ok(s) => s,
+                Err(e) => {
+                    log::error!("!on_timeout: {}", e);
+                    return;
+                },
+            };
+            state.completed = true;
+            if let Some(waker) = state.waker.take() {
+                waker.wake();
+            }
+        }
+
+        let state = Arc::new(Mutex::new(TimerState::default()));
+        let state_c = state.clone();
+        // we should hold the closure until the callback function is called
+        let closure = Closure::new(move || on_timeout(&state_c));
+
+        let timeout_id = setTimeout(&closure, delay_ms);
+        Timer {
+            timeout_id,
+            _closure: closure,
+            state,
+        }
+    }
+}
+
+/// When the `Timer` is destroyed, cancel its `setTimeout` timer.
+impl Drop for Timer {
+    fn drop(&mut self) { clearTimeout(self.timeout_id) }
+}
+
+impl Future for Timer {
+    type Output = ();
+    fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+        let mut state = match self.state.lock() {
+            Ok(s) => s,
+            Err(e) => {
+                log::error!("!Timer::poll: {}", e);
+                // if the mutex is poisoned, this error will appear every poll iteration
+                return Poll::Ready(());
+            },
+        };
+        if state.completed {
+            return Poll::Ready(());
+        }
+
+        // NB: We should get a new `Waker` on every `poll` in case the future migrates between executors.
+        // cf. https://rust-lang.github.io/async-book/02_execution/03_wakeups.html
+        state.waker = Some(cx.waker().clone());
+        Poll::Pending
+    }
+}
+
+#[derive(Default)]
+struct TimerState {
+    completed: bool,
+    waker: Option<Waker>,
+}
diff --git a/mm2src/common/for_c.rs b/mm2src/common/for_c.rs
deleted file mode 100644
index 5d1ff644cd..0000000000
--- a/mm2src/common/for_c.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use libc::c_char;
-use std::ffi::CStr;
-use std::net::IpAddr;
-
-// Example of a function forward:
-//lazy_static! {pub static ref PEERS_SEND_COMPAT: Mutex<Option<fn (u32, i32, *const u8, i32) -> i32>> = Mutex::new (None);}
-
-#[no_mangle]
-#[allow(clippy::missing_safety_doc)]
-pub unsafe extern "C" fn log_stacktrace(desc: *const c_char) {
-    let desc = if desc.is_null() {
-        ""
-    } else {
-        match CStr::from_ptr(desc).to_str() {
-            Ok(s) => s,
-            Err(err) => {
-                log! ({"log_stacktrace] Bad trace description: {}", err});
-                ""
-            },
-        }
-    };
-    let mut trace = String::with_capacity(4096);
-    super::stack_trace(&mut super::stack_trace_frame, &mut |l| trace.push_str(l));
-    log! ({"Stacktrace. {}\n{}", desc, trace});
-}
-
-#[no_mangle]
-#[allow(clippy::missing_safety_doc)]
-pub unsafe extern "C" fn is_loopback_ip(ip: *mut c_char) -> u8 {
-    if ip.is_null() {
-        log!("received null ip");
-        return 0;
-    }
-
-    let ip_str = match CStr::from_ptr(ip).to_str() {
-        Ok(s) => s,
-        Err(e) => {
-            log!("Error creating CStr "[e]);
-            return 0;
-        },
-    };
-
-    let ip: IpAddr = match ip_str.parse() {
-        Ok(ip) => ip,
-        Err(e) => {
-            log!("Error " [e] " parsing ip from str " (ip_str));
-            return 0;
-        },
-    };
-
-    ip.is_loopback() as u8
-}
diff --git a/mm2src/common/iguana_utils.rs b/mm2src/common/iguana_utils.rs
deleted file mode 100755
index f42da258d7..0000000000
--- a/mm2src/common/iguana_utils.rs
+++ /dev/null
@@ -1,1074 +0,0 @@
-/******************************************************************************
- * Copyright © 2014-2018 The SuperNET Developers.                             *
- *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
- * the top-level directory of this distribution for the individual copyright  *
- * holder information and the developer policies on copyright and licensing.  *
- *                                                                            *
- * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
- *                                                                            *
- * Removal or modification of this copyright notice is prohibited.            *
- *                                                                            *
- ******************************************************************************/
-
-use hex::FromHex;
-
-// NB: We have some C methods here from the Bitcoin/Komodod codebase that aren't used in the MarketMaker.
-
-/*
-#include "../iguana/iguana777.h"
-
-int32_t smallprimes[168] =
-{
-    2,      3,      5,      7,     11,     13,     17,     19,     23,     29,
-    31,     37,     41,     43,     47,     53,     59,     61,     67,     71,
-    73,     79,     83,     89,     97,    101,    103,    107,    109,    113,
-    127,    131,    137,    139,    149,    151,    157,    163,    167,    173,
-    179,    181,    191,    193,    197,    199,    211,    223,    227,    229,
-    233,    239,    241,    251,    257,    263,    269,    271,    277,    281,
-    283,    293,    307,    311,    313,    317,    331,    337,    347,    349,
-    353,    359,    367,    373,    379,    383,    389,    397,    401,    409,
-    419,    421,    431,    433,    439,    443,    449,    457,    461,    463,
-    467,    479,    487,    491,    499,    503,    509,    521,    523,    541,
-    547,    557,    563,    569,    571,    577,    587,    593,    599,    601,
-    607,    613,    617,    619,    631,    641,    643,    647,    653,    659,
-    661,    673,    677,    683,    691,    701,    709,    719,    727,    733,
-    739,    743,    751,    757,    761,    769,    773,    787,    797,    809,
-    811,    821,    823,    827,    829,    839,    853,    857,    859,    863,
-    877,    881,    883,    887,    907,    911,    919,    929,    937,    941,
-    947,    953,    967,    971,    977,    983,    991,    997
-};
-
-bits256 bits256_doublesha256(char *hashstr,uint8_t *data,int32_t datalen)
-{
-    bits256 hash,hash2; int32_t i;
-    vcalc_sha256(0,hash.bytes,data,datalen);
-    vcalc_sha256(0,hash2.bytes,hash.bytes,sizeof(hash));
-    for (i=0; i<sizeof(hash); i++)
-        hash.bytes[i] = hash2.bytes[sizeof(hash) - 1 - i];
-    if ( hashstr != 0 )
-        init_hexbytes_noT(hashstr,hash.bytes,sizeof(hash));
-    return(hash);
-}
-
-char *bits256_str(char hexstr[65],bits256 x)
-{
-    init_hexbytes_noT(hexstr,x.bytes,sizeof(x));
-    return(hexstr);
-}
-
-bits256 bits256_conv(char *hexstr)
-{
-    bits256 x;
-    memset(&x,0,sizeof(x));
-    if ( strlen(hexstr) == sizeof(x)*2)
-        decode_hex(x.bytes,sizeof(x.bytes),hexstr);
-    return(x);
-}
-
-char *bits256_lstr(char hexstr[65],bits256 x)
-{
-    bits256 revx; int32_t i;
-    for (i=0; i<32; i++)
-        revx.bytes[i] = x.bytes[31-i];
-    init_hexbytes_noT(hexstr,revx.bytes,sizeof(revx));
-    return(hexstr);
-}
-
-bits256 bits256_add(bits256 a,bits256 b)
-{
-    int32_t i; bits256 sum; uint64_t x,carry = 0;
-    memset(sum.bytes,0,sizeof(sum));
-    for (i=0; i<4; i++)
-    {
-        x = a.ulongs[i] + b.ulongs[i];
-        sum.ulongs[i] = (x + carry);
-        if ( x < a.ulongs[i] || x < b.ulongs[i] )
-            carry = 1;
-        else carry = 0;
-    }
-    return(sum);
-}
-
-int32_t bits256_cmp(bits256 a,bits256 b)
-{
-    int32_t i;
-    for (i=3; i>=0; i--)
-    {
-        //printf("%llx %llx, ",(long long)a.ulongs[i],(long long)b.ulongs[i]);
-        if ( a.ulongs[i] > b.ulongs[i] )
-            return(1);
-        else if ( a.ulongs[i] < b.ulongs[i] )
-            return(-1);
-    }
-    //printf("thesame\n");
-    return(0);
-}
-
-bits256 bits256_rshift(bits256 x)
-{
-    int32_t i; uint64_t carry,prevcarry = 0;
-    for (i=3; i>=0; i--)
-    {
-        carry = (1 & x.ulongs[i]) << 63;
-        x.ulongs[i] = prevcarry | (x.ulongs[i] >> 1);
-        prevcarry = carry;
-    }
-    return(x);
-}
-
-bits256 bits256_lshift(bits256 x)
-{
-    int32_t i,carry,prevcarry = 0; uint64_t mask = (1LL << 63);
-    for (i=0; i<4; i++)
-    {
-        carry = ((mask & x.ulongs[i]) != 0);
-        x.ulongs[i] = (x.ulongs[i] << 1) | prevcarry;
-        prevcarry = carry;
-    }
-    return(x);
-}
-
-bits256 bits256_ave(bits256 a,bits256 b)
-{
-    return(bits256_rshift(bits256_add(a,b)));
-}
-
-bits256 bits256_from_compact(uint32_t c)
-{
-    uint32_t nbytes,nbits,i; bits256 x;
-    memset(x.bytes,0,sizeof(x));
-    nbytes = (c >> 24) & 0xFF;
-    if ( nbytes >= 3 )
-    {
-        nbits = (8 * (nbytes - 3));
-        x.ulongs[0] = c & 0xFFFFFF;
-        for (i=0; i<nbits; i++)
-            x = bits256_lshift(x);
-    }
-    return(x);
-}
-
-uint32_t bits256_to_compact(bits256 x)
-{
-    int32_t i; uint32_t nbits;
-    for (i=31; i>2; i--)
-        if ( x.bytes[i] != 0 )
-            break;
-    if ( (x.bytes[i] & 0x80) != 0 )
-        i++;
-    nbits = x.bytes[i] << 16;
-    nbits |= x.bytes[i-1] << 8;
-    nbits |= x.bytes[i-2];
-    nbits |= ((i+1) << 24);
-    return(nbits);
-}
-
-int32_t bitweight(uint64_t x)
-{
-    int i,wt = 0;
-    for (i=0; i<64; i++)
-        if ( (1LL << i) & x )
-            wt++;
-    return(wt);
-}
-
-void calc_OP_HASH160(char hexstr[41],uint8_t rmd160[20],char *pubkey)
-{
-    uint8_t buf[4096]; int32_t len;
-    len = (int32_t)strlen(pubkey)/2;
-    if ( len > sizeof(buf) )
-    {
-        printf("calc_OP_HASH160 overflow len.%d vs %d\n",len,(int32_t)sizeof(buf));
-        return;
-    }
-    decode_hex(buf,len,pubkey);
-    calc_rmd160_sha256(rmd160,buf,len);
-    if ( (0) )
-    {
-        int i;
-        for (i=0; i<20; i++)
-            printf("%02x",rmd160[i]);
-        printf("<- (%s)\n",pubkey);
-    }
-    if ( hexstr != 0 )
-        init_hexbytes_noT(hexstr,rmd160,20);
-}
-
-double _xblend(float *destp,double val,double decay)
-{
-    double oldval;
-    if ( (oldval = *destp) != 0. )
-        return((oldval * decay) + ((1. - decay) * val));
-    else return(val);
-}
-
-double _dxblend(double *destp,double val,double decay)
-{
-    double oldval;
-    if ( (oldval = *destp) != 0. )
-        return((oldval * decay) + ((1. - decay) * val));
-    else return(val);
-}
-
-double dxblend(double *destp,double val,double decay)
-{
-    double newval,slope;
-    if ( isnan(*destp) != 0 )
-        *destp = 0.;
-    if ( isnan(val) != 0 )
-        return(0.);
-    if ( *destp == 0 )
-    {
-        *destp = val;
-        return(0);
-    }
-    newval = _dxblend(destp,val,decay);
-    if ( newval < SMALLVAL && newval > -SMALLVAL )
-    {
-        // non-zero marker for actual values close to or even equal to zero
-        if ( newval < 0. )
-            newval = -SMALLVAL;
-        else newval = SMALLVAL;
-    }
-    if ( *destp != 0. && newval != 0. )
-        slope = (newval - *destp);
-    else slope = 0.;
-    *destp = newval;
-    return(slope);
-}
-
-int32_t TerminateQ_queued; queue_t TerminateQ;
-/*void iguana_terminator(void *arg)
-{
-    struct iguana_thread *t; uint32_t lastdisp = 0; int32_t terminated = 0;
-    printf("iguana_terminator\n");
-    while ( 1 )
-    {
-        if ( (t= queue_dequeue(&TerminateQ,0)) != 0 )
-        {
-            printf("terminate.%p\n",t);
-            iguana_terminate(t);
-            terminated++;
-            continue;
-        }
-        sleep(1);
-        if ( time(NULL) > lastdisp+60 )
-        {
-            lastdisp = (uint32_t)time(NULL);
-            printf("TerminateQ %d terminated of %d queued\n",terminated,TerminateQ_queued);
-        }
-    }
-}*/
-
-
-int32_t iguana_numthreads(struct iguana_info *coin,int32_t mask)
-{
-    int32_t i,sum = 0;
-    for (i=0; i<8; i++)
-        if ( ((1 << i) & mask) != 0 )
-            sum += (coin->Launched[i] - coin->Terminated[i]);
-    return(sum);
-}
-
-void iguana_launcher(void *ptr)
-{
-    struct iguana_thread *t = ptr; //struct iguana_info *coin;
-    //coin = t->coin;
-    t->funcp(t->arg);
-    //if ( coin != 0 )
-    //    coin->Terminated[t->type % (sizeof(coin->Terminated)/sizeof(*coin->Terminated))]++;
-    queue_enqueue("TerminateQ",&TerminateQ,&t->DL);
-}
-
-void iguana_terminate(struct iguana_thread *t)
-{
-    int32_t retval;
-#ifndef _WIN32
-    retval = pthread_join(t->handle,NULL);
-    if ( retval != 0 )
-        printf("error.%d terminating t.%p thread.%s\n",retval,t,t->name);
-#endif
-    myfree(t,sizeof(*t));
-}
-
-struct iguana_thread *iguana_launch(struct iguana_info *coin,char *name,iguana_func funcp,void *arg,uint8_t type)
-{
-    int32_t retval; struct iguana_thread *t;
-    t = mycalloc('Z',1,sizeof(*t));
-    strcpy(t->name,name);
-    t->coin = coin;
-    t->funcp = funcp;
-    t->arg = arg;
-    t->type = (type % (sizeof(coin->Terminated)/sizeof(*coin->Terminated)));
-    if ( coin != 0 )
-        coin->Launched[t->type]++;
-    retval = OS_thread_create(&t->handle,NULL,(void *)iguana_launcher,(void *)t);
-    if ( retval != 0 )
-        printf("error launching %s retval.%d errno.%d\n",t->name,retval,errno);
-    while ( (t= queue_dequeue(&TerminateQ)) != 0 )
-    {
-        if ( (rand() % 100000) == 0 && coin != 0 )
-            printf("terminated.%d launched.%d terminate.%p\n",coin->Terminated[t->type],coin->Launched[t->type],t);
-        iguana_terminate(t);
-    }
-    return(t);
-}
-
-char hexbyte(int32_t c)
-{
-    c &= 0xf;
-    if ( c < 10 )
-        return('0'+c);
-    else if ( c < 16 )
-        return('a'+c-10);
-    else return(0);
-}
-
-int32_t _unhex(char c)
-{
-    if ( c >= '0' && c <= '9' )
-        return(c - '0');
-    else if ( c >= 'a' && c <= 'f' )
-        return(c - 'a' + 10);
-    else if ( c >= 'A' && c <= 'F' )
-        return(c - 'A' + 10);
-    return(-1);
-}
-
-int32_t is_hexstr(char *str,int32_t n)
-{
-    int32_t i;
-    if ( str == 0 || str[0] == 0 )
-        return(0);
-    for (i=0; str[i]!=0; i++)
-    {
-        if ( n > 0 && i >= n )
-            break;
-        if ( _unhex(str[i]) < 0 )
-            break;
-    }
-    if ( n == 0 )
-        return(i);
-    return(i == n);
-}
-
-int32_t unhex(char c)
-{
-    int32_t hex;
-    if ( (hex= _unhex(c)) < 0 )
-    {
-        //printf("unhex: illegal hexchar.(%c)\n",c);
-    }
-    return(hex);
-}
-
-unsigned char _decode_hex(char *hex) { return((unhex(hex[0])<<4) | unhex(hex[1])); }
-
-*/
-
-/// Unpacks a `hex` string into the corresponding array of `bytes`.
-pub fn decode_hex(bytes: &mut [u8], hex: &[u8]) -> Result<(), String> {
-    if bytes.len() == 32 {
-        // This length is often used (cf. bits256) and we decode it without a temporary vector.
-        // Consider also using `from_hex` directly.
-        let buf: [u8; 32] = try_s!(FromHex::from_hex(hex));
-        bytes.copy_from_slice(&buf);
-    } else {
-        // Refactoring vector: Hex decoding shouldn't be more complex than a simple loop,
-        // there's no need for temporary buffers,
-        // should take some time eventually to reimplement and test this as such.
-        let vec: Vec<u8> = try_s!(FromHex::from_hex(hex));
-        if vec.len() != bytes.len() {
-            return ERR!("Unpacked hex length {} is not {}", vec.len(), bytes.len());
-        }
-        bytes.copy_from_slice(&vec);
-    }
-    Ok(())
-}
-
-/*
-int32_t init_hexbytes_noT(char *hexbytes,unsigned char *message,long len)
-{
-    int32_t i;
-    if ( len <= 0 )
-    {
-        hexbytes[0] = 0;
-        return(1);
-    }
-    for (i=0; i<len; i++)
-    {
-        hexbytes[i*2] = hexbyte((message[i]>>4) & 0xf);
-        hexbytes[i*2 + 1] = hexbyte(message[i] & 0xf);
-        //printf("i.%d (%02x) [%c%c]\n",i,message[i],hexbytes[i*2],hexbytes[i*2+1]);
-    }
-    hexbytes[len*2] = 0;
-    //printf("len.%ld\n",len*2+1);
-    return((int32_t)len*2+1);
-}
-
-long _stripwhite(char *buf,int accept)
-{
-    int32_t i,j,c;
-    if ( buf == 0 || buf[0] == 0 )
-        return(0);
-    for (i=j=0; buf[i]!=0; i++)
-    {
-        buf[j] = c = buf[i];
-        if ( c == accept || (c != ' ' && c != '\n' && c != '\r' && c != '\t' && c != '\b') )
-            j++;
-    }
-    buf[j] = 0;
-    return(j);
-}
-
-char *clonestr(char *str)
-{
-    char *clone;
-    if ( str == 0 || str[0] == 0 )
-    {
-        printf("warning cloning nullstr.%p\n",str);
-//#ifdef __APPLE__
-//        while ( 1 ) sleep(1);
-//#endif
-        str = (char *)"<nullstr>";
-    }
-    clone = (char *)malloc(strlen(str)+16);
-    strcpy(clone,str);
-    return(clone);
-}
-
-int32_t safecopy(char *dest,char *src,long len)
-{
-    int32_t i = -1;
-    if ( src != 0 && dest != 0 && src != dest )
-    {
-        if ( dest != 0 )
-            memset(dest,0,len);
-        for (i=0; i<len&&src[i]!=0; i++)
-            dest[i] = src[i];
-        if ( i == len )
-        {
-            printf("safecopy: %s too long %ld\n",src,len);
-            //printf("divide by zero! %d\n",1/zeroval());
-#ifdef __APPLE__
-            //getchar();
-#endif
-            return(-1);
-        }
-        dest[i] = 0;
-    }
-    return(i);
-}
-
-void escape_code(char *escaped,char *str)
-{
-    int32_t i,j,c; char esc[16];
-    for (i=j=0; str[i]!=0; i++)
-    {
-        if ( ((c= str[i]) >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') )
-            escaped[j++] = c;
-        else
-        {
-            sprintf(esc,"%%%02X",c);
-            //sprintf(esc,"\\\\%c",c);
-            strcpy(escaped + j,esc);
-            j += strlen(esc);
-        }
-    }
-    escaped[j] = 0;
-    //printf("escape_code: (%s) -> (%s)\n",str,escaped);
-}
-
-int32_t is_zeroes(char *str)
-{
-    int32_t i;
-    if ( str == 0 || str[0] == 0 )
-        return(1);
-    for (i=0; str[i]!=0; i++)
-        if ( str[i] != '0' )
-            return(0);
-    return(1);
-}
-
-int64_t conv_floatstr(char *numstr)
-{
-    double val,corr;
-    val = atof(numstr);
-    corr = (val < 0.) ? -0.50000000001 : 0.50000000001;
-    return((int64_t)(val * SATOSHIDEN + corr));
-}
-
-int32_t has_backslash(char *str)
-{
-    int32_t i;
-    if ( str == 0 || str[0] == 0 )
-        return(0);
-    for (i=0; str[i]!=0; i++)
-        if ( str[i] == '\\' )
-            return(1);
-    return(0);
-}
-
-static int _increasing_double(const void *a,const void *b)
-{
-#define double_a (*(double *)a)
-#define double_b (*(double *)b)
-    if ( double_b > double_a )
-        return(-1);
-    else if ( double_b < double_a )
-        return(1);
-    return(0);
-#undef double_a
-#undef double_b
-}
-
-static int _decreasing_double(const void *a,const void *b)
-{
-#define double_a (*(double *)a)
-#define double_b (*(double *)b)
-    if ( double_b > double_a )
-        return(1);
-    else if ( double_b < double_a )
-        return(-1);
-    return(0);
-#undef double_a
-#undef double_b
-}
-
-int _increasing_uint64(const void *a,const void *b)
-{
-#define uint64_a (*(uint64_t *)a)
-#define uint64_b (*(uint64_t *)b)
-    if ( uint64_b > uint64_a )
-        return(-1);
-    else if ( uint64_b < uint64_a )
-        return(1);
-    return(0);
-#undef uint64_a
-#undef uint64_b
-}
-
-int _decreasing_uint64(const void *a,const void *b)
-{
-#define uint64_a (*(uint64_t *)a)
-#define uint64_b (*(uint64_t *)b)
-    if ( uint64_b > uint64_a )
-        return(1);
-    else if ( uint64_b < uint64_a )
-        return(-1);
-    return(0);
-#undef uint64_a
-#undef uint64_b
-}
-
-int _decreasing_uint32(const void *a,const void *b)
-{
-#define uint32_a (*(uint32_t *)a)
-#define uint32_b (*(uint32_t *)b)
-    if ( uint32_b > uint32_a )
-        return(1);
-    else if ( uint32_b < uint32_a )
-        return(-1);
-    return(0);
-#undef uint32_a
-#undef uint32_b
-}
-
-int32_t sortds(double *buf,uint32_t num,int32_t size)
-{
-    qsort(buf,num,size,_increasing_double);
-    return(0);
-}
-
-int32_t revsortds(double *buf,uint32_t num,int32_t size)
-{
-    qsort(buf,num,size,_decreasing_double);
-    return(0);
-}
-
-int32_t sort64s(uint64_t *buf,uint32_t num,int32_t size)
-{
-    qsort(buf,num,size,_increasing_uint64);
-    return(0);
-}
-
-int32_t revsort64s(uint64_t *buf,uint32_t num,int32_t size)
-{
-    qsort(buf,num,size,_decreasing_uint64);
-    return(0);
-}
-
-int32_t revsort32(uint32_t *buf,uint32_t num,int32_t size)
-{
-    qsort(buf,num,size,_decreasing_uint32);
-    return(0);
-}
-
-/*int32_t iguana_sortbignum(void *buf,int32_t size,uint32_t num,int32_t structsize,int32_t dir)
-{
-    int32_t retval = 0;
-    if ( dir > 0 )
-    {
-        if ( size == 32 )
-            qsort(buf,num,structsize,_increasing_bits256);
-        else if ( size == 20 )
-            qsort(buf,num,structsize,_increasing_rmd160);
-        else retval = -1;
-    }
-    else
-    {
-        if ( size == 32 )
-            qsort(buf,num,structsize,_decreasing_bits256);
-        else if ( size == 20 )
-            qsort(buf,num,structsize,_decreasing_rmd160);
-        else retval = -1;
-    }
-    if ( retval < 0 )
-        printf("iguana_sortbignum only does bits256 and rmd160 for now\n");
-    return(retval);
-}*/
-
-void touppercase(char *str)
-{
-    int32_t i;
-    if ( str == 0 || str[0] == 0 )
-        return;
-    for (i=0; str[i]!=0; i++)
-        str[i] = toupper(((int32_t)str[i]));
-}
-
-void tolowercase(char *str)
-{
-    int32_t i;
-    if ( str == 0 || str[0] == 0 )
-        return;
-    for (i=0; str[i]!=0; i++)
-        str[i] = tolower(((int32_t)str[i]));
-}
-
-char *uppercase_str(char *buf,char *str)
-{
-    if ( str != 0 )
-    {
-        strcpy(buf,str);
-        touppercase(buf);
-    } else buf[0] = 0;
-    return(buf);
-}
-
-char *lowercase_str(char *buf,char *str)
-{
-    if ( str != 0 )
-    {
-        strcpy(buf,str);
-        tolowercase(buf);
-    } else buf[0] = 0;
-    return(buf);
-}
-
-int32_t strsearch(char *strs[],int32_t num,char *name)
-{
-    int32_t i; char strA[32],refstr[32];
-    strcpy(refstr,name), touppercase(refstr);
-    for (i=0; i<num; i++)
-    {
-        strcpy(strA,strs[i]), touppercase(strA);
-        if ( strcmp(strA,refstr) == 0 )
-            return(i);
-    }
-    return(-1);
-}
-
-int32_t is_decimalstr(char *str)
-{
-    int32_t i;
-    if ( str == 0 || str[0] == 0 )
-        return(0);
-    for (i=0; str[i]!=0; i++)
-        if ( str[i] < '0' || str[i] > '9' )
-            return(0);
-    return(i);
-}
-
-int32_t unstringbits(char *buf,uint64_t bits)
-{
-    int32_t i;
-    for (i=0; i<8; i++,bits>>=8)
-        if ( (buf[i]= (char)(bits & 0xff)) == 0 )
-            break;
-    buf[i] = 0;
-    return(i);
-}
-
-uint64_t stringbits(char *str)
-{
-    uint64_t bits = 0;
-    if ( str == 0 )
-        return(0);
-    int32_t i,n = (int32_t)strlen(str);
-    if ( n > 8 )
-        n = 8;
-    for (i=n-1; i>=0; i--)
-        bits = (bits << 8) | (str[i] & 0xff);
-    //printf("(%s) -> %llx %llu\n",str,(long long)bits,(long long)bits);
-    return(bits);
-}
-
-char *unstringify(char *str)
-{
-    int32_t i,j,n;
-    if ( str == 0 )
-        return(0);
-    else if ( str[0] == 0 )
-        return(str);
-    n = (int32_t)strlen(str);
-    if ( str[0] == '"' && str[n-1] == '"' )
-        str[n-1] = 0, i = 1;
-    else i = 0;
-    for (j=0; str[i]!=0; i++)
-    {
-        if ( str[i] == '\\' && (str[i+1] == 't' || str[i+1] == 'n' || str[i+1] == 'b' || str[i+1] == 'r') )
-            i++;
-        else if ( str[i] == '\\' && str[i+1] == '"' )
-            str[j++] = '"', i++;
-        else str[j++] = str[i];
-    }
-    str[j] = 0;
-    return(str);
-}
-
-void reverse_hexstr(char *str)
-{
-    int i,n;
-    char *rev;
-    n = (int32_t)strlen(str);
-    rev = (char *)malloc(n + 1);
-    for (i=0; i<n; i+=2)
-    {
-        rev[n-2-i] = str[i];
-        rev[n-1-i] = str[i+1];
-    }
-    rev[n] = 0;
-    strcpy(str,rev);
-    free(rev);
-}
-
-/*
- NXT address converter,
- Ported from original javascript (nxtchg)
- To C by Jones
- */
-
-int32_t gexp[] = {1, 2, 4, 8, 16, 5, 10, 20, 13, 26, 17, 7, 14, 28, 29, 31, 27, 19, 3, 6, 12, 24, 21, 15, 30, 25, 23, 11, 22, 9, 18, 1};
-int32_t glog[] = {0, 0, 1, 18, 2, 5, 19, 11, 3, 29, 6, 27, 20, 8, 12, 23, 4, 10, 30, 17, 7, 22, 28, 26, 21, 25, 9, 16, 13, 14, 24, 15};
-int32_t cwmap[] = {3, 2, 1, 0, 7, 6, 5, 4, 13, 14, 15, 16, 12, 8, 9, 10, 11};
-char alphabet[] = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
-
-int32_t gmult(int32_t a,int32_t b)
-{
-    if ( a == 0 || b == 0 )
-        return 0;
-    int32_t idx = (glog[a] + glog[b]) % 31;
-    return gexp[idx];
-}
-
-int32_t letterval(char letter)
-{
-    int32_t ret = 0;
-    if ( letter < '9' )
-        ret = letter - '2';
-    else
-    {
-        ret = letter - 'A' + 8;
-        if ( letter > 'I' )
-            ret--;
-        if ( letter > 'O' )
-            ret--;
-    }
-    return ret;
-}
-
-uint64_t RS_decode(char *rs)
-{
-    int32_t code[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    int32_t i,p = 4;
-    if ( strncmp("NXT-",rs,4) != 0 )
-        return(0);
-    for (i=0; i<17; i++)
-    {
-        code[cwmap[i]] = letterval(rs[p]);
-        p++;
-        if ( rs[p] == '-' )
-            p++;
-    }
-    uint64_t out = 0;
-    for (i=12; i>=0; i--)
-        out = out * 32 + code[i];
-    return out;
-}
-
-int32_t RS_encode(char *rsaddr,uint64_t id)
-{
-    int32_t a,code[] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    int32_t inp[32],out[32],i,j,fb,pos = 0,len = 0;
-    char acc[64];
-    rsaddr[0] = 0;
-    memset(inp,0,sizeof(inp));
-    memset(out,0,sizeof(out));
-    memset(acc,0,sizeof(acc));
-    expand_nxt64bits(acc,id);
-    //sprintf(acc,"%llu",(long long)id);
-    for (a=0; *(acc+a) != '\0'; a++)
-        len++;
-    if ( len == 20 && *acc != '1' )
-    {
-        printf("error (%s) doesnt start with 1",acc);
-        return(-1);
-    }
-    for (i=0; i<len; i++)
-        inp[i] = (int32_t)*(acc+i) - (int32_t)'0';
-    int32_t divide = 0;
-    int32_t newlen = 0;
-    do // base 10 to base 32 conversion
-    {
-        divide = 0;
-        newlen = 0;
-        for (i=0; i<len; i++)
-        {
-            divide = divide * 10 + inp[i];
-            if (divide >= 32)
-            {
-                inp[newlen++] = divide >> 5;
-                divide &= 31;
-            }
-            else if ( newlen > 0 )
-                inp[newlen++] = 0;
-        }
-        len = newlen;
-        out[pos++] = divide;
-    } while ( newlen != 0 );
-    for (i=0; i<13; i++) // copy to code in reverse, pad with 0's
-        code[i] = (--pos >= 0 ? out[i] : 0);
-    int32_t p[] = {0, 0, 0, 0};
-    for (i=12; i>=0; i--)
-    {
-        fb = code[i] ^ p[3];
-        p[3] = p[2] ^ gmult(30, fb);
-        p[2] = p[1] ^ gmult(6, fb);
-        p[1] = p[0] ^ gmult(9, fb);
-        p[0] = gmult(17, fb);
-    }
-    code[13] = p[0];
-    code[14] = p[1];
-    code[15] = p[2];
-    code[16] = p[3];
-    strcpy(rsaddr,"NXT-");
-    j=4;
-    for (i=0; i<17; i++)
-    {
-        rsaddr[j++] = alphabet[code[cwmap[i]]];
-        if ( (j % 5) == 3 && j < 20 )
-            rsaddr[j++] = '-';
-    }
-    rsaddr[j] = 0;
-    //printf("%llu -> NXT RS (%s)\n",(long long)id,rsaddr);
-    return(0);
-}
-
-uint64_t conv_acctstr(char *acctstr)
-{
-    uint64_t nxt64bits = 0;
-    int32_t len;
-    if ( acctstr != 0 )
-    {
-        if ( (len= is_decimalstr(acctstr)) > 0 && len < 24 )
-            nxt64bits = calc_nxt64bits(acctstr);
-        else if ( strncmp("NXT-",acctstr,4) == 0 )
-        {
-            nxt64bits = RS_decode(acctstr);
-            //nxt64bits = conv_rsacctstr(acctstr,0);
-        }
-    }
-    return(nxt64bits);
-}
-
-int32_t base32byte(int32_t val)
-{
-    if ( val < 26 )
-        return('A' + val);
-    else if ( val < 32 )
-        return('2' + val - 26);
-    else return(-1);
-}
-
-int32_t unbase32(char c)
-{
-    if ( c >= 'A' && c <= 'Z' )
-        return(c - 'A');
-    else if ( c >= '2' && c <= '7' )
-        return(c - '2' + 26);
-    else return(-1);
-}
-
-int init_base32(char *tokenstr,uint8_t *token,int32_t len)
-{
-    int32_t i,j,n,val5,offset = 0;
-    for (i=n=0; i<len; i++)
-    {
-        for (j=val5=0; j<5; j++,offset++)
-            if ( GETBIT(token,offset) != 0 )
-                SETBIT(&val5,offset);
-        tokenstr[n++] = base32byte(val5);
-    }
-    tokenstr[n] = 0;
-    return(n);
-}
-
-int decode_base32(uint8_t *token,uint8_t *tokenstr,int32_t len)
-{
-    int32_t i,j,n,val5,offset = 0;
-    for (i=n=0; i<len; i++)
-    {
-        if ( (val5= unbase32(tokenstr[i])) >= 0 )
-        {
-            for (j=val5=0; j<5; j++,offset++)
-            {
-                if ( GETBIT(&val5,j) != 0 )
-                    SETBIT(token,offset);
-                else CLEARBIT(token,offset);
-            }
-        } else return(-1);
-    }
-    while ( (offset & 7) != 0 )
-    {
-        CLEARBIT(token,offset);
-        offset++;
-    }
-    return(offset);
-}
-
-void calc_hexstr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    init_hexbytes_noT(hexstr,(void *)msg,len+1);
-}
-
-void calc_unhexstr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    decode_hex((void *)hexstr,len>>1,(void *)msg);
-    hexstr[len>>1] = 0;
-}
-
-void calc_base64_encodestr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    nn_base64_encode(msg,len,hexstr,len);
-}
-
-void calc_base64_decodestr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    nn_base64_decode((void *)msg,len,(void *)hexstr,1024);
-}
-
-void sha256_sha256(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    bits256_doublesha256(hexstr,msg,len);
-}
-
-void rmd160ofsha256(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    uint8_t sha256[32];
-    if ( is_hexstr((char *)msg,len) > 0 )
-    {
-        decode_hex((uint8_t *)hexstr,len/2,(char *)msg);
-        vcalc_sha256(0,sha256,(void *)hexstr,len/2);
-        calc_rmd160(hexstr,buf,sha256,sizeof(sha256));
-    } else vcalc_sha256(0,sha256,(void *)msg,len);
-    calc_rmd160(hexstr,buf,sha256,sizeof(sha256));
-}
-
-void calc_crc32str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    uint32_t crc; uint8_t serialized[sizeof(crc)];
-    crc = calc_crc32(0,msg,len);
-    //iguana_rwnum(1,serialized,sizeof(crc),&crc);
-    serialized[3] = (crc & 0xff), crc >>= 8;
-    serialized[2] = (crc & 0xff), crc >>= 8;
-    serialized[1] = (crc & 0xff), crc >>= 8;
-    serialized[0] = (crc & 0xff), crc >>= 8;
-    init_hexbytes_noT(hexstr,serialized,sizeof(crc));
-    //printf("crc.%08x vs revcrc.%08x -> %s\n",crc,*(uint32_t *)serialized,hexstr);
-}
-
-void calc_NXTaddr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    uint8_t mysecret[32]; uint64_t nxt64bits;
-    nxt64bits = conv_NXTpassword(mysecret,buf,msg,len);
-    //printf("call RSencode with %llu\n",(long long)nxt64bits);
-    RS_encode(hexstr,nxt64bits);
-}
-
-void calc_curve25519_str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
-{
-    bits256 x,priv,pub;
-    if ( len != sizeof(bits256)*2 || is_hexstr((char *)msg,64) == 0 )
-        conv_NXTpassword(priv.bytes,pub.bytes,msg,len);
-    else priv = *(bits256 *)msg;
-    x = curve25519(priv,curve25519_basepoint9());
-    init_hexbytes_noT(hexstr,x.bytes,sizeof(x));
-}
-
-void calc_rmd160_sha256(uint8_t rmd160[20],uint8_t *data,int32_t datalen)
-{
-    bits256 hash;
-    vcalc_sha256(0,hash.bytes,data,datalen);
-    calc_rmd160(0,rmd160,hash.bytes,sizeof(hash));
-}
-
-char *bittrex_orderbook(char *base,char *rel,int32_t maxdepth)
-{
-    char market[64],url[512];
-    sprintf(market,"%s-%s",rel,base);
-    sprintf(url,"http://bittrex.com/api/v1.1/public/getorderbook?market=%s&type=both&depth=%d",market,maxdepth);
-    return(issue_curl(url));
-}
-
-bits256 bits256_calctxid(char *symbol,uint8_t *serialized,int32_t len)
-{
-    bits256 txid,revtxid; int32_t i;
-    memset(txid.bytes,0,sizeof(txid));
-    if ( strcmp(symbol,"GRS") != 0 && strcmp(symbol,"SMART") != 0 )
-        txid = bits256_doublesha256(0,serialized,len);
-    else
-    {
-        vcalc_sha256(0,revtxid.bytes,serialized,len);
-        for (i=0; i<32; i++)
-            txid.bytes[i] = revtxid.bytes[31 - i];
-    }
-    return(txid);
-}
-
-bits256 iguana_merkle(char *symbol,bits256 *tree,int32_t txn_count)
-{
-    int32_t i,n=0,prev; uint8_t serialized[sizeof(bits256) * 2];
-    if ( txn_count == 1 )
-        return(tree[0]);
-    prev = 0;
-    while ( txn_count > 1 )
-    {
-        if ( (txn_count & 1) != 0 )
-            tree[prev + txn_count] = tree[prev + txn_count-1], txn_count++;
-        n += txn_count;
-        for (i=0; i<txn_count; i+=2)
-        {
-            iguana_rwbignum(1,serialized,sizeof(*tree),tree[prev + i].bytes);
-            iguana_rwbignum(1,&serialized[sizeof(*tree)],sizeof(*tree),tree[prev + i + 1].bytes);
-            tree[n + (i >> 1)] = bits256_calctxid(symbol,serialized,sizeof(serialized));
-        }
-        prev = n;
-        txn_count >>= 1;
-    }
-    return(tree[n]);
-}
-*/
diff --git a/mm2src/common/jsonrpc_client.rs b/mm2src/common/jsonrpc_client.rs
index c0d625374b..63f2ea0a55 100644
--- a/mm2src/common/jsonrpc_client.rs
+++ b/mm2src/common/jsonrpc_client.rs
@@ -1,6 +1,8 @@
 use futures01::Future;
+use itertools::Itertools;
 use serde::de::DeserializeOwned;
 use serde_json::{self as json, Value as Json};
+use std::collections::{BTreeSet, HashMap};
 use std::fmt;
 
 /// Macro generating functions for RPC requests.
@@ -9,41 +11,46 @@ use std::fmt;
 #[macro_export]
 macro_rules! rpc_func {
     ($selff:ident, $method:expr $(, $arg_name:expr)*) => {{
-        let mut params = vec![];
-        $(
-            params.push(json::value::to_value($arg_name).unwrap());
-        )*
-        let request = JsonRpcRequest {
-            jsonrpc: $selff.version().into(),
-            id: $selff.next_id(),
-            method: $method.into(),
-            params
-        };
+        let request = $crate::rpc_req!($selff, $method $(, $arg_name)*);
         $selff.send_request(request)
     }}
 }
 
 /// Macro generating functions for RPC requests.
-/// Send the RPC request to specified remote endpoint using the passed address.
+/// Sends the RPC request to specified remote endpoint using the passed address.
 /// Args must implement/derive Serialize trait.
 /// Generates params vector from input args, builds the request and sends it.
 #[macro_export]
 macro_rules! rpc_func_from {
-    ($selff:ident, $address:expr, $method:expr $(, $arg_name:ident)*) => {{
+    ($selff:ident, $address:expr, $method:expr $(, $arg_name:expr)*) => {{
+        let request = $crate::rpc_req!($selff, $method $(, $arg_name)*);
+        $selff.send_request_to($address, request)
+    }}
+}
+
+/// Macro generating functions for RPC requests.
+/// Args must implement/derive Serialize trait.
+/// Generates params vector from input args, builds the `JsonRpcRequest` request.
+#[macro_export]
+macro_rules! rpc_req {
+    ($selff:ident, $method:expr $(, $arg_name:expr)*) => {{
         let mut params = vec![];
         $(
             params.push(json::value::to_value($arg_name).unwrap());
         )*
-        let request = JsonRpcRequest {
+        JsonRpcRequest {
             jsonrpc: $selff.version().into(),
             id: $selff.next_id(),
             method: $method.into(),
             params
-        };
-        $selff.send_request_to($address, request)
+        }
     }}
 }
 
+pub type JsonRpcResponseFut =
+    Box<dyn Future<Item = (JsonRpcRemoteAddr, JsonRpcResponseEnum), Error = String> + Send + 'static>;
+pub type RpcRes<T> = Box<dyn Future<Item = T, Error = JsonRpcError> + Send + 'static>;
+
 /// Address of server from which an Rpc response was received
 #[derive(Clone, Default)]
 pub struct JsonRpcRemoteAddr(pub String);
@@ -60,8 +67,50 @@ impl From<String> for JsonRpcRemoteAddr {
     fn from(addr: String) -> Self { JsonRpcRemoteAddr(addr) }
 }
 
-/// Serializable RPC request
-#[derive(Serialize, Deserialize, Debug, Clone)]
+/// The identifier is designed to uniquely match outgoing requests and incoming responses.
+/// Even if the batch response is sorted in a different order, `BTreeSet<Id>` allows it to be matched to the request.
+#[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
+pub enum JsonRpcId {
+    Single(String),
+    Batch(BTreeSet<String>),
+}
+
+/// Serializable RPC request that is either single or batch.
+#[derive(Clone, Deserialize, Serialize)]
+#[serde(untagged)]
+pub enum JsonRpcRequestEnum {
+    Single(JsonRpcRequest),
+    Batch(JsonRpcBatchRequest),
+}
+
+impl JsonRpcRequestEnum {
+    /// Creates [`JsonRpcRequestEnum::Batch`] from the given `requests`.
+    #[inline]
+    pub fn new_batch(requests: Vec<JsonRpcRequest>) -> JsonRpcRequestEnum {
+        JsonRpcRequestEnum::Batch(JsonRpcBatchRequest(requests))
+    }
+
+    /// Returns a `JsonRpcId` identifier of the request.
+    #[inline]
+    pub fn rpc_id(&self) -> JsonRpcId {
+        match self {
+            JsonRpcRequestEnum::Single(single) => single.rpc_id(),
+            JsonRpcRequestEnum::Batch(batch) => batch.rpc_id(),
+        }
+    }
+}
+
+impl fmt::Debug for JsonRpcRequestEnum {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            JsonRpcRequestEnum::Single(single) => single.fmt(f),
+            JsonRpcRequestEnum::Batch(batch) => batch.fmt(f),
+        }
+    }
+}
+
+/// Serializable RPC single request.
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct JsonRpcRequest {
     pub jsonrpc: String,
     #[serde(default)]
@@ -71,10 +120,67 @@ pub struct JsonRpcRequest {
 }
 
 impl JsonRpcRequest {
+    // Returns [`JsonRpcRequest::id`].
+    #[inline]
     pub fn get_id(&self) -> &str { &self.id }
+
+    /// Returns a `JsonRpcId` identifier of the request.
+    #[inline]
+    pub fn rpc_id(&self) -> JsonRpcId { JsonRpcId::Single(self.id.clone()) }
+}
+
+impl From<JsonRpcRequest> for JsonRpcRequestEnum {
+    fn from(single: JsonRpcRequest) -> Self { JsonRpcRequestEnum::Single(single) }
+}
+
+/// Serializable RPC batch request.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct JsonRpcBatchRequest(Vec<JsonRpcRequest>);
+
+impl JsonRpcBatchRequest {
+    /// Returns a `JsonRpcId` identifier of the request.
+    #[inline]
+    pub fn rpc_id(&self) -> JsonRpcId { JsonRpcId::Batch(self.orig_sequence_ids().collect()) }
+
+    /// Returns the number of the requests in the batch.
+    #[inline]
+    pub fn len(&self) -> usize { self.0.len() }
+
+    /// Whether the batch is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool { self.0.is_empty() }
+
+    /// Returns original sequence of identifiers.
+    /// The method is used to process batch responses in the same order in which the requests were sent.
+    #[inline]
+    fn orig_sequence_ids(&self) -> impl Iterator<Item = String> + '_ { self.0.iter().map(|req| req.id.clone()) }
 }
 
-#[derive(Deserialize, Debug, Clone)]
+impl From<JsonRpcBatchRequest> for JsonRpcRequestEnum {
+    fn from(batch: JsonRpcBatchRequest) -> Self { JsonRpcRequestEnum::Batch(batch) }
+}
+
+/// Deserializable RPC response that is either single or batch.
+#[derive(Clone, Debug, Deserialize)]
+#[serde(untagged)]
+pub enum JsonRpcResponseEnum {
+    Single(JsonRpcResponse),
+    Batch(JsonRpcBatchResponse),
+}
+
+impl JsonRpcResponseEnum {
+    /// Returns a `JsonRpcId` identifier of the response.
+    #[inline]
+    pub fn rpc_id(&self) -> JsonRpcId {
+        match self {
+            JsonRpcResponseEnum::Single(single) => single.rpc_id(),
+            JsonRpcResponseEnum::Batch(batch) => batch.rpc_id(),
+        }
+    }
+}
+
+/// Deserializable RPC single response.
+#[derive(Clone, Debug, Deserialize)]
 pub struct JsonRpcResponse {
     #[serde(default)]
     pub jsonrpc: String,
@@ -86,19 +192,55 @@ pub struct JsonRpcResponse {
     pub error: Json,
 }
 
+impl JsonRpcResponse {
+    /// Returns a `JsonRpcId` identifier of the response.
+    #[inline]
+    pub fn rpc_id(&self) -> JsonRpcId { JsonRpcId::Single(self.id.clone()) }
+}
+
+/// Deserializable RPC batch response.
+#[derive(Clone, Debug, Deserialize)]
+pub struct JsonRpcBatchResponse(Vec<JsonRpcResponse>);
+
+impl JsonRpcBatchResponse {
+    /// Returns a `JsonRpcId` identifier of the response.
+    pub fn rpc_id(&self) -> JsonRpcId { JsonRpcId::Batch(self.0.iter().map(|res| res.id.clone()).collect()) }
+
+    /// Returns the number of the requests in the batch.
+    #[inline]
+    pub fn len(&self) -> usize { self.0.len() }
+
+    /// Whether the batch is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool { self.0.is_empty() }
+}
+
+impl IntoIterator for JsonRpcBatchResponse {
+    type Item = JsonRpcResponse;
+    type IntoIter = std::vec::IntoIter<JsonRpcResponse>;
+
+    fn into_iter(self) -> Self::IntoIter { self.0.into_iter() }
+}
+
 #[derive(Clone, Debug)]
 pub struct JsonRpcError {
     /// Additional member contains an instance info that implements the JsonRpcClient trait.
     /// The info is used in particular to supplement the error info.
-    client_info: String,
+    pub client_info: String,
     /// Source Rpc request.
-    request: JsonRpcRequest,
+    pub request: JsonRpcRequestEnum,
     /// Error type.
     pub error: JsonRpcErrorType,
 }
 
+impl fmt::Display for JsonRpcError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{:?}", self) }
+}
+
 #[derive(Clone, Debug)]
 pub enum JsonRpcErrorType {
+    /// Invalid outgoing request error
+    InvalidRequest(String),
     /// Error from transport layer
     Transport(String),
     /// Response parse error
@@ -108,40 +250,84 @@ pub enum JsonRpcErrorType {
 }
 
 impl JsonRpcErrorType {
-    pub fn is_transport(&self) -> bool { matches!(*self, JsonRpcErrorType::Transport(_)) }
+    /// Whether the error type is [`JsonRpcErrorType::Transport`].
+    #[inline]
+    pub fn is_transport(&self) -> bool { matches!(self, JsonRpcErrorType::Transport(_)) }
 }
 
-impl fmt::Display for JsonRpcError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{:?}", self) }
-}
-
-pub type JsonRpcResponseFut =
-    Box<dyn Future<Item = (JsonRpcRemoteAddr, JsonRpcResponse), Error = String> + Send + 'static>;
-pub type RpcRes<T> = Box<dyn Future<Item = T, Error = JsonRpcError> + Send + 'static>;
-
 pub trait JsonRpcClient {
+    /// Returns a stringified version of the JSON-RPC protocol.
     fn version(&self) -> &'static str;
 
+    /// Returns a stringified identifier of the next request.
     fn next_id(&self) -> String;
 
     /// Get info that is used in particular to supplement the error info
     fn client_info(&self) -> String;
 
-    fn transport(&self, request: JsonRpcRequest) -> JsonRpcResponseFut;
+    /// Sends the given `request` to the remote.
+    /// Returns either an address `JsonRpcRemoteAddr` of the responder and the `JsonRpcResponseEnum` response,
+    /// or a stringified error.
+    fn transport(&self, request: JsonRpcRequestEnum) -> JsonRpcResponseFut;
 
+    /// Sends the given single `request` to the remote and tries to decode the response into `T`.
     fn send_request<T: DeserializeOwned + Send + 'static>(&self, request: JsonRpcRequest) -> RpcRes<T> {
         let client_info = self.client_info();
         Box::new(
-            self.transport(request.clone())
-                .then(move |result| process_transport_result(result, client_info, request)),
+            self.transport(JsonRpcRequestEnum::Single(request.clone()))
+                .then(move |result| process_transport_single_result(result, client_info, request)),
+        )
+    }
+}
+
+pub trait JsonRpcBatchClient: JsonRpcClient {
+    /// Sends the RPC batch request.
+    /// Responses are guaranteed to be in the same order in which they were requested.
+    fn batch_rpc<I, T>(&self, batch_requests: I) -> RpcRes<Vec<T>>
+    where
+        I: IntoIterator<Item = JsonRpcRequest>,
+        T: DeserializeOwned + Send + 'static,
+    {
+        let requests: Vec<_> = batch_requests.into_iter().collect();
+        if requests.is_empty() {
+            // Return an empty vector of results.
+            return Box::new(futures01::future::ok(Vec::new()));
+        }
+        self.send_batch_request(JsonRpcBatchRequest(requests))
+    }
+
+    /// Sends the given batch `request` to the remote and tries to decode the batch response into `Vec<T>`.
+    /// Responses are guaranteed to be in the same order in which they were requested.
+    fn send_batch_request<T: DeserializeOwned + Send + 'static>(&self, request: JsonRpcBatchRequest) -> RpcRes<Vec<T>> {
+        try_fu!(self.validate_batch_request(&request));
+        let client_info = self.client_info();
+        Box::new(
+            self.transport(JsonRpcRequestEnum::Batch(request.clone()))
+                .then(move |result| process_transport_batch_result(result, client_info, request)),
         )
     }
+
+    /// Validates the given batch requests if they all have unique IDs.
+    fn validate_batch_request(&self, request: &JsonRpcBatchRequest) -> Result<(), JsonRpcError> {
+        if request.orig_sequence_ids().all_unique() {
+            return Ok(());
+        }
+        Err(JsonRpcError {
+            client_info: self.client_info(),
+            request: request.clone().into(),
+            error: JsonRpcErrorType::InvalidRequest(ERRL!("Each request in a batch must have a unique ID")),
+        })
+    }
 }
 
 /// The trait is used when the rpc client instance has more than one remote endpoints.
 pub trait JsonRpcMultiClient: JsonRpcClient {
-    fn transport_exact(&self, to_addr: String, request: JsonRpcRequest) -> JsonRpcResponseFut;
+    /// Sends the given `request` to the specified `to_addr` remote.
+    /// Returns either an address `JsonRpcRemoteAddr` of the responder and the `JsonRpcResponseEnum` response,
+    /// or a stringified error.
+    fn transport_exact(&self, to_addr: String, request: JsonRpcRequestEnum) -> JsonRpcResponseFut;
 
+    /// Sends the given single `request` to the specified `to_addr` remote and tries to decode the response into `T`.
     fn send_request_to<T: DeserializeOwned + Send + 'static>(
         &self,
         to_addr: &str,
@@ -149,19 +335,61 @@ pub trait JsonRpcMultiClient: JsonRpcClient {
     ) -> RpcRes<T> {
         let client_info = self.client_info();
         Box::new(
-            self.transport_exact(to_addr.to_owned(), request.clone())
-                .then(move |result| process_transport_result(result, client_info, request)),
+            self.transport_exact(to_addr.to_owned(), JsonRpcRequestEnum::Single(request.clone()))
+                .then(move |result| process_transport_single_result(result, client_info, request)),
         )
     }
 }
 
-fn process_transport_result<T: DeserializeOwned + Send + 'static>(
-    result: Result<(JsonRpcRemoteAddr, JsonRpcResponse), String>,
+/// Checks if the given `result` is success and contains `JsonRpcResponse`.
+/// Tries to decode the batch response into `T`.
+fn process_transport_single_result<T: DeserializeOwned + Send + 'static>(
+    result: Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String>,
     client_info: String,
     request: JsonRpcRequest,
 ) -> Result<T, JsonRpcError> {
-    let (remote_addr, response) = match result {
-        Ok(r) => r,
+    let request = JsonRpcRequestEnum::Single(request);
+
+    match result {
+        Ok((remote_addr, JsonRpcResponseEnum::Single(single))) => {
+            process_single_response(client_info, remote_addr, request, single)
+        },
+        Ok((remote_addr, JsonRpcResponseEnum::Batch(batch))) => {
+            let error = ERRL!("Expeced single response, found batch response: {:?}", batch);
+            Err(JsonRpcError {
+                client_info,
+                request,
+                error: JsonRpcErrorType::Parse(remote_addr, error),
+            })
+        },
+        Err(e) => Err(JsonRpcError {
+            client_info,
+            request,
+            error: JsonRpcErrorType::Transport(e),
+        }),
+    }
+}
+
+/// Checks if the given `result` is success and contains `JsonRpcBatchResponse`.
+/// Tries to decode the batch response into `Vec<T>` in the same order in which they were requested.
+fn process_transport_batch_result<T: DeserializeOwned + Send + 'static>(
+    result: Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String>,
+    client_info: String,
+    request: JsonRpcBatchRequest,
+) -> Result<Vec<T>, JsonRpcError> {
+    let orig_ids: Vec<_> = request.orig_sequence_ids().collect();
+    let request = JsonRpcRequestEnum::Batch(request);
+
+    let (remote_addr, batch) = match result {
+        Ok((remote_addr, JsonRpcResponseEnum::Batch(batch))) => (remote_addr, batch),
+        Ok((remote_addr, JsonRpcResponseEnum::Single(single))) => {
+            let error = ERRL!("Expected batch response, found single response: {:?}", single);
+            return Err(JsonRpcError {
+                client_info,
+                request,
+                error: JsonRpcErrorType::Parse(remote_addr, error),
+            });
+        },
         Err(e) => {
             return Err(JsonRpcError {
                 client_info,
@@ -171,6 +399,54 @@ fn process_transport_result<T: DeserializeOwned + Send + 'static>(
         },
     };
 
+    // Turn the vector of responses into a hashmap by their IDs to get quick access to the content of the responses.
+    let mut response_map: HashMap<String, JsonRpcResponse> =
+        batch.into_iter().map(|res| (res.id.clone(), res)).collect();
+    if response_map.len() != orig_ids.len() {
+        let error = ERRL!(
+            "Expected '{}' elements in batch response, found '{}'",
+            orig_ids.len(),
+            response_map.len()
+        );
+        return Err(JsonRpcError {
+            client_info,
+            request,
+            error: JsonRpcErrorType::Parse(remote_addr, error),
+        });
+    }
+
+    let mut result = Vec::with_capacity(orig_ids.len());
+    for id in orig_ids.iter() {
+        let single_resp = match response_map.remove(id) {
+            Some(res) => res,
+            None => {
+                let error = ERRL!("Batch response doesn't contain '{}' identifier", id);
+                return Err(JsonRpcError {
+                    client_info,
+                    request,
+                    error: JsonRpcErrorType::Parse(remote_addr, error),
+                });
+            },
+        };
+
+        result.push(process_single_response(
+            client_info.clone(),
+            remote_addr.clone(),
+            request.clone(),
+            single_resp,
+        )?);
+    }
+    Ok(result)
+}
+
+/// Tries to decode the given single `response` into `T` if it doesn't contain an error,
+/// otherwise returns `JsonRpcError`.
+fn process_single_response<T: DeserializeOwned + Send + 'static>(
+    client_info: String,
+    remote_addr: JsonRpcRemoteAddr,
+    request: JsonRpcRequestEnum,
+    response: JsonRpcResponse,
+) -> Result<T, JsonRpcError> {
     if !response.error.is_null() {
         return Err(JsonRpcError {
             client_info,
diff --git a/mm2src/common/log.rs b/mm2src/common/log.rs
index a7dd383666..15730285c6 100644
--- a/mm2src/common/log.rs
+++ b/mm2src/common/log.rs
@@ -3,11 +3,15 @@
 use super::duplex_mutex::DuplexMutex;
 use super::executor::{spawn, Timer};
 use super::{now_ms, writeln};
+use crate::filename;
 use chrono::format::strftime::StrftimeItems;
 use chrono::format::DelayedFormat;
 use chrono::{Local, TimeZone, Utc};
 use crossbeam::queue::SegQueue;
-use log::Record;
+use itertools::Itertools;
+#[cfg(not(target_arch = "wasm32"))]
+use lightning::util::logger::{Level as LightningLevel, Logger as LightningLogger, Record as LightningRecord};
+use log::{Level, Record};
 use parking_lot::Mutex;
 use serde_json::Value as Json;
 use std::cell::RefCell;
@@ -20,21 +24,24 @@ use std::hash::{Hash, Hasher};
 use std::mem::swap;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
+use std::str::FromStr;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::{Arc, Weak};
 use std::thread;
 
-pub use log::{debug, error, info, trace, warn, LevelFilter};
+pub use log::{self as log_crate, debug, error, info, trace, warn, LevelFilter};
 
 #[cfg(target_arch = "wasm32")]
 #[path = "log/wasm_log.rs"]
 pub mod wasm_log;
+
 #[cfg(target_arch = "wasm32")]
 pub use wasm_log::{LogLevel, WasmCallback, WasmLoggerBuilder};
 
 #[cfg(not(target_arch = "wasm32"))]
 #[path = "log/native_log.rs"]
 mod native_log;
+
 #[cfg(not(target_arch = "wasm32"))]
 pub use native_log::{FfiCallback, LogLevel, UnifiedLoggerBuilder};
 
@@ -168,21 +175,125 @@ pub fn short_log_time(ms: u64) -> DelayedFormat<StrftimeItems<'static>> {
 #[macro_export]
 macro_rules! log {
     ($($args: tt)+) => {{
-        use std::fmt::Write;
-
-        // We can optimize this with a stack-allocated SmallVec from https://github.com/arcnmx/stack-rs,
-        // though it doesn't worth the trouble at the moment.
-        let mut buf = String::new();
-        wite! (&mut buf,
-            ($crate::log::short_log_time ($crate::now_ms()))
-            if cfg! (target_arch = "wasm32") {"ʷ "} else {", "}
-            (::gstuff::filename (file!())) ':' (line!()) "] "
-            $($args)+)
-        .unwrap();
-        $crate::log::chunk2log(buf, $crate::log::LogLevel::Info)
+        let time = $crate::log::short_log_time($crate::now_ms());
+        let file = $crate::filename(file!());
+        let msg = format!($($args)+);
+        let chunk = format!("{}, {}:{}] {}", time, file, line!(), msg);
+        $crate::log::chunk2log(chunk, $crate::log::LogLevel::Info)
     }}
 }
 
+/// Log to the `ctx` dashboard with single tags, or key-value tags, or without any tags.
+///
+/// # Examples
+///
+/// ## With single and key-value tags
+///
+/// ```rust
+/// log_tag!(
+///   ctx,
+///   "😅",
+///   "tx_history",
+///   "coin" => coin.as_ref().conf.ticker;
+///   fmt = "Some message: {}",
+///   any_message
+/// );
+/// ```
+///
+/// ## Without any tags
+///
+/// ```rust
+/// log_tag!(ctx, "😅"; fmt = "Some message: {}", any_message);
+/// ```
+///
+/// # Important
+///
+/// Don't forget to separate tags and message formatting using `;` symbol.
+#[macro_export]
+macro_rules! log_tag {
+    ($ctx:expr, $emotion:literal $(, $tag_key:expr $(=> $tag_val:expr)? )* ; fmt = $($arg:tt)*) => {{
+        let tags: &[&dyn $crate::log::TagParam] = &[
+            $(
+                &(
+                    $tag_key.to_string()
+                    $(, $tag_val.to_string())?
+                )
+            ),*
+        ];
+        let line = ERRL!($($arg)*);
+        $ctx.log.log($emotion, tags, &line);
+    }};
+}
+
+pub trait LogOnError {
+    // Log the error and caller location to WARN level here.
+    fn warn_log(self);
+
+    // Log the error, caller location and the given message to WARN level here.
+    fn warn_log_with_msg(self, msg: &str);
+
+    // Log the error and caller location to ERROR level here.
+    fn error_log(self);
+
+    // Log the error, caller location and the given message to ERROR level here.
+    fn error_log_with_msg(self, msg: &str);
+
+    fn error_log_passthrough(self) -> Self;
+}
+
+impl<T, E: fmt::Display> LogOnError for Result<T, E> {
+    #[track_caller]
+    fn warn_log(self) {
+        if let Err(e) = self {
+            let location = std::panic::Location::caller();
+            let file = filename(location.file());
+            let line = location.line();
+            warn!("{}:{}] {}", file, line, e);
+        }
+    }
+
+    #[track_caller]
+    fn warn_log_with_msg(self, msg: &str) {
+        if let Err(e) = self {
+            let location = std::panic::Location::caller();
+            let file = filename(location.file());
+            let line = location.line();
+            warn!("{}:{}] {}: {}", file, line, msg, e);
+        }
+    }
+
+    #[track_caller]
+    fn error_log(self) {
+        if let Err(e) = self {
+            let location = std::panic::Location::caller();
+            let file = filename(location.file());
+            let line = location.line();
+            error!("{}:{}] {}", file, line, e);
+        }
+    }
+
+    #[track_caller]
+    fn error_log_with_msg(self, msg: &str) {
+        if let Err(e) = self {
+            let location = std::panic::Location::caller();
+            let file = filename(location.file());
+            let line = location.line();
+            error!("{}:{}] {}: {}", file, line, msg, e);
+        }
+    }
+
+    #[track_caller]
+    fn error_log_passthrough(self) -> Self {
+        if let Err(e) = &self {
+            let location = std::panic::Location::caller();
+            let file = filename(location.file());
+            let line = location.line();
+            error!("{}:{}] {}", file, line, e);
+        }
+        self
+    }
+}
+
 pub trait TagParam<'a> {
     fn key(&self) -> String;
     fn val(&self) -> Option<String>;
@@ -210,7 +321,12 @@ impl<'a> TagParam<'a> for (String, &'a str) {
 
 impl<'a> TagParam<'a> for (&'a str, i32) {
     fn key(&self) -> String { String::from(self.0) }
-    fn val(&self) -> Option<String> { Some(fomat!((self.1))) }
+    fn val(&self) -> Option<String> { Some(self.1.to_string()) }
+}
+
+impl<'a> TagParam<'a> for (String, String) {
+    fn key(&self) -> String { self.0.clone() }
+    fn val(&self) -> Option<String> { Some(self.1.clone()) }
 }
 
 #[derive(Clone, Eq, Hash, PartialEq)]
@@ -303,7 +419,7 @@ impl Status {
         swap(&mut log.line, &mut *status.line.spinlock(77).unwrap());
         let mut chunk = String::with_capacity(256);
         if let Err(err) = log.format(&mut chunk) {
-            log! ({"log] Error formatting log entry: {}", err});
+            log!("log] Error formatting log entry: {}", err);
         }
         tail.push_back(log);
         drop(tail);
@@ -334,16 +450,10 @@ impl Default for LogEntry {
 impl LogEntry {
     pub fn format(&self, buf: &mut String) -> Result<(), fmt::Error> {
         let time = Local.timestamp_millis(self.time as i64);
-
-        wite! (buf,
-            if self.emotion.is_empty() {'·'} else {(self.emotion)}
-            ' '
-            (time.format ("%Y-%m-%d %H:%M:%S %z"))
-            ' '
-            // TODO: JSON-escape the keys and values when necessary.
-            '[' for t in &self.tags {(t.key) if let Some (ref v) = t.val {'=' (v)}} separated {' '} "] "
-            (self.line)
-        )
+        let time_formatted = time.format("%Y-%m-%d %H:%M:%S %z");
+        let emotion = if self.emotion.is_empty() { "·" } else { &self.emotion };
+        let tags = format_tags(&self.tags);
+        write!(buf, "{} {} [{}] {}", emotion, time_formatted, tags, self.line)
     }
 }
 
@@ -474,6 +584,8 @@ pub struct LogState {
     /// (this thread becomes a center of gravity for the other registered threads).
     /// In the future we might also use `gravity` to log into a file.
     gravity: DuplexMutex<Option<Arc<Gravity>>>,
+    /// Keeps track of the log level that the log state is initiated with
+    level: LogLevel,
 }
 
 #[derive(Clone)]
@@ -548,27 +660,38 @@ fn log_dashboard_sometimesʹ(dashboard: &[Arc<Status>], dl: &mut DashboardLoggin
 
     dl.last_hash.store(hash, Ordering::Relaxed);
     dl.last_log_ms.store(now, Ordering::Relaxed);
-    let mut buf = String::with_capacity(7777);
-    wite! (buf, "+--- " (short_log_time (now)) " -------").unwrap();
+    let mut buf = format!("+--- {} -------", short_log_time(now));
     for status in dashboard.iter() {
         let start = status.start.load(Ordering::Relaxed);
-        let deadline = status.deadline.load(Ordering::Relaxed);
+
+        let tags_str = match status.tags.spinlock(77) {
+            Ok(t) => format_tags(&t),
+            Err(_) => String::new(),
+        };
+
         let passed = (now as i64 - start as i64) / 1000;
+        let passed_str = if passed >= 0 {
+            format!("{}:{:0>2}", passed / 60, passed % 60)
+        } else {
+            "-".to_owned()
+        };
+
+        let deadline = status.deadline.load(Ordering::Relaxed);
         let timeframe = (deadline as i64 - start as i64) / 1000;
-        let tags = match status.tags.spinlock(77) {
-            Ok(t) => t.clone(),
-            Err(_) => Vec::new(),
+        let timeframe_str = if deadline > 0 {
+            format!("/{}:{:0>2}", timeframe / 60, timeframe % 60)
+        } else {
+            String::new()
         };
+
         let line = match status.line.spinlock(77) {
             Ok(l) => l.clone(),
             Err(_) => "-locked-".into(),
         };
-        wite! (buf,
-          "\n| (" if passed >= 0 {(passed / 60) ':' {"{:0>2}", passed % 60}} else {'-'}
-          if deadline > 0 {'/' (timeframe / 60) ':' {"{:0>2}", timeframe % 60}} ") "
-          '[' for t in tags {(t.key) if let Some (ref v) = t.val {'=' (v)}} separated {' '} "] "
-          (line))
-        .unwrap();
+        buf.push_str(&format!(
+            "\n| ({}{}) [{}] {}",
+            passed_str, timeframe_str, tags_str, line
+        ));
     }
     chunk2log(buf, LogLevel::Info)
 }
@@ -594,6 +717,7 @@ impl LogState {
             dashboard: Arc::new(DuplexMutex::new(Vec::new())),
             tail: Arc::new(DuplexMutex::new(VecDeque::with_capacity(64))),
             gravity: DuplexMutex::new(None),
+            level: LogLevel::default(),
         }
     }
 
@@ -607,9 +731,12 @@ impl LogState {
             dashboard,
             tail: Arc::new(DuplexMutex::new(VecDeque::with_capacity(64))),
             gravity: DuplexMutex::new(None),
+            level: LogLevel::default(),
         }
     }
 
+    pub fn set_level(&mut self, level: LogLevel) { self.level = level; }
+
     /// The operation is considered "in progress" while the `StatusHandle` exists.
     ///
     /// When the `StatusHandle` is dropped the operation is considered "finished" (possibly with a failure)
@@ -759,7 +886,7 @@ impl LogState {
     fn log_entry(&self, entry: LogEntry) {
         let mut chunk = String::with_capacity(256);
         if let Err(err) = entry.format(&mut chunk) {
-            log!({ "log] Error formatting log entry: {}", err });
+            log!("log] Error formatting log entry: {}", err);
             return;
         }
 
@@ -770,11 +897,13 @@ impl LogState {
         tail.push_back(entry);
         drop(tail);
 
-        self.chunk2log(chunk)
+        self.chunk2log(chunk, self.level)
     }
 
-    fn chunk2log(&self, chunk: String) {
-        self::chunk2log(chunk, LogLevel::Info)
+    fn chunk2log(&self, chunk: String, level: LogLevel) {
+        if self.level.ge(&level) {
+            self::chunk2log(chunk, level);
+        }
         /*
         match self.log_file {
             Some (ref f) => match f.lock() {
@@ -797,7 +926,7 @@ impl LogState {
     /// Writes into the *raw* portion of the log, the one not shared with the UI.
     pub fn rawln(&self, mut line: String) {
         line.push('\n');
-        self.chunk2log(line);
+        self.chunk2log(line, self.level);
     }
 
     /// Binds the logger to the current thread,
@@ -844,6 +973,31 @@ impl LogState {
     pub fn register_my_thread(&self) -> Result<(), String> { Ok(()) }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+impl LightningLogger for LogState {
+    fn log(&self, record: &LightningRecord) {
+        let level = match record.level {
+            LightningLevel::Gossip => Level::Trace,
+            LightningLevel::Trace => Level::Debug,
+            LightningLevel::Debug => Level::Debug,
+            LightningLevel::Info => Level::Info,
+            LightningLevel::Warn => Level::Warn,
+            LightningLevel::Error => Level::Error,
+        };
+        let record = Record::builder()
+            .args(record.args)
+            .level(level)
+            .target("mm_log")
+            .module_path(Some(record.module_path))
+            .file(Some(record.file))
+            .line(Some(record.line))
+            .build();
+        let as_string = format_record(&record);
+        let level = LogLevel::from(record.metadata().level());
+        self.chunk2log(as_string, level);
+    }
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 impl Drop for LogState {
     fn drop(&mut self) {
@@ -874,9 +1028,27 @@ impl Drop for LogState {
     }
 }
 
-impl From<log::Level> for LogLevel {
-    fn from(orig: log::Level) -> Self {
-        use log::Level;
+#[derive(Debug)]
+pub struct UnknownLogLevel(String);
+
+impl FromStr for LogLevel {
+    type Err = UnknownLogLevel;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "off" => Ok(LogLevel::Off),
+            "error" => Ok(LogLevel::Error),
+            "warn" => Ok(LogLevel::Warn),
+            "info" => Ok(LogLevel::Info),
+            "debug" => Ok(LogLevel::Debug),
+            "trace" => Ok(LogLevel::Trace),
+            _ => Err(UnknownLogLevel(s.to_owned())),
+        }
+    }
+}
+
+impl From<Level> for LogLevel {
+    fn from(orig: Level) -> Self {
         match orig {
             Level::Error => LogLevel::Error,
             Level::Warn => LogLevel::Warn,
@@ -930,7 +1102,7 @@ pub fn format_record(record: &Record) -> String {
     let level = metadata.level();
     let date = Utc::now().format(DATE_FORMAT);
     let line = record.line().unwrap_or(0);
-    let file = record.file().map(gstuff::filename).unwrap_or("???");
+    let file = record.file().map(filename).unwrap_or("???");
     let module = record.module_path().unwrap_or("");
     let message = record.args();
 
@@ -949,6 +1121,18 @@ pub fn format_record(record: &Record) -> String {
     )
 }
 
+fn format_tags(tags: &[Tag]) -> String {
+    tags.iter()
+        .map(|tag| {
+            if let Some(ref val) = tag.val {
+                format!("{}={}", tag.key, val)
+            } else {
+                tag.key.clone()
+            }
+        })
+        .join(" ")
+}
+
 #[doc(hidden)]
 pub mod tests {
     use super::LogState;
diff --git a/mm2src/common/log/native_log.rs b/mm2src/common/log/native_log.rs
index 6dd3442677..baa4148377 100644
--- a/mm2src/common/log/native_log.rs
+++ b/mm2src/common/log/native_log.rs
@@ -3,6 +3,7 @@ use log::Record;
 use log4rs::encode::pattern;
 use log4rs::{append, config};
 use std::os::raw::c_char;
+use std::str::FromStr;
 
 const DEFAULT_CONSOLE_FORMAT: &str = "[{d(%Y-%m-%d %H:%M:%S %Z)(utc)} {h({l})} {M}:{f}:{L}] {m}\n";
 const DEFAULT_LEVEL_FILTER: LogLevel = LogLevel::Info;
@@ -25,18 +26,15 @@ pub enum LogLevel {
 
 impl LogLevel {
     pub fn from_env() -> Option<LogLevel> {
-        match std::env::var("RUST_LOG").ok()?.to_lowercase().as_str() {
-            "off" => Some(LogLevel::Off),
-            "error" => Some(LogLevel::Error),
-            "warn" => Some(LogLevel::Warn),
-            "info" => Some(LogLevel::Info),
-            "debug" => Some(LogLevel::Debug),
-            "trace" => Some(LogLevel::Trace),
-            _ => None,
-        }
+        let env_val = std::env::var("RUST_LOG").ok()?;
+        LogLevel::from_str(&env_val).ok()
     }
 }
 
+impl Default for LogLevel {
+    fn default() -> Self { DEFAULT_LEVEL_FILTER }
+}
+
 pub struct FfiCallback {
     cb_f: extern "C" fn(line: *const c_char),
 }
@@ -65,7 +63,7 @@ impl Default for UnifiedLoggerBuilder {
     fn default() -> UnifiedLoggerBuilder {
         UnifiedLoggerBuilder {
             console_format: DEFAULT_CONSOLE_FORMAT.to_owned(),
-            filter: DEFAULT_LEVEL_FILTER,
+            filter: LogLevel::default(),
             console: true,
             mm_log: false,
         }
diff --git a/mm2src/common/log/wasm_log.rs b/mm2src/common/log/wasm_log.rs
index 045415f200..ce74fb06ef 100644
--- a/mm2src/common/log/wasm_log.rs
+++ b/mm2src/common/log/wasm_log.rs
@@ -16,7 +16,7 @@ const DEFAULT_LEVEL_FILTER: LogLevel = LogLevel::Info;
 #[macro_export]
 macro_rules! console_err {
     ($($args: tt)+) => {{
-        let here = format!("{}:{}]", ::gstuff::filename(file!()), line!());
+        let here = format!("{}:{}]", $crate::filename(file!()), line!());
         let msg = format!($($args)+);
         let msg_formatted = format!("{} {}", here, msg);
         let msg_js = $crate::log::wasm_log::JsValue::from(msg_formatted);
@@ -27,7 +27,7 @@ macro_rules! console_err {
 #[macro_export]
 macro_rules! console_info {
     ($($args: tt)+) => {{
-        let here = format!("{}:{}]", ::gstuff::filename(file!()), line!());
+        let here = format!("{}:{}]", $crate::filename(file!()), line!());
         let msg = format!($($args)+);
         let msg_formatted = format!("{} {}", here, msg);
         let msg_js = $crate::log::wasm_log::JsValue::from(msg_formatted);
@@ -35,6 +35,17 @@ macro_rules! console_info {
     }};
 }
 
+#[macro_export]
+macro_rules! console_log {
+    ($($args: tt)+) => {{
+        let here = format!("{}:{}]", $crate::filename(file!()), line!());
+        let msg = format!($($args)+);
+        let msg_formatted = format!("{} {}", here, msg);
+        let msg_js = $crate::log::wasm_log::JsValue::from(msg_formatted);
+        $crate::log::wasm_log::console::log_1(&msg_js);
+    }};
+}
+
 const CHANNEL_BUF_SIZE: usize = 1024;
 
 #[wasm_bindgen]
@@ -55,6 +66,10 @@ pub enum LogLevel {
     Trace = 5,
 }
 
+impl Default for LogLevel {
+    fn default() -> Self { DEFAULT_LEVEL_FILTER }
+}
+
 impl From<LogLevel> for JsValue {
     fn from(lvl: LogLevel) -> Self { JsValue::from(lvl as u32) }
 }
@@ -154,3 +169,27 @@ struct CallbackMsg {
     level: LogLevel,
     line: String,
 }
+
+pub fn register_wasm_log() {
+    use crate::log::register_callback;
+    use std::str::FromStr;
+    use std::sync::atomic::{AtomicBool, Ordering};
+
+    static IS_INITIALIZED: AtomicBool = AtomicBool::new(false);
+
+    // Check if the logger is initialized already
+    if let Err(true) = IS_INITIALIZED.compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed) {
+        return;
+    }
+
+    let log_level = match option_env!("RUST_WASM_TEST_LOG") {
+        Some(level_str) => LogLevel::from_str(level_str).unwrap_or(LogLevel::Info),
+        None => LogLevel::Info,
+    };
+
+    register_callback(WasmCallback::console_log());
+    WasmLoggerBuilder::default()
+        .level_filter(log_level)
+        .try_init()
+        .expect("Must be initialized only once");
+}
diff --git a/mm2src/common/mm_metrics/native.rs b/mm2src/common/mm_metrics/native.rs
index 18a2a0c7a8..fafa3beab0 100644
--- a/mm2src/common/mm_metrics/native.rs
+++ b/mm2src/common/mm_metrics/native.rs
@@ -1,5 +1,6 @@
 use super::*;
 use crate::executor::{spawn, Timer};
+use crate::log::error;
 use gstuff::Constructible;
 use hdrhistogram::Histogram;
 use itertools::Itertools;
@@ -8,7 +9,7 @@ use metrics_runtime::{observers::PrometheusBuilder, Receiver};
 use metrics_util::{parse_quantiles, Quantile};
 use serde_json as json;
 use std::collections::HashMap;
-use std::fmt::Write as WriteFmt;
+use std::fmt;
 use std::slice::Iter;
 
 use crate::log::{LogArc, Tag};
@@ -179,11 +180,11 @@ enum Integer {
     Unsigned(u64),
 }
 
-impl ToString for Integer {
-    fn to_string(&self) -> String {
+impl fmt::Display for Integer {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Integer::Signed(x) => format!("{}", x),
-            Integer::Unsigned(x) => format!("{}", x),
+            Integer::Signed(x) => write!(f, "{}", x),
+            Integer::Unsigned(x) => write!(f, "{}", x),
         }
     }
 }
@@ -272,7 +273,7 @@ impl Observer for TagObserver {
             match Histogram::new(sigfig) {
                 Ok(x) => x,
                 Err(err) => {
-                    log!("failed to create histogram: "(err));
+                    error!("failed to create histogram: {}", err);
                     // do nothing on error
                     return;
                 },
@@ -281,7 +282,7 @@ impl Observer for TagObserver {
 
         for value in values {
             if let Err(err) = entry.record(*value) {
-                log!("failed to observe histogram value: "(err));
+                error!("failed to observe histogram value: {}", err);
             }
         }
     }
@@ -329,7 +330,7 @@ impl Observer for JsonObserver {
         let mut histogram = match Histogram::new(sigfig) {
             Ok(x) => x,
             Err(err) => {
-                log!("failed to create histogram: "(err));
+                error!("failed to create histogram: {}", err);
                 // do nothing on error
                 return;
             },
@@ -337,7 +338,7 @@ impl Observer for JsonObserver {
 
         for value in values {
             if let Err(err) = histogram.record(*value) {
-                log!("failed to observe histogram value: "(err));
+                error!("failed to observe histogram value: {}", err);
             }
         }
 
@@ -430,15 +431,11 @@ fn labels_into_parts(labels: Iter<Label>) -> HashMap<String, String> {
 }
 
 fn name_value_map_to_message(name_value_map: &MetricNameValueMap) -> String {
-    let mut message = String::with_capacity(256);
-    match wite!(message, for (key, value) in name_value_map.iter().sorted() { (key) "=" (value.to_string()) } separated {' '})
-    {
-        Ok(_) => message,
-        Err(err) => {
-            log!("Error " (err) " on format hist to message");
-            String::new()
-        },
-    }
+    name_value_map
+        .iter()
+        .sorted()
+        .map(|(key, value)| format!("{}={}", key, value))
+        .join(" ")
 }
 
 fn hist_at_quantiles(hist: Histogram<u64>, quantiles: &[Quantile]) -> HashMap<String, u64> {
@@ -453,24 +450,19 @@ fn hist_at_quantiles(hist: Histogram<u64>, quantiles: &[Quantile]) -> HashMap<St
 }
 
 fn hist_to_message(hist: &Histogram<u64>, quantiles: &[Quantile]) -> String {
-    let mut message = String::with_capacity(256);
-    let fmt_quantiles = quantiles.iter().map(|quantile| {
-        let key = quantile.label().to_string();
-        let val = hist.value_at_quantile(quantile.value());
-        format!("{}={}", key, val)
-    });
-
-    match wite!(message,
-                "count=" (hist.len())
-                if quantiles.is_empty() { "" } else { " " }
-                for q in fmt_quantiles { (q) } separated {' '}
-    ) {
-        Ok(_) => message,
-        Err(err) => {
-            log!("Error " (err) " on format hist to message");
-            String::new()
-        },
+    if quantiles.is_empty() {
+        return format!("count={}", hist.len());
     }
+
+    let fmt_quantiles = quantiles
+        .iter()
+        .map(|quantile| {
+            let key = quantile.label().to_string();
+            let val = hist.value_at_quantile(quantile.value());
+            format!("{}={}", key, val)
+        })
+        .join(" ");
+    format!("count={} {}", hist.len(), fmt_quantiles)
 }
 
 pub mod prometheus {
@@ -508,7 +500,7 @@ pub mod prometheus {
 
         let server = server.then(|r| {
             if let Err(err) = r {
-                log!((err));
+                error!("{}", err);
             };
             futures::future::ready(())
         });
@@ -523,9 +515,9 @@ pub mod prometheus {
         credentials: Option<PrometheusCredentials>,
     ) -> Result<Response<Body>, http::Error> {
         fn on_error(status: StatusCode, error: String) -> Result<Response<Body>, http::Error> {
-            log!((error));
+            error!("{}", error);
             Response::builder().status(status).body(Body::empty()).map_err(|err| {
-                log!((err));
+                error!("{}", err);
                 err
             })
         }
@@ -568,7 +560,7 @@ pub mod prometheus {
             .header(header::CONTENT_TYPE, "text/plain")
             .body(body)
             .map_err(|err| {
-                log!((err));
+                error!("{}", err);
                 err
             })
     }
diff --git a/mm2src/common/privkey.rs b/mm2src/common/privkey.rs
deleted file mode 100644
index afe6a5836c..0000000000
--- a/mm2src/common/privkey.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright © 2014-2018 The SuperNET Developers.                             *
- *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
- * the top-level directory of this distribution for the individual copyright  *
- * holder information and the developer policies on copyright and licensing.  *
- *                                                                            *
- * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
- *                                                                            *
- * Removal or modification of this copyright notice is prohibited.            *
- *                                                                            *
- ******************************************************************************/
-//
-//  LP_utxos.c
-//  marketmaker
-//
-
-use bitcrypto::{sha256, ChecksumType};
-use keys::{Error as KeysError, KeyPair, Private};
-use primitives::hash::H256;
-
-fn private_from_seed(seed: &str) -> Result<Private, String> {
-    match seed.parse() {
-        Ok(private) => return Ok(private),
-        Err(e) => {
-            if let KeysError::InvalidChecksum = e {
-                return ERR!("Provided WIF passphrase has invalid checksum!");
-            }
-        }, // else ignore other errors, assume the passphrase is not WIF
-    }
-
-    match seed.strip_prefix("0x") {
-        Some(stripped) => {
-            let hash: H256 = try_s!(stripped.parse());
-            Ok(Private {
-                prefix: 0,
-                secret: hash,
-                compressed: true,
-                checksum_type: ChecksumType::DSHA256,
-            })
-        },
-        None => {
-            let mut hash = sha256(seed.as_bytes());
-            hash[0] &= 248;
-            hash[31] &= 127;
-            hash[31] |= 64;
-
-            Ok(Private {
-                prefix: 0,
-                secret: hash,
-                compressed: true,
-                checksum_type: ChecksumType::DSHA256,
-            })
-        },
-    }
-}
-
-pub fn key_pair_from_seed(seed: &str) -> Result<KeyPair, String> {
-    let private = try_s!(private_from_seed(seed));
-    if !private.compressed {
-        return ERR!("We only support compressed keys at the moment");
-    }
-    let pair = try_s!(KeyPair::from_private(private));
-    // Just a sanity check. We rely on the public key being 33 bytes (aka compressed).
-    assert_eq!(pair.public().len(), 33);
-    Ok(pair)
-}
diff --git a/mm2src/common/shared_ref_counter/Cargo.toml b/mm2src/common/shared_ref_counter/Cargo.toml
new file mode 100644
index 0000000000..ca49c19b1c
--- /dev/null
+++ b/mm2src/common/shared_ref_counter/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "shared_ref_counter"
+version = "0.1.0"
+edition = "2018"
+
+[features]
+enable = []
+
+[dependencies]
+log = { version = "0.4.8", optional = true }
diff --git a/mm2src/common/shared_ref_counter/src/disable.rs b/mm2src/common/shared_ref_counter/src/disable.rs
new file mode 100644
index 0000000000..3c93985b9d
--- /dev/null
+++ b/mm2src/common/shared_ref_counter/src/disable.rs
@@ -0,0 +1,46 @@
+use std::ops::Deref;
+use std::panic::Location;
+use std::sync::{Arc, Weak};
+
+pub struct SharedRc<T>(Arc<T>);
+
+unsafe impl<T> Send for SharedRc<T> where Arc<T>: Send {}
+unsafe impl<T> Sync for SharedRc<T> {}
+
+impl<T> Deref for SharedRc<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl<T> Clone for SharedRc<T> {
+    fn clone(&self) -> Self { SharedRc(self.0.clone()) }
+}
+
+impl<T> SharedRc<T> {
+    pub fn new(inner: T) -> Self { SharedRc(Arc::new(inner)) }
+
+    pub fn existing_pointers(&self) -> Vec<&'static Location<'static>> { Vec::new() }
+
+    /// Generates a weak pointer, to track the allocated data without prolonging its life.
+    pub fn downgrade(&self) -> WeakRc<T> { WeakRc(Arc::downgrade(&self.0)) }
+}
+
+pub struct WeakRc<T>(Weak<T>);
+
+unsafe impl<T> Send for WeakRc<T> where Weak<T>: Send {}
+unsafe impl<T> Sync for WeakRc<T> {}
+
+impl<T> Clone for WeakRc<T> {
+    fn clone(&self) -> Self { WeakRc(self.0.clone()) }
+}
+
+impl<T> Default for WeakRc<T> {
+    fn default() -> Self { WeakRc(Weak::default()) }
+}
+
+impl<T> WeakRc<T> {
+    pub fn upgrade(&self) -> Option<SharedRc<T>> { self.0.upgrade().map(SharedRc) }
+
+    pub fn strong_count(&self) -> usize { self.0.strong_count() }
+}
diff --git a/mm2src/common/shared_ref_counter/src/enable.rs b/mm2src/common/shared_ref_counter/src/enable.rs
new file mode 100644
index 0000000000..bc4f6a0a67
--- /dev/null
+++ b/mm2src/common/shared_ref_counter/src/enable.rs
@@ -0,0 +1,167 @@
+#[cfg(feature = "log")] use log::{log, Level};
+use std::collections::HashMap;
+use std::ops::Deref;
+use std::panic::Location;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::{Arc, RwLock, Weak};
+
+const LOCKING_ERROR: &str = "Error locking 'SharedRc::existing_pointers'";
+const UPGRADING_ERROR: &str = "Some counter fields are dropped unexpectedly though an inner pointer is still alive";
+
+pub struct SharedRc<T> {
+    inner: Arc<T>,
+    index: usize,
+    next_index: Arc<AtomicUsize>,
+    existing_pointers: Arc<RwLock<HashMap<usize, &'static Location<'static>>>>,
+}
+
+unsafe impl<T> Send for SharedRc<T> {}
+unsafe impl<T> Sync for SharedRc<T> {}
+
+impl<T> Deref for SharedRc<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target { &self.inner }
+}
+
+impl<T> Drop for SharedRc<T> {
+    fn drop(&mut self) {
+        let mut existing_pointers = self.existing_pointers.write().expect(LOCKING_ERROR);
+        existing_pointers.remove(&self.index).unwrap();
+    }
+}
+
+impl<T> Clone for SharedRc<T> {
+    /// # Panic
+    ///
+    /// May panic if another task failed inside with the locked `SharedRc::existing_pointers` mutex.
+    /// This behavior is considered acceptable since the `enable` feature is expected to be used for **debug** purposes only.
+    #[track_caller]
+    fn clone(&self) -> Self {
+        let index = self.next_index.fetch_add(1, Ordering::Relaxed);
+
+        let mut existing_pointers = self.existing_pointers.write().expect(LOCKING_ERROR);
+        existing_pointers.insert(index, Location::caller());
+        drop(existing_pointers);
+
+        Self {
+            inner: self.inner.clone(),
+            index,
+            next_index: self.next_index.clone(),
+            existing_pointers: self.existing_pointers.clone(),
+        }
+    }
+}
+
+impl<T> SharedRc<T> {
+    #[track_caller]
+    pub fn new(inner: T) -> Self {
+        let index = 0;
+        let mut existing_pointers = HashMap::new();
+        existing_pointers.insert(index, Location::caller());
+
+        Self {
+            inner: Arc::new(inner),
+            index,
+            next_index: Arc::new(AtomicUsize::new(index + 1)),
+            existing_pointers: Arc::new(RwLock::new(existing_pointers)),
+        }
+    }
+
+    /// # Panic
+    ///
+    /// May panic if another task failed inside with the locked `SharedRc::existing_pointers` mutex.
+    /// This behavior is considered acceptable since the `enable` feature is expected to be used for **debug** purposes only.
+    #[cfg(feature = "log")]
+    pub fn log_existing_pointers(&self, level: Level, ident: &'static str) {
+        let existing_pointers = self.existing_pointers.read().expect(LOCKING_ERROR);
+        log!(level, "{} exists at:", ident);
+        for (_idx, location) in existing_pointers.iter() {
+            log!(level, "\t{}", stringify_location(*location));
+        }
+    }
+
+    /// # Panic
+    ///
+    /// May panic if another task failed inside with the locked `SharedRc::existing_pointers` mutex.
+    /// This behavior is considered acceptable since the `enable` feature is expected to be used for **debug** purposes only.
+    pub fn existing_pointers(&self) -> Vec<&'static Location<'static>> {
+        let existing_pointers = self.existing_pointers.read().expect(LOCKING_ERROR);
+        let locations: Vec<_> = existing_pointers.iter().map(|(_index, location)| *location).collect();
+        locations
+    }
+
+    /// Generates a weak pointer, to track the allocated data without prolonging its life.
+    pub fn downgrade(&self) -> WeakRc<T> {
+        WeakRc {
+            inner: Arc::downgrade(&self.inner),
+            next_index: Arc::downgrade(&self.next_index),
+            existing_pointers: Arc::downgrade(&self.existing_pointers),
+        }
+    }
+}
+
+pub struct WeakRc<T> {
+    inner: Weak<T>,
+    next_index: Weak<AtomicUsize>,
+    existing_pointers: Weak<RwLock<HashMap<usize, &'static Location<'static>>>>,
+}
+
+unsafe impl<T> Send for WeakRc<T> {}
+unsafe impl<T> Sync for WeakRc<T> {}
+
+impl<T> Clone for WeakRc<T> {
+    fn clone(&self) -> Self {
+        WeakRc {
+            inner: self.inner.clone(),
+            next_index: self.next_index.clone(),
+            existing_pointers: self.existing_pointers.clone(),
+        }
+    }
+}
+
+impl<T> Default for WeakRc<T> {
+    fn default() -> Self {
+        WeakRc {
+            inner: Weak::default(),
+            next_index: Weak::default(),
+            existing_pointers: Weak::default(),
+        }
+    }
+}
+
+impl<T> WeakRc<T> {
+    /// # Panic
+    ///
+    /// May panic if another task failed inside with the locked `SharedRc::existing_pointers` mutex.
+    /// This behavior is considered acceptable since the `enable` feature is expected to be used for **debug** purposes only.
+    #[track_caller]
+    pub fn upgrade(&self) -> Option<SharedRc<T>> {
+        let inner = match self.inner.upgrade() {
+            Some(ctx) => ctx,
+            None => return None,
+        };
+
+        let next_index = self.next_index.upgrade().expect(UPGRADING_ERROR);
+        let index = next_index.fetch_add(1, Ordering::Relaxed);
+
+        let existing_pointers = self.existing_pointers.upgrade().expect(UPGRADING_ERROR);
+        let mut existing_pointers_lock = existing_pointers.write().expect(LOCKING_ERROR);
+        existing_pointers_lock.insert(index, Location::caller());
+        drop(existing_pointers_lock);
+
+        Some(SharedRc {
+            inner,
+            index,
+            next_index,
+            existing_pointers,
+        })
+    }
+
+    pub fn strong_count(&self) -> usize { self.inner.strong_count() }
+}
+
+#[cfg(feature = "log")]
+fn stringify_location(location: &'static Location<'static>) -> String {
+    format!("{}:{}", location.file(), location.line())
+}
diff --git a/mm2src/common/shared_ref_counter/src/lib.rs b/mm2src/common/shared_ref_counter/src/lib.rs
new file mode 100644
index 0000000000..864553dc75
--- /dev/null
+++ b/mm2src/common/shared_ref_counter/src/lib.rs
@@ -0,0 +1,30 @@
+//! `SharedRc` is a thread-safe reference-counting pointer based on `Arc` that stands for 'Atomically
+//! Reference Counted'.
+//! The main difference from `Arc` is that `SharedRc` allows developers to debug hanging pointers
+//! by collecting the location where all `SharedRc` pointers to the same allocation still exist.
+//!
+//! # Optimization
+//!
+//! `shared-ref-counter` works exactly the same as `Arc` if the `enable` feature is not activated.
+//! It means that `SharedRc` doesn't collect any extra data without `enable` feature.
+//!
+//! # Enable
+//!
+//! Add the `enable` feature to the `Cargo.toml` to enable collecting the location of `SharedRc` pointers:
+//! ```toml
+//! shared_ref_counter = { version = "0.1", features = "enable" }
+//! ```
+//!
+//! Please note `enable` feature should be used for **debug** purposes only.
+//!
+//! # Panic
+//!
+//! Some operations over `SharedRc` may lead to a panic if the `enable` features is activated.
+//! This behavior is considered acceptable since the `enable` feature is expected to be used for **debug** purposes only.
+
+#[cfg(not(feature = "enable"))] mod disable;
+#[cfg(feature = "enable")] mod enable;
+
+#[cfg(not(feature = "enable"))]
+pub use disable::{SharedRc, WeakRc};
+#[cfg(feature = "enable")] pub use enable::{SharedRc, WeakRc};
diff --git a/mm2src/common/wasm.rs b/mm2src/common/wasm.rs
new file mode 100644
index 0000000000..a0162e6068
--- /dev/null
+++ b/mm2src/common/wasm.rs
@@ -0,0 +1,155 @@
+use crate::filename;
+use rand::RngCore;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+use serde_wasm_bindgen::Serializer;
+use std::fmt;
+use uuid::{Builder, Uuid, Variant, Version};
+use wasm_bindgen::prelude::*;
+
+pub fn new_uuid() -> Uuid {
+    let mut rng = rand::thread_rng();
+    let mut bytes = [0; 16];
+
+    rng.fill_bytes(&mut bytes);
+
+    Builder::from_bytes(bytes)
+        .set_variant(Variant::RFC4122)
+        .set_version(Version::Random)
+        .build()
+}
+
+/// Get only the first line of the error.
+/// Generally, the `JsValue` error contains the stack trace of an error.
+/// This function cuts off the stack trace.
+pub fn stringify_js_error(error: &JsValue) -> String {
+    format!("{:?}", error)
+        .lines()
+        .next()
+        .map(|e| e.to_owned())
+        .unwrap_or_default()
+}
+
+/// The function helper for the `WasmUnwrapExt`, `WasmUnwrapErrExt` traits.
+#[track_caller]
+fn caller_file_line() -> (&'static str, u32) {
+    let location = std::panic::Location::caller();
+    let file = filename(location.file());
+    let line = location.line();
+    (file, line)
+}
+
+pub trait WasmUnwrapExt<T> {
+    fn unwrap_w(self) -> T;
+    fn expect_w(self, description: &str) -> T;
+}
+
+pub trait WasmUnwrapErrExt<E> {
+    fn unwrap_err_w(self) -> E;
+    fn expect_err_w(self, description: &str) -> E;
+}
+
+impl<T, E: fmt::Debug> WasmUnwrapExt<T> for Result<T, E> {
+    #[track_caller]
+    fn unwrap_w(self) -> T {
+        match self {
+            Ok(t) => t,
+            Err(e) => {
+                let (file, line) = caller_file_line();
+                let error = format!(
+                    "{}:{}] 'Result::unwrap_w' called on an 'Err' value: {:?}",
+                    file, line, e
+                );
+                wasm_bindgen::throw_str(&error)
+            },
+        }
+    }
+
+    #[track_caller]
+    fn expect_w(self, description: &str) -> T {
+        match self {
+            Ok(t) => t,
+            Err(e) => {
+                let (file, line) = caller_file_line();
+                let error = format!("{}:{}] {}: {:?}", file, line, description, e);
+                wasm_bindgen::throw_str(&error)
+            },
+        }
+    }
+}
+
+impl<T> WasmUnwrapExt<T> for Option<T> {
+    #[track_caller]
+    fn unwrap_w(self) -> T {
+        match self {
+            Some(t) => t,
+            None => {
+                let (file, line) = caller_file_line();
+                let error = format!("{}:{}] 'Option::unwrap_w' called on a 'None' value", file, line);
+                wasm_bindgen::throw_str(&error)
+            },
+        }
+    }
+
+    #[track_caller]
+    fn expect_w(self, description: &str) -> T {
+        match self {
+            Some(t) => t,
+            None => {
+                let (file, line) = caller_file_line();
+                let error = format!("{}:{}] {}", file, line, description);
+                wasm_bindgen::throw_str(&error)
+            },
+        }
+    }
+}
+
+impl<T: fmt::Debug, E> WasmUnwrapErrExt<E> for Result<T, E> {
+    #[track_caller]
+    fn unwrap_err_w(self) -> E {
+        match self {
+            Ok(t) => {
+                let (file, line) = caller_file_line();
+                let error = format!(
+                    "{}:{}] 'Result::unwrap_err_w' called on an 'Ok' value: {:?}",
+                    file, line, t
+                );
+                wasm_bindgen::throw_str(&error)
+            },
+            Err(e) => e,
+        }
+    }
+
+    #[track_caller]
+    fn expect_err_w(self, description: &str) -> E {
+        match self {
+            Ok(t) => {
+                let (file, line) = caller_file_line();
+                let error = format!("{}:{}] {}: {:?}", file, line, description, t);
+                wasm_bindgen::throw_str(&error)
+            },
+            Err(e) => e,
+        }
+    }
+}
+
+#[track_caller]
+pub fn panic_w(description: &str) {
+    let (file, line) = caller_file_line();
+    let error = format!("{}:{}] 'panic_w' called: {:?}", file, line, description);
+    wasm_bindgen::throw_str(&error)
+}
+
+lazy_static! {
+    static ref TO_JS_SERIALIZER: Serializer = Serializer::json_compatible();
+}
+
+#[inline]
+pub fn serialize_to_js<T: Serialize>(value: &T) -> Result<JsValue, serde_wasm_bindgen::Error> {
+    value.serialize(&*TO_JS_SERIALIZER)
+}
+
+#[inline]
+pub fn deserialize_from_js<T: DeserializeOwned>(value: JsValue) -> Result<T, serde_wasm_bindgen::Error> {
+    serde_wasm_bindgen::from_value(value)
+}
diff --git a/mm2src/common/wasm_indexed_db.rs b/mm2src/common/wasm_indexed_db.rs
deleted file mode 100644
index b6e999c4df..0000000000
--- a/mm2src/common/wasm_indexed_db.rs
+++ /dev/null
@@ -1,1141 +0,0 @@
-use crate::log::{debug, error};
-use crate::mm_error::prelude::*;
-use crate::{panic_w, stringify_js_error, WasmUnwrapErrExt, WasmUnwrapExt};
-use derive_more::Display;
-use futures::channel::{mpsc, oneshot};
-use futures::StreamExt;
-use js_sys::Array;
-use serde::de::DeserializeOwned;
-use serde::Serialize;
-use std::collections::{HashMap, HashSet};
-use std::fmt;
-use std::marker::PhantomData;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex};
-use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
-use web_sys::{IdbDatabase, IdbIndexParameters, IdbObjectStore, IdbObjectStoreParameters, IdbOpenDbRequest, IdbRequest,
-              IdbTransaction, IdbTransactionMode, IdbVersionChangeEvent};
-
-lazy_static! {
-    static ref OPEN_DATABASES: Mutex<HashSet<String>> = Mutex::new(HashSet::new());
-}
-
-const ITEM_KEY_PATH: &str = "_item_id";
-
-pub type ItemId = u32;
-pub type OnUpgradeResult<T> = Result<T, MmError<OnUpgradeError>>;
-pub type InitDbResult<T> = Result<T, MmError<InitDbError>>;
-pub type DbTransactionResult<T> = Result<T, MmError<DbTransactionError>>;
-
-type OnUpgradeNeededCb = Box<dyn FnOnce(&DbUpgrader, u32, u32) -> OnUpgradeResult<()> + Send>;
-
-#[derive(Debug, Display, PartialEq)]
-pub enum InitDbError {
-    #[display(fmt = "Cannot initialize a Database without tables")]
-    EmptyTableList,
-    #[display(fmt = "Database {} is open already", db_name)]
-    DbIsOpenAlready { db_name: String },
-    #[display(fmt = "It seems this browser doesn't support 'IndexedDb': {}", _0)]
-    NotSupported(String),
-    #[display(fmt = "Invalid Database version: {}", _0)]
-    InvalidVersion(String),
-    #[display(fmt = "Couldn't open Database: {}", _0)]
-    OpeningError(String),
-    #[display(fmt = "Type mismatch: expected '{}', found '{}'", expected, found)]
-    TypeMismatch { expected: String, found: String },
-    #[display(fmt = "Error occurred due to an unexpected state: {:?}", _0)]
-    UnexpectedState(String),
-    #[display(
-        fmt = "Error occurred due to the Database upgrading from {} to {} version: {}",
-        old_version,
-        new_version,
-        error
-    )]
-    UpgradingError {
-        old_version: u32,
-        new_version: u32,
-        error: OnUpgradeError,
-    },
-}
-
-#[derive(Debug, Display, PartialEq)]
-pub enum OnUpgradeError {
-    #[display(fmt = "Error occurred due to creating the '{}' table: {}", table, description)]
-    ErrorCreatingTable { table: String, description: String },
-    #[display(fmt = "Error occurred due to opening the '{}' table: {}", table, description)]
-    ErrorOpeningTable { table: String, description: String },
-    #[display(fmt = "Error occurred due to creating the '{}' index: {}", index, description)]
-    ErrorCreatingIndex { index: String, description: String },
-}
-
-#[derive(Debug, Display)]
-pub enum DbTransactionError {
-    #[display(fmt = "No such table '{}'", table)]
-    NoSuchTable { table: String },
-    #[display(fmt = "Error creating DbTransaction: {:?}", _0)]
-    ErrorCreatingTransaction(String),
-    #[display(fmt = "Error opening the '{}' table: {}", table, description)]
-    ErrorOpeningTable { table: String, description: String },
-    #[display(fmt = "Error serializing an item: {:?}", _0)]
-    ErrorSerializingItem(String),
-    #[display(fmt = "Error deserializing an item: {:?}", _0)]
-    ErrorDeserializingItem(String),
-    #[display(fmt = "Error uploading an item: {:?}", _0)]
-    ErrorUploadingItem(String),
-    #[display(fmt = "Error getting items: {:?}", _0)]
-    ErrorGettingItems(String),
-    #[display(fmt = "Error deleting items: {:?}", _0)]
-    ErrorDeletingItems(String),
-    #[display(fmt = "No such index '{}'", index)]
-    NoSuchIndex { index: String },
-    #[display(fmt = "Invalid index '{}:{}': {:?}", index, index_value, description)]
-    InvalidIndex {
-        index: String,
-        index_value: String,
-        description: String,
-    },
-    #[display(fmt = "Error occurred due to an unexpected state: {:?}", _0)]
-    UnexpectedState(String),
-    #[display(fmt = "Transaction was aborted")]
-    TransactionAborted,
-}
-
-pub struct IndexedDbBuilder {
-    db_name: String,
-    db_version: u32,
-    tables: HashMap<String, OnUpgradeNeededCb>,
-}
-
-impl IndexedDbBuilder {
-    pub fn new(db_name: &str) -> IndexedDbBuilder {
-        IndexedDbBuilder {
-            db_name: db_name.to_owned(),
-            db_version: 1,
-            tables: HashMap::new(),
-        }
-    }
-
-    pub fn with_version(mut self, db_version: u32) -> IndexedDbBuilder {
-        self.db_version = db_version;
-        self
-    }
-
-    pub fn with_table<Table: TableSignature>(mut self) -> IndexedDbBuilder {
-        let on_upgrade_needed_cb = Box::new(Table::on_upgrade_needed);
-        self.tables.insert(Table::table_name().to_owned(), on_upgrade_needed_cb);
-        self
-    }
-
-    pub async fn init(self) -> InitDbResult<IndexedDb> {
-        Self::check_if_db_is_not_open(&self.db_name)?;
-        let (table_names, on_upgrade_needed_handlers) = Self::tables_into_parts(self.tables)?;
-
-        let window = web_sys::window().expect_w("!window");
-        let indexed_db = match window.indexed_db() {
-            Ok(Some(db)) => db,
-            Ok(None) => return MmError::err(InitDbError::NotSupported("Unknown error".to_owned())),
-            Err(e) => return MmError::err(InitDbError::NotSupported(stringify_js_error(&e))),
-        };
-
-        let db_request = match indexed_db.open_with_u32(&self.db_name, self.db_version) {
-            Ok(r) => r,
-            Err(e) => return MmError::err(InitDbError::InvalidVersion(stringify_js_error(&e))),
-        };
-        let (tx, mut rx) = mpsc::channel(1);
-
-        let onerror_closure = construct_event_closure(DbOpenEvent::Failed, tx.clone());
-        let onsuccess_closure = construct_event_closure(DbOpenEvent::Success, tx.clone());
-        let onupgradeneeded_closure = construct_event_closure(DbOpenEvent::UpgradeNeeded, tx.clone());
-
-        db_request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
-        db_request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));
-        db_request.set_onupgradeneeded(Some(onupgradeneeded_closure.as_ref().unchecked_ref()));
-
-        let mut on_upgrade_needed_handlers = Some(on_upgrade_needed_handlers);
-        while let Some(event) = rx.next().await {
-            match event {
-                DbOpenEvent::Failed(e) => return MmError::err(InitDbError::OpeningError(stringify_js_error(&e))),
-                DbOpenEvent::UpgradeNeeded(event) => {
-                    Self::on_upgrade_needed(event, &db_request, &mut on_upgrade_needed_handlers)?
-                },
-                DbOpenEvent::Success(_) => {
-                    let db = Self::get_db_from_request(&db_request)?;
-                    Self::cache_open_db(self.db_name.clone());
-
-                    return Ok(IndexedDb {
-                        db,
-                        db_name: self.db_name,
-                        tables: table_names,
-                    });
-                },
-            }
-        }
-        unreachable!("The event channel must not be closed before either 'DbOpenEvent::Success' or 'DbOpenEvent::Failed' is received");
-    }
-
-    fn on_upgrade_needed(
-        event: JsValue,
-        db_request: &IdbOpenDbRequest,
-        handlers: &mut Option<Vec<OnUpgradeNeededCb>>,
-    ) -> InitDbResult<()> {
-        let handlers = match handlers.take() {
-            Some(handlers) => handlers,
-            None => {
-                return MmError::err(InitDbError::UnexpectedState(
-                    "'IndexedDbBuilder::on_upgraded_needed' was called twice".to_owned(),
-                ))
-            },
-        };
-
-        let db = Self::get_db_from_request(&db_request)?;
-        let transaction = Self::get_transaction_from_request(&db_request)?;
-
-        let version_event = match event.dyn_into::<IdbVersionChangeEvent>() {
-            Ok(version) => version,
-            Err(e) => {
-                return MmError::err(InitDbError::TypeMismatch {
-                    expected: "IdbVersionChangeEvent".to_owned(),
-                    found: format!("{:?}", e),
-                })
-            },
-        };
-        let old_version = version_event.old_version() as u32;
-        let new_version = version_event
-            .new_version()
-            .ok_or(MmError::new(InitDbError::InvalidVersion(
-                "Expected a new_version".to_owned(),
-            )))? as u32;
-
-        let upgrader = DbUpgrader { db, transaction };
-        for on_upgrade_needed_cb in handlers {
-            on_upgrade_needed_cb(&upgrader, old_version, new_version).mm_err(|error| InitDbError::UpgradingError {
-                old_version,
-                new_version,
-                error,
-            })?;
-        }
-        Ok(())
-    }
-
-    fn cache_open_db(db_name: String) {
-        let mut open_databases = OPEN_DATABASES.lock().expect_w("!OPEN_DATABASES.lock()");
-        open_databases.insert(db_name);
-    }
-
-    fn check_if_db_is_not_open(db_name: &str) -> InitDbResult<()> {
-        let open_databases = OPEN_DATABASES.lock().expect_w("!OPEN_DATABASES.lock()");
-        if open_databases.contains(db_name) {
-            MmError::err(InitDbError::DbIsOpenAlready {
-                db_name: db_name.to_owned(),
-            })
-        } else {
-            Ok(())
-        }
-    }
-
-    fn get_db_from_request(db_request: &IdbOpenDbRequest) -> InitDbResult<IdbDatabase> {
-        let db_result = match db_request.result() {
-            Ok(res) => res,
-            Err(e) => return MmError::err(InitDbError::UnexpectedState(stringify_js_error(&e))),
-        };
-        db_result.dyn_into::<IdbDatabase>().map_err(|db_result| {
-            MmError::new(InitDbError::TypeMismatch {
-                expected: "IdbDatabase".to_owned(),
-                found: format!("{:?}", db_result),
-            })
-        })
-    }
-
-    fn get_transaction_from_request(db_request: &IdbOpenDbRequest) -> InitDbResult<IdbTransaction> {
-        let transaction = match db_request.transaction() {
-            Some(res) => res,
-            None => {
-                return MmError::err(InitDbError::UnexpectedState(
-                    "Expected 'IdbOpenDbRequest::transaction'".to_owned(),
-                ))
-            },
-        };
-        transaction.dyn_into::<IdbTransaction>().map_err(|transaction| {
-            MmError::new(InitDbError::TypeMismatch {
-                expected: "IdbTransaction".to_owned(),
-                found: format!("{:?}", transaction),
-            })
-        })
-    }
-
-    fn tables_into_parts(
-        tables: HashMap<String, OnUpgradeNeededCb>,
-    ) -> InitDbResult<(HashSet<String>, Vec<OnUpgradeNeededCb>)> {
-        if tables.is_empty() {
-            return MmError::err(InitDbError::EmptyTableList);
-        }
-
-        let mut table_names = HashSet::with_capacity(tables.len());
-        let mut on_upgrade_needed_handlers = Vec::with_capacity(tables.len());
-        for (table_name, handler) in tables {
-            table_names.insert(table_name);
-            on_upgrade_needed_handlers.push(handler);
-        }
-        Ok((table_names, on_upgrade_needed_handlers))
-    }
-}
-
-pub struct IndexedDb {
-    db: IdbDatabase,
-    db_name: String,
-    tables: HashSet<String>,
-}
-
-impl !Send for IndexedDb {}
-
-impl fmt::Debug for IndexedDb {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "IndexedDb {{ db_name: {:?}, tables: {:?} }}",
-            self.db_name, self.tables
-        )
-    }
-}
-
-impl IndexedDb {
-    pub fn transaction(&self) -> DbTransactionResult<DbTransaction> {
-        let store_names = Array::new();
-        for table in self.tables.iter() {
-            store_names.push(&JsValue::from(table));
-        }
-
-        match self
-            .db
-            .transaction_with_str_sequence_and_mode(&store_names, IdbTransactionMode::Readwrite)
-        {
-            Ok(transaction) => Ok(DbTransaction::init(transaction, self.tables.clone())),
-            Err(e) => MmError::err(DbTransactionError::ErrorCreatingTransaction(stringify_js_error(&e))),
-        }
-    }
-}
-
-impl Drop for IndexedDb {
-    fn drop(&mut self) {
-        self.db.close();
-        let mut open_databases = OPEN_DATABASES.lock().expect_w("!OPEN_DATABASES.lock()");
-        open_databases.remove(&self.db_name);
-    }
-}
-
-pub struct DbTransaction {
-    transaction: IdbTransaction,
-    tables: HashSet<String>,
-    aborted: Arc<AtomicBool>,
-    complete_rx: oneshot::Receiver<Result<JsValue, JsValue>>,
-}
-
-impl !Send for DbTransaction {}
-
-impl DbTransaction {
-    pub fn aborted(&self) -> bool { self.aborted.load(Ordering::Relaxed) }
-
-    pub fn open_table<Table: TableSignature>(&self) -> DbTransactionResult<DbTable<Table>> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let table_name = Table::table_name();
-        if !self.tables.contains(table_name) {
-            let table = table_name.to_owned();
-            return MmError::err(DbTransactionError::NoSuchTable { table });
-        }
-
-        match self.transaction.object_store(table_name) {
-            Ok(object_store) => Ok(DbTable {
-                object_store,
-                aborted: self.aborted.clone(),
-                phantom: PhantomData::default(),
-            }),
-            Err(e) => MmError::err(DbTransactionError::ErrorOpeningTable {
-                table: table_name.to_owned(),
-                description: stringify_js_error(&e),
-            }),
-        }
-    }
-
-    pub async fn wait_for_complete(self) -> DbTransactionResult<()> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let result = self
-            .complete_rx
-            .await
-            .expect_w("The complete channel must not be closed");
-        match result {
-            Ok(_event) => Ok(()),
-            Err(_error_event) => return MmError::err(DbTransactionError::TransactionAborted),
-        }
-    }
-
-    fn init(transaction: IdbTransaction, tables: HashSet<String>) -> DbTransaction {
-        let (complete_tx, complete_rx) = oneshot::channel();
-        let (event_tx, mut event_rx) = mpsc::channel(2);
-
-        let oncomplete_closure = construct_event_closure(Ok, event_tx.clone());
-        let onabort_closure = construct_event_closure(Err, event_tx.clone());
-
-        transaction.set_oncomplete(Some(oncomplete_closure.as_ref().unchecked_ref()));
-        // Don't set the `onerror` closure, because the `onabort` is called immediately after the error.
-        transaction.set_onabort(Some(onabort_closure.as_ref().unchecked_ref()));
-
-        // move the closures into this async block to keep it alive until either `oncomplete` or `onabort` handler is called
-        let fut = async move {
-            let complete_or_abort = event_rx.next().await.expect_w("The event channel must not be closed");
-            // ignore if the receiver is closed
-            let _res = complete_tx.send(complete_or_abort);
-
-            // do any action to move the closures into this async block to keep it alive until the `state_machine` finishes
-            drop(oncomplete_closure);
-            drop(onabort_closure);
-        };
-
-        wasm_bindgen_futures::spawn_local(fut);
-        DbTransaction {
-            transaction,
-            tables,
-            aborted: Arc::new(AtomicBool::new(false)),
-            complete_rx,
-        }
-    }
-}
-
-pub struct DbTable<'a, T: TableSignature> {
-    object_store: IdbObjectStore,
-    aborted: Arc<AtomicBool>,
-    phantom: PhantomData<&'a T>,
-}
-
-impl<'a, T: TableSignature> !Send for DbTable<'a, T> {}
-
-impl<'a, T: TableSignature> DbTable<'a, T> {
-    pub fn aborted(&self) -> bool { self.aborted.load(Ordering::Relaxed) }
-
-    pub async fn add_item(&self, item: &T) -> DbTransactionResult<ItemId> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        // The [`InternalItem::item`] is a flatten field, so if we add the item without the [`InternalItem::_item_id`] id,
-        // it will be calculated automatically.
-        let js_value = match JsValue::from_serde(item) {
-            Ok(value) => value,
-            Err(e) => return MmError::err(DbTransactionError::ErrorSerializingItem(e.to_string())),
-        };
-        let add_request = match self.object_store.add(&js_value) {
-            Ok(request) => request,
-            Err(e) => return MmError::err(DbTransactionError::ErrorUploadingItem(stringify_js_error(&e))),
-        };
-
-        if let Err(_error_event) = Self::wait_for_request_complete(&add_request).await {
-            self.aborted.store(true, Ordering::Relaxed);
-            let error = Self::error_from_failed_request(&add_request);
-            return MmError::err(DbTransactionError::ErrorUploadingItem(error));
-        }
-
-        Self::item_id_from_completed_request(&add_request)
-    }
-
-    pub async fn get_items(&self, index_str: &str, index_value_str: &str) -> DbTransactionResult<Vec<(ItemId, T)>> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let index = index_str.to_owned();
-        let index_value = index_value_str.to_owned();
-
-        let index_value_js = JsValue::from(index_value_str);
-
-        let db_index = match self.object_store.index(index_str) {
-            Ok(index) => index,
-            Err(_) => return MmError::err(DbTransactionError::NoSuchIndex { index }),
-        };
-        let get_request = match db_index.get_all_with_key(&index_value_js) {
-            Ok(request) => request,
-            Err(e) => {
-                return MmError::err(DbTransactionError::InvalidIndex {
-                    index,
-                    index_value,
-                    description: stringify_js_error(&e),
-                })
-            },
-        };
-
-        if let Err(_error_event) = Self::wait_for_request_complete(&get_request).await {
-            self.aborted.store(true, Ordering::Relaxed);
-            let error = Self::error_from_failed_request(&get_request);
-            return MmError::err(DbTransactionError::ErrorGettingItems(error));
-        }
-
-        Self::items_from_completed_request(&get_request)
-    }
-
-    pub async fn get_item_ids(&self, index_str: &str, index_value_str: &str) -> DbTransactionResult<Vec<ItemId>> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let index = index_str.to_owned();
-        let index_value = index_value_str.to_owned();
-
-        let index_value_js = JsValue::from(index_value_str);
-
-        let db_index = match self.object_store.index(index_str) {
-            Ok(index) => index,
-            Err(_) => return MmError::err(DbTransactionError::NoSuchIndex { index }),
-        };
-        let get_request = match db_index.get_all_keys_with_key(&index_value_js) {
-            Ok(request) => request,
-            Err(e) => {
-                return MmError::err(DbTransactionError::InvalidIndex {
-                    index,
-                    index_value,
-                    description: stringify_js_error(&e),
-                })
-            },
-        };
-
-        if let Err(_error_event) = Self::wait_for_request_complete(&get_request).await {
-            self.aborted.store(true, Ordering::Relaxed);
-            let error = Self::error_from_failed_request(&get_request);
-            return MmError::err(DbTransactionError::ErrorGettingItems(error));
-        }
-
-        Self::item_ids_from_completed_request(&get_request)
-    }
-
-    pub async fn get_all_items(&self) -> DbTransactionResult<Vec<(ItemId, T)>> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let get_request = match self.object_store.get_all() {
-            Ok(request) => request,
-            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
-        };
-
-        if let Err(_error_event) = Self::wait_for_request_complete(&get_request).await {
-            self.aborted.store(true, Ordering::Relaxed);
-            let error = Self::error_from_failed_request(&get_request);
-            return MmError::err(DbTransactionError::ErrorGettingItems(error));
-        }
-
-        Self::items_from_completed_request(&get_request)
-    }
-
-    pub async fn replace_item(&self, _item_id: ItemId, item: T) -> DbTransactionResult<ItemId> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let item_with_key = InternalItem { _item_id, item };
-        let js_value = match JsValue::from_serde(&item_with_key) {
-            Ok(value) => value,
-            Err(e) => return MmError::err(DbTransactionError::ErrorSerializingItem(e.to_string())),
-        };
-        let replace_request = match self.object_store.put(&js_value) {
-            Ok(request) => request,
-            Err(e) => return MmError::err(DbTransactionError::ErrorUploadingItem(stringify_js_error(&e))),
-        };
-
-        if let Err(_error_event) = Self::wait_for_request_complete(&replace_request).await {
-            self.aborted.store(true, Ordering::Relaxed);
-            let error = Self::error_from_failed_request(&replace_request);
-            return MmError::err(DbTransactionError::ErrorUploadingItem(error));
-        }
-
-        Self::item_id_from_completed_request(&replace_request)
-    }
-
-    pub async fn delete_item(&self, item_id: ItemId) -> DbTransactionResult<()> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let item_id = JsValue::from(item_id);
-
-        let delete_request = match self.object_store.delete(&item_id) {
-            Ok(request) => request,
-            Err(e) => return MmError::err(DbTransactionError::ErrorDeletingItems(stringify_js_error(&e))),
-        };
-
-        if let Err(_error_event) = Self::wait_for_request_complete(&delete_request).await {
-            self.aborted.store(true, Ordering::Relaxed);
-            let error = Self::error_from_failed_request(&delete_request);
-            return MmError::err(DbTransactionError::ErrorDeletingItems(error));
-        }
-
-        Ok(())
-    }
-
-    pub async fn clear(&self) -> DbTransactionResult<()> {
-        if self.aborted.load(Ordering::Relaxed) {
-            return MmError::err(DbTransactionError::TransactionAborted);
-        }
-
-        let clear_request = match self.object_store.clear() {
-            Ok(request) => request,
-            Err(e) => return MmError::err(DbTransactionError::ErrorDeletingItems(stringify_js_error(&e))),
-        };
-
-        if let Err(_error_event) = Self::wait_for_request_complete(&clear_request).await {
-            self.aborted.store(true, Ordering::Relaxed);
-            let error = Self::error_from_failed_request(&clear_request);
-            return MmError::err(DbTransactionError::ErrorDeletingItems(error));
-        }
-
-        Ok(())
-    }
-
-    async fn wait_for_request_complete(request: &IdbRequest) -> Result<JsValue, JsValue> {
-        let (tx, mut rx) = mpsc::channel(2);
-
-        let onsuccess_closure = construct_event_closure(Ok, tx.clone());
-        let onerror_closure = construct_event_closure(Err, tx.clone());
-
-        request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));
-        request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
-
-        rx.next().await.expect_w("The request event channel must not be closed")
-    }
-
-    fn item_id_from_completed_request(request: &IdbRequest) -> DbTransactionResult<ItemId> {
-        let result_js_value = match request.result() {
-            Ok(res) => res,
-            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
-        };
-
-        result_js_value
-            .into_serde()
-            .map_to_mm(|e| DbTransactionError::ErrorDeserializingItem(e.to_string()))
-    }
-
-    fn items_from_completed_request(request: &IdbRequest) -> DbTransactionResult<Vec<(ItemId, T)>> {
-        let result_js_value = match request.result() {
-            Ok(res) => res,
-            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
-        };
-
-        if result_js_value.is_null() || result_js_value.is_undefined() {
-            return Ok(Vec::new());
-        }
-
-        let items: Vec<InternalItem<T>> = match result_js_value.into_serde() {
-            Ok(items) => items,
-            Err(e) => return MmError::err(DbTransactionError::ErrorDeserializingItem(e.to_string())),
-        };
-
-        Ok(items.into_iter().map(|item| (item._item_id, item.item)).collect())
-    }
-
-    fn item_ids_from_completed_request(request: &IdbRequest) -> DbTransactionResult<Vec<ItemId>> {
-        let result_js_value = match request.result() {
-            Ok(res) => res,
-            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
-        };
-
-        if result_js_value.is_null() || result_js_value.is_undefined() {
-            return Ok(Vec::new());
-        }
-
-        result_js_value
-            .into_serde()
-            .map_to_mm(|e| DbTransactionError::ErrorDeserializingItem(e.to_string()))
-    }
-
-    fn error_from_failed_request(request: &IdbRequest) -> String {
-        match request.error() {
-            Ok(Some(exception)) => format!("{:?}", exception),
-            _ => "Unknown".to_owned(),
-        }
-    }
-}
-
-pub struct DbUpgrader {
-    db: IdbDatabase,
-    transaction: IdbTransaction,
-}
-
-impl DbUpgrader {
-    pub fn create_table(&self, table: &str) -> OnUpgradeResult<TableUpgrader> {
-        // We use the [in-line](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API/Basic_Concepts_Behind_IndexedDB#gloss_inline_key) primary keys.
-        let key_path = JsValue::from(ITEM_KEY_PATH);
-
-        let mut params = IdbObjectStoreParameters::new();
-        params.key_path(Some(&key_path));
-        params.auto_increment(true);
-
-        match self.db.create_object_store_with_optional_parameters(table, &params) {
-            Ok(object_store) => Ok(TableUpgrader { object_store }),
-            Err(e) => MmError::err(OnUpgradeError::ErrorCreatingTable {
-                table: table.to_owned(),
-                description: stringify_js_error(&e),
-            }),
-        }
-    }
-
-    /// Open the `table` if it was created already.
-    pub fn open_table(&self, table: &str) -> OnUpgradeResult<TableUpgrader> {
-        match self.transaction.object_store(table) {
-            Ok(object_store) => Ok(TableUpgrader { object_store }),
-            Err(e) => MmError::err(OnUpgradeError::ErrorOpeningTable {
-                table: table.to_owned(),
-                description: stringify_js_error(&e),
-            }),
-        }
-    }
-}
-
-pub struct TableUpgrader {
-    object_store: IdbObjectStore,
-}
-
-impl TableUpgrader {
-    pub fn create_index(&self, index: &str, unique: bool) -> OnUpgradeResult<()> {
-        let mut params = IdbIndexParameters::new();
-        params.unique(unique);
-        self.object_store
-            .create_index_with_str_and_optional_parameters(index, index, &params)
-            .map(|_| ())
-            .map_to_mm(|e| OnUpgradeError::ErrorCreatingIndex {
-                index: index.to_owned(),
-                description: stringify_js_error(&e),
-            })
-    }
-}
-
-pub trait TableSignature: DeserializeOwned + Serialize + 'static {
-    fn table_name() -> &'static str;
-
-    fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()>;
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-struct InternalItem<T> {
-    _item_id: ItemId,
-    #[serde(flatten)]
-    item: T,
-}
-
-#[derive(Debug)]
-enum DbOpenEvent {
-    Failed(JsValue),
-    UpgradeNeeded(JsValue),
-    Success(JsValue),
-}
-
-/// Please note the `Event` type can be `JsValue`. It doesn't lead to a runtime error, because [`JsValue::dyn_into<JsValue>()`] returns itself.
-fn construct_event_closure<F, Event>(mut f: F, mut event_tx: mpsc::Sender<Event>) -> Closure<dyn FnMut(JsValue)>
-where
-    F: FnMut(JsValue) -> Event + 'static,
-    Event: fmt::Debug + 'static,
-{
-    Closure::new(move |event: JsValue| {
-        let open_event = f(event);
-        if let Err(e) = event_tx.try_send(open_event) {
-            let error = e.to_string();
-            let event = e.into_inner();
-            error!("Error sending the '{:?}' event: {}", event, error);
-        }
-    })
-}
-
-mod tests {
-    use super::*;
-    use crate::for_tests::register_wasm_log;
-    use crate::log::LogLevel;
-    use wasm_bindgen_test::*;
-
-    wasm_bindgen_test_configure!(run_in_browser);
-
-    #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-    #[serde(deny_unknown_fields)]
-    struct TxTable {
-        ticker: String,
-        tx_hash: String,
-        block_height: u64,
-    }
-
-    impl TableSignature for TxTable {
-        fn table_name() -> &'static str { "tx_table" }
-
-        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, _new_version: u32) -> OnUpgradeResult<()> {
-            if old_version > 0 {
-                // the table is initialized already
-                return Ok(());
-            }
-            let table_upgrader = upgrader.create_table("tx_table")?;
-            table_upgrader.create_index("ticker", false)?;
-            table_upgrader.create_index("tx_hash", true)
-        }
-    }
-
-    #[wasm_bindgen_test]
-    async fn test_add_get_item() {
-        const DB_NAME: &str = "TEST_ADD_GET_ITEM";
-        const DB_VERSION: u32 = 1;
-
-        let rick_tx_1 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
-            block_height: 10000,
-        };
-        let rick_tx_2 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
-            block_height: 10000,
-        };
-        let morty_tx_1 = TxTable {
-            ticker: "MORTY".to_owned(),
-            tx_hash: "1fc789133239260ed16361190a026a88cab2243935f02f1ccd794f1d06a22246".to_owned(),
-            block_height: 20000,
-        };
-
-        register_wasm_log(LogLevel::Debug);
-
-        let db = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_w("!IndexedDb::init");
-        let transaction = db.transaction().expect_w("!IndexedDb::transaction()");
-        let table = transaction
-            .open_table::<TxTable>()
-            .expect_w("!DbTransaction::open_table");
-
-        let rick_tx_1_id = table
-            .add_item(&rick_tx_1)
-            .await
-            .expect_w("!Couldn't add a 'RICK' transaction");
-        let rick_tx_2_id = table
-            .add_item(&rick_tx_2)
-            .await
-            .expect_w("!Couldn't add a 'RICK' transaction with the different 'tx_hash'");
-        let morty_tx_1_id = table
-            .add_item(&morty_tx_1)
-            .await
-            .expect_w("!Couldn't add a 'MORTY' transaction");
-        assert!(rick_tx_1_id != rick_tx_2_id && rick_tx_2_id != morty_tx_1_id);
-
-        let actual_rick_txs = table
-            .get_items("ticker", "RICK")
-            .await
-            .expect_w("!Couldn't get items by the index 'ticker=RICK'");
-        let expected_rick_txs = vec![(rick_tx_1_id, rick_tx_1), (rick_tx_2_id, rick_tx_2.clone())];
-        assert_eq!(actual_rick_txs, expected_rick_txs);
-
-        let actual_rick_tx_ids = table
-            .get_item_ids("ticker", "RICK")
-            .await
-            .expect_w("Couldn't get item ids by the index 'ticker=RICK'");
-        let expected_rick_tx_ids = vec![rick_tx_1_id, rick_tx_2_id];
-        assert_eq!(actual_rick_tx_ids, expected_rick_tx_ids);
-
-        let actual_rick_2_tx = table
-            .get_items(
-                "tx_hash",
-                "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424",
-            )
-            .await
-            .expect_w("!Couldn't get items by the index 'tx_hash'");
-        let expected_rick_txs = vec![(rick_tx_2_id, rick_tx_2)];
-        assert_eq!(actual_rick_2_tx, expected_rick_txs);
-    }
-
-    #[wasm_bindgen_test]
-    async fn test_replace_item() {
-        const DB_NAME: &str = "TEST_REPLACE_ITEM";
-        const DB_VERSION: u32 = 1;
-
-        let rick_tx_1 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
-            block_height: 10000,
-        };
-        let rick_tx_2 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
-            block_height: 10000,
-        };
-        let rick_tx_1_updated = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
-            block_height: 20000,
-        };
-
-        register_wasm_log(LogLevel::Debug);
-
-        let db = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_w("!IndexedDb::init");
-        let transaction = db.transaction().expect_w("!IndexedDb::transaction()");
-        let table = transaction
-            .open_table::<TxTable>()
-            .expect_w("!DbTransaction::open_table");
-
-        let rick_tx_1_id = table.add_item(&rick_tx_1).await.expect_w("Couldn't add an item");
-        let rick_tx_2_id = table.add_item(&rick_tx_2).await.expect_w("Couldn't add an item");
-
-        // Wait for the transaction to complete to save the changes to the database.
-        transaction
-            .wait_for_complete()
-            .await
-            .expect_w("Error waiting for the transaction to complete");
-
-        // Open new transaction.
-        let transaction = db.transaction().expect_w("!IndexedDb::transaction()");
-        let table = transaction
-            .open_table::<TxTable>()
-            .expect_w("!DbTransaction::open_table");
-
-        // Try to add the updated RICK tx item with the same [`TxTable::tx_hash`].
-        // [`TxTable::tx_hash`] is a unique index, so this operation must fail.
-        let err = table
-            .add_item(&rick_tx_1_updated)
-            .await
-            .expect_err_w("'DbTable::add_item' should have failed");
-        match err.into_inner() {
-            DbTransactionError::ErrorUploadingItem(err) => debug!("error: {}", err),
-            e => panic_w(&format!(
-                "Expected 'DbTransactionError::ErrorUploadingItem', found: {:?}",
-                e
-            )),
-        }
-        assert!(transaction.aborted() && table.aborted());
-
-        // But we should be able to replace the updated item.
-        // Since the last operation failed, we have to reopen the transaction.
-        let transaction = db.transaction().expect_w("!IndexedDb::transaction()");
-        let table = transaction
-            .open_table::<TxTable>()
-            .expect_w("!DbTransaction::open_table");
-
-        let rick_tx_1_updated_id = table
-            .replace_item(rick_tx_1_id, rick_tx_1_updated.clone())
-            .await
-            .expect_w("!Couldn't replace an item");
-        assert_eq!(rick_tx_1_updated_id, rick_tx_1_id);
-
-        let actual_rick_txs = table
-            .get_items("ticker", "RICK")
-            .await
-            .expect_w("Couldn't get items by the index 'ticker=RICK'");
-        assert_eq!(actual_rick_txs, vec![
-            (rick_tx_1_id, rick_tx_1_updated),
-            (rick_tx_2_id, rick_tx_2)
-        ]);
-    }
-
-    #[wasm_bindgen_test]
-    async fn test_delete_item() {
-        const DB_NAME: &str = "TEST_DELETE_ITEM";
-        const DB_VERSION: u32 = 1;
-
-        let rick_tx_1 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
-            block_height: 10000,
-        };
-        let rick_tx_2 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
-            block_height: 10000,
-        };
-
-        register_wasm_log(LogLevel::Debug);
-
-        let db = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_w("!IndexedDb::init");
-        let transaction = db.transaction().expect_w("!IndexedDb::transaction()");
-        let table = transaction
-            .open_table::<TxTable>()
-            .expect_w("!DbTransaction::open_table");
-
-        let rick_tx_1_id = table.add_item(&rick_tx_1).await.expect_w("Couldn't add an item");
-        let rick_tx_2_id = table.add_item(&rick_tx_2).await.expect_w("Couldn't add an item");
-
-        table
-            .delete_item(rick_tx_1_id)
-            .await
-            .expect_w("Couldn't delete an item");
-
-        let actual_rick_txs = table
-            .get_items("ticker", "RICK")
-            .await
-            .expect_w("Couldn't get items by the index 'ticker=RICK'");
-        assert_eq!(actual_rick_txs, vec![(rick_tx_2_id, rick_tx_2)]);
-    }
-
-    #[wasm_bindgen_test]
-    async fn test_clear() {
-        const DB_NAME: &str = "TEST_CLEAR";
-        const DB_VERSION: u32 = 1;
-
-        let rick_tx_1 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
-            block_height: 10000,
-        };
-        let rick_tx_2 = TxTable {
-            ticker: "RICK".to_owned(),
-            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
-            block_height: 10000,
-        };
-
-        register_wasm_log(LogLevel::Debug);
-
-        let db = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_w("!IndexedDb::init");
-        let transaction = db.transaction().expect_w("!IndexedDb::transaction()");
-        let table = transaction
-            .open_table::<TxTable>()
-            .expect_w("!DbTransaction::open_table");
-
-        let _rick_tx_1_id = table.add_item(&rick_tx_1).await.expect_w("Couldn't add an item");
-        let _rick_tx_2_id = table.add_item(&rick_tx_2).await.expect_w("Couldn't add an item");
-
-        table.clear().await.expect_w("Couldn't clear the database");
-
-        let actual_rick_txs = table
-            .get_items("ticker", "RICK")
-            .await
-            .expect_w("Couldn't get items by the index 'ticker=RICK'");
-        assert!(actual_rick_txs.is_empty());
-    }
-
-    #[wasm_bindgen_test]
-    async fn test_upgrade_needed() {
-        const DB_NAME: &str = "TEST_UPGRADE_NEEDED";
-
-        lazy_static! {
-            static ref LAST_VERSIONS: Mutex<Option<(u32, u32)>> = Mutex::new(None);
-        }
-
-        #[derive(Serialize, Deserialize)]
-        struct UpgradableTable;
-
-        impl TableSignature for UpgradableTable {
-            fn table_name() -> &'static str { "upgradable_table" }
-
-            fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
-                let mut versions = LAST_VERSIONS.lock().expect_w("!old_new_versions.lock()");
-                *versions = Some((old_version, new_version));
-
-                match (old_version, new_version) {
-                    (0, 1) => {
-                        let table = upgrader.create_table("upgradable_table")?;
-                        table.create_index("first_index", false)?;
-                    },
-                    (0, 2) => {
-                        let table = upgrader.create_table("upgradable_table")?;
-                        table.create_index("first_index", false)?;
-                        table.create_index("second_index", false)?;
-                    },
-                    (1, 2) => {
-                        let table = upgrader.open_table("upgradable_table")?;
-                        table.create_index("second_index", false)?;
-                    },
-                    v => panic_w(&format!("Unexpected old, new versions: {:?}", v)),
-                }
-                Ok(())
-            }
-        }
-
-        async fn init_and_check(version: u32, expected_old_new_versions: Option<(u32, u32)>) -> Result<(), String> {
-            let mut versions = LAST_VERSIONS.lock().expect_w("!LAST_VERSIONS.lock()");
-            *versions = None;
-            drop(versions);
-
-            let _db = IndexedDbBuilder::new(DB_NAME)
-                .with_version(version)
-                .with_table::<UpgradableTable>()
-                .init()
-                .await
-                .map_err(|e| format!("{}", e))?;
-
-            let actual_versions = LAST_VERSIONS.lock().unwrap_w();
-            if *actual_versions == expected_old_new_versions {
-                Ok(())
-            } else {
-                Err(format!(
-                    "Expected {:?}, found {:?}",
-                    expected_old_new_versions, actual_versions
-                ))
-            }
-        }
-
-        register_wasm_log(LogLevel::Debug);
-
-        init_and_check(1, Some((0, 1))).await.unwrap_w();
-        init_and_check(2, Some((1, 2))).await.unwrap_w();
-        // the same 2 version, `on_upgrade_needed` must not be called
-        init_and_check(2, None).await.unwrap_w();
-    }
-
-    #[wasm_bindgen_test]
-    async fn test_open_twice() {
-        const DB_NAME: &str = "TEST_OPEN_TWICE";
-        const DB_VERSION: u32 = 1;
-
-        register_wasm_log(LogLevel::Debug);
-
-        let _db = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_w("!IndexedDb::init first time");
-
-        let err = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION + 1)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_err_w("!IndexedDb::init should have failed");
-        assert_eq!(err.into_inner(), InitDbError::DbIsOpenAlready {
-            db_name: DB_NAME.to_owned()
-        });
-    }
-
-    #[wasm_bindgen_test]
-    async fn test_open_close_and_open() {
-        const DB_NAME: &str = "TEST_OPEN_CLOSE_AND_OPEN";
-        const DB_VERSION: u32 = 1;
-
-        register_wasm_log(LogLevel::Debug);
-
-        let db = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_w("!IndexedDb::init first time");
-        drop(db);
-
-        let _db = IndexedDbBuilder::new(DB_NAME)
-            .with_version(DB_VERSION)
-            .with_table::<TxTable>()
-            .init()
-            .await
-            .expect_w("!IndexedDb::init second time");
-    }
-}
diff --git a/mm2src/common/wio.rs b/mm2src/common/wio.rs
new file mode 100644
index 0000000000..ab358f3962
--- /dev/null
+++ b/mm2src/common/wio.rs
@@ -0,0 +1,188 @@
+//! `wio` stands for "web I/O", it contains the parts which aren't directly available with WASM.
+
+use futures::compat::Future01CompatExt;
+use futures::executor::ThreadPool;
+use futures01::sync::oneshot::{self, Receiver};
+use futures01::{Async, Future, Poll};
+use futures_cpupool::CpuPool;
+use gstuff::{duration_to_float, now_float};
+use hyper::client::HttpConnector;
+use hyper::Client;
+use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
+use std::fmt;
+use std::sync::Mutex;
+use std::thread::JoinHandle;
+use std::time::Duration;
+use tokio::runtime::Runtime;
+
+fn start_core_thread() -> Mm2Runtime { Mm2Runtime(Runtime::new().unwrap()) }
+
+pub struct Mm2Runtime(pub Runtime);
+
+lazy_static! {
+    /// Shared asynchronous reactor.
+    pub static ref CORE: Mm2Runtime = start_core_thread();
+    /// Shared CPU pool to run intensive/sleeping requests on a separate thread.
+    ///
+    /// Deprecated, prefer the futures 0.3 `POOL` instead.
+    pub static ref CPUPOOL: CpuPool = CpuPool::new(8);
+    /// Shared CPU pool to run intensive/sleeping requests on s separate thread.
+    pub static ref POOL: Mutex<ThreadPool> = Mutex::new(ThreadPool::builder()
+        .pool_size(8)
+        .name_prefix("POOL")
+        .create().expect("!ThreadPool"));
+}
+
+impl<Fut: std::future::Future<Output = ()> + Send + 'static> hyper::rt::Executor<Fut> for &Mm2Runtime {
+    fn execute(&self, fut: Fut) { self.0.spawn(fut); }
+}
+
+/// With a shared reactor drives the future `f` to completion.
+///
+/// NB: This function is only useful if you need to get the results of the execution.
+/// If the results are not necessary then a future can be scheduled directly on the reactor:
+///
+///     CORE.spawn (|_| f);
+pub fn drive<F, R, E>(f: F) -> Receiver<Result<R, E>>
+where
+    F: Future<Item = R, Error = E> + Send + 'static,
+    R: Send + 'static,
+    E: Send + 'static,
+{
+    let (sx, rx) = oneshot::channel();
+    CORE.0.spawn(
+        f.then(move |fr: Result<R, E>| -> Result<(), ()> {
+            let _ = sx.send(fr);
+            Ok(())
+        })
+        .compat(),
+    );
+    rx
+}
+
+pub fn drive03<F, O>(f: F) -> futures::channel::oneshot::Receiver<O>
+where
+    F: std::future::Future<Output = O> + Send + 'static,
+    O: Send + 'static,
+{
+    let (sx, rx) = futures::channel::oneshot::channel();
+    CORE.0.spawn(async move {
+        let res = f.await;
+        if sx.send(res).is_err() {
+            crate::log::debug!("drive03 receiver is dropped");
+        };
+    });
+    rx
+}
+
+/// With a shared reactor drives the future `f` to completion.
+///
+/// Similar to `fn drive`, but returns a stringified error,
+/// allowing us to collapse the `Receiver` and return the `R` directly.
+pub fn drive_s<F, R, E>(f: F) -> impl Future<Item = R, Error = String>
+where
+    F: Future<Item = R, Error = E> + Send + 'static,
+    R: Send + 'static,
+    E: fmt::Display + Send + 'static,
+{
+    drive(f).then(move |r| -> Result<R, String> {
+        let r = try_s!(r); // Peel the `Receiver`.
+        let r = try_s!(r); // `E` to `String`.
+        Ok(r)
+    })
+}
+
+/// Finishes with the "timeout" error if the underlying future isn't ready withing the given timeframe.
+///
+/// NB: Tokio timers (in `tokio::timer`) only seem to work under the Tokio runtime,
+/// which is unfortunate as we want the different futures executed on the different reactors
+/// depending on how much they're I/O-bound, CPU-bound or blocking.
+/// Unlike the Tokio timers this `Timeout` implementation works with any reactor.
+/// Another option to consider is https://github.com/alexcrichton/futures-timer.
+/// P.S. The older `0.1` version of the `tokio::timer` might work NP, it works in other parts of our code.
+///      The new version, on the other hand, requires the Tokio runtime (https://tokio.rs/blog/2018-03-timers/).
+/// P.S. We could try using the `futures-timer` crate instead, but note that it is currently under-maintained,
+///      https://github.com/rustasync/futures-timer/issues/9#issuecomment-400802515.
+pub struct Timeout<R> {
+    fut: Box<dyn Future<Item = R, Error = String>>,
+    started: f64,
+    timeout: f64,
+    monitor: Option<JoinHandle<()>>,
+}
+impl<R> Future for Timeout<R> {
+    type Item = R;
+    type Error = String;
+    fn poll(&mut self) -> Poll<R, String> {
+        match self.fut.poll() {
+            Err(err) => Err(err),
+            Ok(Async::Ready(r)) => Ok(Async::Ready(r)),
+            Ok(Async::NotReady) => {
+                let now = now_float();
+                if now >= self.started + self.timeout {
+                    Err(format!("timeout ({:.1} > {:.1})", now - self.started, self.timeout))
+                } else {
+                    // Start waking up this future until it has a chance to timeout.
+                    // For now it's just a basic separate thread. Will probably optimize later.
+                    if self.monitor.is_none() {
+                        let task = futures01::task::current();
+                        let deadline = self.started + self.timeout;
+                        self.monitor = Some(
+                            std::thread::Builder::new()
+                                .name("timeout monitor".into())
+                                .spawn(move || loop {
+                                    std::thread::sleep(Duration::from_secs(1));
+                                    task.notify();
+                                    if now_float() > deadline + 2. {
+                                        break;
+                                    }
+                                })
+                                .unwrap(),
+                        );
+                    }
+                    Ok(Async::NotReady)
+                }
+            },
+        }
+    }
+}
+impl<R> Timeout<R> {
+    pub fn new(fut: Box<dyn Future<Item = R, Error = String>>, timeout: Duration) -> Timeout<R> {
+        Timeout {
+            fut,
+            started: now_float(),
+            timeout: duration_to_float(timeout),
+            monitor: None,
+        }
+    }
+}
+
+unsafe impl<R> Send for Timeout<R> where Box<dyn Future<Item = R, Error = String>>: Send {}
+
+/// Initialize the crate.
+pub fn init() {
+    // Pre-allocate the stack trace buffer in order to avoid allocating it from a signal handler.
+    super::black_box(&*super::trace_buf());
+    super::black_box(&*super::trace_name_buf());
+}
+
+lazy_static! {
+    /// NB: With a shared client there is a possibility that keep-alive connections will be reused.
+    pub static ref HYPER: Client<HttpsConnector<HttpConnector>> = {
+        // Please note there was a problem on iOS if [`HttpsConnector::with_native_roots`] is used instead.
+        let https = HttpsConnectorBuilder::new().with_webpki_roots().https_or_http().enable_http1().enable_http2().build();
+        Client::builder()
+            .executor(&*CORE)
+            // Hyper had a lot of Keep-Alive bugs over the years and I suspect
+            // that with the shared client we might be getting errno 10054
+            // due to a closed Keep-Alive connection mismanagement.
+            // (To solve this problem Hyper should proactively close the Keep-Alive
+            // connections after a configurable amount of time has passed since
+            // their creation, thus saving us from trying to use the connections
+            // closed on the other side. I wonder if we can implement this strategy
+            // ourselves with a custom connector or something).
+            // Performance of Keep-Alive in the Hyper client is questionable as well,
+            // should measure it on a case-by-case basis when we need it.
+            .pool_max_idle_per_host(0)
+            .build(https)
+    };
+}
diff --git a/mm2src/crypto/Cargo.toml b/mm2src/crypto/Cargo.toml
new file mode 100644
index 0000000000..d2333932f1
--- /dev/null
+++ b/mm2src/crypto/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "crypto"
+version = "1.0.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rustc-hex = "2"
+mm2_err_handle = { path = "../mm2_err_handle" }
+async-trait = "0.1"
+bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
+bitcrypto = { path = "../mm2_bitcoin/crypto" }
+common = { path = "../common" }
+mm2_core = { path = "../mm2_core" }
+derive_more = "0.99"
+enum-primitive-derive = "0.2"
+futures = "0.3"
+hex = "0.4.2"
+http = "0.2"
+hw_common = { path = "../hw_common" }
+parking_lot = { version = "0.12.0", features = ["nightly"] }
+keys = { path = "../mm2_bitcoin/keys" }
+num-traits = "0.2"
+primitives = { path = "../mm2_bitcoin/primitives" }
+rpc_task = { path = "../rpc_task" }
+secp256k1 = "0.20"
+ser_error = { path = "../derives/ser_error" }
+ser_error_derive = { path = "../derives/ser_error_derive" }
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+trezor = { path = "../trezor" }
diff --git a/mm2src/crypto/src/bip32_child.rs b/mm2src/crypto/src/bip32_child.rs
new file mode 100644
index 0000000000..17b5064f97
--- /dev/null
+++ b/mm2src/crypto/src/bip32_child.rs
@@ -0,0 +1,248 @@
+use crate::RpcDerivationPath;
+use hw_common::primitives::{Bip32Error, ChildNumber, DerivationPath};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::convert::TryFrom;
+use std::fmt;
+use std::str::FromStr;
+
+pub type HardenedValue = AnyValue<true>;
+pub type NonHardenedValue = AnyValue<false>;
+
+#[derive(Debug, Eq, PartialEq)]
+pub enum Bip32DerPathError {
+    InvalidDerivationPathLength {
+        expected: usize,
+        found: usize,
+    },
+    ChildIsNotHardened {
+        child_at: usize,
+    },
+    ChildIsHardened {
+        child_at: usize,
+    },
+    UnexpectedChildValue {
+        child_at: usize,
+        actual: u32,
+        expected: String,
+    },
+    Bip32Error(Bip32Error),
+}
+
+impl From<Bip32Error> for Bip32DerPathError {
+    fn from(e: Bip32Error) -> Self { Bip32DerPathError::Bip32Error(e) }
+}
+
+pub trait Bip32DerPathOps: Sized {
+    fn to_derivation_path(&self) -> DerivationPath { DerivationPath::default() }
+
+    fn derive<T>(&self, bip32_number: ChildNumber) -> Result<T, Bip32DerPathError>
+    where
+        T: TryFrom<DerivationPath, Error = Bip32DerPathError>,
+    {
+        let mut derivation_path = self.to_derivation_path();
+        derivation_path.push(bip32_number);
+        T::try_from(derivation_path)
+    }
+}
+
+pub trait Bip32InternalOps: Sized {
+    /// This method is used to get the number of expected children.
+    fn depth() -> usize { 0 }
+
+    fn from_iter<I>(iter: I, current_depth: usize) -> Result<Self, Bip32DerPathError>
+    where
+        I: Iterator<Item = ChildNumber>;
+
+    fn fill_derivation_path(&self, _derivation_path: &mut DerivationPath) {}
+
+    fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result { Ok(()) }
+}
+
+pub trait Bip32ChildValue: Sized {
+    type Value;
+
+    fn hardened() -> bool;
+
+    fn number(&self) -> u32;
+
+    fn value(&self) -> Self::Value;
+
+    fn bip32_number(&self) -> ChildNumber {
+        ChildNumber::new(self.number(), Self::hardened()).expect("'ChildValue::number' is expected to be a valid index")
+    }
+
+    fn from_bip32_number(child_number: ChildNumber, child_index: usize) -> Result<Self, Bip32DerPathError>;
+}
+
+#[derive(Clone, PartialEq)]
+pub struct AnyValue<const HARDENED: bool> {
+    number: u32,
+}
+
+impl<const HARDENED: bool> Bip32ChildValue for AnyValue<HARDENED> {
+    type Value = u32;
+
+    fn hardened() -> bool { HARDENED }
+
+    fn number(&self) -> u32 { self.number }
+
+    fn value(&self) -> Self::Value { self.number }
+
+    fn from_bip32_number(child_number: ChildNumber, child_at: usize) -> Result<Self, Bip32DerPathError> {
+        if child_number.is_hardened() == HARDENED {
+            return Ok(AnyValue {
+                number: child_number.index(),
+            });
+        }
+        if HARDENED {
+            Err(Bip32DerPathError::ChildIsNotHardened { child_at })
+        } else {
+            Err(Bip32DerPathError::ChildIsHardened { child_at })
+        }
+    }
+}
+
+#[derive(Clone, PartialEq)]
+pub struct Bip32Child<Value, Child> {
+    value: Value,
+    child: Child,
+}
+
+impl<Value: Bip32ChildValue, Child: Bip32InternalOps> fmt::Debug for Bip32Child<Value, Child> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self) }
+}
+
+impl<Value: Bip32ChildValue, Child: Bip32InternalOps> fmt::Display for Bip32Child<Value, Child> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "m")?;
+        Bip32InternalOps::fmt(self, f)
+    }
+}
+
+impl<Value, Child> TryFrom<DerivationPath> for Bip32Child<Value, Child>
+where
+    Child: Bip32InternalOps,
+    Value: Bip32ChildValue,
+{
+    type Error = Bip32DerPathError;
+
+    fn try_from(value: DerivationPath) -> Result<Self, Self::Error> {
+        const INITIAL_DEPTH: usize = 0;
+        Self::from_iter(value.iter(), INITIAL_DEPTH)
+    }
+}
+
+impl<'de, Value, Child> Deserialize<'de> for Bip32Child<Value, Child>
+where
+    Child: Bip32InternalOps,
+    Value: Bip32ChildValue,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let derivation_path: RpcDerivationPath = Deserialize::deserialize(deserializer)?;
+        Self::try_from(derivation_path.0).map_err(|e| serde::de::Error::custom(format!("{:?}", e)))
+    }
+}
+
+impl<Value, Child> Serialize for Bip32Child<Value, Child>
+where
+    Child: Bip32DerPathOps + Bip32InternalOps,
+    Value: Bip32ChildValue,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let derivation_path = RpcDerivationPath(self.to_derivation_path());
+        derivation_path.serialize(serializer)
+    }
+}
+
+impl<Value, Child> FromStr for Bip32Child<Value, Child>
+where
+    Child: Bip32InternalOps,
+    Value: Bip32ChildValue,
+{
+    type Err = Bip32DerPathError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let derivation_path = DerivationPath::from_str(s)?;
+        Bip32Child::try_from(derivation_path)
+    }
+}
+
+impl<Value, Child> Bip32DerPathOps for Bip32Child<Value, Child>
+where
+    Child: Bip32DerPathOps + Bip32InternalOps,
+    Value: Bip32ChildValue,
+{
+    fn to_derivation_path(&self) -> DerivationPath {
+        let mut derivation_path = DerivationPath::default();
+        self.fill_derivation_path(&mut derivation_path);
+        derivation_path
+    }
+}
+
+impl<Value, Child> Bip32InternalOps for Bip32Child<Value, Child>
+where
+    Child: Bip32InternalOps,
+    Value: Bip32ChildValue,
+{
+    fn depth() -> usize { Child::depth() + 1 }
+
+    fn from_iter<I>(mut iter: I, current_depth: usize) -> Result<Self, Bip32DerPathError>
+    where
+        I: Iterator<Item = ChildNumber>,
+    {
+        let child_number = match iter.next() {
+            Some(ch) => ch,
+            None => {
+                let found = current_depth;
+                let expected = Self::depth() + current_depth;
+                return Err(Bip32DerPathError::InvalidDerivationPathLength { expected, found });
+            },
+        };
+        let value = Value::from_bip32_number(child_number, current_depth)?;
+        let child = Child::from_iter(iter, current_depth + 1)?;
+        Ok(Bip32Child { value, child })
+    }
+
+    fn fill_derivation_path(&self, derivation_path: &mut DerivationPath) {
+        derivation_path.push(self.value.bip32_number());
+        self.child.fill_derivation_path(derivation_path)
+    }
+
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "/{}", self.value.bip32_number())?;
+        Bip32InternalOps::fmt(&self.child, f)
+    }
+}
+
+impl<Value: Bip32ChildValue, Child> Bip32Child<Value, Child> {
+    pub fn value(&self) -> Value::Value { self.value.value() }
+
+    pub fn child(&self) -> &Child { &self.child }
+}
+
+#[derive(Clone, PartialEq)]
+pub struct Bip44Tail;
+
+impl Bip32DerPathOps for Bip44Tail {}
+
+impl Bip32InternalOps for Bip44Tail {
+    fn from_iter<I>(iter: I, current_depth: usize) -> Result<Self, Bip32DerPathError>
+    where
+        I: Iterator<Item = ChildNumber>,
+    {
+        let left = iter.count();
+        if left == 0 {
+            return Ok(Bip44Tail);
+        }
+        Err(Bip32DerPathError::InvalidDerivationPathLength {
+            expected: current_depth,
+            found: current_depth + left,
+        })
+    }
+}
diff --git a/mm2src/crypto/src/bip44.rs b/mm2src/crypto/src/bip44.rs
new file mode 100644
index 0000000000..d473094ae9
--- /dev/null
+++ b/mm2src/crypto/src/bip44.rs
@@ -0,0 +1,259 @@
+use crate::bip32_child::{Bip32Child, Bip32ChildValue, Bip32DerPathError, Bip44Tail, HardenedValue, NonHardenedValue};
+use bip32::ChildNumber;
+use derive_more::Display;
+use enum_primitive_derive::Primitive;
+use hw_common::primitives::Bip32Error;
+use num_traits::FromPrimitive;
+use std::convert::TryFrom;
+
+pub const BIP44_PURPOSE: u32 = 44;
+
+#[rustfmt::skip]
+pub type Bip44DerivationPath =
+    Bip32Child<Bip44PurposeValue, // `purpose`
+    Bip32Child<HardenedValue, // `coin_type`
+    Bip32Child<HardenedValue, // `account_id`
+    Bip32Child<Bip44ChainValue, // `chain`
+    Bip32Child<NonHardenedValue, // `address_id`
+    Bip44Tail>>>>>;
+#[rustfmt::skip]
+pub type Bip44PathToCoin =
+    Bip32Child<Bip44PurposeValue, // `purpose`
+    Bip32Child<HardenedValue, // `coin_type`
+    Bip44Tail>>;
+#[rustfmt::skip]
+pub type Bip44PathToAccount =
+    Bip32Child<Bip44PurposeValue, // `purpose`
+    Bip32Child<HardenedValue, // `coin_type`
+    Bip32Child<HardenedValue, // `account_id`
+    Bip44Tail>>>;
+
+impl Bip44DerivationPath {
+    pub fn coin_type(&self) -> u32 { self.child().value() }
+
+    pub fn account_id(&self) -> u32 { self.child().child().value() }
+
+    pub fn chain(&self) -> Bip44Chain { self.child().child().child().value() }
+
+    pub fn address_id(&self) -> u32 { self.child().child().child().child().value() }
+}
+
+impl Bip44PathToCoin {
+    pub fn coin_type(&self) -> u32 { self.child().value() }
+}
+
+impl Bip44PathToAccount {
+    pub fn coin_type(&self) -> u32 { self.child().value() }
+
+    pub fn account_id(&self) -> u32 { self.child().child().value() }
+}
+
+pub struct UnkownBip44ChainError {
+    pub chain: u32,
+}
+
+#[derive(Debug, Display, Eq, PartialEq)]
+pub enum Bip44DerPathError {
+    #[display(fmt = "Invalid derivation path length '{}', expected '{}'", found, expected)]
+    InvalidDerivationPathLength { expected: usize, found: usize },
+    #[display(fmt = "Child '{}' is expected to be hardened", child)]
+    ChildIsNotHardened { child: String },
+    #[display(fmt = "Child '{}' is expected not to be hardened", child)]
+    ChildIsHardened { child: String },
+    #[display(fmt = "Unexpected '{}' child value '{}', expected: {}", child, value, expected)]
+    UnexpectedChildValue {
+        child: String,
+        value: u32,
+        expected: String,
+    },
+    #[display(fmt = "Unknown BIP32 error: {}", _0)]
+    Bip32Error(Bip32Error),
+}
+
+impl From<Bip32DerPathError> for Bip44DerPathError {
+    fn from(e: Bip32DerPathError) -> Self {
+        fn display_child_at(child_at: usize) -> String {
+            Bip44Index::from_usize(child_at)
+                .map(|index| format!("{:?}", index))
+                .unwrap_or_else(|| "UNKNOWN".to_owned())
+        }
+
+        match e {
+            Bip32DerPathError::InvalidDerivationPathLength { expected, found } => {
+                Bip44DerPathError::InvalidDerivationPathLength { expected, found }
+            },
+            Bip32DerPathError::ChildIsNotHardened { child_at } => Bip44DerPathError::ChildIsNotHardened {
+                child: display_child_at(child_at),
+            },
+            Bip32DerPathError::ChildIsHardened { child_at } => Bip44DerPathError::ChildIsHardened {
+                child: display_child_at(child_at),
+            },
+            Bip32DerPathError::UnexpectedChildValue {
+                child_at,
+                actual,
+                expected,
+            } => Bip44DerPathError::UnexpectedChildValue {
+                child: display_child_at(child_at),
+                value: actual,
+                expected,
+            },
+            Bip32DerPathError::Bip32Error(bip32) => Bip44DerPathError::Bip32Error(bip32),
+        }
+    }
+}
+
+impl From<UnkownBip44ChainError> for Bip32DerPathError {
+    fn from(e: UnkownBip44ChainError) -> Self {
+        Bip32DerPathError::UnexpectedChildValue {
+            child_at: Bip44Index::Chain as usize,
+            actual: e.chain,
+            expected: "0 or 1 chain".to_owned(),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Primitive)]
+pub enum Bip44Index {
+    Purpose = 0,
+    CoinType = 1,
+    AccountId = 2,
+    Chain = 3,
+    AddressId = 4,
+}
+
+#[derive(Debug, Copy, Clone, Deserialize, PartialEq, Serialize)]
+pub enum Bip44Chain {
+    External = 0,
+    Internal = 1,
+}
+
+impl TryFrom<u32> for Bip44Chain {
+    type Error = UnkownBip44ChainError;
+
+    fn try_from(value: u32) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(Bip44Chain::External),
+            1 => Ok(Bip44Chain::Internal),
+            chain => Err(UnkownBip44ChainError { chain }),
+        }
+    }
+}
+
+impl Bip44Chain {
+    pub fn to_child_number(&self) -> ChildNumber { ChildNumber::from(*self as u32) }
+}
+
+#[derive(Clone, PartialEq)]
+pub struct Bip44ChainValue {
+    chain: Bip44Chain,
+}
+
+impl Bip32ChildValue for Bip44ChainValue {
+    type Value = Bip44Chain;
+
+    /// `chain` is a non-hardened child as it's described in the BIP44 standard.
+    fn hardened() -> bool { false }
+
+    fn number(&self) -> u32 { self.chain as u32 }
+
+    fn value(&self) -> Self::Value { self.chain }
+
+    fn from_bip32_number(child_number: ChildNumber, child_at: usize) -> Result<Self, Bip32DerPathError> {
+        if child_number.is_hardened() {
+            return Err(Bip32DerPathError::ChildIsHardened { child_at });
+        }
+        Ok(Bip44ChainValue {
+            chain: Bip44Chain::try_from(child_number.index())?,
+        })
+    }
+}
+
+#[derive(Clone, PartialEq)]
+pub struct Bip44PurposeValue;
+
+impl Bip32ChildValue for Bip44PurposeValue {
+    type Value = u32;
+
+    /// `purpose` is always a hardened child as it's described in the BIP44 standard.
+    fn hardened() -> bool { true }
+
+    fn number(&self) -> u32 { BIP44_PURPOSE }
+
+    fn value(&self) -> u32 { BIP44_PURPOSE }
+
+    fn from_bip32_number(child_number: ChildNumber, child_at: usize) -> Result<Self, Bip32DerPathError> {
+        let purpose_child_hardened = true;
+        let expected_purpose = ChildNumber::new(BIP44_PURPOSE, purpose_child_hardened)
+            .expect("'BIP44_PURPOSE' is expected to be a valid index");
+
+        if child_number != expected_purpose {
+            return Err(Bip32DerPathError::UnexpectedChildValue {
+                child_at,
+                actual: child_number.0,
+                expected: format!("'{}' BIP44 purpose", expected_purpose),
+            });
+        }
+        Ok(Bip44PurposeValue)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::bip32_child::Bip32DerPathOps;
+    use bip32::DerivationPath;
+    use std::str::FromStr;
+
+    #[test]
+    fn test_from_str() {
+        let der_path = Bip44DerivationPath::from_str("m/44'/141'/1'/0/10").unwrap();
+        assert_eq!(der_path.coin_type(), 141);
+        assert_eq!(der_path.account_id(), 1);
+        assert_eq!(der_path.chain(), Bip44Chain::External);
+        assert_eq!(der_path.address_id(), 10);
+    }
+
+    #[test]
+    fn test_display() {
+        let der_path = Bip44PathToAccount::from_str("m/44'/141'/1'").unwrap();
+        let actual = format!("{}", der_path);
+        assert_eq!(actual, "m/44'/141'/1'");
+    }
+
+    #[test]
+    fn test_derive() {
+        let der_path_to_coin = Bip44PathToCoin::from_str("m/44'/141'").unwrap();
+        let der_path_to_account: Bip44PathToAccount =
+            der_path_to_coin.derive(ChildNumber::new(10, true).unwrap()).unwrap();
+        assert_eq!(
+            der_path_to_account.to_derivation_path(),
+            DerivationPath::from_str("m/44'/141'/10'").unwrap()
+        );
+    }
+
+    #[test]
+    fn test_from_invalid_length() {
+        let error = Bip44DerivationPath::from_str("m/44'/141'/0'").expect_err("derivation path is too short");
+        assert_eq!(error, Bip32DerPathError::InvalidDerivationPathLength {
+            expected: 5,
+            found: 3
+        });
+
+        let error = Bip44DerivationPath::from_str("m/44'/141'/0'/1/2/3")
+            .expect_err("max number of children is 5, but 6 passes");
+        assert_eq!(error, Bip32DerPathError::InvalidDerivationPathLength {
+            expected: 5,
+            found: 6
+        });
+    }
+
+    #[test]
+    fn test_from_unexpected_child_value() {
+        let error = Bip44PathToAccount::from_str("m/44'/141'/0").expect_err("'account_id' is not hardened");
+        assert_eq!(error, Bip32DerPathError::ChildIsNotHardened { child_at: 2 });
+        let error = Bip44DerPathError::from(error);
+        assert_eq!(error, Bip44DerPathError::ChildIsNotHardened {
+            child: "AccountId".to_owned()
+        });
+    }
+}
diff --git a/mm2src/crypto/src/crypto_ctx.rs b/mm2src/crypto/src/crypto_ctx.rs
new file mode 100644
index 0000000000..67de032cc2
--- /dev/null
+++ b/mm2src/crypto/src/crypto_ctx.rs
@@ -0,0 +1,168 @@
+use crate::hw_client::{HwError, HwProcessingError, TrezorConnectProcessor};
+use crate::hw_ctx::{HardwareWalletArc, HardwareWalletCtx};
+use crate::key_pair_ctx::IguanaArc;
+use crate::privkey::{key_pair_from_seed, PrivKeyError};
+use derive_more::Display;
+use hw_common::primitives::EcdsaCurve;
+use keys::Public as PublicKey;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use parking_lot::RwLock;
+use primitives::hash::H160;
+use std::ops::Deref;
+use std::sync::Arc;
+
+pub type CryptoInitResult<T> = Result<T, MmError<CryptoInitError>>;
+
+/// The derivation path generally consists of:
+/// `m/purpose'/coin_type'/account'/change/address_index`.
+/// For MarketMaker internal purposes, we decided to use a pubkey derived from the following path, where:
+/// * `coin_type = 141` - KMD coin;
+/// * `account = (2 ^ 31 - 1) = 2147483647` - latest available account index.
+///   This number is chosen so that it does not cross with real accounts;
+/// * `change = 0`, `address_index = 0` - nothing special.
+pub(crate) const MM2_INTERNAL_DERIVATION_PATH: &str = "m/44'/141'/2147483647/0/0";
+pub(crate) const MM2_INTERNAL_ECDSA_CURVE: EcdsaCurve = EcdsaCurve::Secp256k1;
+
+#[derive(Debug, Display)]
+pub enum CryptoInitError {
+    NotInitialized,
+    InitializedAlready,
+    #[display(fmt = "jeezy says we cant use the nullstring as passphrase and I agree")]
+    NullStringPassphrase,
+    #[display(fmt = "Invalid passphrase: '{}'", _0)]
+    InvalidPassphrase(PrivKeyError),
+    Internal(String),
+}
+
+impl From<PrivKeyError> for CryptoInitError {
+    fn from(e: PrivKeyError) -> Self { CryptoInitError::InvalidPassphrase(e) }
+}
+
+#[derive(Debug)]
+pub enum HwCtxInitError<ProcessorError> {
+    InitializingAlready,
+    InitializedAlready,
+    HwError(HwError),
+    ProcessorError(ProcessorError),
+}
+
+impl<ProcessorError> From<HwProcessingError<ProcessorError>> for HwCtxInitError<ProcessorError> {
+    fn from(e: HwProcessingError<ProcessorError>) -> Self {
+        match e {
+            HwProcessingError::HwError(hw_error) => HwCtxInitError::HwError(hw_error),
+            HwProcessingError::ProcessorError(processor_error) => HwCtxInitError::ProcessorError(processor_error),
+        }
+    }
+}
+
+/// This is required for converting `MmError<HwProcessingError<E>>` into `MmError<InitHwCtxError<E>>`.
+impl<E> NotEqual for HwCtxInitError<E> {}
+
+pub struct CryptoCtx {
+    iguana_ctx: IguanaArc,
+    /// Can be initialized on [`CryptoCtx::init_hw_ctx_with_trezor`].
+    hw_ctx: RwLock<HardwareWalletCtxState>,
+}
+
+impl CryptoCtx {
+    pub fn from_ctx(ctx: &MmArc) -> CryptoInitResult<Arc<CryptoCtx>> {
+        let ctx_field = ctx
+            .crypto_ctx
+            .lock()
+            .map_to_mm(|poison| CryptoInitError::Internal(poison.to_string()))?;
+        let ctx = match ctx_field.deref() {
+            Some(ctx) => ctx,
+            None => return MmError::err(CryptoInitError::NotInitialized),
+        };
+        ctx.clone()
+            .downcast()
+            .map_err(|_| MmError::new(CryptoInitError::Internal("Error casting the context field".to_owned())))
+    }
+
+    pub fn iguana_ctx(&self) -> &IguanaArc { &self.iguana_ctx }
+
+    pub fn secp256k1_pubkey(&self) -> PublicKey { self.iguana_ctx.secp256k1_pubkey() }
+
+    pub fn secp256k1_pubkey_hex(&self) -> String { hex::encode(&*self.secp256k1_pubkey()) }
+
+    pub fn hw_ctx(&self) -> Option<HardwareWalletArc> { self.hw_ctx.read().to_option().cloned() }
+
+    /// Returns an `RIPEMD160(SHA256(x))` where x is secp256k1 pubkey that identifies a Hardware Wallet device or an HD master private key.
+    pub fn hd_wallet_rmd160(&self) -> Option<H160> { self.hw_ctx.read().to_option().map(|hw_ctx| hw_ctx.rmd160()) }
+
+    pub fn init_with_iguana_passphrase(ctx: MmArc, passphrase: &str) -> CryptoInitResult<()> {
+        let mut ctx_field = ctx
+            .crypto_ctx
+            .lock()
+            .map_to_mm(|poison| CryptoInitError::Internal(poison.to_string()))?;
+        if ctx_field.is_some() {
+            return MmError::err(CryptoInitError::InitializedAlready);
+        }
+
+        if passphrase.is_empty() {
+            return MmError::err(CryptoInitError::NullStringPassphrase);
+        }
+
+        let secp256k1_key_pair = key_pair_from_seed(passphrase)?;
+        // We can't clone `secp256k1_key_pair`, but it's used later to initialize legacy `MmCtx` fields.
+        let secp256k1_key_pair_for_legacy = key_pair_from_seed(passphrase)?;
+
+        let rmd160 = secp256k1_key_pair.public().address_hash();
+        let crypto_ctx = CryptoCtx {
+            iguana_ctx: IguanaArc::from(secp256k1_key_pair),
+            hw_ctx: RwLock::new(HardwareWalletCtxState::NotInitialized),
+        };
+        *ctx_field = Some(Arc::new(crypto_ctx));
+
+        // TODO remove initializing legacy fields when lp_swap and lp_ordermatch support CryptoCtx.
+        ctx.secp256k1_key_pair
+            .pin(secp256k1_key_pair_for_legacy)
+            .map_to_mm(CryptoInitError::Internal)?;
+        ctx.rmd160.pin(rmd160).map_to_mm(CryptoInitError::Internal)?;
+
+        Ok(())
+    }
+
+    pub async fn init_hw_ctx_with_trezor<Processor>(
+        &self,
+        processor: &Processor,
+    ) -> MmResult<HardwareWalletArc, HwCtxInitError<Processor::Error>>
+    where
+        Processor: TrezorConnectProcessor + Sync,
+    {
+        {
+            let mut state = self.hw_ctx.write();
+            match state.deref() {
+                HardwareWalletCtxState::NotInitialized => (),
+                HardwareWalletCtxState::Initializing => return MmError::err(HwCtxInitError::InitializingAlready),
+                HardwareWalletCtxState::Ready(_) => return MmError::err(HwCtxInitError::InitializedAlready),
+            }
+
+            *state = HardwareWalletCtxState::Initializing;
+        }
+
+        let (res, new_state) = match HardwareWalletCtx::init_with_trezor(processor).await {
+            Ok(hw_ctx) => (Ok(hw_ctx.clone()), HardwareWalletCtxState::Ready(hw_ctx)),
+            Err(e) => (Err(e), HardwareWalletCtxState::NotInitialized),
+        };
+
+        *self.hw_ctx.write() = new_state;
+        res.mm_err(HwCtxInitError::from)
+    }
+}
+
+enum HardwareWalletCtxState {
+    NotInitialized,
+    Initializing,
+    Ready(HardwareWalletArc),
+}
+
+impl HardwareWalletCtxState {
+    fn to_option(&self) -> Option<&HardwareWalletArc> {
+        match self {
+            HardwareWalletCtxState::Ready(hw_ctx) => Some(hw_ctx),
+            _ => None,
+        }
+    }
+}
diff --git a/mm2src/crypto/src/hw_client.rs b/mm2src/crypto/src/hw_client.rs
new file mode 100644
index 0000000000..54f4222949
--- /dev/null
+++ b/mm2src/crypto/src/hw_client.rs
@@ -0,0 +1,205 @@
+use async_trait::async_trait;
+use common::custom_futures::FutureTimerExt;
+use derive_more::Display;
+use futures::FutureExt;
+use hw_common::primitives::Bip32Error;
+use mm2_err_handle::prelude::*;
+use primitives::hash::H264;
+use std::time::Duration;
+use trezor::client::TrezorClient;
+use trezor::{TrezorError, TrezorProcessingError, TrezorRequestProcessor, TrezorUserInteraction};
+
+pub type HwResult<T> = Result<T, MmError<HwError>>;
+
+#[derive(Clone, Debug, Display)]
+pub enum HwError {
+    NoTrezorDeviceAvailable,
+    #[display(fmt = "Found multiple devices ({}). Please unplug unused devices", count)]
+    CannotChooseDevice {
+        count: usize,
+    },
+    #[display(fmt = "Couldn't connect to a Hardware Wallet device in {:?}", timeout)]
+    ConnectionTimedOut {
+        timeout: Duration,
+    },
+    #[display(
+        fmt = "Expected a Hardware Wallet device with '{}' pubkey, found '{}'",
+        expected_pubkey,
+        actual_pubkey
+    )]
+    FoundUnexpectedDevice {
+        actual_pubkey: H264,
+        expected_pubkey: H264,
+    },
+    DeviceDisconnected,
+    #[display(fmt = "'{}' transport not supported", transport)]
+    TransportNotSupported {
+        transport: String,
+    },
+    #[display(fmt = "Invalid xpub received from a device: '{}'", _0)]
+    InvalidXpub(Bip32Error),
+    Failure(String),
+    UnderlyingError(String),
+    ProtocolError(String),
+    UnexpectedUserInteractionRequest(TrezorUserInteraction),
+    Internal(String),
+}
+
+impl From<TrezorError> for HwError {
+    fn from(e: TrezorError) -> Self {
+        let error = e.to_string();
+        match e {
+            TrezorError::TransportNotSupported { transport } => HwError::TransportNotSupported { transport },
+            TrezorError::ErrorRequestingAccessPermission(_) => HwError::NoTrezorDeviceAvailable,
+            TrezorError::DeviceDisconnected => HwError::DeviceDisconnected,
+            TrezorError::UnderlyingError(_) => HwError::UnderlyingError(error),
+            TrezorError::ProtocolError(_) | TrezorError::UnexpectedMessageType(_) => HwError::Internal(error),
+            // TODO handle the failure correctly later
+            TrezorError::Failure(_) => HwError::Failure(error),
+            TrezorError::UnexpectedInteractionRequest(req) => HwError::UnexpectedUserInteractionRequest(req),
+            TrezorError::Internal(_) => HwError::Internal(error),
+        }
+    }
+}
+
+impl From<Bip32Error> for HwError {
+    fn from(e: Bip32Error) -> Self { HwError::InvalidXpub(e) }
+}
+
+#[derive(Display)]
+pub enum HwProcessingError<E> {
+    HwError(HwError),
+    ProcessorError(E),
+}
+
+impl<E> From<HwError> for HwProcessingError<E> {
+    fn from(e: HwError) -> Self { HwProcessingError::HwError(e) }
+}
+
+impl<E> From<TrezorError> for HwProcessingError<E> {
+    fn from(e: TrezorError) -> Self { HwProcessingError::HwError(HwError::from(e)) }
+}
+
+impl<E> From<TrezorProcessingError<E>> for HwProcessingError<E> {
+    fn from(e: TrezorProcessingError<E>) -> Self {
+        match e {
+            TrezorProcessingError::TrezorError(trezor) => HwProcessingError::from(trezor),
+            TrezorProcessingError::ProcessorError(processor) => HwProcessingError::ProcessorError(processor),
+        }
+    }
+}
+
+/// This is required for converting `MmError<HwError>` into `MmError<HwProcessingError<E>>`.
+impl<E> NotEqual for HwProcessingError<E> {}
+
+#[derive(Clone, Copy, Deserialize)]
+pub enum HwWalletType {
+    Trezor,
+}
+
+#[async_trait]
+pub trait TrezorConnectProcessor: TrezorRequestProcessor {
+    async fn on_connect(&self) -> MmResult<Duration, HwProcessingError<Self::Error>>;
+
+    async fn on_connected(&self) -> MmResult<(), HwProcessingError<Self::Error>>;
+
+    async fn on_connection_failed(&self) -> MmResult<(), HwProcessingError<Self::Error>>;
+}
+
+#[derive(Clone)]
+pub enum HwClient {
+    Trezor(TrezorClient),
+}
+
+impl From<TrezorClient> for HwClient {
+    fn from(trezor: TrezorClient) -> Self { HwClient::Trezor(trezor) }
+}
+
+impl HwClient {
+    pub fn hw_wallet_type(&self) -> HwWalletType {
+        match self {
+            HwClient::Trezor(_) => HwWalletType::Trezor,
+        }
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub(crate) async fn trezor<Processor: TrezorConnectProcessor>(
+        processor: &Processor,
+    ) -> MmResult<TrezorClient, HwProcessingError<Processor::Error>> {
+        let timeout = processor.on_connect().await?;
+
+        let fut = async move {
+            // `find_devices` in a browser leads to a popup that asks the user which device he wants to connect.
+            // So we shouldn't ask in a loop like we do natively.
+            let mut devices = trezor::transport::webusb::find_devices()
+                .boxed()
+                .timeout(timeout)
+                .await
+                .map_to_mm(|_| HwError::ConnectionTimedOut { timeout })??;
+            if devices.available.is_empty() {
+                return MmError::err(HwProcessingError::HwError(HwError::NoTrezorDeviceAvailable));
+            }
+            let device = devices.available.remove(0);
+            Ok(device.connect().await?)
+        };
+
+        match fut.await {
+            Ok(transport) => {
+                processor.on_connected().await?;
+                Ok(TrezorClient::from_transport(transport))
+            },
+            Err(e) => {
+                processor.on_connection_failed().await?;
+                Err(e)
+            },
+        }
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) async fn trezor<Processor: TrezorConnectProcessor>(
+        processor: &Processor,
+    ) -> MmResult<TrezorClient, HwProcessingError<Processor::Error>> {
+        use common::custom_futures::TimeoutError;
+        use common::executor::Timer;
+
+        async fn try_to_connect() -> HwResult<Option<TrezorClient>> {
+            let mut devices = trezor::transport::usb::find_devices()?;
+            if devices.is_empty() {
+                return Ok(None);
+            }
+            if devices.len() != 1 {
+                return MmError::err(HwError::CannotChooseDevice { count: devices.len() });
+            }
+            let device = devices.remove(0);
+            let transport = device.connect()?;
+            let trezor = TrezorClient::from_transport(transport);
+            Ok(Some(trezor))
+        }
+
+        let fut = async move {
+            loop {
+                if let Some(trezor) = try_to_connect().await? {
+                    return Ok(trezor);
+                }
+                Timer::sleep(1.).await;
+            }
+        };
+
+        let timeout = processor.on_connect().await?;
+        let result: Result<HwResult<TrezorClient>, TimeoutError> = fut.boxed().timeout(timeout).await;
+        match result {
+            Ok(Ok(trezor)) => {
+                processor.on_connected().await?;
+                Ok(trezor)
+            },
+            Ok(Err(hw_err)) => {
+                processor.on_connection_failed().await?;
+                Err(hw_err.map(HwProcessingError::from))
+            },
+            Err(_timed_out) => {
+                processor.on_connection_failed().await?;
+                MmError::err(HwProcessingError::HwError(HwError::ConnectionTimedOut { timeout }))
+            },
+        }
+    }
+}
diff --git a/mm2src/crypto/src/hw_ctx.rs b/mm2src/crypto/src/hw_ctx.rs
new file mode 100644
index 0000000000..1120af5034
--- /dev/null
+++ b/mm2src/crypto/src/hw_ctx.rs
@@ -0,0 +1,135 @@
+use crate::crypto_ctx::{MM2_INTERNAL_DERIVATION_PATH, MM2_INTERNAL_ECDSA_CURVE};
+use crate::hw_client::{HwClient, HwError, HwProcessingError, TrezorConnectProcessor};
+use crate::trezor::TrezorSession;
+use crate::HwWalletType;
+use bitcrypto::dhash160;
+use common::log::warn;
+use futures::lock::Mutex as AsyncMutex;
+use hw_common::primitives::{DerivationPath, Secp256k1ExtendedPublicKey};
+use keys::Public as PublicKey;
+use mm2_err_handle::prelude::*;
+use primitives::hash::{H160, H264};
+use std::ops::Deref;
+use std::str::FromStr;
+use std::sync::Arc;
+use trezor::client::TrezorClient;
+use trezor::utxo::TrezorUtxoCoin;
+use trezor::{ProcessTrezorResponse, TrezorRequestProcessor};
+
+pub(crate) const MM2_TREZOR_INTERNAL_COIN: TrezorUtxoCoin = TrezorUtxoCoin::Komodo;
+
+#[derive(Clone)]
+pub struct HardwareWalletArc(Arc<HardwareWalletCtx>);
+
+impl Deref for HardwareWalletArc {
+    type Target = HardwareWalletCtx;
+
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl HardwareWalletArc {
+    pub fn new(ctx: HardwareWalletCtx) -> HardwareWalletArc { HardwareWalletArc(Arc::new(ctx)) }
+}
+
+pub struct HardwareWalletCtx {
+    /// The pubkey derived from `MM2_INTERNAL_DERIVATION_PATH`.
+    pub(crate) hw_internal_pubkey: H264,
+    pub(crate) hw_wallet_type: HwWalletType,
+    /// Please avoid locking multiple mutexes.
+    /// The mutex hasn't to be locked while the client is used
+    /// because every variant of `HwClient` uses an internal mutex to operate with the device.
+    /// But it has to be locked while the client is initialized.
+    pub(crate) hw_wallet: AsyncMutex<Option<HwClient>>,
+}
+
+impl HardwareWalletCtx {
+    pub(crate) async fn init_with_trezor<Processor>(
+        processor: &Processor,
+    ) -> MmResult<HardwareWalletArc, HwProcessingError<Processor::Error>>
+    where
+        Processor: TrezorConnectProcessor + Sync,
+    {
+        let trezor = HwClient::trezor(processor).await?;
+        let hw_internal_pubkey = {
+            let mut session = trezor.session().await?;
+            HardwareWalletCtx::trezor_mm_internal_pubkey(&mut session, processor).await?
+        };
+        let hw_client = HwClient::Trezor(trezor);
+        Ok(HardwareWalletArc::new(HardwareWalletCtx {
+            hw_internal_pubkey,
+            hw_wallet_type: hw_client.hw_wallet_type(),
+            hw_wallet: AsyncMutex::new(Some(hw_client)),
+        }))
+    }
+
+    pub fn hw_wallet_type(&self) -> HwWalletType { self.hw_wallet_type }
+
+    /// Connects to a Trezor device and checks if MM was initialized from this particular device.
+    pub async fn trezor<Processor>(
+        &self,
+        processor: &Processor,
+    ) -> MmResult<TrezorClient, HwProcessingError<Processor::Error>>
+    where
+        Processor: TrezorConnectProcessor + Sync,
+        Processor::Error: std::fmt::Display,
+    {
+        let mut hw_client = self.hw_wallet.lock().await;
+        if let Some(HwClient::Trezor(connected_trezor)) = hw_client.deref() {
+            match self.check_trezor(connected_trezor, processor).await {
+                Ok(()) => return Ok(connected_trezor.clone()),
+                // The device could be unplugged. We should try to reconnect to the device.
+                Err(e) => warn!("Error checking hardware wallet device: '{}'. Trying to reconnect...", e),
+            }
+        }
+        // Connect to a device.
+        let trezor = HwClient::trezor(processor).await?;
+        // Check if the connected device has the same public key as we used to initialize the app.
+        self.check_trezor(&trezor, processor).await?;
+
+        // Reinitialize the field to avoid reconnecting next time.
+        *hw_client = Some(HwClient::Trezor(trezor.clone()));
+
+        Ok(trezor)
+    }
+
+    pub fn secp256k1_pubkey(&self) -> PublicKey { PublicKey::Compressed(self.hw_internal_pubkey) }
+
+    pub fn rmd160(&self) -> H160 { dhash160(self.hw_internal_pubkey.as_slice()) }
+
+    pub(crate) async fn trezor_mm_internal_pubkey<Processor>(
+        trezor: &mut TrezorSession<'_>,
+        processor: &Processor,
+    ) -> MmResult<H264, HwProcessingError<Processor::Error>>
+    where
+        Processor: TrezorRequestProcessor + Sync,
+    {
+        let path = DerivationPath::from_str(MM2_INTERNAL_DERIVATION_PATH)
+            .expect("'MM2_INTERNAL_DERIVATION_PATH' is expected to be valid derivation path");
+        let mm2_internal_xpub = trezor
+            .get_public_key(path, MM2_TREZOR_INTERNAL_COIN, MM2_INTERNAL_ECDSA_CURVE)
+            .await?
+            .process(processor)
+            .await?;
+        let extended_pubkey = Secp256k1ExtendedPublicKey::from_str(&mm2_internal_xpub).map_to_mm(HwError::from)?;
+        Ok(H264::from(extended_pubkey.public_key().serialize()))
+    }
+
+    async fn check_trezor<Processor>(
+        &self,
+        trezor: &TrezorClient,
+        processor: &Processor,
+    ) -> MmResult<(), HwProcessingError<Processor::Error>>
+    where
+        Processor: TrezorRequestProcessor + Sync,
+    {
+        let mut session = trezor.session().await.mm_err(HwError::from)?;
+        let actual_pubkey = Self::trezor_mm_internal_pubkey(&mut session, processor).await?;
+        if actual_pubkey != self.hw_internal_pubkey {
+            return MmError::err(HwProcessingError::HwError(HwError::FoundUnexpectedDevice {
+                actual_pubkey,
+                expected_pubkey: self.hw_internal_pubkey,
+            }));
+        }
+        Ok(())
+    }
+}
diff --git a/mm2src/crypto/src/hw_rpc_task.rs b/mm2src/crypto/src/hw_rpc_task.rs
new file mode 100644
index 0000000000..1928ff1270
--- /dev/null
+++ b/mm2src/crypto/src/hw_rpc_task.rs
@@ -0,0 +1,148 @@
+use crate::hw_client::{HwProcessingError, TrezorConnectProcessor};
+use crate::trezor::TrezorPinMatrix3x3Response;
+use async_trait::async_trait;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::RpcTaskUserActionRequest;
+use serde::Serialize;
+use std::convert::{TryFrom, TryInto};
+use std::time::Duration;
+use trezor::trezor_rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, TrezorRequestStatuses, TrezorRpcTaskProcessor};
+use trezor::{TrezorProcessingError, TrezorRequestProcessor};
+
+const CONNECT_DEFAULT_TIMEOUT: Duration = Duration::from_secs(60);
+
+pub type HwRpcTaskUserActionRequest = RpcTaskUserActionRequest<HwRpcTaskUserAction>;
+
+/// When it comes to interacting with a HW device, this is a common awaiting RPC status.
+/// The status says to the user that he should pass a Trezor PIN to continue the pending RPC task.
+#[derive(Clone, Serialize)]
+pub enum HwRpcTaskAwaitingStatus {
+    WaitForTrezorPin,
+}
+
+/// When it comes to interacting with a HW device,
+/// this is a common user action in answer to awaiting RPC task status.
+#[derive(Deserialize, Serialize)]
+#[serde(tag = "action_type")]
+pub enum HwRpcTaskUserAction {
+    TrezorPin(TrezorPinMatrix3x3Response),
+}
+
+impl TryFrom<HwRpcTaskUserAction> for TrezorPinMatrix3x3Response {
+    type Error = RpcTaskError;
+
+    fn try_from(value: HwRpcTaskUserAction) -> Result<Self, Self::Error> {
+        match value {
+            HwRpcTaskUserAction::TrezorPin(pin) => Ok(pin),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct HwConnectStatuses<InProgressStatus, AwaitingStatus> {
+    pub on_connect: InProgressStatus,
+    pub on_connected: InProgressStatus,
+    pub on_connection_failed: InProgressStatus,
+    pub on_button_request: InProgressStatus,
+    pub on_pin_request: AwaitingStatus,
+    pub on_ready: InProgressStatus,
+}
+
+impl<InProgressStatus, AwaitingStatus> HwConnectStatuses<InProgressStatus, AwaitingStatus>
+where
+    InProgressStatus: Clone,
+    AwaitingStatus: Clone,
+{
+    pub fn to_trezor_request_statuses(&self) -> TrezorRequestStatuses<InProgressStatus, AwaitingStatus> {
+        TrezorRequestStatuses {
+            on_button_request: self.on_button_request.clone(),
+            on_pin_request: self.on_pin_request.clone(),
+            on_ready: self.on_ready.clone(),
+        }
+    }
+}
+
+pub struct TrezorRpcTaskConnectProcessor<'a, Task: RpcTask> {
+    request_processor: TrezorRpcTaskProcessor<'a, Task>,
+    on_connect: Task::InProgressStatus,
+    on_connected: Task::InProgressStatus,
+    on_connection_failed: Task::InProgressStatus,
+    connect_timeout: Duration,
+}
+
+#[async_trait]
+impl<'a, Task> TrezorRequestProcessor for TrezorRpcTaskConnectProcessor<'a, Task>
+where
+    Task: RpcTask,
+    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError>,
+{
+    type Error = RpcTaskError;
+
+    async fn on_button_request(&self) -> MmResult<(), TrezorProcessingError<Self::Error>> {
+        self.request_processor.on_button_request().await
+    }
+
+    async fn on_pin_request(&self) -> MmResult<TrezorPinMatrix3x3Response, TrezorProcessingError<Self::Error>> {
+        self.request_processor.on_pin_request().await
+    }
+
+    async fn on_ready(&self) -> MmResult<(), TrezorProcessingError<Self::Error>> {
+        self.request_processor.on_ready().await
+    }
+}
+
+#[async_trait]
+impl<'a, Task> TrezorConnectProcessor for TrezorRpcTaskConnectProcessor<'a, Task>
+where
+    Task: RpcTask,
+    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError>,
+{
+    async fn on_connect(&self) -> MmResult<Duration, HwProcessingError<RpcTaskError>> {
+        self.request_processor
+            .update_in_progress_status(self.on_connect.clone())?;
+        Ok(self.connect_timeout)
+    }
+
+    async fn on_connected(&self) -> MmResult<(), HwProcessingError<RpcTaskError>> {
+        Ok(self
+            .request_processor
+            .update_in_progress_status(self.on_connected.clone())?)
+    }
+
+    async fn on_connection_failed(&self) -> MmResult<(), HwProcessingError<RpcTaskError>> {
+        Ok(self
+            .request_processor
+            .update_in_progress_status(self.on_connection_failed.clone())?)
+    }
+}
+
+impl<'a, Task: RpcTask> TrezorRpcTaskConnectProcessor<'a, Task> {
+    pub fn new(
+        task_handle: &'a RpcTaskHandle<Task>,
+        statuses: HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    ) -> Self {
+        let request_statuses = TrezorRequestStatuses {
+            on_button_request: statuses.on_button_request,
+            on_pin_request: statuses.on_pin_request,
+            on_ready: statuses.on_ready,
+        };
+        let request_processor = TrezorRpcTaskProcessor::new(task_handle, request_statuses);
+        TrezorRpcTaskConnectProcessor {
+            request_processor,
+            on_connect: statuses.on_connect,
+            on_connected: statuses.on_connected,
+            on_connection_failed: statuses.on_connection_failed,
+            connect_timeout: CONNECT_DEFAULT_TIMEOUT,
+        }
+    }
+
+    pub fn with_pin_timeout(mut self, pin_timeout: Duration) -> Self {
+        self.request_processor = self.request_processor.with_pin_timeout(pin_timeout);
+        self
+    }
+
+    pub fn with_connect_timeout(mut self, connect_timeout: Duration) -> Self {
+        self.connect_timeout = connect_timeout;
+        self
+    }
+}
diff --git a/mm2src/crypto/src/key_pair_ctx.rs b/mm2src/crypto/src/key_pair_ctx.rs
new file mode 100644
index 0000000000..8026b6b9a8
--- /dev/null
+++ b/mm2src/crypto/src/key_pair_ctx.rs
@@ -0,0 +1,34 @@
+use keys::{KeyPair, Private, Public as PublicKey};
+use std::ops::Deref;
+use std::sync::Arc;
+
+#[derive(Clone)]
+pub struct IguanaArc(Arc<IguanaCtx>);
+
+impl Deref for IguanaArc {
+    type Target = IguanaCtx;
+
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl From<KeyPair> for IguanaArc {
+    fn from(secp256k1_key_pair: KeyPair) -> Self { IguanaArc::new(IguanaCtx { secp256k1_key_pair }) }
+}
+
+impl IguanaArc {
+    pub fn new(ctx: IguanaCtx) -> IguanaArc { IguanaArc(Arc::new(ctx)) }
+}
+
+pub struct IguanaCtx {
+    /// secp256k1 key pair derived from passphrase.
+    /// cf. `key_pair_from_seed`.
+    pub(crate) secp256k1_key_pair: KeyPair,
+}
+
+impl IguanaCtx {
+    pub fn secp256k1_pubkey(&self) -> PublicKey { *self.secp256k1_key_pair.public() }
+
+    pub fn secp256k1_privkey(&self) -> &Private { self.secp256k1_key_pair.private() }
+
+    pub fn secp256k1_privkey_bytes(&self) -> &[u8] { self.secp256k1_privkey().secret.as_slice() }
+}
diff --git a/mm2src/crypto/src/lib.rs b/mm2src/crypto/src/lib.rs
new file mode 100644
index 0000000000..4a5c1e3b35
--- /dev/null
+++ b/mm2src/crypto/src/lib.rs
@@ -0,0 +1,57 @@
+#[macro_use] extern crate serde_derive;
+
+mod bip32_child;
+mod bip44;
+mod crypto_ctx;
+mod hw_client;
+mod hw_ctx;
+pub mod hw_rpc_task;
+mod key_pair_ctx;
+pub mod privkey;
+
+pub use bip32_child::{Bip32Child, Bip32DerPathError, Bip32DerPathOps, Bip44Tail};
+pub use bip44::{Bip44Chain, Bip44DerPathError, Bip44DerivationPath, Bip44PathToAccount, Bip44PathToCoin,
+                UnkownBip44ChainError, BIP44_PURPOSE};
+pub use crypto_ctx::{CryptoCtx, CryptoInitError, CryptoInitResult, HwCtxInitError};
+pub use hw_client::TrezorConnectProcessor;
+pub use hw_client::{HwClient, HwError, HwProcessingError, HwResult, HwWalletType};
+pub use hw_common::primitives::{Bip32Error, ChildNumber, DerivationPath, EcdsaCurve, ExtendedPublicKey,
+                                Secp256k1ExtendedPublicKey, XPub};
+pub use hw_ctx::{HardwareWalletArc, HardwareWalletCtx};
+pub use key_pair_ctx::{IguanaArc, IguanaCtx};
+pub use trezor;
+
+use serde::de::Error;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::str::FromStr;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct RpcDerivationPath(pub DerivationPath);
+
+impl From<DerivationPath> for RpcDerivationPath {
+    fn from(der: DerivationPath) -> Self { RpcDerivationPath(der) }
+}
+
+impl From<RpcDerivationPath> for DerivationPath {
+    fn from(der: RpcDerivationPath) -> Self { der.0 }
+}
+
+impl Serialize for RpcDerivationPath {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.0.to_string())
+    }
+}
+
+impl<'de> Deserialize<'de> for RpcDerivationPath {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let path = String::deserialize(deserializer)?;
+        let inner = DerivationPath::from_str(&path).map_err(|e| D::Error::custom(format!("{}", e)))?;
+        Ok(RpcDerivationPath(inner))
+    }
+}
diff --git a/mm2src/crypto/src/privkey.rs b/mm2src/crypto/src/privkey.rs
new file mode 100644
index 0000000000..cfbc82c8a6
--- /dev/null
+++ b/mm2src/crypto/src/privkey.rs
@@ -0,0 +1,192 @@
+/******************************************************************************
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
+ *                                                                            *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+//
+//  LP_utxos.c
+//  marketmaker
+//
+
+use bitcrypto::{sha256, ChecksumType};
+use derive_more::Display;
+use keys::{Error as KeysError, KeyPair, Private};
+use mm2_err_handle::prelude::*;
+use primitives::hash::H256;
+use rustc_hex::FromHexError;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+pub type PrivKeyResult<T> = Result<T, MmError<PrivKeyError>>;
+
+#[derive(Debug, Display, Serialize)]
+pub enum PrivKeyError {
+    #[display(fmt = "Provided WIF passphrase has invalid checksum!")]
+    WifPassphraseInvalidChecksum,
+    #[display(fmt = "Error parsing passphrase: {}", _0)]
+    ErrorParsingPassphrase(String),
+    #[display(fmt = "Invalid private key: {}", _0)]
+    InvalidPrivKey(KeysError),
+    #[display(fmt = "We only support compressed keys at the moment")]
+    ExpectedCompressedKeys,
+}
+
+impl From<FromHexError> for PrivKeyError {
+    fn from(e: FromHexError) -> Self { PrivKeyError::ErrorParsingPassphrase(e.to_string()) }
+}
+
+impl From<KeysError> for PrivKeyError {
+    fn from(e: KeysError) -> Self { PrivKeyError::InvalidPrivKey(e) }
+}
+
+fn private_from_seed(seed: &str) -> PrivKeyResult<Private> {
+    match seed.parse() {
+        Ok(private) => return Ok(private),
+        Err(e) => {
+            if let KeysError::InvalidChecksum = e {
+                return MmError::err(PrivKeyError::WifPassphraseInvalidChecksum);
+            }
+        }, // else ignore other errors, assume the passphrase is not WIF
+    }
+
+    match seed.strip_prefix("0x") {
+        Some(stripped) => {
+            let hash: H256 = stripped.parse()?;
+            Ok(Private {
+                prefix: 0,
+                secret: hash,
+                compressed: true,
+                checksum_type: ChecksumType::DSHA256,
+            })
+        },
+        None => {
+            let hash = sha256(seed.as_bytes());
+
+            Ok(Private {
+                prefix: 0,
+                secret: secp_privkey_from_hash(hash),
+                compressed: true,
+                checksum_type: ChecksumType::DSHA256,
+            })
+        },
+    }
+}
+
+/// Mutates the arbitrary hash to become a valid secp256k1 private key
+pub fn secp_privkey_from_hash(mut hash: H256) -> H256 {
+    hash[0] &= 248;
+    hash[31] &= 127;
+    hash[31] |= 64;
+    hash
+}
+
+pub fn key_pair_from_seed(seed: &str) -> PrivKeyResult<KeyPair> {
+    let private = private_from_seed(seed)?;
+    if !private.compressed {
+        return MmError::err(PrivKeyError::ExpectedCompressedKeys);
+    }
+    let pair = KeyPair::from_private(private)?;
+    // Just a sanity check. We rely on the public key being 33 bytes (aka compressed).
+    assert_eq!(pair.public().len(), 33);
+    Ok(pair)
+}
+
+pub fn key_pair_from_secret(secret: &[u8]) -> PrivKeyResult<KeyPair> {
+    if secret.len() != 32 {
+        return MmError::err(PrivKeyError::InvalidPrivKey(KeysError::InvalidPrivate));
+    }
+
+    let private = Private {
+        prefix: 0,
+        secret: secret.into(),
+        compressed: true,
+        checksum_type: Default::default(),
+    };
+    Ok(KeyPair::from_private(private)?)
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct SerializableSecp256k1Keypair {
+    inner: KeyPair,
+}
+
+impl PartialEq for SerializableSecp256k1Keypair {
+    fn eq(&self, other: &Self) -> bool { self.inner.public() == other.inner.public() }
+}
+
+impl Eq for SerializableSecp256k1Keypair {}
+
+impl SerializableSecp256k1Keypair {
+    fn new(key: [u8; 32]) -> PrivKeyResult<Self> {
+        Ok(SerializableSecp256k1Keypair {
+            inner: key_pair_from_secret(&key)?,
+        })
+    }
+
+    pub fn key_pair(&self) -> &KeyPair { &self.inner }
+
+    pub fn public_slice(&self) -> &[u8] { self.inner.public_slice() }
+
+    fn priv_key(&self) -> [u8; 32] { self.inner.private().secret.take() }
+
+    pub fn random() -> Self {
+        SerializableSecp256k1Keypair {
+            inner: KeyPair::random_compressed(),
+        }
+    }
+
+    pub fn into_inner(self) -> KeyPair { self.inner }
+}
+
+impl From<KeyPair> for SerializableSecp256k1Keypair {
+    fn from(inner: KeyPair) -> Self { SerializableSecp256k1Keypair { inner } }
+}
+
+impl Serialize for SerializableSecp256k1Keypair {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.priv_key().serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for SerializableSecp256k1Keypair {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let priv_key = <[u8; 32]>::deserialize(deserializer)?;
+        SerializableSecp256k1Keypair::new(priv_key).map_err(serde::de::Error::custom)
+    }
+}
+
+#[test]
+fn serializable_secp256k1_keypair_test() {
+    use serde_json::{self as json};
+
+    let key_pair = KeyPair::random_compressed();
+    let serializable = SerializableSecp256k1Keypair { inner: key_pair };
+    let serialized = json::to_string(&serializable).unwrap();
+    println!("{}", serialized);
+    let deserialized = json::from_str(&serialized).unwrap();
+    assert_eq!(serializable, deserialized);
+
+    let invalid_privkey: [u8; 32] = [
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xba, 0xae,
+        0xdc, 0xe6, 0xaf, 0x48, 0xa0, 0x3b, 0xbf, 0xd2, 0x5e, 0x8c, 0xd0, 0x36, 0x41, 0x41,
+    ];
+    let invalid_privkey_serialized = json::to_string(&invalid_privkey).unwrap();
+    let err = json::from_str::<SerializableSecp256k1Keypair>(&invalid_privkey_serialized).unwrap_err();
+    println!("{}", err);
+}
diff --git a/mm2src/database/database_common.rs b/mm2src/database/database_common.rs
deleted file mode 100644
index 61f0fe1ac8..0000000000
--- a/mm2src/database/database_common.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use common::log::debug;
-use common::rusqlite::{Connection, Result as SqlResult, ToSql};
-use sql_builder::SqlBuilder;
-use std::convert::TryInto;
-use std::num::NonZeroUsize;
-use uuid::Uuid;
-
-const fn ten() -> usize { 10 }
-
-fn one() -> NonZeroUsize { NonZeroUsize::new(1).unwrap() }
-
-#[derive(Debug, Deserialize)]
-pub struct PagingOptions {
-    #[serde(default = "ten")]
-    pub limit: usize,
-    #[serde(default = "one")]
-    pub page_number: NonZeroUsize,
-    pub from_uuid: Option<Uuid>,
-}
-
-/// Calculates the offset to skip records by uuid.
-/// Expects `query_builder` to have where clauses applied *before* calling this fn.
-pub fn offset_by_uuid(
-    conn: &Connection,
-    query_builder: &SqlBuilder,
-    params: &[(&str, String)],
-    uuid: &Uuid,
-) -> SqlResult<usize> {
-    // building following query to determine offset by from_uuid
-    // select row from (
-    //     select uuid, ROW_NUMBER() OVER (ORDER BY started_at DESC) AS row
-    //     from my_swaps
-    //     where ... filtering options here ...
-    // ) where uuid = "from_uuid";
-    let subquery = query_builder
-        .clone()
-        .field("ROW_NUMBER() OVER (ORDER BY started_at DESC) AS row")
-        .field("uuid")
-        .subquery()
-        .expect("SQL query builder should never fail here");
-
-    let external_query = SqlBuilder::select_from(subquery)
-        .field("row")
-        .and_where("uuid = :uuid")
-        .sql()
-        .expect("SQL query builder should never fail here");
-
-    let mut params_for_offset = params.to_owned();
-    params_for_offset.push((":uuid", uuid.to_string()));
-    let params_as_trait: Vec<_> = params_for_offset
-        .iter()
-        .map(|(key, value)| (*key, value as &dyn ToSql))
-        .collect();
-    debug!(
-        "Trying to execute SQL query {} with params {:?}",
-        external_query, params_for_offset
-    );
-    let mut stmt = conn.prepare(&external_query)?;
-    let offset: isize = stmt.query_row_named(params_as_trait.as_slice(), |row| row.get(0))?;
-    Ok(offset.try_into().expect("row index should be always above zero"))
-}
diff --git a/mm2src/db_common/Cargo.toml b/mm2src/db_common/Cargo.toml
new file mode 100644
index 0000000000..f1c0e32921
--- /dev/null
+++ b/mm2src/db_common/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "db_common"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+hex = "0.4.2"
+log = "0.4.8"
+uuid = { version = "0.7", features = ["serde", "v4"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+rusqlite = { version = "0.24.2", features = ["bundled"] }
+sql-builder = "3.1.1"
diff --git a/mm2src/db_common/src/lib.rs b/mm2src/db_common/src/lib.rs
new file mode 100644
index 0000000000..644887e563
--- /dev/null
+++ b/mm2src/db_common/src/lib.rs
@@ -0,0 +1,2 @@
+#[cfg(not(target_arch = "wasm32"))] pub mod sql_query;
+#[cfg(not(target_arch = "wasm32"))] pub mod sqlite;
diff --git a/mm2src/db_common/src/sql_query.rs b/mm2src/db_common/src/sql_query.rs
new file mode 100644
index 0000000000..a8ed13db36
--- /dev/null
+++ b/mm2src/db_common/src/sql_query.rs
@@ -0,0 +1,699 @@
+use crate::sqlite::{query_single_row, validate_ident, validate_table_name, OwnedSqlParam, OwnedSqlParams,
+                    SqlParamsBuilder, SqlValue, ToValidSqlIdent, ToValidSqlTable};
+use log::debug;
+use rusqlite::{Connection, Error as SqlError, Result as SqlResult, Row};
+use sql_builder::SqlBuilder;
+use std::error::Error as StdError;
+use std::fmt;
+
+#[derive(Clone)]
+pub struct SqlQuery<'a> {
+    conn: &'a Connection,
+    sql_builder: SqlBuilder,
+    params: SqlParamsBuilder,
+    ordering: Vec<SqlOrdering>,
+}
+
+impl<'a> SqlQuery<'a> {
+    /// Create SELECT query.
+    /// Please note the function validates the given `table` name.
+    pub fn select_from(conn: &'a Connection, table: &str) -> SqlResult<Self> {
+        validate_table_name(table)?;
+        Ok(SqlQuery {
+            conn,
+            sql_builder: SqlBuilder::select_from(table),
+            params: SqlParamsBuilder::default(),
+            ordering: Vec::default(),
+        })
+    }
+
+    /// Create SELECT query.
+    /// The method takes the `alias` of the `table`.
+    ///
+    /// Please note the function validates the given `table` and `alias` names.
+    pub fn select_from_alias(conn: &'a Connection, table: &str, alias: &'static str) -> SqlResult<Self> {
+        validate_table_name(table)?;
+        validate_table_name(alias)?;
+        Ok(SqlQuery {
+            conn,
+            sql_builder: SqlBuilder::select_from(format!("{} AS {}", table, alias)),
+            params: SqlParamsBuilder::default(),
+            ordering: Vec::default(),
+        })
+    }
+
+    /// Create SELECT query.
+    /// Please note that [`SqlQuery::ordering`] is not inherited by the external query.
+    pub fn select_from_subquery(subquery: SqlSubquery<'a>) -> SqlResult<Self> {
+        let subquery_sql = subquery
+            .0
+            .sql_builder
+            .subquery()
+            .map_err(|e| SqlError::ToSqlConversionFailure(e.into()))?;
+        Ok(SqlQuery {
+            conn: subquery.0.conn,
+            sql_builder: SqlBuilder::select_from(subquery_sql),
+            params: subquery.0.params,
+            ordering: Vec::default(),
+        })
+    }
+
+    /// Add COUNT(field).
+    /// For more details see [`SqlBuilder::count`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn count<S: ToValidSqlIdent>(&mut self, field: S) -> SqlResult<&mut Self> {
+        self.sql_builder.count(field.to_valid_sql_ident()?);
+        Ok(self)
+    }
+
+    /// Add field.
+    /// For more details see [`SqlBuilder::field`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn field<S: ToValidSqlIdent>(&mut self, field: S) -> SqlResult<&mut Self> {
+        self.sql_builder.field(field.to_valid_sql_ident()?);
+        Ok(self)
+    }
+
+    /// Add field and gives it an alias.
+    /// For more details see [`SqlBuilder::field`].
+    ///
+    /// Please note the function validates the given `field` and `alias` names.
+    #[inline]
+    pub fn field_alias<S: ToValidSqlIdent>(&mut self, field: S, alias: &'static str) -> SqlResult<&mut Self> {
+        validate_ident(alias)?;
+        self.sql_builder
+            .field(format!("{} AS {}", field.to_valid_sql_ident()?, alias));
+        Ok(self)
+    }
+
+    /// Set OFFSET.
+    /// For more details see [`SqlBuilder::offset`].
+    #[inline]
+    pub fn offset(&mut self, offset: usize) -> &mut Self {
+        self.sql_builder.offset(offset);
+        self
+    }
+
+    /// Set LIMIT.
+    /// For more details see [`SqlBuilder::limit`].
+    #[inline]
+    pub fn limit(&mut self, limit: usize) -> &mut Self {
+        self.sql_builder.limit(limit);
+        self
+    }
+
+    /// Add GROUP BY part.
+    /// For more details see [`SqlBuilder::group_by`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn group_by<S: ToValidSqlIdent>(&mut self, field: S) -> SqlResult<&mut Self> {
+        self.sql_builder.group_by(field.to_valid_sql_ident()?);
+        Ok(self)
+    }
+
+    /// Add ORDER BY ASC.
+    /// For more details see [`SqlBuilder::order_asc`].
+    ///
+    /// Please note the function validates the given `field` name.
+    #[inline]
+    pub fn order_asc<S: ToValidSqlIdent>(&mut self, field: S) -> SqlResult<&mut Self> {
+        self.ordering.push(SqlOrdering::Asc(field.to_valid_sql_ident()?));
+        Ok(self)
+    }
+
+    /// Add ORDER BY DESC.
+    /// For more details see [`SqlBuilder::order_desc`].
+    ///
+    /// Please note the function validates the given `field` name.
+    #[inline]
+    pub fn order_desc<S: ToValidSqlIdent>(&mut self, field: S) -> SqlResult<&mut Self> {
+        self.ordering.push(SqlOrdering::Desc(field.to_valid_sql_ident()?));
+        Ok(self)
+    }
+
+    /// Join the given `table` and gives it the `alias`.
+    /// For more details see [`SqlBuilder::join`].
+    ///
+    /// Please note the function validates the given `table` and `alias` names.
+    #[inline]
+    pub fn join_alias<S: ToValidSqlTable>(&mut self, table: S, alias: &'static str) -> SqlResult<&mut Self> {
+        validate_table_name(alias)?;
+        self.sql_builder
+            .join(format!("{} AS {}", table.to_valid_sql_table()?, alias));
+        Ok(self)
+    }
+
+    /// Join the given `table`.
+    /// For more details see [`SqlBuilder::join`].
+    ///
+    /// Please note the function validates the given `table` name.
+    #[inline]
+    pub fn join<S: ToValidSqlTable>(&mut self, table: S) -> SqlResult<&mut Self> {
+        self.sql_builder.join(table.to_valid_sql_table()?);
+        Ok(self)
+    }
+
+    /// Join constraint to the last JOIN part [`SqlQuery::join`].
+    /// For more details see [`SqlBuilder::on_eq`].
+    ///
+    /// Please note the function validates the given `c1` name,
+    /// and `c2` is considered a valid value as it's able to be converted into `SqlValue`.
+    #[inline]
+    pub fn on_join_eq<C1, C2>(&mut self, c1: C1, c2: C2) -> SqlResult<&mut Self>
+    where
+        C1: ToValidSqlIdent,
+        SqlValue: From<C2>,
+    {
+        self.sql_builder
+            .on_eq(c1.to_valid_sql_ident()?, SqlValue::value_to_string(c2));
+        Ok(self)
+    }
+
+    /// Add WHERE condition for equal parts.
+    /// For more details see [`SqlBuilder::and_where_eq`].
+    ///
+    /// Please note the function validates the given `field` name,
+    /// and `value` is considered a valid as it's able to be converted into `SqlValue`.
+    #[inline]
+    pub fn and_where_eq<S, T>(&mut self, field: S, value: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValue: From<T>,
+    {
+        self.sql_builder
+            .and_where_eq(field.to_valid_sql_ident()?, SqlValue::value_to_string(value));
+        Ok(self)
+    }
+
+    /// Add WHERE condition for equal parts.
+    /// For more details see [`SqlBuilder::and_where_eq`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn and_where_eq_param<S, T>(&mut self, field: S, param: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        OwnedSqlParam: From<T>,
+    {
+        self.sql_builder
+            .and_where_eq(field.to_valid_sql_ident()?, self.params.push_param(param));
+        Ok(self)
+    }
+
+    /// Add WHERE field IN (list).
+    /// For more details see [`SqlBuilder::and_where_in`].
+    ///
+    /// Please note the function validates the given `field`,
+    /// and `values` are considered valid as they're able to be converted into `SqlValue`.
+    #[inline]
+    pub fn and_where_in<S, I, T>(&mut self, field: S, values: I) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        I: IntoIterator<Item = T>,
+        SqlValue: From<T>,
+    {
+        self.sql_builder
+            .and_where_in(field.to_valid_sql_ident()?, &SqlValue::values_to_strings(values));
+        Ok(self)
+    }
+
+    /// Add WHERE field IN (string list).
+    /// For more details see [`SqlBuilder::and_where_in_quoted`].
+    ///
+    /// Please note the function validates the given `field`,
+    /// and `values` are considered valid as they're able to be converted into `SqlValue`.
+    #[inline]
+    pub fn and_where_in_quoted<S, I, T>(&mut self, field: S, values: I) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        I: IntoIterator<Item = T>,
+        SqlValue: From<T>,
+    {
+        let values: Vec<_> = values.into_iter().map(SqlValue::value_to_string).collect();
+        self.sql_builder
+            .and_where_in_quoted(field.to_valid_sql_ident()?, &values);
+        Ok(self)
+    }
+
+    /// Add WHERE field IN (string list) with the specified `params`.
+    /// For more details see [`SqlBuilder::and_where_in_quoted`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn and_where_in_params<S, I, P>(&mut self, field: S, params: I) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        I: IntoIterator<Item = P>,
+        OwnedSqlParam: From<P>,
+    {
+        self.sql_builder
+            .and_where_in(field.to_valid_sql_ident()?, &self.params.push_params(params));
+        Ok(self)
+    }
+
+    /// Add OR condition of equal parts to the last WHERE condition.
+    /// For more details see [`SqlBuilder::or_where_eq`].
+    ///
+    /// Please note the function validates the given `field`,
+    /// and `value` is considered a valid as it's able to be converted into `SqlValue`.
+    #[inline]
+    pub fn or_where_eq<S, T>(&mut self, field: S, value: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValue: From<T>,
+    {
+        self.sql_builder
+            .or_where_eq(field.to_valid_sql_ident()?, SqlValue::value_to_string(value));
+        Ok(self)
+    }
+
+    /// Add OR condition of equal parts to the last WHERE condition.
+    /// For more details see [`SqlBuilder::or_where_eq`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn or_where_eq_param<S, T>(&mut self, field: S, param: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        OwnedSqlParam: From<T>,
+    {
+        self.sql_builder
+            .or_where_eq(field.to_valid_sql_ident()?, self.params.push_param(param));
+        Ok(self)
+    }
+
+    /// Add OR field IN (list) to the last WHERE condition.
+    /// For more details see [`SqlBuilder::or_where_in`].
+    ///
+    /// Please note the function validates the given `field`,
+    /// and `values` are considered valid as they're able to be converted into `SqlValue`.
+    #[inline]
+    pub fn or_where_in<S, I, T>(&mut self, field: S, values: I) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        I: IntoIterator<Item = T>,
+        SqlValue: From<T>,
+    {
+        self.sql_builder
+            .or_where_in(field.to_valid_sql_ident()?, &SqlValue::values_to_strings(values));
+        Ok(self)
+    }
+
+    /// Add OR field IN (string list) to the last WHERE condition.
+    /// For more details see [`SqlBuilder::and_where_in_quoted`].
+    ///
+    /// Please note the function validates the given `field`,
+    /// and `values` are considered valid as they're able to be converted into `SqlValue`.
+    #[inline]
+    pub fn or_where_in_quoted<S, I, T>(&mut self, field: S, values: I) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        I: IntoIterator<Item = T>,
+        SqlValue: From<T>,
+    {
+        self.sql_builder
+            .or_where_in_quoted(field.to_valid_sql_ident()?, &SqlValue::values_to_strings(values));
+        Ok(self)
+    }
+
+    /// Add OR field IN (list) to the last WHERE condition.
+    /// For more details see [`SqlBuilder::or_where_in_quoted`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn or_where_in_params<S, I, P>(&mut self, field: S, params: I) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        I: IntoIterator<Item = P>,
+        OwnedSqlParam: From<P>,
+    {
+        self.sql_builder
+            .or_where_in(field.to_valid_sql_ident()?, &self.params.push_params(params));
+        Ok(self)
+    }
+
+    #[inline]
+    pub fn sql(mut self) -> SqlResult<String> {
+        self.apply_ordering();
+        self.sql_builder
+            .sql()
+            .map_err(|e| SqlError::ToSqlConversionFailure(e.into()))
+    }
+
+    /// Returns an SQL subquery that can be used in [`SqlQuery::select_from_subquery`].
+    #[inline]
+    pub fn subquery(self) -> SqlSubquery<'a> { SqlSubquery(self) }
+
+    /// Returns the reference to the specified SQL parameters.
+    #[inline]
+    pub fn params(&self) -> &OwnedSqlParams { self.params.params() }
+
+    /// # Usage
+    ///
+    /// 1) Create a `SqlQuery` instance;
+    /// 2) Join tables, specify `WHERE`, `ORDER`, `GROUP BY` constraints;
+    /// 3) Create a copy of the instance;
+    /// 4) Call [`SqlQuery::offset_by_id`] method on the copy instance
+    ///    to get an offset from which you need to query rows from the storage;
+    /// 5) Specify the returned `offset` value by [`SqlQuery::offset`] on the original instance;
+    /// 6) Query rows by [`SqlQuery::query`].
+    ///
+    /// # Note
+    ///
+    /// 1) It's recommended not to specify fields by [`SqlQuery::field`] before [`SqlQuery::offset_by_id`] is used;
+    /// 2) Don't specify any `WHERE` constraint, ordering on the original `SqlQuery` instance
+    ///    after [`SqlQuery::offset_by_id`] is called.
+    #[inline]
+    pub fn query_offset_by_id<S, T>(mut self, id_field: S, where_id_eq_param: T) -> SqlResult<Option<usize>>
+    where
+        S: ToValidSqlIdent,
+        OwnedSqlParam: From<T>,
+    {
+        /// The alias is needed so that the external query can access the results of the subquery.
+        /// Example:
+        ///   SUBQUERY: `SELECT ROW_NUMBER() OVER (ORDER BY h.height ASC, h.total_amount DESC) AS __ROW, h.tx_hash as __ID_FIELD FROM tx_history h JOIN tx_address a ON h.tx_hash = a.tx_hash WHERE a.address IN ('address_2', 'address_4') GROUP BY h.tx_hash`
+        ///   EXTERNAL_QUERY: `SELECT __ROW FROM (<SUBQUERY>) WHERE __ID_FIELD = :1;`
+        /// Here we can't use `id_field = "h.tx_hash"` in the external query because it doesn't know about the `tx_history AS h` table.
+        /// So we need to give the `id_field` an alias like `__ID_FIELD`.
+        const ID_FIELD_ALIAS: &str = "__ID_FIELD";
+        const ROW_NUMBER_ALIAS: &str = "__ROW";
+
+        if self.ordering.is_empty() {
+            let error = "SQL ORDERs must be specified before `SqlQuery::query_offset_by_id` is called";
+            return Err(SqlError::ToSqlConversionFailure(StringError::from(error).into_boxed()));
+        }
+
+        self
+            // Query the number of the row with the specified `order_by` ordering.
+            .row_number_alias(ROW_NUMBER_ALIAS)?
+            // Query `id_field` and give it the `__ID_FIELD` alias.
+            .field_alias(id_field.to_valid_sql_ident()?, ID_FIELD_ALIAS)?;
+
+        let mut external_query = SqlQuery::select_from_subquery(self.subquery())?;
+        external_query
+            .field(ROW_NUMBER_ALIAS)?
+            .and_where_eq_param(ID_FIELD_ALIAS, where_id_eq_param)?;
+        Ok(external_query
+            .query_single_row(|row| row.get::<_, isize>(0))?
+            .map(|offset| offset.try_into().expect("row index should be always above zero")))
+    }
+
+    /// Convenience method to execute a query that is expected to return mapped rows.
+    /// For more details see [`SqlBuilder::query_row`].
+    pub fn query<F, B>(mut self, f: F) -> SqlResult<Vec<B>>
+    where
+        F: FnMut(&Row<'_>) -> SqlResult<B>,
+    {
+        self.apply_ordering();
+        let sql = self
+            .sql_builder
+            .sql()
+            .map_err(|e| SqlError::ToSqlConversionFailure(e.into()))?;
+
+        debug!("Trying to execute SQL query {} with params {:?}", sql, self.params());
+        let mut stmt = self.conn.prepare(&sql)?;
+        let items = stmt.query_map(self.params(), f)?.collect::<SqlResult<Vec<_>>>()?;
+        // Otherwise, we'll get the compile error:
+        // `stmt` does not live long enough
+        Ok(items)
+    }
+
+    /// Convenience method to execute a query that is expected to return a single row.
+    /// For more details see [`SqlBuilder::query_row`].
+    pub fn query_single_row<F, T>(mut self, f: F) -> SqlResult<Option<T>>
+    where
+        F: FnOnce(&Row<'_>) -> SqlResult<T>,
+    {
+        self.apply_ordering();
+        let sql = self
+            .sql_builder
+            .sql()
+            .map_err(|e| SqlError::ToSqlConversionFailure(e.into()))?;
+        debug!("Trying to execute SQL query {} with params {:?}", sql, self.params());
+        query_single_row(self.conn, &sql, self.params(), f)
+    }
+
+    /// Applies [`SqlQuery::ordering`] to [`SqlQuery::sql_builder`].
+    /// Please note the functions clears [`SqlQuery::ordering`].
+    fn apply_ordering(&mut self) {
+        for order in self.ordering.drain(..) {
+            match order {
+                SqlOrdering::Asc(column) => self.sql_builder.order_asc(column),
+                SqlOrdering::Desc(column) => self.sql_builder.order_desc(column),
+            };
+        }
+    }
+
+    /// Add `ROW_NUMBER()` field with the specified `order_by` ordering,
+    /// and give it the specified `alias`.
+    /// For more details see [`SqlBuilder::field`].
+    ///
+    /// Please note the functions clears [`SqlQuery::ordering`].
+    fn row_number_alias(&mut self, alias: &'static str) -> SqlResult<&mut Self> {
+        validate_ident(alias)?;
+        let order_by = self
+            .ordering
+            .drain(..)
+            .map(|ordering| SqlOrdering::to_sql(&ordering))
+            .collect::<Vec<_>>()
+            .join(", ");
+        // Query the number of the row with the specified `order_by` ordering.
+        self.sql_builder
+            .field(format!("ROW_NUMBER() OVER (ORDER BY {}) AS {}", order_by, alias));
+        Ok(self)
+    }
+}
+
+/// An instance of this structure is returned by [`SqlQuery::subquery`].
+pub struct SqlSubquery<'a>(SqlQuery<'a>);
+
+#[derive(Clone)]
+enum SqlOrdering {
+    Asc(String),
+    Desc(String),
+}
+
+impl SqlOrdering {
+    fn to_sql(&self) -> String {
+        match self {
+            SqlOrdering::Asc(column) => format!("{} ASC", column),
+            SqlOrdering::Desc(column) => format!("{} DESC", column),
+        }
+    }
+}
+
+#[derive(Debug)]
+struct StringError(String);
+
+impl fmt::Display for StringError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }
+}
+
+impl StdError for StringError {}
+
+impl From<&'static str> for StringError {
+    fn from(s: &str) -> Self { StringError(s.to_owned()) }
+}
+
+impl StringError {
+    fn into_boxed(self) -> Box<StringError> { Box::new(self) }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use rusqlite::NO_PARAMS;
+
+    const CREATE_TX_HISTORY_TABLE: &str = "CREATE TABLE tx_history (
+        tx_hash VARCHAR(255) NOT NULL UNIQUE,
+        height INTEGER NOT NULL,
+        total_amount INTEGER NOT NULL
+    );";
+    const CREATE_TX_ADDRESS_TABLE: &str = "CREATE TABLE tx_address (
+        tx_hash VARCHAR(255) NOT NULL,
+        address VARCHAR(255) NOT NULL
+    );";
+    const INSERT_TX_TO_HISTORY_TABLE: &str =
+        "INSERT INTO tx_history (tx_hash, height, total_amount) VALUES (?1, ?2, ?3)";
+    const INSERT_TX_TO_ADDRESS_TABLE: &str = "INSERT INTO tx_address (tx_hash, address) VALUES (?1, ?2)";
+
+    fn init_table_for_test(conn: &Connection) {
+        conn.execute(CREATE_TX_HISTORY_TABLE, NO_PARAMS).unwrap();
+        conn.execute(CREATE_TX_ADDRESS_TABLE, NO_PARAMS).unwrap();
+
+        let history_items = vec![
+            ("tx_hash_1", 699545, 23),
+            ("tx_hash_2", 699547, 10),
+            ("tx_hash_3", 699547, 11),
+            ("tx_hash_4", 699530, 100),
+            ("tx_hash_5", 699532, 19),
+        ];
+        for (tx_hash, height, total_amount) in history_items {
+            conn.execute(INSERT_TX_TO_HISTORY_TABLE, &[
+                tx_hash.to_owned(),
+                height.to_string(),
+                total_amount.to_string(),
+            ])
+            .unwrap();
+        }
+
+        let address_table_items = vec![
+            ("tx_hash_1", "address_1"),
+            ("tx_hash_1", "address_2"),
+            ("tx_hash_2", "address_1"),
+            ("tx_hash_2", "address_3"),
+            ("tx_hash_2", "address_4"),
+            ("tx_hash_3", "address_3"),
+            ("tx_hash_4", "address_2"),
+            ("tx_hash_4", "address_4"),
+            ("tx_hash_5", "address_1"),
+        ];
+        for (tx_hash, address) in address_table_items {
+            conn.execute(INSERT_TX_TO_ADDRESS_TABLE, &[tx_hash.to_owned(), address.to_string()])
+                .unwrap();
+        }
+    }
+
+    #[test]
+    fn test_query_join() {
+        const SEARCHING_ADDRESSES: [&str; 2] = ["address_2", "address_4"];
+
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        let mut query = SqlQuery::select_from(&conn, "tx_history").unwrap();
+        query
+            .field("tx_history.tx_hash")
+            .unwrap()
+            .join("tx_address")
+            .unwrap()
+            .on_join_eq("tx_history.tx_hash", "tx_address.tx_hash")
+            .unwrap()
+            .and_where_in_quoted("tx_address.address", SEARCHING_ADDRESSES.to_owned())
+            .unwrap()
+            .group_by("tx_history.tx_hash")
+            .unwrap();
+        assert_eq!(
+            query.clone().sql().unwrap(),
+            "SELECT tx_history.tx_hash FROM tx_history JOIN tx_address ON tx_history.tx_hash = tx_address.tx_hash WHERE tx_address.address IN ('address_2', 'address_4') GROUP BY tx_history.tx_hash;"
+        );
+        let actual: Vec<String> = query.query(|row| row.get(0)).unwrap();
+        let expected = vec!["tx_hash_1".to_owned(), "tx_hash_2".to_owned(), "tx_hash_4".to_owned()];
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_query_where_in_params() {
+        const SEARCHING_HEIGHTS: [u32; 3] = [699547, 699530, 699533];
+
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        let mut query = SqlQuery::select_from(&conn, "tx_history").unwrap();
+        query
+            .field("tx_hash")
+            .unwrap()
+            .and_where_in_params("height", SEARCHING_HEIGHTS.clone())
+            .unwrap();
+        assert_eq!(
+            query.clone().sql().unwrap(),
+            "SELECT tx_hash FROM tx_history WHERE height IN (:1, :2, :3);"
+        );
+        assert_eq!(query.params(), &vec![699547.into(), 699530.into(), 699533.into()]);
+
+        let actual: Vec<String> = query.query(|row| row.get(0)).unwrap();
+        let expected = vec!["tx_hash_2".to_owned(), "tx_hash_3".to_owned(), "tx_hash_4".to_owned()];
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_query_offset_by_id() {
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        let mut query = SqlQuery::select_from(&conn, "tx_history").unwrap();
+        query.order_asc("height").unwrap().order_desc("total_amount").unwrap();
+
+        // Resulting rows:
+        // 1) tx_hash="tx_hash_4", height=699530, total_amount=100
+        // 2) tx_hash="tx_hash_5", height=699532, total_amount=19
+        // 3) tx_hash="tx_hash_1", height=699545, total_amount=23
+        // 4) tx_hash="tx_hash_3", height=699547, total_amount=11
+        // 5) tx_hash="tx_hash_2", height=699547, total_amount=10
+
+        let actual = query
+            .clone()
+            .query_offset_by_id("tx_hash", "tx_hash_4".to_owned())
+            .unwrap();
+        assert_eq!(actual, Some(1));
+
+        let actual = query
+            .clone()
+            .query_offset_by_id("tx_hash", "tx_hash_3".to_owned())
+            .unwrap();
+        assert_eq!(actual, Some(4));
+
+        let actual = query
+            .clone()
+            .query_offset_by_id("tx_hash", "tx_hash_2".to_owned())
+            .unwrap();
+        assert_eq!(actual, Some(5));
+
+        let actual = query.query_offset_by_id("tx_hash", "tx_hash_6".to_owned()).unwrap();
+        assert_eq!(actual, None);
+    }
+
+    #[test]
+    fn test_query_offset_by_id_with_join() {
+        const SEARCHING_ADDRESSES: [&str; 2] = ["address_2", "address_4"];
+
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        let mut query = SqlQuery::select_from_alias(&conn, "tx_history", "h").unwrap();
+        query
+            .order_asc("h.height")
+            .unwrap()
+            .order_desc("h.total_amount")
+            .unwrap()
+            .join_alias("tx_address", "a")
+            .unwrap()
+            .on_join_eq("h.tx_hash", "a.tx_hash")
+            .unwrap()
+            .and_where_in_quoted("a.address", SEARCHING_ADDRESSES.to_owned())
+            .unwrap()
+            .group_by("h.tx_hash")
+            .unwrap();
+
+        // Resulting rows:
+        // 1) tx_hash="tx_hash_4", height=699530, total_amount=100
+        // 2) tx_hash="tx_hash_1", height=699545, total_amount=23
+        // 3) tx_hash="tx_hash_2", height=699547, total_amount=10
+
+        let actual = query
+            .clone()
+            .query_offset_by_id("h.tx_hash", "tx_hash_4".to_owned())
+            .unwrap();
+        assert_eq!(actual, Some(1));
+
+        let actual = query
+            .clone()
+            .query_offset_by_id("h.tx_hash", "tx_hash_1".to_owned())
+            .unwrap();
+        assert_eq!(actual, Some(2));
+
+        let actual = query
+            .clone()
+            .query_offset_by_id("h.tx_hash", "tx_hash_2".to_owned())
+            .unwrap();
+        assert_eq!(actual, Some(3));
+
+        let actual = query.query_offset_by_id("h.tx_hash", "tx_hash_3".to_owned()).unwrap();
+        assert_eq!(actual, None);
+    }
+}
diff --git a/mm2src/db_common/src/sqlite.rs b/mm2src/db_common/src/sqlite.rs
new file mode 100644
index 0000000000..8cb351f1db
--- /dev/null
+++ b/mm2src/db_common/src/sqlite.rs
@@ -0,0 +1,318 @@
+pub use rusqlite;
+pub use sql_builder;
+use std::fmt;
+
+use log::debug;
+use rusqlite::types::{FromSql, Type as SqlType, Value};
+use rusqlite::{Connection, Error as SqlError, Result as SqlResult, Row, ToSql, NO_PARAMS};
+use sql_builder::SqlBuilder;
+use std::sync::{Arc, Mutex, Weak};
+use uuid::Uuid;
+
+pub const CHECK_TABLE_EXISTS_SQL: &str = "SELECT name FROM sqlite_master WHERE type='table' AND name=?1;";
+
+/// The macro returns `OwnedSqlNamedParams`.
+#[macro_export]
+macro_rules! owned_named_params {
+    () => {
+        Vec::new()
+    };
+    ($($param_name:literal: $param_val:expr),+ $(,)?) => {
+        vec![$(($param_name, Value::from($param_val))),+]
+    };
+}
+
+pub type SqliteConnShared = Arc<Mutex<Connection>>;
+pub type SqliteConnWeak = Weak<Mutex<Connection>>;
+
+pub(crate) type ParamId = String;
+
+pub(crate) type OwnedSqlParam = Value;
+pub(crate) type OwnedSqlParams = Vec<OwnedSqlParam>;
+
+type SqlNamedParam<'a> = (&'a str, &'a dyn ToSql);
+type SqlNamedParams<'a> = Vec<SqlNamedParam<'a>>;
+type OwnedSqlNamedParam = (&'static str, Value);
+pub type OwnedSqlNamedParams = Vec<OwnedSqlNamedParam>;
+
+pub trait AsSqlNamedParams {
+    fn as_sql_named_params(&self) -> SqlNamedParams<'_>;
+}
+
+impl AsSqlNamedParams for OwnedSqlNamedParams {
+    fn as_sql_named_params(&self) -> SqlNamedParams<'_> {
+        self.iter().map(|(name, param)| (*name, param as &dyn ToSql)).collect()
+    }
+}
+
+pub fn string_from_row(row: &Row<'_>) -> Result<String, SqlError> { row.get(0) }
+
+pub fn query_single_row<T, P, F>(conn: &Connection, query: &str, params: P, map_fn: F) -> Result<Option<T>, SqlError>
+where
+    P: IntoIterator,
+    P::Item: ToSql,
+    F: FnOnce(&Row<'_>) -> Result<T, SqlError>,
+{
+    let maybe_result = conn.query_row(query, params, map_fn);
+    if let Err(SqlError::QueryReturnedNoRows) = maybe_result {
+        return Ok(None);
+    }
+
+    let result = maybe_result?;
+    Ok(Some(result))
+}
+
+pub fn validate_ident(ident: &str) -> SqlResult<()> {
+    validate_ident_impl(ident, |c| c.is_alphanumeric() || c == '_' || c == '.')
+}
+
+pub fn validate_table_name(table_name: &str) -> SqlResult<()> {
+    // As per https://stackoverflow.com/a/3247553, tables can't be the target of parameter substitution.
+    // So we have to use a plain concatenation disallowing any characters in the table name that may lead to SQL injection.
+    validate_ident_impl(table_name, |c| c.is_alphanumeric() || c == '_')
+}
+
+/// Calculates the offset to skip records by uuid.
+/// Expects `query_builder` to have where clauses applied *before* calling this fn.
+pub fn offset_by_uuid(
+    conn: &Connection,
+    query_builder: &SqlBuilder,
+    params: &[(&str, String)],
+    uuid: &Uuid,
+) -> SqlResult<usize> {
+    // building following query to determine offset by from_uuid
+    // select row from (
+    //     select uuid, ROW_NUMBER() OVER (ORDER BY started_at DESC) AS row
+    //     from my_swaps
+    //     where ... filtering options here ...
+    // ) where uuid = "from_uuid";
+    let subquery = query_builder
+        .clone()
+        .field("ROW_NUMBER() OVER (ORDER BY started_at DESC) AS row")
+        .field("uuid")
+        .subquery()
+        .expect("SQL query builder should never fail here");
+
+    let external_query = SqlBuilder::select_from(subquery)
+        .field("row")
+        .and_where("uuid = :uuid")
+        .sql()
+        .expect("SQL query builder should never fail here");
+
+    let mut params_for_offset = params.to_owned();
+    params_for_offset.push((":uuid", uuid.to_string()));
+    let params_as_trait: Vec<_> = params_for_offset
+        .iter()
+        .map(|(key, value)| (*key, value as &dyn ToSql))
+        .collect();
+
+    debug!(
+        "Trying to execute SQL query {} with params {:?}",
+        external_query, params_for_offset
+    );
+
+    let mut stmt = conn.prepare(&external_query)?;
+    let offset: isize = stmt.query_row_named(params_as_trait.as_slice(), |row| row.get(0))?;
+    Ok(offset.try_into().expect("row index should be always above zero"))
+}
+
+/// A more universal offset_by_id query that will replace offset_by_uuid at some point
+pub fn offset_by_id<P>(
+    conn: &Connection,
+    query_builder: &SqlBuilder,
+    params: P,
+    id_field: &str,
+    order_by: &str,
+    where_id: &str,
+) -> SqlResult<Option<usize>>
+where
+    P: IntoIterator + std::fmt::Debug,
+    P::Item: ToSql,
+{
+    let row_number = format!("ROW_NUMBER() OVER (ORDER BY {}) AS row", order_by);
+    let subquery = query_builder
+        .clone()
+        .field(&row_number)
+        .field(id_field)
+        .subquery()
+        .expect("SQL query builder should never fail here");
+
+    let external_query = SqlBuilder::select_from(subquery)
+        .field("row")
+        .and_where(where_id)
+        .sql()
+        .expect("SQL query builder should never fail here");
+
+    debug!(
+        "Trying to execute SQL query {} with params {:?}",
+        external_query, params,
+    );
+
+    let mut stmt = conn.prepare(&external_query)?;
+    let maybe_offset = stmt.query_row(params, |row| row.get::<_, isize>(0));
+    if let Err(SqlError::QueryReturnedNoRows) = maybe_offset {
+        return Ok(None);
+    }
+    let offset = maybe_offset?;
+    Ok(Some(offset.try_into().expect("row index should be always above zero")))
+}
+
+pub fn sql_text_conversion_err<E>(field_id: usize, e: E) -> SqlError
+where
+    E: std::error::Error + Send + Sync + 'static,
+{
+    SqlError::FromSqlConversionFailure(field_id, SqlType::Text, Box::new(e))
+}
+
+pub fn h256_slice_from_row<T>(row: &Row<'_>, column_id: usize) -> Result<[u8; 32], SqlError>
+where
+    T: AsRef<[u8]> + FromSql,
+{
+    let mut h256_slice = [0u8; 32];
+    hex::decode_to_slice(row.get::<_, T>(column_id)?, &mut h256_slice as &mut [u8])
+        .map_err(|e| sql_text_conversion_err(column_id, e))?;
+    Ok(h256_slice)
+}
+
+pub fn h256_option_slice_from_row<T>(row: &Row<'_>, column_id: usize) -> Result<Option<[u8; 32]>, SqlError>
+where
+    T: AsRef<[u8]> + FromSql,
+{
+    let maybe_h256_slice = row.get::<_, Option<T>>(column_id)?;
+    let res = match maybe_h256_slice {
+        Some(s) => {
+            let mut h256_slice = [0u8; 32];
+            hex::decode_to_slice(s, &mut h256_slice as &mut [u8]).map_err(|e| sql_text_conversion_err(column_id, e))?;
+            Some(h256_slice)
+        },
+        None => None,
+    };
+    Ok(res)
+}
+
+/// As per https://twitter.com/marcan42/status/1494213862970707969, I've noticed significant SQLite performance
+/// difference on M1 Mac and Linux.
+/// But according to https://phiresky.github.io/blog/2020/sqlite-performance-tuning/, these pragmas should
+/// be safe to use, while giving great speed boost.
+/// With these, Mac and Linux have comparable SQLite performance.
+pub fn run_optimization_pragmas(conn: &Connection) -> Result<(), SqlError> {
+    conn.query_row("pragma journal_mode = WAL;", NO_PARAMS, |row| row.get::<_, String>(0))?;
+    conn.execute("pragma synchronous = normal;", NO_PARAMS)?;
+    conn.execute("pragma temp_store = memory;", NO_PARAMS)?;
+    Ok(())
+}
+
+pub fn execute_batch(statement: &'static [&str]) -> Vec<(&'static str, Vec<String>)> {
+    statement.iter().map(|sql| (*sql, vec![])).collect()
+}
+
+pub trait ToValidSqlTable {
+    /// Converts `self` to a valid SQL table name or returns an error.
+    fn to_valid_sql_table(&self) -> SqlResult<String>;
+}
+
+impl<S: ToString> ToValidSqlTable for S {
+    fn to_valid_sql_table(&self) -> SqlResult<String> {
+        let table = self.to_string();
+        validate_table_name(&table)?;
+        Ok(table)
+    }
+}
+
+pub trait ToValidSqlIdent {
+    /// Converts `self` to a valid SQL value or returns an error.
+    fn to_valid_sql_ident(&self) -> SqlResult<String>;
+}
+
+impl<S: ToString> ToValidSqlIdent for S {
+    fn to_valid_sql_ident(&self) -> SqlResult<String> {
+        let ident = self.to_string();
+        validate_ident(&ident)?;
+        Ok(ident)
+    }
+}
+
+/// A valid SQL value that can be passed as an argument to the `SqlBuilder` or `SqlQuery` safely.
+pub enum SqlValue {
+    String(&'static str),
+    Decimal(i64),
+}
+
+impl SqlValue {
+    /// Converts the given `value` to string if it implements `Into<SqlValue>`.
+    /// The resulting string is considered a safe SQL value.
+    pub(crate) fn value_to_string<S>(value: S) -> String
+    where
+        SqlValue: From<S>,
+    {
+        SqlValue::from(value).to_string()
+    }
+
+    /// Converts the given `values` to `Vec<String>` if they implement `Into<SqlValue>`.
+    /// /// The resulting strings are considered safe SQL values.
+    pub(crate) fn values_to_strings<I, S>(values: I) -> Vec<String>
+    where
+        I: IntoIterator<Item = S>,
+        SqlValue: From<S>,
+    {
+        values.into_iter().map(SqlValue::value_to_string).collect()
+    }
+}
+
+impl fmt::Display for SqlValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SqlValue::String(string) => write!(f, "{}", string),
+            SqlValue::Decimal(decimal) => write!(f, "{}", decimal),
+        }
+    }
+}
+
+impl From<&'static str> for SqlValue {
+    fn from(string: &'static str) -> Self { SqlValue::String(string) }
+}
+
+impl From<i64> for SqlValue {
+    fn from(decimal: i64) -> Self { SqlValue::Decimal(decimal) }
+}
+
+/// This structure manages the SQL parameters.
+#[derive(Clone, Default)]
+pub(crate) struct SqlParamsBuilder {
+    next_param_id: usize,
+    params: OwnedSqlParams,
+}
+
+impl SqlParamsBuilder {
+    /// Pushes the given `param` and returns its `:<IDX>` identifier.
+    pub(crate) fn push_param<P>(&mut self, param: P) -> ParamId
+    where
+        OwnedSqlParam: From<P>,
+    {
+        self.params.push(OwnedSqlParam::from(param));
+        self.next_param_id += 1;
+        format!(":{}", self.next_param_id)
+    }
+
+    /// Pushes the given `params` and returns their `:<IDX>` identifiers.
+    pub(crate) fn push_params<I, P>(&mut self, params: I) -> Vec<ParamId>
+    where
+        I: IntoIterator<Item = P>,
+        OwnedSqlParam: From<P>,
+    {
+        params.into_iter().map(|param| self.push_param(param)).collect()
+    }
+
+    pub(crate) fn params(&self) -> &OwnedSqlParams { &self.params }
+}
+
+fn validate_ident_impl<F>(ident: &str, is_valid: F) -> SqlResult<()>
+where
+    F: Fn(char) -> bool,
+{
+    if ident.chars().all(is_valid) {
+        Ok(())
+    } else {
+        Err(SqlError::InvalidParameterName(ident.to_string()))
+    }
+}
diff --git a/mm2src/derives/ser_error_derive/src/lib.rs b/mm2src/derives/ser_error_derive/src/lib.rs
index 3b79538335..79608cc630 100644
--- a/mm2src/derives/ser_error_derive/src/lib.rs
+++ b/mm2src/derives/ser_error_derive/src/lib.rs
@@ -64,7 +64,7 @@ fn check_enum_attributes(input: &DeriveInput) -> Result<(), CompileError> {
     let mut tag = None;
     let mut content = None;
 
-    for meta_item in input.attrs.iter().flat_map(|attr| get_serde_meta_items(attr)) {
+    for meta_item in input.attrs.iter().flat_map(get_serde_meta_items) {
         match meta_item {
             NestedMeta::Meta(NameValue(m)) if m.path.is_ident(TAG_ATTR) => tag = Some(parse_lit_str(TAG_ATTR, m.lit)?),
             NestedMeta::Meta(NameValue(m)) if m.path.is_ident(CONTENT_ATTR) => {
diff --git a/mm2src/docker_tests/slp_tests.rs b/mm2src/docker_tests/slp_tests.rs
deleted file mode 100644
index c05e3cef2f..0000000000
--- a/mm2src/docker_tests/slp_tests.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use super::*;
-use bitcoin_cash_slp::{slp_genesis_output, SlpTokenType};
-use chain::TransactionOutput;
-use coins::utxo::slp::SlpToken;
-use coins::utxo::utxo_common::send_outputs_from_my_address;
-use keys::{KeyPair, Private};
-use script::Builder;
-
-#[test]
-fn mint_slp_token() {
-    let (_ctx, coin, privkey) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let private = Private {
-        prefix: 0,
-        secret: privkey.into(),
-        compressed: true,
-        checksum_type: Default::default(),
-    };
-    let keypair = KeyPair::from_private(private).unwrap();
-
-    let output = slp_genesis_output(SlpTokenType::Fungible, "ADEX", "ADEX", "", "", 8, None, 1000_0000_0000);
-    let script_pubkey = output.script.serialize().unwrap().to_vec().into();
-
-    let op_return_output = TransactionOutput {
-        value: output.value,
-        script_pubkey,
-    };
-    let mint_output = TransactionOutput {
-        value: 1000,
-        script_pubkey: Builder::build_p2pkh(&keypair.public().address_hash()).to_bytes(),
-    };
-    let tx = send_outputs_from_my_address(coin.clone(), vec![op_return_output, mint_output])
-        .wait()
-        .unwrap();
-
-    let slp = SlpToken::new(8, "ADEX".into(), tx.tx_hash().as_slice().into(), coin, 0);
-    let balance = slp.my_balance().wait().unwrap();
-    let expected = BigDecimal::from(1000);
-    assert_eq!(expected, balance.spendable);
-
-    let secret = [0; 32];
-    let secret_hash = dhash160(&secret);
-    let time_lock = (now_ms() / 1000) as u32;
-
-    let tx = slp
-        .send_maker_payment(time_lock, &*keypair.public(), &*secret_hash, 1.into(), &None)
-        .wait()
-        .unwrap();
-    println!("{}", hex::encode(tx.tx_hex()));
-}
diff --git a/mm2src/floodsub/Cargo.toml b/mm2src/floodsub/Cargo.toml
index 8109f43532..864cc0f0a4 100644
--- a/mm2src/floodsub/Cargo.toml
+++ b/mm2src/floodsub/Cargo.toml
@@ -14,9 +14,9 @@ cuckoofilter = "0.3.2"
 futures = "0.3.1"
 libp2p-core = { git = "https://github.com/libp2p/rust-libp2p.git" }
 libp2p-swarm = { git = "https://github.com/libp2p/rust-libp2p.git" }
-prost = "0.8"
+prost = "0.10"
 rand = "0.7"
 smallvec = "1.0"
 
 [build-dependencies]
-prost-build = "0.8"
+prost-build = "0.10.3"
diff --git a/mm2src/floodsub/src/layer.rs b/mm2src/floodsub/src/layer.rs
index 13b4443663..7151948a95 100644
--- a/mm2src/floodsub/src/layer.rs
+++ b/mm2src/floodsub/src/layer.rs
@@ -22,9 +22,9 @@ use crate::protocol::{FloodsubMessage, FloodsubProtocol, FloodsubRpc, FloodsubSu
 use crate::topic::Topic;
 use crate::FloodsubConfig;
 use cuckoofilter::CuckooFilter;
-use libp2p_core::{connection::ConnectionId, Multiaddr, PeerId};
-use libp2p_swarm::{NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, OneShotHandler, PollParameters,
-                   ProtocolsHandler};
+use libp2p_core::{connection::ConnectionId, ConnectedPoint, Multiaddr, PeerId};
+use libp2p_swarm::{IntoConnectionHandler, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, OneShotHandler,
+                   PollParameters};
 use smallvec::SmallVec;
 use std::collections::hash_map::{DefaultHasher, HashMap};
 use std::task::{Context, Poll};
@@ -33,7 +33,8 @@ use std::{collections::VecDeque, iter};
 /// Network behaviour that handles the floodsub protocol.
 pub struct Floodsub {
     /// Events that need to be yielded to the outside when polling.
-    events: VecDeque<NetworkBehaviourAction<FloodsubRpc, FloodsubEvent>>,
+    events:
+        VecDeque<NetworkBehaviourAction<FloodsubEvent, OneShotHandler<FloodsubProtocol, FloodsubRpc, InnerMessage>>>,
 
     config: FloodsubConfig,
 
@@ -201,14 +202,26 @@ impl Floodsub {
 }
 
 impl NetworkBehaviour for Floodsub {
-    type ProtocolsHandler = OneShotHandler<FloodsubProtocol, FloodsubRpc, InnerMessage>;
+    type ConnectionHandler = OneShotHandler<FloodsubProtocol, FloodsubRpc, InnerMessage>;
     type OutEvent = FloodsubEvent;
 
-    fn new_handler(&mut self) -> Self::ProtocolsHandler { Default::default() }
+    fn new_handler(&mut self) -> Self::ConnectionHandler { Default::default() }
 
     fn addresses_of_peer(&mut self, _: &PeerId) -> Vec<Multiaddr> { Vec::new() }
 
-    fn inject_connected(&mut self, id: &PeerId) {
+    fn inject_connection_established(
+        &mut self,
+        id: &PeerId,
+        _: &ConnectionId,
+        _: &ConnectedPoint,
+        _: Option<&Vec<Multiaddr>>,
+        other_established: usize,
+    ) {
+        if other_established > 0 {
+            // We only care about the first time a peer connects.
+            return;
+        }
+
         // We need to send our subscriptions to the newly-connected node.
         for topic in self.subscribed_topics.iter().cloned() {
             self.events.push_back(NetworkBehaviourAction::NotifyHandler {
@@ -227,7 +240,19 @@ impl NetworkBehaviour for Floodsub {
         self.connected_peers.insert(*id, SmallVec::new());
     }
 
-    fn inject_disconnected(&mut self, id: &PeerId) {
+    fn inject_connection_closed(
+        &mut self,
+        id: &PeerId,
+        _: &ConnectionId,
+        _: &ConnectedPoint,
+        _: <Self::ConnectionHandler as IntoConnectionHandler>::Handler,
+        remaining_established: usize,
+    ) {
+        if remaining_established > 0 {
+            // we only care about peer disconnections
+            return;
+        }
+
         let was_in = self.connected_peers.remove(id);
         debug_assert!(was_in.is_some());
     }
@@ -324,7 +349,7 @@ impl NetworkBehaviour for Floodsub {
         &mut self,
         _: &mut Context<'_>,
         _: &mut impl PollParameters,
-    ) -> Poll<NetworkBehaviourAction<<Self::ProtocolsHandler as ProtocolsHandler>::InEvent, Self::OutEvent>> {
+    ) -> Poll<NetworkBehaviourAction<Self::OutEvent, Self::ConnectionHandler>> {
         if let Some(event) = self.events.pop_front() {
             return Poll::Ready(event);
         }
@@ -334,6 +359,7 @@ impl NetworkBehaviour for Floodsub {
 }
 
 /// Transmission between the `OneShotHandler` and the `FloodsubHandler`.
+#[derive(Debug)]
 pub enum InnerMessage {
     /// We received an RPC from a remote.
     Rx(FloodsubRpc),
diff --git a/mm2src/gossipsub/Cargo.toml b/mm2src/gossipsub/Cargo.toml
index f8ef397e99..5cdd94dcfb 100644
--- a/mm2src/gossipsub/Cargo.toml
+++ b/mm2src/gossipsub/Cargo.toml
@@ -20,10 +20,9 @@ futures_codec = "0.4.0"
 libp2p-swarm = { git = "https://github.com/libp2p/rust-libp2p.git" }
 libp2p-core = { git = "https://github.com/libp2p/rust-libp2p.git" }
 log = "0.4.8"
-lru = "0.4.3"
-prost = "0.8"
+prost = "0.10"
 rand = "0.7"
-sha2 = "0.8.1"
+sha2 = "0.9"
 smallvec = "1.1.0"
 unsigned-varint = { version = "0.4.0", features = ["futures-codec"] }
 wasm-timer = "0.2.4"
@@ -36,4 +35,4 @@ libp2p-yamux = { git = "https://github.com/libp2p/rust-libp2p.git" }
 quickcheck = "0.9.2"
 
 [build-dependencies]
-prost-build = "0.8"
+prost-build = "0.10.3"
diff --git a/mm2src/gossipsub/src/behaviour.rs b/mm2src/gossipsub/src/behaviour.rs
index c702d907f9..75742febfd 100644
--- a/mm2src/gossipsub/src/behaviour.rs
+++ b/mm2src/gossipsub/src/behaviour.rs
@@ -27,15 +27,16 @@ use crate::topic::{Topic, TopicHash};
 use common::time_cache::{Entry as TimeCacheEntry, TimeCache};
 use futures::prelude::*;
 use libp2p_core::{connection::ConnectionId, ConnectedPoint, Multiaddr, PeerId};
-use libp2p_swarm::{NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters, ProtocolsHandler};
+use libp2p_swarm::{IntoConnectionHandler, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters};
 use log::{debug, error, info, trace, warn};
 use rand::seq::SliceRandom;
 use smallvec::SmallVec;
+use std::collections::hash_map::Entry;
+use std::collections::{HashMap, HashSet, VecDeque};
+use std::iter;
+use std::sync::Arc;
+use std::task::{Context, Poll};
 use std::time::Duration;
-use std::{collections::{HashMap, HashSet, VecDeque},
-          iter,
-          sync::Arc,
-          task::{Context, Poll}};
 use wasm_timer::{Instant, Interval};
 
 mod tests;
@@ -46,7 +47,7 @@ pub struct Gossipsub {
     config: GossipsubConfig,
 
     /// Events that need to be yielded to the outside when polling.
-    events: VecDeque<NetworkBehaviourAction<Arc<GossipsubRpc>, GossipsubEvent>>,
+    events: VecDeque<NetworkBehaviourAction<GossipsubEvent, GossipsubHandler, Arc<GossipsubRpc>>>,
 
     /// Pools non-urgent control messages between heartbeats.
     control_pool: HashMap<PeerId, Vec<GossipsubControlAction>>,
@@ -240,13 +241,23 @@ impl Gossipsub {
 
     /// Publishes a message to the network.
     pub fn publish(&mut self, topic: &Topic, data: impl Into<Vec<u8>>) {
-        self.publish_many(iter::once(topic.clone()), data)
+        self.publish_many_from(iter::once(topic.clone()), data, self.local_peer_id)
     }
 
     /// Publishes a message with multiple topics to the network.
     pub fn publish_many(&mut self, topic: impl IntoIterator<Item = Topic>, data: impl Into<Vec<u8>>) {
+        self.publish_many_from(topic, data, self.local_peer_id);
+    }
+
+    /// Publishes a message with multiple topics to the network.
+    pub fn publish_many_from(
+        &mut self,
+        topic: impl IntoIterator<Item = Topic>,
+        data: impl Into<Vec<u8>>,
+        source: PeerId,
+    ) {
         let message = GossipsubMessage {
-            source: self.local_peer_id,
+            source,
             data: data.into(),
             // To be interoperable with the go-implementation this is treated as a 64-bit
             // big-endian uint.
@@ -257,8 +268,7 @@ impl Gossipsub {
         debug!("Publishing message: {:?}", (self.config.message_id_fn)(&message));
 
         // forward the message to mesh peers
-        let local_peer_id = self.local_peer_id;
-        self.forward_msg(message.clone(), &local_peer_id);
+        self.forward_msg(message.clone(), &source);
 
         let mut recipient_peers = HashSet::new();
         for topic_hash in &message.topics {
@@ -290,8 +300,7 @@ impl Gossipsub {
         // add published message to our received caches
         let msg_id = (self.config.message_id_fn)(&message);
         self.mcache.put(message.clone());
-        self.received
-            .insert(msg_id.clone(), SmallVec::from_elem(local_peer_id, 1));
+        self.received.insert(msg_id.clone(), SmallVec::from_elem(source, 1));
 
         debug!("Published message: {:?}", msg_id);
 
@@ -849,7 +858,7 @@ impl Gossipsub {
                 .collect();
             let mut prunes: Vec<GossipsubControlAction> = to_prune
                 .remove(peer)
-                .unwrap_or_else(Vec::new)
+                .unwrap_or_default()
                 .iter()
                 .map(|topic_hash| GossipsubControlAction::Prune {
                     topic_hash: topic_hash.clone(),
@@ -1042,12 +1051,10 @@ impl Gossipsub {
         }
     }
 
-    pub fn get_mesh_peers(&self, topic: &TopicHash) -> Vec<PeerId> {
-        self.mesh.get(topic).cloned().unwrap_or_else(Vec::new)
-    }
+    pub fn get_mesh_peers(&self, topic: &TopicHash) -> Vec<PeerId> { self.mesh.get(topic).cloned().unwrap_or_default() }
 
     pub fn get_topic_peers(&self, topic: &TopicHash) -> Vec<PeerId> {
-        self.topic_peers.get(topic).cloned().unwrap_or_else(Vec::new)
+        self.topic_peers.get(topic).cloned().unwrap_or_default()
     }
 
     pub fn get_num_peers(&self) -> usize { self.peer_topics.len() }
@@ -1240,16 +1247,34 @@ impl Gossipsub {
 }
 
 impl NetworkBehaviour for Gossipsub {
-    type ProtocolsHandler = GossipsubHandler;
+    type ConnectionHandler = GossipsubHandler;
     type OutEvent = GossipsubEvent;
 
-    fn new_handler(&mut self) -> Self::ProtocolsHandler {
+    fn new_handler(&mut self) -> Self::ConnectionHandler {
         GossipsubHandler::new(self.config.protocol_id.clone(), self.config.max_transmit_size)
     }
 
     fn addresses_of_peer(&mut self, _: &PeerId) -> Vec<Multiaddr> { Vec::new() }
 
-    fn inject_connected(&mut self, id: &PeerId) {
+    fn inject_connection_established(
+        &mut self,
+        id: &PeerId,
+        conn_id: &ConnectionId,
+        point: &ConnectedPoint,
+        _: Option<&Vec<Multiaddr>>,
+        other_established: usize,
+    ) {
+        self.peer_connections
+            .entry(*id)
+            .or_insert_with(Default::default)
+            .push((*conn_id, point.clone()));
+        self.connected_addresses.push(point.get_remote_address().clone());
+
+        if other_established > 0 {
+            // For other actions, we only care about the first time a peer connects.
+            return;
+        }
+
         info!("New peer connected: {:?}", id);
         // We need to send our subscriptions to the newly-connected node if we are not relay.
         // Notify peer that we act as relay otherwise
@@ -1284,11 +1309,33 @@ impl NetworkBehaviour for Gossipsub {
         self.peer_topics.insert(*id, Vec::new());
     }
 
-    fn inject_disconnected(&mut self, id: &PeerId) {
+    fn inject_connection_closed(
+        &mut self,
+        peer_id: &PeerId,
+        disconnected_conn_id: &ConnectionId,
+        disconnected_point: &ConnectedPoint,
+        _: <Self::ConnectionHandler as IntoConnectionHandler>::Handler,
+        remaining_established: usize,
+    ) {
+        if let Entry::Occupied(mut o) = self.peer_connections.entry(*peer_id) {
+            let connected_points = o.get_mut();
+            connected_points.retain(|(conn_id, _point)| conn_id != disconnected_conn_id);
+            if connected_points.is_empty() {
+                o.remove_entry();
+            }
+        }
+
+        self.connected_addresses
+            .retain(|addr| addr != disconnected_point.get_remote_address());
+
+        if remaining_established > 0 {
+            return;
+        }
+
         // remove from mesh, topic_peers, peer_topic and fanout
-        debug!("Peer disconnected: {:?}", id);
+        debug!("Peer disconnected: {:?}", peer_id);
         {
-            let topics = match self.peer_topics.get(id) {
+            let topics = match self.peer_topics.get(peer_id) {
                 Some(topics) => (topics),
                 None => {
                     warn!("Disconnected node, not in connected nodes");
@@ -1301,71 +1348,43 @@ impl NetworkBehaviour for Gossipsub {
                 // check the mesh for the topic
                 if let Some(mesh_peers) = self.mesh.get_mut(topic) {
                     // check if the peer is in the mesh and remove it
-                    if let Some(pos) = mesh_peers.iter().position(|p| p == id) {
+                    if let Some(pos) = mesh_peers.iter().position(|p| p == peer_id) {
                         mesh_peers.remove(pos);
                     }
                 }
 
                 // remove from topic_peers
                 if let Some(peer_list) = self.topic_peers.get_mut(topic) {
-                    if let Some(pos) = peer_list.iter().position(|p| p == id) {
+                    if let Some(pos) = peer_list.iter().position(|p| p == peer_id) {
                         peer_list.remove(pos);
                     }
                     // debugging purposes
                     else {
-                        warn!("Disconnected node: {:?} not in topic_peers peer list", &id);
+                        warn!("Disconnected node: {:?} not in topic_peers peer list", peer_id);
                     }
                 } else {
                     warn!(
                         "Disconnected node: {:?} with topic: {:?} not in topic_peers",
-                        &id, &topic
+                        &peer_id, &topic
                     );
                 }
 
                 // remove from fanout
                 if let Some(peers) = self.fanout.get_mut(topic) {
-                    peers.retain(|p| p != id)
+                    peers.retain(|p| p != peer_id)
                 }
             }
         }
 
-        self.relays_mesh.remove(id);
-        self.connected_relays.remove(id);
-        self.included_to_relays_mesh.remove(id);
-        self.peer_connections.remove(id);
+        self.relays_mesh.remove(peer_id);
+        self.connected_relays.remove(peer_id);
+        self.included_to_relays_mesh.remove(peer_id);
+        self.peer_connections.remove(peer_id);
         // remove peer from peer_topics
-        let was_in = self.peer_topics.remove(id);
+        let was_in = self.peer_topics.remove(peer_id);
         debug_assert!(was_in.is_some());
     }
 
-    fn inject_connection_established(&mut self, peer_id: &PeerId, conn_id: &ConnectionId, point: &ConnectedPoint) {
-        self.peer_connections
-            .entry(*peer_id)
-            .or_insert_with(Default::default)
-            .push((*conn_id, point.clone()));
-        self.connected_addresses.push(point.get_remote_address().clone());
-    }
-
-    fn inject_connection_closed(
-        &mut self,
-        peer_id: &PeerId,
-        disconnected_conn_id: &ConnectionId,
-        disconnected_point: &ConnectedPoint,
-    ) {
-        let mut clean = false;
-
-        if let Some(connected_points) = self.peer_connections.get_mut(peer_id) {
-            connected_points.retain(|(conn_id, _point)| conn_id != disconnected_conn_id);
-            clean = connected_points.is_empty();
-        }
-        if clean {
-            self.peer_connections.remove(peer_id);
-        }
-
-        self.connected_addresses
-            .retain(|addr| addr != disconnected_point.get_remote_address());
-    }
-
     fn inject_event(&mut self, propagation_source: PeerId, _: ConnectionId, event: GossipsubRpc) {
         // Handle subscriptions
         // Update connected peers topics
@@ -1419,7 +1438,7 @@ impl NetworkBehaviour for Gossipsub {
         &mut self,
         cx: &mut Context,
         _: &mut impl PollParameters,
-    ) -> Poll<NetworkBehaviourAction<<Self::ProtocolsHandler as ProtocolsHandler>::InEvent, Self::OutEvent>> {
+    ) -> Poll<NetworkBehaviourAction<Self::OutEvent, Self::ConnectionHandler>> {
         if let Some(event) = self.events.pop_front() {
             // clone send event reference if others references are present
             match event {
@@ -1446,11 +1465,8 @@ impl NetworkBehaviour for Gossipsub {
                 NetworkBehaviourAction::GenerateEvent(e) => {
                     return Poll::Ready(NetworkBehaviourAction::GenerateEvent(e));
                 },
-                NetworkBehaviourAction::DialAddress { address } => {
-                    return Poll::Ready(NetworkBehaviourAction::DialAddress { address });
-                },
-                NetworkBehaviourAction::DialPeer { peer_id, condition } => {
-                    return Poll::Ready(NetworkBehaviourAction::DialPeer { peer_id, condition });
+                NetworkBehaviourAction::Dial { opts, handler } => {
+                    return Poll::Ready(NetworkBehaviourAction::Dial { opts, handler });
                 },
                 NetworkBehaviourAction::ReportObservedAddr { address, score } => {
                     return Poll::Ready(NetworkBehaviourAction::ReportObservedAddr { address, score });
diff --git a/mm2src/gossipsub/src/behaviour/tests.rs b/mm2src/gossipsub/src/behaviour/tests.rs
index c6d46c9a8a..5dee054c59 100644
--- a/mm2src/gossipsub/src/behaviour/tests.rs
+++ b/mm2src/gossipsub/src/behaviour/tests.rs
@@ -24,6 +24,9 @@
 mod tests {
     use super::super::*;
     use crate::GossipsubConfigBuilder;
+    use libp2p_core::Endpoint;
+    use std::net::IpAddr;
+    use std::str::FromStr;
 
     // helper functions for testing
 
@@ -50,10 +53,20 @@ mod tests {
         // build and connect peer_no random peers
         let mut peers = vec![];
 
-        for _ in 0..peer_no {
+        for i in 0..peer_no {
             let peer = PeerId::random();
             peers.push(peer.clone());
-            <Gossipsub as NetworkBehaviour>::inject_connected(&mut gs, &peer);
+            <Gossipsub as NetworkBehaviour>::inject_connection_established(
+                &mut gs,
+                &peer,
+                &ConnectionId::new(i),
+                &ConnectedPoint::Dialer {
+                    address: Multiaddr::from(IpAddr::from_str("127.0.0.1").unwrap()),
+                    role_override: Endpoint::Dialer,
+                },
+                None,
+                0,
+            );
             if to_subscribe {
                 gs.handle_received_subscriptions(
                     &topic_hashes
@@ -399,7 +412,7 @@ mod tests {
 
         // check that our subscriptions are sent to each of the peers
         // collect all the SendEvents
-        let send_events: Vec<&NetworkBehaviourAction<Arc<GossipsubRpc>, GossipsubEvent>> = gs
+        let send_events: Vec<&NetworkBehaviourAction<GossipsubEvent, GossipsubHandler, Arc<GossipsubRpc>>> = gs
             .events
             .iter()
             .filter(|e| match e {
diff --git a/mm2src/gossipsub/src/config.rs b/mm2src/gossipsub/src/config.rs
index cafd0c1ce1..f74343e21d 100644
--- a/mm2src/gossipsub/src/config.rs
+++ b/mm2src/gossipsub/src/config.rs
@@ -124,18 +124,11 @@ impl Default for GossipsubConfig {
     }
 }
 
+#[derive(Default)]
 pub struct GossipsubConfigBuilder {
     config: GossipsubConfig,
 }
 
-impl Default for GossipsubConfigBuilder {
-    fn default() -> GossipsubConfigBuilder {
-        GossipsubConfigBuilder {
-            config: GossipsubConfig::default(),
-        }
-    }
-}
-
 impl GossipsubConfigBuilder {
     // set default values
     pub fn new() -> GossipsubConfigBuilder { GossipsubConfigBuilder::default() }
diff --git a/mm2src/gossipsub/src/handler.rs b/mm2src/gossipsub/src/handler.rs
index 6cc2d07229..2b71cf13dd 100644
--- a/mm2src/gossipsub/src/handler.rs
+++ b/mm2src/gossipsub/src/handler.rs
@@ -23,8 +23,8 @@ use crate::protocol::{GossipsubCodec, ProtocolConfig};
 use futures::prelude::*;
 use futures_codec::Framed;
 use libp2p_core::upgrade::{InboundUpgrade, OutboundUpgrade};
-use libp2p_swarm::protocols_handler::{KeepAlive, ProtocolsHandler, ProtocolsHandlerEvent, ProtocolsHandlerUpgrErr,
-                                      SubstreamProtocol};
+use libp2p_swarm::handler::{ConnectionHandler, ConnectionHandlerEvent, ConnectionHandlerUpgrErr, KeepAlive,
+                            SubstreamProtocol};
 use libp2p_swarm::NegotiatedSubstream;
 use log::{debug, error, trace, warn};
 use smallvec::SmallVec;
@@ -108,7 +108,7 @@ impl Default for GossipsubHandler {
     }
 }
 
-impl ProtocolsHandler for GossipsubHandler {
+impl ConnectionHandler for GossipsubHandler {
     type InEvent = GossipsubRpc;
     type OutEvent = GossipsubRpc;
     type Error = io::Error;
@@ -153,7 +153,7 @@ impl ProtocolsHandler for GossipsubHandler {
     fn inject_dial_upgrade_error(
         &mut self,
         _: Self::OutboundOpenInfo,
-        _: ProtocolsHandlerUpgrErr<<Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Error>,
+        _: ConnectionHandlerUpgrErr<<Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Error>,
     ) {
         self.outbound_substream_establishing = false;
         // Ignore upgrade errors for now.
@@ -167,13 +167,13 @@ impl ProtocolsHandler for GossipsubHandler {
     fn poll(
         &mut self,
         cx: &mut Context,
-    ) -> Poll<ProtocolsHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>> {
+    ) -> Poll<ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::OutEvent, Self::Error>> {
         // determine if we need to create the stream
         if !self.send_queue.is_empty() && self.outbound_substream.is_none() && !self.outbound_substream_establishing {
             let message = self.send_queue.remove(0);
             self.send_queue.shrink_to_fit();
             self.outbound_substream_establishing = true;
-            return Poll::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
+            return Poll::Ready(ConnectionHandlerEvent::OutboundSubstreamRequest {
                 protocol: self.listen_protocol.clone().map_info(|()| message),
             });
         }
@@ -185,7 +185,7 @@ impl ProtocolsHandler for GossipsubHandler {
                     match substream.poll_next_unpin(cx) {
                         Poll::Ready(Some(Ok(message))) => {
                             self.inbound_substream = Some(InboundSubstreamState::WaitingInput(substream));
-                            return Poll::Ready(ProtocolsHandlerEvent::Custom(message));
+                            return Poll::Ready(ConnectionHandlerEvent::Custom(message));
                         },
                         Poll::Ready(Some(Err(e))) => {
                             debug!("Inbound substream error while awaiting input: {:?}", e);
@@ -253,13 +253,13 @@ impl ProtocolsHandler for GossipsubHandler {
                                     error!("Message over the maximum transmission limit was not sent.");
                                     self.outbound_substream = Some(OutboundSubstreamState::WaitingOutput(substream));
                                 } else {
-                                    return Poll::Ready(ProtocolsHandlerEvent::Close(e));
+                                    return Poll::Ready(ConnectionHandlerEvent::Close(e));
                                 }
                             },
                         },
                         Poll::Ready(Err(e)) => {
                             debug!("Outbound substream error while sending output: {:?}", e);
-                            return Poll::Ready(ProtocolsHandlerEvent::Close(e));
+                            return Poll::Ready(ConnectionHandlerEvent::Close(e));
                         },
                         Poll::Pending => {
                             self.outbound_substream = Some(OutboundSubstreamState::PendingSend(substream, message));
@@ -272,7 +272,7 @@ impl ProtocolsHandler for GossipsubHandler {
                         Poll::Ready(Ok(())) => {
                             self.outbound_substream = Some(OutboundSubstreamState::WaitingOutput(substream))
                         },
-                        Poll::Ready(Err(e)) => return Poll::Ready(ProtocolsHandlerEvent::Close(e)),
+                        Poll::Ready(Err(e)) => return Poll::Ready(ConnectionHandlerEvent::Close(e)),
                         Poll::Pending => {
                             self.outbound_substream = Some(OutboundSubstreamState::PendingFlush(substream));
                             break;
@@ -291,7 +291,7 @@ impl ProtocolsHandler for GossipsubHandler {
                         },
                         Poll::Ready(Err(e)) => {
                             debug!("Outbound substream error while closing: {:?}", e);
-                            return Poll::Ready(ProtocolsHandlerEvent::Close(io::Error::new(
+                            return Poll::Ready(ConnectionHandlerEvent::Close(io::Error::new(
                                 io::ErrorKind::BrokenPipe,
                                 "Failed to close outbound substream",
                             )));
diff --git a/mm2src/gossipsub/tests/smoke.rs b/mm2src/gossipsub/tests/smoke.rs
index 0d8d311da6..b9c3063cc0 100644
--- a/mm2src/gossipsub/tests/smoke.rs
+++ b/mm2src/gossipsub/tests/smoke.rs
@@ -89,7 +89,7 @@ impl Graph {
                 p2p_suffix_connected.unwrap()
             );
 
-            Swarm::dial_addr(&mut next.1, connected_addr_no_p2p).unwrap();
+            Swarm::dial(&mut next.1, connected_addr_no_p2p).unwrap();
 
             connected_nodes.push(next);
         }
@@ -144,7 +144,7 @@ fn build_node() -> (Multiaddr, Swarm<Gossipsub>) {
         .multiplex(yamux::YamuxConfig::default())
         .boxed();
 
-    let peer_id = public_key.clone().into_peer_id();
+    let peer_id = public_key.clone().to_peer_id();
 
     // NOTE: The graph of created nodes can be disconnected from the mesh point of view as nodes
     // can reach their d_lo value and not add other nodes to their mesh. To speed up this test, we
@@ -164,7 +164,7 @@ fn build_node() -> (Multiaddr, Swarm<Gossipsub>) {
     let mut addr: Multiaddr = Protocol::Memory(port).into();
     swarm.listen_on(addr.clone()).unwrap();
 
-    addr = addr.with(libp2p_core::multiaddr::Protocol::P2p(public_key.into_peer_id().into()));
+    addr = addr.with(libp2p_core::multiaddr::Protocol::P2p(public_key.to_peer_id().into()));
 
     (addr, swarm)
 }
diff --git a/mm2src/hw_common/.cargo/config.toml b/mm2src/hw_common/.cargo/config.toml
new file mode 100644
index 0000000000..e7becffde0
--- /dev/null
+++ b/mm2src/hw_common/.cargo/config.toml
@@ -0,0 +1,2 @@
+[target.wasm32-unknown-unknown]
+rustflags = ["--cfg=web_sys_unstable_apis"]
\ No newline at end of file
diff --git a/mm2src/hw_common/Cargo.toml b/mm2src/hw_common/Cargo.toml
new file mode 100644
index 0000000000..2a9b987bb7
--- /dev/null
+++ b/mm2src/hw_common/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "hw_common"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1"
+bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
+common = { path = "../common" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
+secp256k1 = { version = "0.20", features = ["rand"] }
+serde = "1.0"
+serde_derive = "1.0"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+rusb = { version = "0.7.0" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+js-sys = { version = "0.3.27" }
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
+wasm-bindgen-futures = { version = "0.4.1" }
+wasm-bindgen-test = { version = "0.3.1" }
+web-sys = { version = "0.3.55", features = ["console", "Navigator", "Usb", "UsbDevice", "UsbDeviceRequestOptions", "UsbInTransferResult"] }
diff --git a/mm2src/hw_common/src/lib.rs b/mm2src/hw_common/src/lib.rs
new file mode 100644
index 0000000000..6f74b5fe09
--- /dev/null
+++ b/mm2src/hw_common/src/lib.rs
@@ -0,0 +1,6 @@
+#[cfg(target_arch = "wasm32")]
+#[macro_use]
+extern crate serde_derive;
+
+pub mod primitives;
+pub mod transport;
diff --git a/mm2src/hw_common/src/primitives.rs b/mm2src/hw_common/src/primitives.rs
new file mode 100644
index 0000000000..1c8d782b7a
--- /dev/null
+++ b/mm2src/hw_common/src/primitives.rs
@@ -0,0 +1,11 @@
+pub const HARDENED_PATH: u32 = 2147483648;
+
+pub use bip32::{ChildNumber, DerivationPath, Error as Bip32Error, ExtendedPublicKey};
+
+pub type Secp256k1ExtendedPublicKey = ExtendedPublicKey<secp256k1::PublicKey>;
+pub type XPub = String;
+
+#[derive(Clone, Copy)]
+pub enum EcdsaCurve {
+    Secp256k1,
+}
diff --git a/mm2src/hw_common/src/transport/hid_driver.rs b/mm2src/hw_common/src/transport/hid_driver.rs
new file mode 100644
index 0000000000..9fadc9e738
--- /dev/null
+++ b/mm2src/hw_common/src/transport/hid_driver.rs
@@ -0,0 +1,234 @@
+//! [`hidapi::HidApi`] is not thread-safe https://github.com/libusb/hidapi/issues/133 and synchronous.
+//! We have the following workarounds:
+//! 1) Spawn a thread where we initialize `hidapi`, request, read, write to devices;
+//! 2) Wrap `HidApi` into an mutex, also make reading non-blocking using [`hidapi::HidDevice::set_blocking_mode`].
+//!    Then we can work with the API from different threads and not block, waiting for chunks.
+//! The problem with `hidapi` is in that we can't determine when the device is disconnected.
+//! https://github.com/libusb/hidapi/issues/103#issuecomment-537336680
+
+use common::log::warn;
+use mm2_err_handle::prelude::*;
+use derive_more::Display;
+use futures::lock::Mutex as AsyncMutex;
+use hidapi::HidApi;
+use std::collections::HashMap;
+use std::ffi::CString;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+
+const BLOCKING_MOD: bool = false;
+
+pub type HidResult<T> = Result<T, MmError<HidError>>;
+type HidContextShared = Arc<AsyncMutex<HidContext>>;
+
+#[derive(Display)]
+pub enum HidError {
+    /// Please note it's not the same as disconnected!
+    DeviceNotInitializedYet,
+    #[display(fmt = "Device is open already: {:?}", _0)]
+    DeviceIsOpenAlready(HidDeviceInfo),
+    #[display(fmt = "HID API has been initialized already")]
+    InitializedAlready,
+    ErrorInitializing(hidapi::HidError),
+    ErrorGettingDevices(hidapi::HidError),
+    ErrorOpeningDevice(hidapi::HidError),
+    ErrorWritingChunk(hidapi::HidError),
+    #[display(
+        fmt = "Writing to the HID device descriptor has been interrupted. Tried to send '{}' bytes, but '{}' are only sent",
+        chunk_len,
+        sent
+    )]
+    WritingInterrupted {
+        chunk_len: usize,
+        sent: usize,
+    },
+    ErrorReadingChunk(hidapi::HidError),
+    #[display(fmt = "Received chunk is too long: '{}', expected '{}'", actual, expected)]
+    ReceivedChunkTooLong {
+        actual: usize,
+        expected: usize,
+    },
+    #[display(fmt = "Not enough info to connect to a HID device: {:?}", _0)]
+    NotEnoughInfoToConnect(HidDeviceInfo),
+    Internal(String),
+}
+
+static HID_API_INITIALIZED: AtomicBool = AtomicBool::new(false);
+
+pub struct HidInstance {
+    ctx: HidContextShared,
+}
+
+impl HidInstance {
+    /// Initialize the `hidapi::HidApi` in a new thread.
+    pub async fn init() -> HidResult<HidInstance> {
+        HidInstance::check_on_init()?;
+        let api = HidApi::new().map_to_mm(HidError::ErrorInitializing)?;
+        let ctx = Arc::new(AsyncMutex::new(HidContext::new(api)));
+        Ok(HidInstance { ctx })
+    }
+
+    fn check_on_init() -> HidResult<()> {
+        if HID_API_INITIALIZED.load(Ordering::Relaxed) {
+            return MmError::err(HidError::InitializedAlready);
+        }
+        Ok(())
+    }
+
+    pub async fn device_list(&self) -> HidResult<Vec<HidDevice>> {
+        let mut ctx = self.ctx.lock().await;
+        let devices = ctx
+            .device_list()?
+            .into_iter()
+            .map(|device_info| HidDevice {
+                ctx: self.ctx.clone(),
+                device_info,
+            })
+            .collect();
+        Ok(devices)
+    }
+}
+
+struct HidContext {
+    api: HidApi,
+    connected_devices: HashMap<HidDeviceInfo, hidapi::HidDevice>,
+}
+
+impl Drop for HidContext {
+    fn drop(&mut self) {
+        const EXPECTED_CURRENT: bool = true;
+        if HID_API_INITIALIZED
+            .compare_exchange(EXPECTED_CURRENT, false, Ordering::Relaxed, Ordering::Relaxed)
+            .is_err()
+        {
+            warn!("HID API has been released already");
+        }
+    }
+}
+
+impl HidContext {
+    fn new(api: HidApi) -> HidContext {
+        HidContext {
+            api,
+            connected_devices: HashMap::new(),
+        }
+    }
+
+    fn device_list(&mut self) -> HidResult<Vec<HidDeviceInfo>> {
+        self.api.refresh_devices().map_to_mm(HidError::ErrorGettingDevices)?;
+        Ok(self.api.device_list().map(HidDeviceInfo::from).collect())
+    }
+}
+
+pub struct HidDevice {
+    ctx: HidContextShared,
+    device_info: HidDeviceInfo,
+}
+
+impl HidDevice {
+    pub async fn connect(&self) -> HidResult<()> {
+        let mut ctx = self.ctx.lock().await;
+        if ctx.connected_devices.contains_key(&self.device_info) {
+            return MmError::err(HidError::DeviceIsOpenAlready(self.device_info.clone()));
+        }
+
+        // `CString` is expected to end with a zero byte and has a length of at least one.
+        let device = if self.device_info.path.as_bytes().len() > 1 {
+            ctx.api
+                .open_path(self.device_info.path.as_c_str())
+                .map_to_mm(HidError::ErrorOpeningDevice)?
+        } else {
+            let serial_number = self
+                .device_info
+                .serial_number
+                .as_ref()
+                .or_mm_err(|| HidError::NotEnoughInfoToConnect(self.device_info.clone()))?;
+            ctx.api
+                .open_serial(self.device_info.vendor_id, self.device_info.product_id, &serial_number)
+                .map_to_mm(HidError::ErrorOpeningDevice)?
+        };
+        device
+            .set_blocking_mode(BLOCKING_MOD)
+            .map_to_mm(HidError::ErrorInitializing)?;
+        ctx.connected_devices.insert(self.device_info.clone(), device);
+        Ok(())
+    }
+
+    /// Returns true if the device is open yet.
+    /// Please note USB enumeration can be expensive on some OS.
+    pub async fn is_open(&self) -> bool {
+        let mut ctx = self.ctx.lock().await;
+        if ctx.connected_devices.get(&self.device_info).is_none() {
+            return false;
+        }
+        let devices = match ctx.device_list() {
+            Ok(devices) => devices,
+            Err(e) => {
+                warn!("{}", e);
+                return false;
+            },
+        };
+        devices.contains(&self.device_info)
+    }
+
+    pub async fn write_chunk(&self, chunk: Vec<u8>) -> HidResult<()> {
+        let ctx = self.ctx.lock().await;
+        let chunk_len = chunk.len();
+
+        let device = ctx
+            .connected_devices
+            .get(&self.device_info)
+            .or_mm_err(|| HidError::DeviceNotInitializedYet)?;
+        let sent = device.write(&chunk).map_to_mm(HidError::ErrorWritingChunk)?;
+        if sent < chunk_len {
+            return MmError::err(HidError::WritingInterrupted { chunk_len, sent });
+        }
+        Ok(())
+    }
+
+    /// # Important
+    ///
+    /// May return a chunk with the length less than `chunk_len`.
+    pub async fn read_chunk(&self, chunk_len: usize) -> HidResult<Vec<u8>> {
+        let ctx = self.ctx.lock().await;
+        let device = ctx
+            .connected_devices
+            .get(&self.device_info)
+            .or_mm_err(|| HidError::DeviceNotInitializedYet)?;
+        let mut buf = vec![0; chunk_len];
+        // Don't use [`HidDevice::read_timeout`] because we set [`HidDevice::set_blocking_mode`] to false.
+        let received = device.read(&mut buf).map_to_mm(HidError::ErrorReadingChunk)?;
+        if received > chunk_len {
+            return MmError::err(HidError::ReceivedChunkTooLong {
+                actual: received,
+                expected: chunk_len,
+            });
+        }
+        Ok(buf[0..received].to_vec())
+    }
+}
+
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
+pub struct HidDeviceInfo {
+    pub vendor_id: u16,
+    pub product_id: u16,
+    pub interface_number: i32,
+    pub path: CString,
+    pub serial_number: Option<String>,
+    pub manufacturer_string: Option<String>,
+    pub product_string: Option<String>,
+}
+
+impl From<&hidapi::DeviceInfo> for HidDeviceInfo {
+    fn from(info: &hidapi::DeviceInfo) -> Self {
+        HidDeviceInfo {
+            vendor_id: info.vendor_id(),
+            product_id: info.product_id(),
+            interface_number: info.interface_number(),
+            path: info.path().to_owned(),
+            serial_number: info.serial_number().map(str::to_owned),
+            manufacturer_string: info.manufacturer_string().map(str::to_owned),
+            product_string: info.product_string().map(str::to_owned),
+        }
+    }
+}
diff --git a/mm2src/hw_common/src/transport/libusb.rs b/mm2src/hw_common/src/transport/libusb.rs
new file mode 100644
index 0000000000..ac9351b99c
--- /dev/null
+++ b/mm2src/hw_common/src/transport/libusb.rs
@@ -0,0 +1,323 @@
+//! TODO consider refactoring [`UsbDevice::connect`] not to spawn a thread for every device.
+//! We can spawn it once on [`UsbContext::new`], but we have to set the read/write chunk timeout to 0.5s or smaller.
+
+use super::{send_event_recv_response, InternalError};
+use common::block_on;
+use common::log::error;
+use derive_more::Display;
+use futures::channel::{mpsc, oneshot};
+use futures::StreamExt;
+use mm2_err_handle::prelude::*;
+use rusb::Error as RusbError;
+use rusb::UsbContext as RusbContext;
+use std::thread;
+use std::time::{Duration, Instant};
+
+pub const READ_ENDPOINT_MASK: u8 = 0x80;
+
+pub type UsbResult<T> = Result<T, MmError<UsbError>>;
+
+type EventResultSender<T> = oneshot::Sender<UsbResult<T>>;
+type DeviceEventSender = mpsc::UnboundedSender<internal::DeviceEvent>;
+type DeviceEventReceiver = mpsc::UnboundedReceiver<internal::DeviceEvent>;
+
+#[derive(Display)]
+pub enum UsbError {
+    DeviceDisconnected,
+    ErrorInitializingSession(rusb::Error),
+    ErrorGettingDevices(rusb::Error),
+    ErrorOpeningDevice(rusb::Error),
+    ErrorWritingChunk(rusb::Error),
+    ErrorReadingChunk(rusb::Error),
+    Timeout,
+    Internal(String),
+}
+
+impl InternalError for UsbError {
+    fn internal(e: String) -> Self { UsbError::Internal(e) }
+}
+
+#[derive(Clone)]
+pub struct GetDevicesFilters {
+    pub config_id: u8,
+    pub interface_id: u8,
+    pub interface_descriptor: u8,
+    pub interface_class_code: u8,
+}
+
+pub struct UsbContext {
+    context: rusb::Context,
+}
+
+impl UsbContext {
+    pub fn new() -> UsbResult<UsbContext> {
+        let inner = rusb::Context::new().map_to_mm(UsbError::ErrorInitializingSession)?;
+        Ok(UsbContext { context: inner })
+    }
+
+    pub fn get_devices(&self, filters: GetDevicesFilters) -> UsbResult<Vec<UsbAvailableDevice>> {
+        let found_devices = self.devices()?;
+        let mut devices = Vec::with_capacity(found_devices.len());
+        for device in found_devices.iter() {
+            let device_descriptor = match device.device_descriptor() {
+                Ok(descr) => descr,
+                Err(e) => {
+                    error!("Error getting device descriptor: {}", e);
+                    continue;
+                },
+            };
+            let interface_info = match Self::device_interface_by_filters(&device, &device_descriptor, &filters) {
+                Ok(Some(interface_info)) => interface_info,
+                Ok(None) => continue,
+                Err(e) => {
+                    error!("Error checking device interface: {}", e);
+                    continue;
+                },
+            };
+            let device_info = UsbDeviceInfo {
+                vendor_id: device_descriptor.vendor_id(),
+                product_id: device_descriptor.product_id(),
+                bus: device.bus_number(),
+                address: device.address(),
+                interface_info,
+            };
+            devices.push(UsbAvailableDevice { device, device_info });
+        }
+        Ok(devices)
+    }
+
+    /// `libusb_get_device_list` is a blocking function, but it's blocking time is negligible on many OS.
+    fn devices(&self) -> UsbResult<rusb::DeviceList<rusb::Context>> {
+        self.context.devices().map_to_mm(UsbError::ErrorGettingDevices)
+    }
+
+    fn device_interface_by_filters(
+        device: &rusb::Device<rusb::Context>,
+        device_descriptor: &rusb::DeviceDescriptor,
+        filters: &GetDevicesFilters,
+    ) -> UsbResult<Option<UsbDeviceInterfaceInfo>> {
+        if device_descriptor.num_configurations() <= filters.config_id {
+            return Ok(None);
+        }
+        let config_descriptor = device
+            .config_descriptor(filters.config_id)
+            .map_to_mm(UsbError::ErrorGettingDevices)?;
+        let interface = match config_descriptor
+            .interfaces()
+            .find(|i| i.number() == filters.interface_id)
+        {
+            Some(interface) => interface,
+            None => return Ok(None),
+        };
+        let descriptor = match interface
+            .descriptors()
+            .find(|d| d.setting_number() == filters.interface_descriptor)
+        {
+            Some(descriptor) => descriptor,
+            None => return Ok(None),
+        };
+        if descriptor.class_code() != filters.interface_class_code {
+            return Ok(None);
+        }
+        // Get the first endpoint.
+        let endpoint = match descriptor.endpoint_descriptors().next() {
+            Some(endpoint) => endpoint,
+            None => return Ok(None),
+        };
+        Ok(Some(UsbDeviceInterfaceInfo {
+            interface_number: filters.interface_id,
+            endpoint_number: endpoint.number(),
+        }))
+    }
+}
+
+/// An available transport for connecting with a device.
+pub struct UsbAvailableDevice {
+    device: rusb::Device<rusb::Context>,
+    device_info: UsbDeviceInfo,
+}
+
+impl UsbAvailableDevice {
+    pub fn connect(self) -> UsbResult<UsbDevice> {
+        // This is a non-blocking function; no requests are sent over the bus.
+        let mut device_handle = self.device.open().map_to_mm(UsbError::ErrorOpeningDevice)?;
+        // Claiming of interfaces is a purely logical operation.
+        // It does not cause any requests to be sent over the bus.
+        // Interface claiming is used to instruct the underlying operating system that your application wishes to take ownership of the interface.
+        device_handle
+            .claim_interface(self.device_info.interface_info.interface_number)
+            .map_to_mm(UsbError::ErrorOpeningDevice)?;
+
+        let (event_tx, event_rx) = mpsc::unbounded();
+        let thread_handle = thread::spawn(move || Self::event_loop(event_rx, device_handle));
+        Ok(UsbDevice {
+            event_tx,
+            device_info: self.device_info,
+            thread_handle,
+        })
+    }
+
+    pub fn device_info(&self) -> &UsbDeviceInfo { &self.device_info }
+
+    fn event_loop(mut event_rx: DeviceEventReceiver, device_handle: rusb::DeviceHandle<rusb::Context>) {
+        while let Some(event) = block_on(event_rx.next()) {
+            match event {
+                internal::DeviceEvent::WriteChunk {
+                    endpoint_number,
+                    chunk,
+                    timeout,
+                    result_tx,
+                } => {
+                    result_tx
+                        .send(Self::on_write_chunk(&device_handle, chunk, endpoint_number, timeout))
+                        .ok();
+                },
+                internal::DeviceEvent::ReadChunk {
+                    endpoint_number,
+                    chunk_len,
+                    timeout,
+                    result_tx,
+                } => {
+                    result_tx
+                        .send(Self::on_read_chunk(&device_handle, endpoint_number, chunk_len, timeout))
+                        .ok();
+                },
+            }
+        }
+    }
+
+    fn on_write_chunk(
+        device_handle: &rusb::DeviceHandle<rusb::Context>,
+        chunk: Vec<u8>,
+        endpoint: u8,
+        mut timeout: Duration,
+    ) -> UsbResult<()> {
+        if chunk.is_empty() {
+            return MmError::err(UsbError::ErrorWritingChunk(RusbError::InvalidParam));
+        }
+
+        let mut sent_bytes = 0;
+        loop {
+            let started_at = Instant::now();
+
+            // If an error variant is returned, no bytes were written.
+            sent_bytes += device_handle
+                .write_interrupt(endpoint, &chunk[sent_bytes..], timeout)
+                .map_to_mm(|e| match e {
+                    RusbError::NoDevice => UsbError::DeviceDisconnected,
+                    RusbError::Timeout => UsbError::Timeout,
+                    e => UsbError::ErrorWritingChunk(e),
+                })?;
+
+            let ended_at = Instant::now();
+            if sent_bytes == chunk.len() {
+                return Ok(());
+            }
+            // If the timeout has not expired yet, try to continue writing the chunk.
+            timeout = match timeout.checked_sub(ended_at - started_at) {
+                Some(time_left) => time_left,
+                None => return MmError::err(UsbError::Timeout),
+            };
+        }
+    }
+
+    fn on_read_chunk(
+        device_handle: &rusb::DeviceHandle<rusb::Context>,
+        endpoint: u8,
+        chunk_len: usize,
+        mut timeout: Duration,
+    ) -> UsbResult<Vec<u8>> {
+        let mut chunk = vec![0; chunk_len];
+
+        loop {
+            let started_at = Instant::now();
+
+            // If an error variant is returned, no bytes were written.
+            let read_bytes = device_handle
+                .read_interrupt(endpoint, &mut chunk, timeout)
+                .map_to_mm(|e| match e {
+                    RusbError::NoDevice => UsbError::DeviceDisconnected,
+                    RusbError::Timeout => UsbError::Timeout,
+                    e => UsbError::ErrorReadingChunk(e),
+                })?;
+
+            let ended_at = Instant::now();
+            if read_bytes != 0 {
+                return Ok(chunk[0..read_bytes].to_vec());
+            }
+
+            // If the timeout has not expired yet, try to continue reading the chunk.
+            timeout = match timeout.checked_sub(ended_at - started_at) {
+                Some(time_left) => time_left,
+                None => return MmError::err(UsbError::Timeout),
+            };
+        }
+    }
+}
+
+pub struct UsbDevice {
+    event_tx: DeviceEventSender,
+    device_info: UsbDeviceInfo,
+    #[allow(dead_code)]
+    thread_handle: thread::JoinHandle<()>,
+}
+
+impl UsbDevice {
+    pub async fn write_chunk(&self, chunk: Vec<u8>, timeout: Duration) -> UsbResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DeviceEvent::WriteChunk {
+            endpoint_number: self.endpoint_number(),
+            chunk,
+            timeout,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    pub async fn read_chunk(&self, chunk_len: usize, timeout: Duration) -> UsbResult<Vec<u8>> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DeviceEvent::ReadChunk {
+            endpoint_number: READ_ENDPOINT_MASK | self.endpoint_number(),
+            chunk_len,
+            timeout,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    fn endpoint_number(&self) -> u8 { self.device_info.interface_info.endpoint_number }
+}
+
+#[derive(Debug)]
+pub struct UsbDeviceInfo {
+    pub vendor_id: u16,
+    pub product_id: u16,
+    pub bus: u8,
+    pub address: u8,
+    pub interface_info: UsbDeviceInterfaceInfo,
+}
+
+#[derive(Debug)]
+pub struct UsbDeviceInterfaceInfo {
+    pub interface_number: u8,
+    pub endpoint_number: u8,
+}
+
+mod internal {
+    use super::*;
+
+    pub(super) enum DeviceEvent {
+        WriteChunk {
+            endpoint_number: u8,
+            chunk: Vec<u8>,
+            timeout: Duration,
+            result_tx: EventResultSender<()>,
+        },
+        ReadChunk {
+            endpoint_number: u8,
+            chunk_len: usize,
+            timeout: Duration,
+            result_tx: EventResultSender<Vec<u8>>,
+        },
+    }
+}
diff --git a/mm2src/hw_common/src/transport/mod.rs b/mm2src/hw_common/src/transport/mod.rs
new file mode 100644
index 0000000000..92b4b38082
--- /dev/null
+++ b/mm2src/hw_common/src/transport/mod.rs
@@ -0,0 +1,35 @@
+use futures::channel::{mpsc, oneshot};
+use mm2_err_handle::prelude::*;
+
+#[cfg(target_arch = "wasm32")] pub mod webusb_driver;
+#[cfg(target_arch = "wasm32")]
+pub use webusb_driver::WebUsbError;
+
+// #[cfg(not(target_arch = "wasm32"))] pub mod hid_driver;
+#[cfg(not(target_arch = "wasm32"))] pub mod libusb;
+#[cfg(not(target_arch = "wasm32"))] pub use libusb::UsbError;
+
+trait InternalError: Sized {
+    fn internal(e: String) -> Self;
+}
+
+async fn send_event_recv_response<Event, Ok, Error>(
+    event_tx: &mpsc::UnboundedSender<Event>,
+    event: Event,
+    result_rx: oneshot::Receiver<Result<Ok, MmError<Error>>>,
+) -> Result<Ok, MmError<Error>>
+where
+    Error: InternalError + NotMmError,
+{
+    if let Err(e) = event_tx.unbounded_send(event) {
+        let error = format!("Error sending event: {}", e);
+        return MmError::err(Error::internal(error));
+    }
+    match result_rx.await {
+        Ok(result) => result,
+        Err(e) => {
+            let error = format!("Error receiving result: {}", e);
+            MmError::err(Error::internal(error))
+        },
+    }
+}
diff --git a/mm2src/hw_common/src/transport/webusb_driver.rs b/mm2src/hw_common/src/transport/webusb_driver.rs
new file mode 100644
index 0000000000..23497795df
--- /dev/null
+++ b/mm2src/hw_common/src/transport/webusb_driver.rs
@@ -0,0 +1,436 @@
+use crate::transport::{send_event_recv_response, InternalError};
+use common::executor::spawn_local;
+use common::{deserialize_from_js, log::error, serialize_to_js, stringify_js_error};
+use derive_more::Display;
+use futures::channel::{mpsc, oneshot};
+use futures::StreamExt;
+use js_sys::{Array, Uint8Array};
+use mm2_err_handle::prelude::*;
+use serde::Serialize;
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::JsCast;
+use wasm_bindgen_futures::JsFuture;
+use web_sys::{Usb, UsbDevice, UsbDeviceRequestOptions, UsbInTransferResult};
+
+pub type WebUsbResult<T> = Result<T, MmError<WebUsbError>>;
+type EventResultSender<T> = oneshot::Sender<WebUsbResult<T>>;
+type WebUsbEventSender = mpsc::UnboundedSender<WebUsbEvent>;
+pub type DeviceEventSender = mpsc::UnboundedSender<DeviceEvent>;
+type DeviceEventReceiver = mpsc::UnboundedReceiver<DeviceEvent>;
+
+#[derive(Display)]
+pub enum WebUsbError {
+    #[display(fmt = "WebUSB is not available on this browser")]
+    NotSupported,
+    #[display(fmt = "Error requesting access permission: {}", _0)]
+    ErrorRequestingDevice(String),
+    #[display(fmt = "Error getting devices: {}", _0)]
+    ErrorGettingDevices(String),
+    #[display(
+        fmt = "Error setting configuration: configurationNumber={}, error='{}'",
+        configuration_number,
+        error
+    )]
+    ErrorSettingConfiguration { configuration_number: u8, error: String },
+    #[display(
+        fmt = "Error claiming an interface: interfaceNumber={}, error='{}'",
+        interface_number,
+        error
+    )]
+    ErrorClaimingInterface { interface_number: u8, error: String },
+    #[display(fmt = "Error opening a device: {}", _0)]
+    ErrorOpeningDevice(String),
+    #[display(fmt = "Error resetting device: {}", _0)]
+    ErrorResettingDevice(String),
+    #[display(fmt = "Error writing a chunk: {}", _0)]
+    ErrorWritingChunk(String),
+    #[display(fmt = "Error reading a chunk: {}", _0)]
+    ErrorReadingChunk(String),
+    #[display(fmt = "Type mismatch: expected '{}', found '{}'", expected, found)]
+    TypeMismatch { expected: String, found: String },
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl InternalError for WebUsbError {
+    fn internal(e: String) -> Self { WebUsbError::Internal(e) }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DeviceFilter {
+    #[serde(rename = "vendorId")]
+    pub vendor_id: u16,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "productId")]
+    pub product_id: Option<u16>,
+}
+
+impl DeviceFilter {
+    pub const fn new(vendor_id: u16) -> DeviceFilter {
+        DeviceFilter {
+            vendor_id,
+            product_id: None,
+        }
+    }
+
+    pub const fn with_product_id(vendor_id: u16, product_id: u16) -> DeviceFilter {
+        DeviceFilter {
+            vendor_id,
+            product_id: Some(product_id),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct WebUsbDeviceInfo {
+    pub vendor_id: u16,
+    pub product_id: u16,
+    pub serial_number: Option<String>,
+    pub interface: Option<DeviceInterfaceInfo>,
+}
+
+impl WebUsbDeviceInfo {
+    fn from_usb_device(usb_device: &UsbDevice) -> WebUsbDeviceInfo {
+        let interface = match device_interface(usb_device) {
+            Ok(js_value) => deserialize_from_js::<DeviceInterfaceInfo>(js_value).ok(),
+            Err(e) => {
+                error!("Error getting device interface: {}", stringify_js_error(&e));
+                None
+            },
+        };
+        WebUsbDeviceInfo {
+            vendor_id: usb_device.vendor_id(),
+            product_id: usb_device.product_id(),
+            serial_number: usb_device.serial_number(),
+            interface,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct DeviceInterfaceInfo {
+    pub interface_number: u8,
+    pub endpoint_number: u8,
+}
+
+pub struct WebUsbWrapper {
+    event_tx: WebUsbEventSender,
+}
+
+impl WebUsbWrapper {
+    pub fn new() -> WebUsbResult<WebUsbWrapper> {
+        let usb = get_webusb().or_mm_err(|| WebUsbError::NotSupported)?;
+        let (event_tx, mut event_rx) = mpsc::unbounded();
+        let fut = async move {
+            while let Some(event) = event_rx.next().await {
+                match event {
+                    WebUsbEvent::RequestDevice { filters, result_tx } => {
+                        result_tx
+                            .send(WebUsbWrapper::on_request_device(&usb, filters).await)
+                            .ok();
+                    },
+                    WebUsbEvent::GetDevices { result_tx } => {
+                        result_tx.send(WebUsbWrapper::on_get_devices(&usb).await).ok();
+                    },
+                }
+            }
+        };
+        spawn_local(fut);
+        Ok(WebUsbWrapper { event_tx })
+    }
+
+    pub async fn request_device(&self, filters: Vec<DeviceFilter>) -> WebUsbResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        send_event_recv_response(
+            &self.event_tx,
+            WebUsbEvent::RequestDevice { filters, result_tx },
+            result_rx,
+        )
+        .await
+    }
+
+    pub async fn get_devices(&self) -> WebUsbResult<Vec<WebUsbDevice>> {
+        let (result_tx, result_rx) = oneshot::channel();
+        send_event_recv_response(&self.event_tx, WebUsbEvent::GetDevices { result_tx }, result_rx).await
+    }
+
+    async fn on_request_device(usb: &Usb, filters: Vec<DeviceFilter>) -> WebUsbResult<()> {
+        let filters_js_value = serialize_to_js(&filters)
+            .map_to_mm(|e| WebUsbError::Internal(format!("DeviceFilter::serialize should never fail: {}", e)))?;
+
+        let request_options = UsbDeviceRequestOptions::new(&filters_js_value);
+        if let Err(e) = JsFuture::from(usb.request_device(&request_options)).await {
+            return MmError::err(WebUsbError::ErrorRequestingDevice(stringify_js_error(&e)));
+        }
+        Ok(())
+    }
+
+    async fn on_get_devices(usb: &Usb) -> WebUsbResult<Vec<WebUsbDevice>> {
+        let devices = JsFuture::from(usb.get_devices())
+            .await
+            .map_to_mm(|e| WebUsbError::ErrorGettingDevices(stringify_js_error(&e)))?;
+        let devices_array: Array = devices.dyn_into().map_to_mm(|found| WebUsbError::TypeMismatch {
+            expected: "Array".to_owned(),
+            found: format!("{:?}", found),
+        })?;
+
+        let mut result_devices = Vec::with_capacity(devices_array.length() as usize);
+        for device_js in devices_array.iter() {
+            let device: UsbDevice = device_js.dyn_into().map_to_mm(|found| WebUsbError::TypeMismatch {
+                expected: "UsbDevice".to_owned(),
+                found: format!("{:?}", found),
+            })?;
+            let device_info = WebUsbDeviceInfo::from_usb_device(&device);
+
+            let (device_event_tx, device_event_rx) = mpsc::unbounded();
+            result_devices.push(WebUsbDevice {
+                event_tx: device_event_tx,
+                device_info,
+            });
+
+            spawn_local(WebUsbDevice::event_loop(device, device_event_rx));
+        }
+        Ok(result_devices)
+    }
+}
+
+pub struct WebUsbDevice {
+    pub event_tx: DeviceEventSender,
+    pub device_info: WebUsbDeviceInfo,
+}
+
+impl WebUsbDevice {
+    pub async fn select_configuration(&self, configuration_number: u8) -> WebUsbResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = DeviceEvent::SelectConfiguration {
+            configuration_number,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    pub async fn claim_interface(&self, interface_number: u8) -> WebUsbResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = DeviceEvent::ClaimInterface {
+            interface_number,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    pub async fn open(&self) -> WebUsbResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        send_event_recv_response(&self.event_tx, DeviceEvent::Open { result_tx }, result_rx).await
+    }
+
+    pub async fn is_open(&self) -> WebUsbResult<bool> {
+        let (result_tx, result_rx) = oneshot::channel();
+        send_event_recv_response(&self.event_tx, DeviceEvent::IsOpen { result_tx }, result_rx).await
+    }
+
+    pub async fn reset_device(&self) -> WebUsbResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        send_event_recv_response(&self.event_tx, DeviceEvent::ResetDevice { result_tx }, result_rx).await
+    }
+
+    pub async fn write_chunk(&self, endpoint_number: u8, chunk: Vec<u8>) -> WebUsbResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = DeviceEvent::WriteChunk {
+            endpoint_number,
+            chunk,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    pub async fn read_chunk(&self, endpoint_number: u8, chunk_len: u32) -> WebUsbResult<Vec<u8>> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = DeviceEvent::ReadChunk {
+            endpoint_number,
+            chunk_len,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    async fn event_loop(device: UsbDevice, mut event_rx: DeviceEventReceiver) {
+        while let Some(event) = event_rx.next().await {
+            match event {
+                DeviceEvent::SelectConfiguration {
+                    configuration_number,
+                    result_tx,
+                } => {
+                    result_tx
+                        .send(WebUsbDevice::on_select_configuration(&device, configuration_number).await)
+                        .ok();
+                },
+                DeviceEvent::ClaimInterface {
+                    interface_number,
+                    result_tx,
+                } => {
+                    result_tx
+                        .send(WebUsbDevice::on_claim_interface(&device, interface_number).await)
+                        .ok();
+                },
+                DeviceEvent::Open { result_tx } => {
+                    result_tx.send(WebUsbDevice::on_open(&device).await).ok();
+                },
+                DeviceEvent::IsOpen { result_tx } => {
+                    result_tx.send(WebUsbDevice::on_is_open(&device)).ok();
+                },
+                DeviceEvent::ResetDevice { result_tx } => {
+                    result_tx.send(WebUsbDevice::on_reset_device(&device).await).ok();
+                },
+                DeviceEvent::WriteChunk {
+                    endpoint_number,
+                    chunk,
+                    result_tx,
+                } => {
+                    result_tx
+                        .send(WebUsbDevice::on_write_chunk(&device, endpoint_number, chunk).await)
+                        .ok();
+                },
+                DeviceEvent::ReadChunk {
+                    endpoint_number,
+                    chunk_len,
+                    result_tx,
+                } => {
+                    result_tx
+                        .send(WebUsbDevice::on_read_chunk(&device, endpoint_number, chunk_len).await)
+                        .ok();
+                },
+            }
+        }
+    }
+
+    async fn on_select_configuration(device: &UsbDevice, configuration_number: u8) -> WebUsbResult<()> {
+        JsFuture::from(device.select_configuration(configuration_number))
+            .await
+            .map_to_mm(|e| WebUsbError::ErrorSettingConfiguration {
+                configuration_number,
+                error: stringify_js_error(&e),
+            })?;
+        Ok(())
+    }
+
+    async fn on_claim_interface(device: &UsbDevice, interface_number: u8) -> WebUsbResult<()> {
+        JsFuture::from(device.claim_interface(interface_number))
+            .await
+            .map_to_mm(|e| WebUsbError::ErrorClaimingInterface {
+                interface_number,
+                error: stringify_js_error(&e),
+            })?;
+        Ok(())
+    }
+
+    async fn on_open(device: &UsbDevice) -> WebUsbResult<()> {
+        JsFuture::from(device.open())
+            .await
+            .map_to_mm(|e| WebUsbError::ErrorOpeningDevice(stringify_js_error(&e)))?;
+        Ok(())
+    }
+
+    fn on_is_open(device: &UsbDevice) -> WebUsbResult<bool> { Ok(device.opened()) }
+
+    async fn on_reset_device(device: &UsbDevice) -> WebUsbResult<()> {
+        JsFuture::from(device.reset())
+            .await
+            .map_to_mm(|e| WebUsbError::ErrorResettingDevice(stringify_js_error(&e)))?;
+        Ok(())
+    }
+
+    async fn on_write_chunk(device: &UsbDevice, endpoint_number: u8, mut chunk: Vec<u8>) -> WebUsbResult<()> {
+        if let Err(e) = JsFuture::from(device.transfer_out_with_u8_array(endpoint_number, &mut chunk)).await {
+            return MmError::err(WebUsbError::ErrorWritingChunk(stringify_js_error(&e)));
+        }
+        Ok(())
+    }
+
+    async fn on_read_chunk(device: &UsbDevice, endpoint_number: u8, chunk_len: u32) -> WebUsbResult<Vec<u8>> {
+        let buffer = loop {
+            let js_value = JsFuture::from(device.transfer_in(endpoint_number, chunk_len))
+                .await
+                .map_to_mm(|e| WebUsbError::ErrorReadingChunk(stringify_js_error(&e)))?;
+            let result: UsbInTransferResult = js_value.dyn_into().map_to_mm(|found| WebUsbError::TypeMismatch {
+                expected: "UsbInTransferResult".to_owned(),
+                found: format!("{:?}", found),
+            })?;
+            let data_view = match result.data() {
+                Some(data) => data,
+                None => continue,
+            };
+            if data_view.byte_length() == 0 {
+                continue;
+            }
+            break data_view.buffer();
+        };
+        let bytes = Uint8Array::new(&buffer);
+        let chunk = bytes.to_vec();
+        Ok(chunk)
+    }
+}
+
+enum WebUsbEvent {
+    RequestDevice {
+        filters: Vec<DeviceFilter>,
+        result_tx: EventResultSender<()>,
+    },
+    GetDevices {
+        result_tx: EventResultSender<Vec<WebUsbDevice>>,
+    },
+}
+
+pub enum DeviceEvent {
+    SelectConfiguration {
+        configuration_number: u8,
+        result_tx: EventResultSender<()>,
+    },
+    ClaimInterface {
+        interface_number: u8,
+        result_tx: EventResultSender<()>,
+    },
+    Open {
+        result_tx: EventResultSender<()>,
+    },
+    IsOpen {
+        result_tx: EventResultSender<bool>,
+    },
+    ResetDevice {
+        result_tx: EventResultSender<()>,
+    },
+    WriteChunk {
+        endpoint_number: u8,
+        chunk: Vec<u8>,
+        result_tx: EventResultSender<()>,
+    },
+    ReadChunk {
+        endpoint_number: u8,
+        chunk_len: u32,
+        result_tx: EventResultSender<Vec<u8>>,
+    },
+}
+
+/// [Navigator::usb](https://rustwasm.github.io/wasm-bindgen/api/web_sys/struct.Navigator.html#method.usb)
+/// crushes if a browser doesn't support WebUSB.
+/// Use this wrapper instead.
+#[wasm_bindgen(inline_js = "export function get_webusb() { return navigator.usb; }")]
+extern "C" {
+    fn get_webusb() -> Option<Usb>;
+}
+
+/// https://github.com/LedgerHQ/ledgerjs/blob/v6.9.0/packages/hw-transport-webusb/src/TransportWebUSB.ts#L131
+#[wasm_bindgen(inline_js = r"
+  export function device_interface(device) {
+    const interfaces = device.configurations[0].interfaces;
+    for (let i = 0; i < interfaces.length; ++i) {
+        const ifaceAlt = interfaces[i].alternates.find((a) => a.interfaceClass === 255);
+        if (!ifaceAlt) { continue; }
+        return { interface_number: interfaces[i].interfaceNumber, endpoint_number: ifaceAlt.endpoints[0].endpointNumber }
+    }
+    return null;
+  }
+")]
+extern "C" {
+    #[wasm_bindgen(catch)]
+    fn device_interface(device: &UsbDevice) -> Result<JsValue, JsValue>;
+}
diff --git a/mm2src/ledger/Cargo.toml b/mm2src/ledger/Cargo.toml
new file mode 100644
index 0000000000..7f44a2c3a8
--- /dev/null
+++ b/mm2src/ledger/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "ledger"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1"
+byteorder = "1.3.2"
+common = { path = "../common" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
+hw_common = { path = "../hw_common" }
+serde = "1.0"
+serde_derive = "1.0"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+js-sys = { version = "0.3.27" }
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
+wasm-bindgen-futures = { version = "0.4.1" }
+wasm-bindgen-test = { version = "0.3.1" }
+web-sys = { version = "0.3.55" }
diff --git a/mm2src/ledger/src/error.rs b/mm2src/ledger/src/error.rs
new file mode 100644
index 0000000000..141aef0123
--- /dev/null
+++ b/mm2src/ledger/src/error.rs
@@ -0,0 +1,14 @@
+use mm2_err_handle::prelude::*;
+
+pub type LedgerResult<T> = Result<T, MmError<LedgerError>>;
+
+#[derive(Debug, Display)]
+pub enum LedgerError {
+    /// TODO put a device info
+    DeviceDisconnected,
+    /// The error depends on transport implementation.
+    UnderlyingError(String),
+    ErrorDeserializingApdu(String),
+    ProtocolError(String),
+    InternalError(String),
+}
diff --git a/mm2src/ledger/src/lib.rs b/mm2src/ledger/src/lib.rs
new file mode 100644
index 0000000000..a59868450c
--- /dev/null
+++ b/mm2src/ledger/src/lib.rs
@@ -0,0 +1,12 @@
+mod error;
+pub mod transport;
+
+pub use error::{LedgerError, LedgerResult};
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        assert_eq!(2 + 2, 4);
+    }
+}
diff --git a/mm2src/ledger/src/transport/apdu.rs b/mm2src/ledger/src/transport/apdu.rs
new file mode 100644
index 0000000000..098d3dcf1a
--- /dev/null
+++ b/mm2src/ledger/src/transport/apdu.rs
@@ -0,0 +1,76 @@
+use crate::{LedgerError, LedgerResult};
+use byteorder::{BigEndian, ByteOrder};
+use mm2_err_handle::prelude::*;
+
+const APDU_RET_LEN: usize = 2;
+
+#[derive(Clone, Debug)]
+pub struct APDUCommand {
+    pub cla: u8,
+    pub ins: u8,
+    pub p1: u8,
+    pub p2: u8,
+    pub data: Vec<u8>,
+}
+
+impl APDUCommand {
+    pub fn serialize(&self) -> LedgerResult<Vec<u8>> {
+        if self.data.len() < u8::MAX as usize {
+            let error = format!(
+                "APDU data is too long: '{}', expected not more than '{}'",
+                self.data.len(),
+                u8::MAX
+            );
+            return MmError::err(LedgerError::InternalError(error));
+        }
+        let mut v = vec![self.cla, self.ins, self.p1, self.p2, self.data.len() as u8];
+        v.extend(&self.data);
+        Ok(v)
+    }
+}
+
+#[derive(Debug)]
+pub struct APDUAnswer {
+    pub data: Vec<u8>,
+    pub retcode: u16,
+}
+
+impl APDUAnswer {
+    pub fn from_answer(answer: Vec<u8>) -> LedgerResult<APDUAnswer> {
+        if answer.len() < APDU_RET_LEN {
+            let error = format!(
+                "Data is too short: '{}', expected at least '{}'",
+                answer.len(),
+                APDU_RET_LEN
+            );
+            return MmError::err(LedgerError::ProtocolError(error));
+        }
+
+        let retcode_starts_from = answer.len() - APDU_RET_LEN;
+        let apdu_retcode = BigEndian::read_u16(&answer[retcode_starts_from..]);
+        let apdu_data = &answer[..retcode_starts_from];
+
+        Ok(APDUAnswer {
+            data: apdu_data.to_vec(),
+            retcode: apdu_retcode,
+        })
+    }
+}
+
+#[derive(Copy, Clone)]
+pub enum APDUErrorCodes {
+    NoError = 0x9000,
+    ExecutionError = 0x6400,
+    WrongLength = 0x6700,
+    EmptyBuffer = 0x6982,
+    OutputBufferTooSmall = 0x6983,
+    DataInvalid = 0x6984,
+    ConditionsNotSatisfied = 0x6985,
+    CommandNotAllowed = 0x6986,
+    BadKeyHandle = 0x6A80,
+    InvalidP1P2 = 0x6B00,
+    InsNotSupported = 0x6D00,
+    ClaNotSupported = 0x6E00,
+    Unknown = 0x6F00,
+    SignVerifyError = 0x6F01,
+}
diff --git a/mm2src/ledger/src/transport/hid_tokenizer.rs b/mm2src/ledger/src/transport/hid_tokenizer.rs
new file mode 100644
index 0000000000..f8422e49f9
--- /dev/null
+++ b/mm2src/ledger/src/transport/hid_tokenizer.rs
@@ -0,0 +1,200 @@
+//! Inspired by https://github.com/LedgerHQ/ledgerjs/blob/v6.9.0/packages/devices/src/hid-framing.ts#L27
+//! TODO consider moving the `HidTokenizer` implementation into `HidProtocol`.
+
+use crate::transport::apdu::APDUCommand;
+use byteorder::{BigEndian, ByteOrder};
+
+/// https://github.com/LedgerHQ/ledgerjs/blob/v6.9.0/packages/devices/src/hid-framing.ts#L10
+const LEDGER_PACKET_TAG: u8 = 0x05;
+const CHUNK_SIZE: usize = 64;
+
+pub type HidChunk = Vec<u8>;
+
+pub struct HidTokenizer {
+    channel: u16,
+    chunk_size: usize,
+    tag: u8,
+}
+
+struct ChunkHeader {
+    channel: u16,
+    tag: u8,
+    chunk_idx: u16,
+}
+
+impl ChunkHeader {
+    const CHUNK_HEADER_LEN: usize = 5;
+
+    /// |  1  |  2  |  3  |  4  |  5  | .... |
+    /// |  CHANNEL  | TAG | CHUNK_IDX | DATA |
+    fn serialize(self) -> Vec<u8> {
+        let mut data = vec![0; 5];
+        BigEndian::write_u16(&mut data[0..2], self.channel);
+        data[2] = self.tag;
+        BigEndian::write_u16(&mut data[3..5], self.chunk_idx);
+        data
+    }
+}
+
+impl HidTokenizer {
+    pub fn new(channel: u16, chunk_size: usize, tag: u8) -> HidTokenizer {
+        HidTokenizer {
+            channel,
+            chunk_size,
+            tag,
+        }
+    }
+
+    pub fn apdu_into_chunks(&self, apdu: APDUCommand) -> Vec<HidChunk> {
+        let serialized_apdu = apdu.serialize();
+        assert!(serialized_apdu.len() < u16::MAX as usize);
+
+        let mut packet_data = vec![0; 2];
+        BigEndian::write_u16(&mut packet_data[0..2], serialized_apdu.len() as u16);
+        packet_data.extend(serialized_apdu);
+
+        let chunk_data_len = self.chunk_size - ChunkHeader::CHUNK_HEADER_LEN;
+        let chunks_number = ceiling_div(packet_data.len(), chunk_data_len);
+
+        // Fill the packet data with padding.
+        // https://github.com/LedgerHQ/ledgerjs/blob/v6.9.0/packages/devices/src/hid-framing.ts#L33
+        packet_data.extend(vec![0; chunks_number * chunk_data_len - packet_data.len()]);
+
+        packet_data
+            .chunks(chunk_data_len)
+            .enumerate()
+            .map(|(chunk_idx, chunk_data)| {
+                let header = ChunkHeader {
+                    channel: self.channel,
+                    tag: self.tag,
+                    chunk_idx: chunk_idx as u16,
+                };
+                let mut chunk = header.serialize();
+                chunk.extend(chunk_data);
+                chunk
+            })
+            .collect()
+    }
+}
+
+fn ceiling_div(num: usize, denom: usize) -> usize {
+    assert_ne!(denom, 0);
+    if (num % denom) == 0 {
+        num / denom
+    } else {
+        num / denom + 1
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Any magic number.
+    const CHANNEL: u16 = 111;
+
+    #[test]
+    fn test_hid_tokenizer_apdu_into_chunks() {
+        let tokenizer = HidTokenizer::new(CHANNEL, CHUNK_SIZE, LEDGER_PACKET_TAG);
+
+        let data = vec![
+            121, 156, 246, 65, 161, 98, 102, 231, 56, 96, 173, 91, 158, 103, 121, 157, 76, 106, 41, 217, 23, 190, 26,
+            151, 164, 107, 196, 12, 111, 146, 160, 169, 169, 94, 52, 118, 55, 106, 179, 51, 185, 106, 100, 141, 98,
+            105, 221, 223, 154, 47, 72, 56, 74, 159, 138, 153, 21, 225, 142, 38, 166, 90, 73, 79,
+        ];
+        let data_len = data.len();
+        assert_eq!(data_len, CHUNK_SIZE);
+        let apdu = APDUCommand {
+            cla: 1,
+            ins: 2,
+            p1: 3,
+            p2: 4,
+            data,
+        };
+        let actual = tokenizer.apdu_into_chunks(apdu);
+        #[rustfmt::skip]
+        let expected = vec![
+            vec![
+                // Chunk header
+                0, 111, LEDGER_PACKET_TAG, 0, 0,
+                // Total data length `APDUCommand::serialize().len()` big ending
+                0, 69,
+                // First chunk data (APDU header)
+                1, 2, 3, 4, 64,
+                // First chunk data
+                121, 156, 246, 65, 161, 98, 102, 231, 56, 96, 173, 91, 158, 103, 121, 157,
+                76, 106, 41, 217, 23, 190, 26, 151, 164, 107, 196, 12, 111, 146, 160, 169, 169, 94, 52,
+                118, 55, 106, 179, 51, 185, 106, 100, 141, 98, 105, 221, 223, 154, 47, 72, 56,
+            ],
+            vec![
+                // Second chunk data (APDU header)
+                0, 111, LEDGER_PACKET_TAG, 0, 1,
+                // Second chunk data
+                74, 159, 138, 153, 21, 225, 142, 38, 166, 90, 73, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0,
+            ]
+        ];
+        assert_eq!(actual, expected);
+
+        // ================= //
+
+        let data = vec![
+            121, 156, 246, 65, 161, 98, 102, 231, 56, 96, 173, 91, 158, 103, 121, 157, 76, 106, 41, 217, 23, 190, 26,
+            151, 164, 107, 196, 12, 111, 146, 160, 169, 169, 94, 52, 118, 55, 106, 179, 51, 185, 106, 100, 141, 98,
+            105, 221, 223, 154, 47, 72, 56,
+        ];
+        let data_len = data.len();
+        assert_eq!(data_len, 52);
+        let apdu = APDUCommand {
+            cla: 0,
+            ins: 255,
+            p1: 0,
+            p2: 255,
+            data,
+        };
+        let actual = tokenizer.apdu_into_chunks(apdu);
+        #[rustfmt::skip]
+        let expected = vec![
+            vec![
+                // Chunk header
+                0, 111, LEDGER_PACKET_TAG, 0, 0,
+                // Total data length `APDUCommand::serialize().len()` big ending
+                0, 57,
+                // First chunk data (APDU header)
+                0, 255, 0, 255, 52,
+                // First chunk data
+                121, 156, 246, 65, 161, 98, 102, 231, 56, 96, 173, 91, 158, 103, 121, 157,
+                76, 106, 41, 217, 23, 190, 26, 151, 164, 107, 196, 12, 111, 146, 160, 169, 169, 94, 52,
+                118, 55, 106, 179, 51, 185, 106, 100, 141, 98, 105, 221, 223, 154, 47, 72, 56,
+            ],
+        ];
+        assert_eq!(actual, expected);
+
+        // ================= //
+
+        let apdu = APDUCommand {
+            cla: 0,
+            ins: 255,
+            p1: 0,
+            p2: 255,
+            data: Vec::new(),
+        };
+        let actual = tokenizer.apdu_into_chunks(apdu);
+        #[rustfmt::skip]
+        let expected = vec![
+            vec![
+                // Chunk header
+                0, 111, LEDGER_PACKET_TAG, 0, 0,
+                // Total data length `APDUCommand::serialize().len()` big ending
+                0, 5,
+                // First chunk data (APDU header)
+                0, 255, 0, 255, 0,
+                // First chunk data
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        ];
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/mm2src/ledger/src/transport/mod.rs b/mm2src/ledger/src/transport/mod.rs
new file mode 100644
index 0000000000..37ed602e59
--- /dev/null
+++ b/mm2src/ledger/src/transport/mod.rs
@@ -0,0 +1,5 @@
+#[cfg(target_arch = "wasm32")]
+pub mod webusb;
+mod protocol;
+mod apdu;
+mod hid_tokenizer;
\ No newline at end of file
diff --git a/mm2src/ledger/src/transport/protocol.rs b/mm2src/ledger/src/transport/protocol.rs
new file mode 100644
index 0000000000..d0af8b1ad4
--- /dev/null
+++ b/mm2src/ledger/src/transport/protocol.rs
@@ -0,0 +1,31 @@
+use crate::error::LedgerResult;
+use crate::transport::apdu::{APDUAnswer, APDUCommand};
+use byteorder::{BigEndian, ByteOrder};
+
+const CHUNK_SIZE: usize = 64;
+const CHUNK_LEN: u32 = 64;
+
+/// A link represents a serial connection to send and receive byte chunks from and to a Ledger device.
+#[async_trait]
+pub trait Link {
+    async fn write_chunk(&mut self, chunk: Vec<u8>) -> LedgerResult<()>;
+    async fn read_chunk(&mut self, chunk_len: u32) -> LedgerResult<Vec<u8>>;
+}
+
+/// A protocol is used to encode messages in chunks that can be sent to the device and to parse
+/// chunks into messages.
+#[async_trait]
+pub trait Protocol {
+    async fn write(&mut self, message: APDUCommand) -> LedgerResult<()>;
+    async fn read(&mut self) -> LedgerResult<APDUAnswer>;
+}
+
+pub struct HidProtocol<L: Link> {
+    pub link: L,
+}
+
+impl<L: Link> Protocol for HidProtocol<L> {
+    async fn write(&mut self, message: APDUCommand) -> LedgerResult<()> { todo!() }
+
+    async fn read(&mut self) -> LedgerResult<APDUAnswer> { todo!() }
+}
diff --git a/mm2src/rpc/lp_signatures.rs b/mm2src/ledger/src/transport/webusb.rs
similarity index 100%
rename from mm2src/rpc/lp_signatures.rs
rename to mm2src/ledger/src/transport/webusb.rs
diff --git a/mm2src/lp_native_dex.rs b/mm2src/lp_native_dex.rs
deleted file mode 100644
index edcd496012..0000000000
--- a/mm2src/lp_native_dex.rs
+++ /dev/null
@@ -1,568 +0,0 @@
-/******************************************************************************
- * Copyright © 2014-2019 The SuperNET Developers.                             *
- *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
- * the top-level directory of this distribution for the individual copyright  *
- * holder information and the developer policies on copyright and licensing.  *
- *                                                                            *
- * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
- *                                                                            *
- * Removal or modification of this copyright notice is prohibited.            *
- *                                                                            *
- ******************************************************************************/
-//
-//  lp_native_dex.rs
-//  marketmaker
-//
-
-use coins::register_balance_update_handler;
-use mm2_libp2p::{spawn_gossipsub, NodeType};
-use rand::rngs::SmallRng;
-use rand::{random, Rng, SeedableRng};
-use serde_json::{self as json};
-use std::fs;
-use std::io::{Read, Write};
-use std::net::{IpAddr, Ipv4Addr};
-use std::path::Path;
-use std::str;
-
-#[cfg(not(target_arch = "wasm32"))]
-use crate::mm2::database::init_and_migrate_db;
-use crate::mm2::lp_network::{lp_ports, p2p_event_process_loop, P2PContext};
-use crate::mm2::lp_ordermatch::{broadcast_maker_orders_keep_alive_loop, clean_memory_loop, init_ordermatch_context,
-                                lp_ordermatch_loop, orders_kick_start, BalanceUpdateOrdermatchHandler};
-use crate::mm2::lp_swap::{running_swaps_num, swap_kick_starts};
-use crate::mm2::rpc::spawn_rpc;
-use crate::mm2::{MM_DATETIME, MM_VERSION};
-use bitcrypto::sha256;
-use common::executor::{spawn, spawn_boxed, Timer};
-use common::log::{error, info, warn};
-use common::mm_ctx::{MmArc, MmCtx};
-use common::privkey::key_pair_from_seed;
-use common::slurp_url;
-
-const IP_PROVIDERS: [&str; 2] = ["http://checkip.amazonaws.com/", "http://api.ipify.org"];
-const NETID_7777_SEEDNODES: [&str; 3] = ["seed1.defimania.live", "seed2.defimania.live", "seed3.defimania.live"];
-
-#[cfg(target_arch = "wasm32")]
-fn default_seednodes(netid: u16) -> Vec<String> {
-    if netid == 7777 {
-        NETID_7777_SEEDNODES
-            .iter()
-            .map(|dns| format!("/dns/{}/tcp/{}/ws", dns, netid))
-            .collect()
-    } else {
-        Vec::new()
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn default_seednodes(netid: u16) -> Vec<String> {
-    use crate::mm2::lp_network::addr_to_ipv4_string;
-    if netid == 7777 {
-        NETID_7777_SEEDNODES
-            .iter()
-            .filter_map(|seed| addr_to_ipv4_string(*seed).ok())
-            .collect()
-    } else {
-        Vec::new()
-    }
-}
-
-/// Invokes `OS_ensure_directory`,
-/// then prints an error and returns `false` if the directory is not writable.
-fn ensure_dir_is_writable(dir_path: &Path) -> bool {
-    if dir_path.exists() && !dir_path.is_dir() {
-        error!("The {} is not a directory", dir_path.display());
-        return false;
-    } else if let Err(e) = std::fs::create_dir_all(dir_path) {
-        error!("Could not create dir {}, error {}", dir_path.display(), e);
-        return false;
-    }
-    let r: [u8; 32] = random();
-    let mut check: Vec<u8> = Vec::with_capacity(r.len());
-    let fname = dir_path.join("checkval");
-    let mut fp = match fs::File::create(&fname) {
-        Ok(fp) => fp,
-        Err(_) => {
-            error!("FATAL cannot create {:?}", fname);
-            return false;
-        },
-    };
-    if fp.write_all(&r).is_err() {
-        error!("FATAL cannot write to {:?}", fname);
-        return false;
-    }
-    drop(fp);
-    let mut fp = match fs::File::open(&fname) {
-        Ok(fp) => fp,
-        Err(_) => {
-            error!("FATAL cannot open {:?}", fname);
-            return false;
-        },
-    };
-    if fp.read_to_end(&mut check).is_err() || check.len() != r.len() {
-        error!("FATAL cannot read {:?}", fname);
-        return false;
-    }
-    if check != r {
-        error!("FATAL expect the same {:?} data: {:?} != {:?}", fname, r, check);
-        return false;
-    }
-    true
-}
-
-fn ensure_file_is_writable(file_path: &Path) -> Result<(), String> {
-    if fs::File::open(file_path).is_err() {
-        // try to create file if opening fails
-        if let Err(e) = fs::OpenOptions::new().write(true).create_new(true).open(file_path) {
-            return ERR!("{} when trying to create the file {}", e, file_path.display());
-        }
-    } else {
-        // try to open file in write append mode
-        if let Err(e) = fs::OpenOptions::new().write(true).append(true).open(file_path) {
-            return ERR!(
-                "{} when trying to open the file {} in write mode",
-                e,
-                file_path.display()
-            );
-        }
-    }
-    Ok(())
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn fix_directories(ctx: &MmCtx) -> Result<(), String> {
-    let dbdir = ctx.dbdir();
-    try_s!(std::fs::create_dir_all(&dbdir));
-
-    if !ensure_dir_is_writable(&dbdir.join("SWAPS")) {
-        return ERR!("SWAPS db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("MY")) {
-        return ERR!("SWAPS/MY db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("STATS")) {
-        return ERR!("SWAPS/STATS db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("STATS").join("MAKER")) {
-        return ERR!("SWAPS/STATS/MAKER db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("STATS").join("TAKER")) {
-        return ERR!("SWAPS/STATS/TAKER db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("TRANSACTIONS")) {
-        return ERR!("TRANSACTIONS db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("GTC")) {
-        return ERR!("GTC db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("PRICES")) {
-        return ERR!("PRICES db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("UNSPENTS")) {
-        return ERR!("UNSPENTS db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("ORDERS")) {
-        return ERR!("ORDERS db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY")) {
-        return ERR!("ORDERS/MY db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY").join("MAKER")) {
-        return ERR!("ORDERS/MY/MAKER db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY").join("TAKER")) {
-        return ERR!("ORDERS/MY/TAKER db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY").join("HISTORY")) {
-        return ERR!("ORDERS/MY/HISTORY db dir is not writable");
-    }
-    if !ensure_dir_is_writable(&dbdir.join("TX_CACHE")) {
-        return ERR!("TX_CACHE db dir is not writable");
-    }
-    try_s!(ensure_file_is_writable(&dbdir.join("GTC").join("orders")));
-    Ok(())
-}
-
-#[cfg(target_arch = "wasm32")]
-fn fix_directories(ctx: &MmCtx) -> Result<(), String> {
-    use std::os::raw::c_char;
-
-    #[wasm_bindgen(raw_module = "../../../js/defined-in-js.js")]
-    extern "C" {
-        pub fn host_ensure_dir_is_writable(ptr: *const c_char, len: i32) -> i32;
-    }
-    macro_rules! writeable_dir {
-        ($path: expr) => {
-            let path = $path;
-            let path = try_s!(path.to_str().ok_or("Non-unicode path"));
-            let rc = host_ensure_dir_is_writable(path.as_ptr() as *const c_char, path.len() as i32);
-            if rc != 0 {
-                return ERR!("Dir '{}' not writeable: {}", path, rc);
-            }
-        };
-    }
-
-    let dbdir = ctx.dbdir();
-    writeable_dir!(dbdir.join("SWAPS").join("MY"));
-    writeable_dir!(dbdir.join("SWAPS").join("STATS").join("MAKER"));
-    writeable_dir!(dbdir.join("SWAPS").join("STATS").join("TAKER"));
-    writeable_dir!(dbdir.join("ORDERS").join("MY").join("MAKER"));
-    writeable_dir!(dbdir.join("ORDERS").join("MY").join("TAKER"));
-    Ok(())
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn migrate_db(ctx: &MmArc) -> Result<(), String> {
-    let migration_num_path = ctx.dbdir().join(".migration");
-    let mut current_migration = match std::fs::read(&migration_num_path) {
-        Ok(bytes) => {
-            let mut num_bytes = [0; 8];
-            if bytes.len() == 8 {
-                num_bytes.clone_from_slice(&bytes);
-                u64::from_le_bytes(num_bytes)
-            } else {
-                0
-            }
-        },
-        Err(_) => 0,
-    };
-
-    if current_migration < 1 {
-        migration_1(ctx);
-        current_migration = 1;
-    }
-    try_s!(std::fs::write(&migration_num_path, &current_migration.to_le_bytes()));
-    Ok(())
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn migration_1(_ctx: &MmArc) {}
-
-/// Resets the context (most of which resides currently in `lp::G` but eventually would move into `MmCtx`).
-/// Restarts the peer connections.
-/// Reloads the coin keys.
-///
-/// Besides the `passphrase` it also allows changing the `seednode` at runtime.  
-/// AG: While there might be value in changing `seednode` at runtime, I'm not sure if changing `gui` is actually necessary.
-///
-/// AG: If possible, I think we should avoid calling this function on a working MM, using it for initialization only,
-///     in order to avoid the possibility of invalid state.
-/// AP: Totally agree, moreover maybe we even `must` deny calling this on a working MM as it's being refactored
-pub fn lp_passphrase_init(ctx: &MmArc) -> Result<(), String> {
-    let passphrase = ctx.conf["passphrase"].as_str();
-    let passphrase = match passphrase {
-        None | Some("") => return ERR!("jeezy says we cant use the nullstring as passphrase and I agree"),
-        Some(s) => s.to_string(),
-    };
-
-    let key_pair = try_s!(key_pair_from_seed(&passphrase));
-    let key_pair = try_s!(ctx.secp256k1_key_pair.pin(key_pair));
-    try_s!(ctx.rmd160.pin(key_pair.public().address_hash()));
-    Ok(())
-}
-
-/// Tries to serve on the given IP to check if it's available.  
-/// We need this check because our external IP, particularly under NAT,
-/// might be outside of the set of IPs we can open and run a server on.
-///
-/// Returns an error if the address did not work
-/// (like when the `ip` does not belong to a connected interface).
-///
-/// The primary concern of this function is to test the IP,
-/// but this opportunity is also used to start the HTTP fallback server,
-/// in order to improve the reliability of the said server (in the Lean "stop the line" manner).
-///
-/// If the IP has passed the communication check then a shutdown Sender is returned.
-/// Dropping or using that Sender will stop the HTTP fallback server.
-///
-/// Also the port of the HTTP fallback server is returned.
-#[cfg(not(target_arch = "wasm32"))]
-fn test_ip(ctx: &MmArc, ip: IpAddr) -> Result<(), String> {
-    let netid = ctx.netid();
-
-    // Try a few pseudo-random ports.
-    // `netid` is used as the seed in order for the port selection to be determenistic,
-    // similar to how the port selection and probing worked before (since MM1)
-    // and in order to reduce the likehood of *unexpected* port conflicts.
-    let mut attempts_left = 9;
-    let mut rng = SmallRng::seed_from_u64(netid as u64);
-    loop {
-        if attempts_left < 1 {
-            break ERR!("Out of attempts");
-        }
-        attempts_left -= 1;
-        // TODO: Avoid `mypubport`.
-        let port = rng.gen_range(1111, 65535);
-        info!("Trying to bind on {}:{}", ip, port);
-        match std::net::TcpListener::bind((ip, port)) {
-            Ok(_) => break Ok(()),
-            Err(err) => {
-                if attempts_left == 0 {
-                    break ERR!("{}", err);
-                }
-                continue;
-            },
-        }
-    }
-}
-
-#[cfg_attr(target_arch = "wasm32", allow(unused_variables))]
-/// * `ctx_cb` - callback used to share the `MmCtx` ID with the call site.
-pub async fn lp_init(ctx: MmArc) -> Result<(), String> {
-    info!("Version: {} DT {}", MM_VERSION, MM_DATETIME);
-    try_s!(lp_passphrase_init(&ctx));
-
-    try_s!(fix_directories(&ctx));
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        try_s!(ctx.init_sqlite_connection());
-        try_s!(init_and_migrate_db(&ctx, &ctx.sqlite_connection()));
-        try_s!(migrate_db(&ctx));
-    }
-
-    try_s!(init_ordermatch_context(&ctx));
-    try_s!(init_p2p(ctx.clone()).await);
-
-    let balance_update_ordermatch_handler = BalanceUpdateOrdermatchHandler::new(ctx.clone());
-    register_balance_update_handler(ctx.clone(), Box::new(balance_update_ordermatch_handler)).await;
-
-    try_s!(ctx.initialized.pin(true));
-
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        // launch kickstart threads before RPC is available, this will prevent the API user to place
-        // an order and start new swap that might get started 2 times because of kick-start
-        let mut coins_needed_for_kick_start = swap_kick_starts(ctx.clone());
-        coins_needed_for_kick_start.extend(try_s!(orders_kick_start(&ctx).await));
-        *(try_s!(ctx.coins_needed_for_kick_start.lock())) = coins_needed_for_kick_start;
-    }
-
-    spawn(lp_ordermatch_loop(ctx.clone()));
-
-    spawn(broadcast_maker_orders_keep_alive_loop(ctx.clone()));
-
-    spawn(clean_memory_loop(ctx.clone()));
-
-    let ctx_id = try_s!(ctx.ffi_handle());
-
-    spawn_rpc(ctx_id);
-    let ctx_c = ctx.clone();
-    spawn(async move {
-        if let Err(err) = ctx_c.init_metrics() {
-            warn!("Couldn't initialize metrics system: {}", err);
-        }
-    });
-    // In the mobile version we might depend on `lp_init` staying around until the context stops.
-    loop {
-        if ctx.is_stopping() {
-            break;
-        };
-        Timer::sleep(0.2).await
-    }
-
-    // wait for swaps to stop
-    loop {
-        if running_swaps_num(&ctx) == 0 {
-            break;
-        };
-        Timer::sleep(0.2).await
-    }
-    Ok(())
-}
-
-fn simple_ip_extractor(ip: &str) -> Result<IpAddr, String> {
-    let ip = ip.trim();
-    Ok(match ip.parse() {
-        Ok(ip) => ip,
-        Err(err) => return ERR!("Error parsing IP address '{}': {}", ip, err),
-    })
-}
-
-/// Detect the real IP address.
-///
-/// We're detecting the outer IP address, visible to the internet.
-/// Later we'll try to *bind* on this IP address,
-/// and this will break under NAT or forwarding because the internal IP address will be different.
-/// Which might be a good thing, allowing us to detect the likehoodness of NAT early.
-#[cfg(not(target_arch = "wasm32"))]
-async fn detect_myipaddr(ctx: MmArc) -> Result<IpAddr, String> {
-    for url in IP_PROVIDERS.iter() {
-        info!("Trying to fetch the real IP from '{}' ...", url);
-        let (status, _headers, ip) = match slurp_url(url).await {
-            Ok(t) => t,
-            Err(err) => {
-                error!("Failed to fetch IP from '{}': {}", url, err);
-                continue;
-            },
-        };
-        if !status.is_success() {
-            error!("Failed to fetch IP from '{}': status {:?}", url, status);
-            continue;
-        }
-        let ip = match std::str::from_utf8(&ip) {
-            Ok(ip) => ip,
-            Err(err) => {
-                error!("Failed to fetch IP from '{}', not UTF-8: {}", url, err);
-                continue;
-            },
-        };
-        let ip = match simple_ip_extractor(ip) {
-            Ok(ip) => ip,
-            Err(err) => {
-                error!("Failed to parse IP '{}' fetched from '{}': {}", ip, url, err);
-                continue;
-            },
-        };
-
-        // Try to bind on this IP.
-        // If we're not behind a NAT then the bind will likely succeed.
-        // If the bind fails then emit a user-visible warning and fall back to 0.0.0.0.
-        match test_ip(&ctx, ip) {
-            Ok(_) => {
-                ctx.log.log(
-                    "🙂",
-                    &[&"myipaddr"],
-                    &fomat! (
-                        "We've detected an external IP " (ip) " and we can bind on it"
-                        ", so probably a dedicated IP."),
-                );
-                return Ok(ip);
-            },
-            Err(err) => error!("IP {} not available: {}", ip, err),
-        }
-        let all_interfaces = Ipv4Addr::new(0, 0, 0, 0).into();
-        if test_ip(&ctx, all_interfaces).is_ok() {
-            ctx.log.log ("😅", &[&"myipaddr"], &fomat! (
-                    "We couldn't bind on the external IP " (ip) ", so NAT is likely to be present. We'll be okay though."));
-            return Ok(all_interfaces);
-        }
-        let localhost = Ipv4Addr::new(127, 0, 0, 1).into();
-        if test_ip(&ctx, localhost).is_ok() {
-            ctx.log.log(
-                "🤫",
-                &[&"myipaddr"],
-                &fomat! (
-                    "We couldn't bind on " (ip) " or 0.0.0.0!"
-                    " Looks like we can bind on 127.0.0.1 as a workaround, but that's not how we're supposed to work."),
-            );
-            return Ok(localhost);
-        }
-        ctx.log.log(
-            "🤒",
-            &[&"myipaddr"],
-            &fomat! (
-                "Couldn't bind on " (ip) ", 0.0.0.0 or 127.0.0.1."),
-        );
-        return Ok(all_interfaces); // Seems like a better default than 127.0.0.1, might still work for other ports.
-    }
-    ERR!("Couldn't fetch the real IP")
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-async fn myipaddr(ctx: MmArc) -> Result<IpAddr, String> {
-    let myipaddr: IpAddr = if Path::new("myipaddr").exists() {
-        match fs::File::open("myipaddr") {
-            Ok(mut f) => {
-                let mut buf = String::new();
-                if let Err(err) = f.read_to_string(&mut buf) {
-                    return ERR!("Can't read from 'myipaddr': {}", err);
-                }
-                try_s!(simple_ip_extractor(&buf))
-            },
-            Err(err) => return ERR!("Can't read from 'myipaddr': {}", err),
-        }
-    } else if !ctx.conf["myipaddr"].is_null() {
-        let s = try_s!(ctx.conf["myipaddr"].as_str().ok_or("'myipaddr' is not a string"));
-        try_s!(simple_ip_extractor(s))
-    } else {
-        try_s!(detect_myipaddr(ctx).await)
-    };
-    Ok(myipaddr)
-}
-
-async fn init_p2p(ctx: MmArc) -> Result<(), String> {
-    let i_am_seed = ctx.conf["i_am_seed"].as_bool().unwrap_or(false);
-    let netid = ctx.netid();
-
-    let seednodes: Vec<String> = if ctx.conf["seednodes"].is_null() {
-        default_seednodes(netid)
-    } else {
-        try_s!(json::from_value(ctx.conf["seednodes"].clone()))
-    };
-
-    let ctx_on_poll = ctx.clone();
-    let force_p2p_key = if i_am_seed {
-        let key = sha256(&*ctx.secp256k1_key_pair().private().secret);
-        Some(key.take())
-    } else {
-        None
-    };
-
-    let node_type = if i_am_seed {
-        #[cfg(target_arch = "wasm32")]
-        return ERR!("'i_am_seed' is only supported in native mode");
-
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let ip = try_s!(myipaddr(ctx.clone()).await);
-            let (_, network_port, network_ws_port) = try_s!(lp_ports(netid));
-            NodeType::Relay {
-                ip,
-                network_port,
-                network_ws_port,
-            }
-        }
-    } else {
-        let (_, network_port, _network_ws_port) = try_s!(lp_ports(netid));
-        NodeType::Light { network_port }
-    };
-
-    let (cmd_tx, event_rx, peer_id, p2p_abort) =
-        spawn_gossipsub(netid, force_p2p_key, spawn_boxed, seednodes, node_type, move |swarm| {
-            let behaviour = swarm.behaviour();
-            mm_gauge!(
-                ctx_on_poll.metrics,
-                "p2p.connected_relays.len",
-                behaviour.connected_relays_len() as i64
-            );
-            mm_gauge!(
-                ctx_on_poll.metrics,
-                "p2p.relay_mesh.len",
-                behaviour.relay_mesh_len() as i64
-            );
-            let (period, received_msgs) = behaviour.received_messages_in_period();
-            mm_gauge!(
-                ctx_on_poll.metrics,
-                "p2p.received_messages.period_in_secs",
-                period.as_secs() as i64
-            );
-
-            mm_gauge!(ctx_on_poll.metrics, "p2p.received_messages.count", received_msgs as i64);
-
-            let connected_peers_count = behaviour.connected_peers_len();
-
-            mm_gauge!(
-                ctx_on_poll.metrics,
-                "p2p.connected_peers.count",
-                connected_peers_count as i64
-            );
-        })
-        .await;
-    let mut p2p_abort = Some(p2p_abort);
-    ctx.on_stop(Box::new(move || {
-        if let Some(handle) = p2p_abort.take() {
-            handle.abort();
-        }
-        Ok(())
-    }));
-    try_s!(ctx.peer_id.pin(peer_id.to_string()));
-    let p2p_context = P2PContext::new(cmd_tx);
-    p2p_context.store_to_mm_arc(&ctx);
-    spawn(p2p_event_process_loop(ctx.weak(), event_rx, i_am_seed));
-
-    Ok(())
-}
diff --git a/mm2src/lp_ordermatch/best_orders.rs b/mm2src/lp_ordermatch/best_orders.rs
deleted file mode 100644
index 257b467ed4..0000000000
--- a/mm2src/lp_ordermatch/best_orders.rs
+++ /dev/null
@@ -1,255 +0,0 @@
-use super::{addr_format_from_protocol_info, BaseRelProtocolInfo, OrderbookP2PItemWithProof, OrdermatchContext,
-            OrdermatchRequest};
-use crate::mm2::lp_network::{request_any_relay, P2PRequest};
-use coins::{address_by_coin_conf_and_pubkey_str, coin_conf, is_wallet_only_conf, is_wallet_only_ticker};
-use common::log;
-use common::mm_ctx::MmArc;
-use common::mm_number::MmNumber;
-use http::Response;
-use num_rational::BigRational;
-use num_traits::Zero;
-use serde_json::{self as json, Value as Json};
-use std::collections::HashMap;
-use uuid::Uuid;
-
-#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
-#[serde(rename_all = "lowercase")]
-pub enum BestOrdersAction {
-    Buy,
-    Sell,
-}
-
-#[derive(Debug, Deserialize)]
-struct BestOrdersRequest {
-    coin: String,
-    action: BestOrdersAction,
-    volume: MmNumber,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-struct BestOrdersRes {
-    orders: HashMap<String, Vec<OrderbookP2PItemWithProof>>,
-    #[serde(default)]
-    protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
-}
-
-pub async fn process_best_orders_p2p_request(
-    ctx: MmArc,
-    coin: String,
-    action: BestOrdersAction,
-    required_volume: BigRational,
-) -> Result<Option<Vec<u8>>, String> {
-    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).expect("ordermatch_ctx must exist at this point");
-    let orderbook = ordermatch_ctx.orderbook.lock().await;
-    let search_pairs_in = match action {
-        BestOrdersAction::Buy => &orderbook.pairs_existing_for_base,
-        BestOrdersAction::Sell => &orderbook.pairs_existing_for_rel,
-    };
-    let tickers = match search_pairs_in.get(&coin) {
-        Some(tickers) => tickers,
-        None => return Ok(None),
-    };
-    let mut result = HashMap::new();
-    let pairs = tickers.iter().map(|ticker| match action {
-        BestOrdersAction::Buy => (coin.clone(), ticker.clone()),
-        BestOrdersAction::Sell => (ticker.clone(), coin.clone()),
-    });
-
-    let mut protocol_infos = HashMap::new();
-
-    for pair in pairs {
-        let orders = match orderbook.ordered.get(&pair) {
-            Some(orders) => orders,
-            None => {
-                log::debug!("No orders for pair {:?}", pair);
-                continue;
-            },
-        };
-        let mut best_orders = vec![];
-        let mut collected_volume = BigRational::zero();
-        for ordered in orders {
-            match orderbook.order_set.get(&ordered.uuid) {
-                Some(o) => {
-                    let min_volume = match action {
-                        BestOrdersAction::Buy => o.min_volume.clone(),
-                        BestOrdersAction::Sell => &o.min_volume * &o.price,
-                    };
-                    if min_volume > required_volume {
-                        log::debug!("Order {} min_vol {:?} > {:?}", o.uuid, min_volume, required_volume);
-                        continue;
-                    }
-
-                    let max_volume = match action {
-                        BestOrdersAction::Buy => o.max_volume.clone(),
-                        BestOrdersAction::Sell => &o.max_volume * &o.price,
-                    };
-                    let order_w_proof = orderbook.orderbook_item_with_proof(o.clone());
-                    protocol_infos.insert(order_w_proof.order.uuid, order_w_proof.order.base_rel_proto_info());
-                    best_orders.push(order_w_proof.into());
-
-                    collected_volume += max_volume;
-                    if collected_volume >= required_volume {
-                        break;
-                    }
-                },
-                None => {
-                    log::debug!("No order with uuid {:?}", ordered.uuid);
-                    continue;
-                },
-            };
-        }
-        match action {
-            BestOrdersAction::Buy => result.insert(pair.1, best_orders),
-            BestOrdersAction::Sell => result.insert(pair.0, best_orders),
-        };
-    }
-    let response = BestOrdersRes {
-        orders: result,
-        protocol_infos,
-    };
-    let encoded = rmp_serde::to_vec(&response).expect("rmp_serde::to_vec should not fail here");
-    Ok(Some(encoded))
-}
-
-pub async fn best_orders_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
-    let req: BestOrdersRequest = try_s!(json::from_value(req));
-    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    if is_wallet_only_ticker(&ctx, &req.coin) {
-        return ERR!("Coin {} is wallet only", &req.coin);
-    }
-    let p2p_request = OrdermatchRequest::BestOrders {
-        coin: ordermatch_ctx.orderbook_ticker_bypass(&req.coin),
-        action: req.action,
-        volume: req.volume.into(),
-    };
-
-    let best_orders_res =
-        try_s!(request_any_relay::<BestOrdersRes>(ctx.clone(), P2PRequest::Ordermatch(p2p_request)).await);
-    let mut response = HashMap::new();
-    if let Some((p2p_response, peer_id)) = best_orders_res {
-        log::debug!("Got best orders {:?} from peer {}", p2p_response, peer_id);
-        for (coin, orders_w_proofs) in p2p_response.orders {
-            let coin_conf = coin_conf(&ctx, &coin);
-            if coin_conf.is_null() {
-                log::warn!("Coin {} is not found in config", coin);
-                continue;
-            }
-            if is_wallet_only_conf(&coin_conf) {
-                log::warn!(
-                    "Coin {} was removed from best orders because it's defined as wallet only in config",
-                    coin
-                );
-                continue;
-            }
-            for order_w_proof in orders_w_proofs {
-                let order = order_w_proof.order;
-                let empty_proto_info = BaseRelProtocolInfo::default();
-                let proto_infos = p2p_response
-                    .protocol_infos
-                    .get(&order.uuid)
-                    .unwrap_or(&empty_proto_info);
-                let addr_format = match req.action {
-                    BestOrdersAction::Buy => addr_format_from_protocol_info(&proto_infos.rel),
-                    BestOrdersAction::Sell => addr_format_from_protocol_info(&proto_infos.base),
-                };
-                let address = match address_by_coin_conf_and_pubkey_str(&coin, &coin_conf, &order.pubkey, addr_format) {
-                    Ok(a) => a,
-                    Err(e) => {
-                        log::error!("Error {} getting coin {} address from pubkey {}", e, coin, order.pubkey);
-                        continue;
-                    },
-                };
-                let entry = match req.action {
-                    BestOrdersAction::Buy => order.as_rpc_best_orders_buy(address, false),
-                    BestOrdersAction::Sell => order.as_rpc_best_orders_sell(address, false),
-                };
-                response.entry(coin.clone()).or_insert_with(Vec::new).push(entry);
-            }
-        }
-    }
-
-    let res = json!({ "result": response, "original_tickers": &ordermatch_ctx.original_tickers });
-    Response::builder()
-        .body(json::to_vec(&res).expect("Serialization failed"))
-        .map_err(|e| ERRL!("{}", e))
-}
-
-#[cfg(all(test, not(target_arch = "wasm32")))]
-mod best_orders_test {
-    use super::*;
-    use crate::mm2::lp_ordermatch::ordermatch_tests::make_random_orders;
-    use crate::mm2::lp_ordermatch::{OrderbookItem, TrieProof};
-    use std::iter::FromIterator;
-
-    #[test]
-    fn check_best_orders_p2p_res_serde() {
-        #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-        struct BestOrderV1 {
-            pubkey: String,
-            base: String,
-            rel: String,
-            price: BigRational,
-            max_volume: BigRational,
-            min_volume: BigRational,
-            uuid: Uuid,
-            created_at: u64,
-        }
-
-        impl From<OrderbookItem> for BestOrderV1 {
-            fn from(o: OrderbookItem) -> Self {
-                BestOrderV1 {
-                    pubkey: o.pubkey,
-                    base: o.base,
-                    rel: o.rel,
-                    price: o.price,
-                    max_volume: o.max_volume,
-                    min_volume: o.min_volume,
-                    uuid: o.uuid,
-                    created_at: o.created_at,
-                }
-            }
-        }
-
-        #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-        struct BestOrderWithProofV1 {
-            /// Orderbook item
-            order: BestOrderV1,
-            /// Last pubkey message payload that contains most recent pair trie root
-            last_message_payload: Vec<u8>,
-            /// Proof confirming that orderbook item is in the pair trie
-            proof: TrieProof,
-        }
-
-        #[derive(Debug, Deserialize, PartialEq, Serialize)]
-        struct BestOrdersResV1 {
-            orders: HashMap<String, Vec<BestOrderWithProofV1>>,
-        }
-
-        let orders = make_random_orders("".into(), &[1; 32], "RICK".into(), "MORTY".into(), 10);
-        let orders: Vec<_> = orders
-            .into_iter()
-            .map(|order| BestOrderWithProofV1 {
-                order: order.into(),
-                last_message_payload: vec![],
-                proof: vec![],
-            })
-            .collect();
-
-        let old = BestOrdersResV1 {
-            orders: HashMap::from_iter(std::iter::once(("RICK".into(), orders))),
-        };
-
-        let old_serialized = rmp_serde::to_vec(&old).unwrap();
-
-        let mut new: BestOrdersRes = rmp_serde::from_read_ref(&old_serialized).unwrap();
-        new.protocol_infos.insert(Uuid::new_v4(), BaseRelProtocolInfo {
-            base: vec![1],
-            rel: vec![2],
-        });
-
-        let new_serialized = rmp_serde::to_vec(&new).unwrap();
-
-        let old_from_new: BestOrdersResV1 = rmp_serde::from_read_ref(&new_serialized).unwrap();
-        assert_eq!(old, old_from_new);
-    }
-}
diff --git a/mm2src/lp_ordermatch/orderbook_rpc.rs b/mm2src/lp_ordermatch/orderbook_rpc.rs
deleted file mode 100644
index a4857ee328..0000000000
--- a/mm2src/lp_ordermatch/orderbook_rpc.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-use super::{subscribe_to_orderbook_topic, OrdermatchContext, RpcOrderbookEntry};
-use crate::mm2::lp_ordermatch::addr_format_from_protocol_info;
-use coins::{address_by_coin_conf_and_pubkey_str, coin_conf, is_wallet_only_conf};
-use common::{mm_ctx::MmArc, mm_number::MmNumber, now_ms};
-use http::Response;
-use num_rational::BigRational;
-use num_traits::Zero;
-use serde_json::{self as json, Value as Json};
-
-#[derive(Deserialize)]
-struct OrderbookReq {
-    base: String,
-    rel: String,
-}
-
-construct_detailed!(TotalAsksBaseVol, total_asks_base_vol);
-construct_detailed!(TotalAsksRelVol, total_asks_rel_vol);
-construct_detailed!(TotalBidsBaseVol, total_bids_base_vol);
-construct_detailed!(TotalBidsRelVol, total_bids_rel_vol);
-construct_detailed!(AggregatedBaseVol, base_max_volume_aggr);
-construct_detailed!(AggregatedRelVol, rel_max_volume_aggr);
-
-#[derive(Debug, Serialize)]
-pub struct AggregatedOrderbookEntry {
-    #[serde(flatten)]
-    entry: RpcOrderbookEntry,
-    #[serde(flatten)]
-    base_max_volume_aggr: AggregatedBaseVol,
-    #[serde(flatten)]
-    rel_max_volume_aggr: AggregatedRelVol,
-}
-
-#[derive(Debug, Serialize)]
-pub struct OrderbookResponse {
-    #[serde(rename = "askdepth")]
-    ask_depth: u32,
-    asks: Vec<AggregatedOrderbookEntry>,
-    base: String,
-    #[serde(rename = "biddepth")]
-    bid_depth: u32,
-    bids: Vec<AggregatedOrderbookEntry>,
-    netid: u16,
-    #[serde(rename = "numasks")]
-    num_asks: usize,
-    #[serde(rename = "numbids")]
-    num_bids: usize,
-    rel: String,
-    timestamp: u64,
-    #[serde(flatten)]
-    total_asks_base: TotalAsksBaseVol,
-    #[serde(flatten)]
-    total_asks_rel: TotalAsksRelVol,
-    #[serde(flatten)]
-    total_bids_base: TotalBidsBaseVol,
-    #[serde(flatten)]
-    total_bids_rel: TotalBidsRelVol,
-}
-
-fn build_aggregated_entries(entries: Vec<RpcOrderbookEntry>) -> (Vec<AggregatedOrderbookEntry>, MmNumber, MmNumber) {
-    let mut total_base = BigRational::zero();
-    let mut total_rel = BigRational::zero();
-    let aggregated = entries
-        .into_iter()
-        .map(|entry| {
-            total_base += entry.base_max_volume.as_ratio();
-            total_rel += entry.rel_max_volume.as_ratio();
-            AggregatedOrderbookEntry {
-                entry,
-                base_max_volume_aggr: MmNumber::from(total_base.clone()).into(),
-                rel_max_volume_aggr: MmNumber::from(total_rel.clone()).into(),
-            }
-        })
-        .collect();
-    (aggregated, total_base.into(), total_rel.into())
-}
-
-pub async fn orderbook_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
-    let req: OrderbookReq = try_s!(json::from_value(req));
-    if req.base == req.rel {
-        return ERR!("Base and rel must be different coins");
-    }
-    let base_coin_conf = coin_conf(&ctx, &req.base);
-    if base_coin_conf.is_null() {
-        return ERR!("Coin {} is not found in config", req.base);
-    }
-    if is_wallet_only_conf(&base_coin_conf) {
-        return ERR!("Base Coin {} is wallet only", req.base);
-    }
-    let rel_coin_conf = coin_conf(&ctx, &req.rel);
-    if rel_coin_conf.is_null() {
-        return ERR!("Coin {} is not found in config", req.rel);
-    }
-    if is_wallet_only_conf(&rel_coin_conf) {
-        return ERR!("Base Coin {} is wallet only", req.rel);
-    }
-    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
-    let request_orderbook = true;
-    let base_ticker = ordermatch_ctx.orderbook_ticker_bypass(&req.base);
-    let rel_ticker = ordermatch_ctx.orderbook_ticker_bypass(&req.rel);
-    if base_ticker == rel_ticker && base_coin_conf["protocol"] == rel_coin_conf["protocol"] {
-        return ERR!("Base and rel coins have the same orderbook tickers and protocols.");
-    }
-
-    try_s!(subscribe_to_orderbook_topic(&ctx, &base_ticker, &rel_ticker, request_orderbook).await);
-    let orderbook = ordermatch_ctx.orderbook.lock().await;
-    let my_pubsecp = hex::encode(&**ctx.secp256k1_key_pair().public());
-
-    let mut asks = match orderbook.unordered.get(&(base_ticker.clone(), rel_ticker.clone())) {
-        Some(uuids) => {
-            let mut orderbook_entries = Vec::new();
-            for uuid in uuids {
-                let ask = orderbook.order_set.get(uuid).ok_or(ERRL!(
-                    "Orderbook::unordered contains {:?} uuid that is not in Orderbook::order_set",
-                    uuid
-                ))?;
-                let address_format = addr_format_from_protocol_info(&ask.base_protocol_info);
-                let address = try_s!(address_by_coin_conf_and_pubkey_str(
-                    &req.base,
-                    &base_coin_conf,
-                    &ask.pubkey,
-                    address_format,
-                ));
-                let is_mine = my_pubsecp == ask.pubkey;
-                orderbook_entries.push(ask.as_rpc_entry_ask(address, is_mine));
-            }
-            orderbook_entries
-        },
-        None => Vec::new(),
-    };
-    asks.sort_unstable_by(|ask1, ask2| ask1.price_rat.cmp(&ask2.price_rat));
-    let (mut asks, total_asks_base_vol, total_asks_rel_vol) = build_aggregated_entries(asks);
-    asks.reverse();
-
-    let mut bids = match orderbook.unordered.get(&(rel_ticker, base_ticker)) {
-        Some(uuids) => {
-            let mut orderbook_entries = vec![];
-            for uuid in uuids {
-                let bid = orderbook.order_set.get(uuid).ok_or(ERRL!(
-                    "Orderbook::unordered contains {:?} uuid that is not in Orderbook::order_set",
-                    uuid
-                ))?;
-                let address_format = addr_format_from_protocol_info(&bid.base_protocol_info);
-                let address = try_s!(address_by_coin_conf_and_pubkey_str(
-                    &req.rel,
-                    &rel_coin_conf,
-                    &bid.pubkey,
-                    address_format,
-                ));
-                let is_mine = my_pubsecp == bid.pubkey;
-                orderbook_entries.push(bid.as_rpc_entry_bid(address, is_mine));
-            }
-            orderbook_entries
-        },
-        None => vec![],
-    };
-    bids.sort_unstable_by(|bid1, bid2| bid2.price_rat.cmp(&bid1.price_rat));
-    let (bids, total_bids_base_vol, total_bids_rel_vol) = build_aggregated_entries(bids);
-
-    let response = OrderbookResponse {
-        num_asks: asks.len(),
-        num_bids: bids.len(),
-        ask_depth: 0,
-        asks,
-        base: req.base,
-        bid_depth: 0,
-        bids,
-        netid: ctx.netid(),
-        rel: req.rel,
-        timestamp: now_ms() / 1000,
-        total_asks_base: total_asks_base_vol.into(),
-        total_asks_rel: total_asks_rel_vol.into(),
-        total_bids_base: total_bids_base_vol.into(),
-        total_bids_rel: total_bids_rel_vol.into(),
-    };
-    let response = try_s!(json::to_vec(&response));
-    Ok(try_s!(Response::builder().body(response)))
-}
diff --git a/mm2src/mm2_bitcoin/chain/Cargo.toml b/mm2src/mm2_bitcoin/chain/Cargo.toml
index bb287b058a..4263b584cb 100644
--- a/mm2src/mm2_bitcoin/chain/Cargo.toml
+++ b/mm2src/mm2_bitcoin/chain/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["debris <marek.kotewicz@gmail.com>"]
 
 [dependencies]
 rustc-hex = "2"
+bitcoin = "0.27.1"
 bitcrypto = { path = "../crypto" }
 primitives = { path = "../primitives" }
 serialization = { path = "../serialization" }
diff --git a/mm2src/mm2_bitcoin/chain/src/block_header.rs b/mm2src/mm2_bitcoin/chain/src/block_header.rs
index d5d3c48ec9..611977d52e 100644
--- a/mm2src/mm2_bitcoin/chain/src/block_header.rs
+++ b/mm2src/mm2_bitcoin/chain/src/block_header.rs
@@ -2,6 +2,8 @@ use compact::Compact;
 use crypto::dhash256;
 use hash::H256;
 use hex::FromHex;
+use primitives::bytes::Bytes;
+use primitives::U256;
 use ser::{deserialize, serialize, Deserializable, Reader, Serializable, Stream};
 use std::io;
 use transaction::{deserialize_tx, TxType};
@@ -41,7 +43,7 @@ const AUX_POW_VERSION_DOGE: u32 = 6422788;
 const AUX_POW_VERSION_SYS: u32 = 537919744;
 const MTP_POW_VERSION: u32 = 0x20001000u32;
 const PROG_POW_SWITCH_TIME: u32 = 1635228000;
-const QTUM_BLOCK_HEADER_VERSION: u32 = 536870912;
+const BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION: u32 = 536870912;
 // RVN
 const KAWPOW_VERSION: u32 = 805306368;
 
@@ -90,6 +92,8 @@ pub struct BlockHeader {
     pub version: u32,
     pub previous_header_hash: H256,
     pub merkle_root_hash: H256,
+    /// https://github.com/lbryio/lbrycrd/blob/71fc94b1dea1c7818f84a09832ec3db736481e0f/src/primitives/block.h#L40
+    pub claim_trie_root: Option<H256>,
     pub hash_final_sapling_root: Option<H256>,
     pub time: u32,
     pub bits: BlockHeaderBits,
@@ -127,6 +131,9 @@ impl Serializable for BlockHeader {
         }
         s.append(&self.previous_header_hash);
         s.append(&self.merkle_root_hash);
+        if let Some(claim) = &self.claim_trie_root {
+            s.append(claim);
+        }
         match &self.hash_final_sapling_root {
             Some(h) => {
                 s.append(h);
@@ -195,6 +202,14 @@ impl Deserializable for BlockHeader {
         }
         let previous_header_hash = reader.read()?;
         let merkle_root_hash = reader.read()?;
+
+        // This is needed to deserialize coin like LBC correctly.
+        let claim_trie_root = if version == BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION && reader.coin_variant().is_lbc() {
+            Some(reader.read()?)
+        } else {
+            None
+        };
+
         let hash_final_sapling_root = if version == 4 { Some(reader.read()?) } else { None };
         let time = reader.read()?;
         let bits = if version == 4 {
@@ -242,7 +257,7 @@ impl Deserializable for BlockHeader {
         };
 
         let (hash_state_root, hash_utxo_root, prevout_stake, vch_block_sig_dlgt) =
-            if version == QTUM_BLOCK_HEADER_VERSION && reader.coin_variant().is_qtum() {
+            if version == BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION && reader.coin_variant().is_qtum() {
                 (
                     Some(reader.read()?),
                     Some(reader.read()?),
@@ -264,6 +279,7 @@ impl Deserializable for BlockHeader {
             version,
             previous_header_hash,
             merkle_root_hash,
+            claim_trie_root,
             hash_final_sapling_root,
             time,
             bits,
@@ -288,6 +304,13 @@ impl BlockHeader {
     pub fn hash(&self) -> H256 { dhash256(&serialize(self)) }
 
     pub fn is_prog_pow(&self) -> bool { self.version == MTP_POW_VERSION && self.time >= PROG_POW_SWITCH_TIME }
+    pub fn raw(&self) -> Bytes { serialize(self) }
+    pub fn target(&self) -> Result<U256, U256> {
+        match self.bits {
+            BlockHeaderBits::Compact(compact) => compact.to_u256(),
+            BlockHeaderBits::U32(nb) => Ok(U256::from(nb)),
+        }
+    }
 }
 
 impl From<&'static str> for BlockHeader {
@@ -297,7 +320,7 @@ impl From<&'static str> for BlockHeader {
 #[cfg(test)]
 mod tests {
     use block_header::{BlockHeader, BlockHeaderBits, BlockHeaderNonce, AUX_POW_VERSION_DOGE, AUX_POW_VERSION_SYS,
-                       KAWPOW_VERSION, MTP_POW_VERSION, PROG_POW_SWITCH_TIME, QTUM_BLOCK_HEADER_VERSION};
+                       BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION, KAWPOW_VERSION, MTP_POW_VERSION, PROG_POW_SWITCH_TIME};
     use hex::FromHex;
     use ser::{deserialize, serialize, serialize_list, CoinVariant, Error as ReaderError, Reader, Stream};
 
@@ -307,6 +330,7 @@ mod tests {
             version: 1,
             previous_header_hash: [2; 32].into(),
             merkle_root_hash: [3; 32].into(),
+            claim_trie_root: None,
             hash_final_sapling_root: None,
             time: 4,
             bits: BlockHeaderBits::Compact(5.into()),
@@ -352,6 +376,7 @@ mod tests {
             version: 1,
             previous_header_hash: [2; 32].into(),
             merkle_root_hash: [3; 32].into(),
+            claim_trie_root: None,
             hash_final_sapling_root: Default::default(),
             time: 4,
             bits: BlockHeaderBits::Compact(5.into()),
@@ -384,6 +409,7 @@ mod tests {
             version: 4,
             previous_header_hash: "8e4e7283b71dd1572d220935db0a1654d1042e92378579f8abab67b143f93a02".into(),
             merkle_root_hash: "fa026610d2634b72ff729b9ea7850c0d2c25eeaf7a82878ca42a8e9912028863".into(),
+            claim_trie_root: None,
             hash_final_sapling_root: Some("a2d8a734eb73a4dc734072dbfd12406f1e7121bfe0e3d6c10922495c44e5cc1c".into()),
             time: 1583159441,
             bits: BlockHeaderBits::U32(486611429),
@@ -891,6 +917,71 @@ mod tests {
         assert_eq!(serialized.take(), headers_bytes);
     }
 
+    #[test]
+    fn test_lbc_block_herders_serde_11() {
+        let headers_bytes: &[u8] = &[
+            11, 0, 0, 0, 32, 4, 226, 205, 70, 162, 151, 56, 130, 229, 25, 56, 118, 91, 160, 178, 217, 85, 27, 1, 56,
+            140, 20, 226, 40, 81, 171, 69, 77, 146, 40, 3, 245, 151, 115, 182, 25, 85, 159, 63, 6, 216, 43, 43, 130,
+            111, 1, 126, 229, 53, 112, 195, 185, 7, 49, 80, 227, 104, 71, 129, 155, 14, 80, 229, 38, 102, 215, 134, 81,
+            191, 250, 187, 217, 169, 93, 203, 220, 82, 217, 39, 221, 45, 2, 138, 18, 143, 248, 133, 15, 59, 140, 214,
+            169, 65, 98, 208, 61, 46, 30, 213, 98, 213, 174, 0, 26, 75, 221, 59, 116, 0, 0, 0, 32, 196, 109, 14, 170,
+            9, 36, 64, 47, 8, 64, 125, 180, 223, 157, 207, 10, 17, 147, 142, 204, 121, 184, 222, 20, 96, 107, 117, 222,
+            175, 16, 105, 186, 108, 207, 33, 68, 226, 33, 122, 81, 173, 178, 158, 158, 8, 214, 102, 132, 57, 8, 233,
+            138, 194, 133, 26, 124, 84, 0, 79, 31, 203, 142, 45, 232, 94, 218, 52, 2, 164, 160, 62, 236, 233, 187, 156,
+            61, 122, 43, 214, 177, 87, 143, 144, 214, 64, 70, 168, 150, 210, 240, 78, 38, 204, 182, 2, 226, 137, 30,
+            213, 98, 207, 195, 0, 26, 26, 210, 86, 33, 0, 0, 0, 32, 248, 242, 27, 4, 83, 243, 188, 89, 225, 120, 109,
+            155, 92, 211, 112, 226, 110, 106, 117, 155, 244, 215, 210, 185, 63, 178, 180, 223, 137, 162, 58, 251, 107,
+            190, 58, 159, 209, 134, 141, 129, 158, 66, 135, 230, 248, 146, 217, 232, 6, 92, 244, 181, 139, 203, 184,
+            35, 35, 209, 240, 53, 56, 222, 63, 95, 180, 75, 178, 246, 193, 163, 175, 209, 16, 201, 188, 164, 245, 0,
+            44, 216, 64, 8, 22, 170, 213, 238, 21, 240, 118, 16, 197, 201, 177, 29, 109, 91, 217, 30, 213, 98, 171,
+            186, 0, 26, 3, 57, 180, 217, 0, 0, 0, 32, 107, 241, 118, 66, 209, 221, 160, 24, 69, 212, 76, 221, 81, 47,
+            150, 6, 196, 22, 254, 107, 67, 96, 165, 129, 93, 87, 86, 253, 174, 166, 240, 6, 87, 49, 250, 185, 201, 18,
+            49, 115, 222, 30, 154, 134, 214, 114, 183, 95, 87, 218, 116, 4, 176, 126, 196, 187, 210, 197, 142, 91, 129,
+            175, 158, 88, 141, 159, 87, 247, 179, 75, 237, 84, 58, 216, 37, 210, 72, 167, 226, 154, 15, 69, 10, 254,
+            149, 135, 74, 149, 110, 178, 91, 9, 134, 36, 137, 183, 57, 32, 213, 98, 182, 176, 0, 26, 184, 35, 19, 17,
+            0, 0, 0, 32, 54, 175, 218, 241, 215, 229, 54, 226, 65, 178, 208, 185, 207, 176, 61, 171, 1, 203, 94, 53,
+            30, 40, 188, 54, 70, 35, 33, 68, 234, 37, 203, 110, 248, 170, 156, 152, 52, 72, 42, 28, 248, 97, 9, 159,
+            106, 83, 6, 68, 106, 134, 222, 38, 97, 227, 211, 181, 75, 36, 154, 182, 130, 133, 161, 8, 94, 210, 79, 13,
+            155, 245, 191, 77, 157, 95, 40, 208, 220, 69, 190, 192, 248, 200, 39, 148, 177, 163, 88, 210, 23, 209, 106,
+            200, 239, 23, 147, 3, 87, 32, 213, 98, 41, 206, 0, 26, 36, 6, 216, 89, 0, 0, 0, 32, 191, 206, 127, 113,
+            217, 20, 89, 51, 103, 46, 155, 38, 64, 52, 51, 218, 35, 153, 161, 11, 24, 225, 116, 139, 117, 96, 245, 112,
+            218, 168, 88, 99, 13, 117, 103, 10, 163, 133, 114, 186, 178, 138, 120, 22, 245, 23, 32, 108, 186, 238, 18,
+            250, 254, 20, 236, 152, 247, 1, 229, 145, 249, 121, 29, 19, 64, 176, 250, 1, 212, 155, 54, 168, 176, 22,
+            10, 174, 183, 38, 88, 77, 17, 174, 221, 73, 84, 133, 174, 149, 222, 93, 168, 85, 47, 122, 254, 142, 191,
+            32, 213, 98, 139, 185, 0, 26, 11, 156, 81, 208, 0, 0, 0, 32, 185, 10, 134, 138, 197, 14, 90, 184, 108, 77,
+            52, 169, 245, 158, 113, 196, 92, 63, 10, 42, 93, 138, 96, 146, 248, 103, 105, 107, 110, 92, 153, 32, 46,
+            134, 91, 9, 151, 59, 17, 87, 145, 104, 83, 124, 153, 71, 154, 44, 254, 1, 16, 179, 214, 82, 219, 179, 57,
+            94, 110, 85, 137, 231, 104, 113, 216, 65, 67, 201, 131, 14, 28, 55, 72, 31, 197, 88, 146, 130, 243, 56,
+            173, 30, 153, 236, 36, 53, 220, 45, 18, 114, 217, 223, 59, 74, 60, 143, 214, 35, 213, 98, 91, 179, 0, 26,
+            184, 79, 48, 125, 0, 0, 0, 32, 207, 9, 44, 157, 84, 2, 136, 174, 93, 198, 173, 105, 35, 141, 243, 6, 21,
+            214, 24, 80, 113, 166, 149, 36, 207, 78, 157, 77, 195, 76, 118, 75, 93, 168, 103, 196, 147, 125, 5, 145,
+            183, 30, 98, 150, 37, 135, 29, 3, 184, 160, 62, 61, 205, 109, 89, 124, 161, 161, 99, 166, 76, 198, 57, 104,
+            21, 200, 173, 105, 181, 83, 152, 148, 115, 92, 215, 131, 108, 16, 121, 168, 25, 212, 150, 158, 205, 1, 128,
+            106, 232, 31, 177, 216, 61, 70, 106, 149, 19, 36, 213, 98, 8, 13, 1, 26, 66, 126, 250, 117, 0, 0, 0, 32,
+            14, 226, 195, 145, 216, 149, 97, 248, 36, 168, 95, 51, 163, 63, 36, 79, 144, 213, 195, 185, 88, 79, 179,
+            68, 6, 166, 42, 176, 56, 129, 130, 158, 157, 158, 185, 82, 70, 100, 135, 53, 130, 252, 84, 56, 153, 183, 4,
+            64, 167, 75, 237, 171, 159, 117, 76, 115, 169, 115, 131, 251, 119, 23, 3, 24, 159, 110, 115, 78, 6, 134,
+            71, 167, 91, 187, 203, 252, 77, 121, 169, 201, 152, 67, 155, 21, 5, 19, 61, 136, 215, 31, 55, 173, 225,
+            126, 138, 230, 51, 36, 213, 98, 77, 249, 0, 26, 153, 65, 133, 15, 0, 0, 0, 32, 98, 23, 129, 255, 228, 196,
+            211, 128, 56, 58, 241, 153, 48, 139, 73, 26, 39, 169, 57, 4, 91, 179, 149, 36, 158, 254, 190, 185, 52, 110,
+            160, 218, 227, 60, 248, 234, 204, 240, 216, 126, 70, 68, 180, 22, 122, 203, 103, 19, 177, 126, 226, 83, 44,
+            83, 2, 36, 157, 164, 127, 241, 219, 47, 100, 53, 86, 216, 76, 242, 161, 117, 71, 214, 50, 154, 144, 42,
+            180, 57, 145, 57, 95, 10, 18, 217, 161, 66, 70, 4, 116, 79, 24, 64, 71, 88, 47, 160, 77, 38, 213, 98, 8,
+            226, 0, 26, 6, 75, 190, 72, 0, 0, 0, 32, 92, 201, 103, 9, 253, 13, 166, 231, 44, 6, 225, 162, 236, 10, 255,
+            4, 42, 43, 196, 53, 83, 118, 220, 157, 231, 6, 104, 2, 111, 141, 219, 28, 162, 101, 33, 136, 243, 11, 130,
+            200, 145, 88, 52, 186, 115, 44, 146, 231, 80, 158, 155, 182, 134, 156, 229, 247, 68, 55, 145, 249, 71, 225,
+            115, 127, 165, 240, 245, 7, 151, 6, 193, 202, 139, 227, 48, 79, 12, 178, 233, 104, 176, 129, 136, 171, 201,
+            184, 15, 6, 37, 118, 246, 130, 5, 177, 140, 190, 58, 38, 213, 98, 92, 42, 1, 26, 63, 91, 195, 195,
+        ];
+        let mut reader = Reader::new_with_coin_variant(headers_bytes, CoinVariant::LBC);
+        let headers = reader.read_list::<BlockHeader>().unwrap();
+        for header in headers.iter() {
+            assert_eq!(header.version, BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION);
+        }
+        let serialized = serialize_list(&headers);
+        assert_eq!(serialized.take(), headers_bytes);
+    }
+
     #[test]
     fn test_verus_block_headers_serde_11() {
         let headers_bytes: &[u8] = &[
@@ -1956,7 +2047,7 @@ mod tests {
         let mut reader = Reader::new_with_coin_variant(headers_bytes, CoinVariant::Qtum);
         let headers = reader.read_list::<BlockHeader>().unwrap();
         for header in headers.iter() {
-            assert_eq!(header.version, QTUM_BLOCK_HEADER_VERSION);
+            assert_eq!(header.version, BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION);
         }
         let serialized = serialize_list(&headers);
         assert_eq!(serialized.take(), headers_bytes);
diff --git a/mm2src/mm2_bitcoin/chain/src/lib.rs b/mm2src/mm2_bitcoin/chain/src/lib.rs
index fbf5c9424b..b3f474fd49 100644
--- a/mm2src/mm2_bitcoin/chain/src/lib.rs
+++ b/mm2src/mm2_bitcoin/chain/src/lib.rs
@@ -1,3 +1,4 @@
+extern crate bitcoin as ext_bitcoin;
 extern crate bitcrypto as crypto;
 extern crate primitives;
 extern crate rustc_hex as hex;
@@ -9,6 +10,8 @@ pub mod constants;
 mod block;
 mod block_header;
 mod merkle_root;
+mod raw_block;
+pub use raw_block::{RawBlockHeader, RawHeaderError};
 mod transaction;
 
 /// `IndexedBlock` extension
@@ -21,7 +24,7 @@ pub trait RepresentH256 {
 pub use primitives::{bytes, compact, hash, U256};
 
 pub use block::Block;
-pub use block_header::BlockHeader;
+pub use block_header::{BlockHeader, BlockHeaderBits, BlockHeaderNonce};
 pub use merkle_root::{merkle_node_hash, merkle_root};
 pub use transaction::{JoinSplit, OutPoint, ShieldedOutput, ShieldedSpend, Transaction, TransactionInput,
                       TransactionOutput, TxHashAlgo};
diff --git a/mm2src/mm2_bitcoin/chain/src/merkle_root.rs b/mm2src/mm2_bitcoin/chain/src/merkle_root.rs
index 3a205fe525..2be5acc4a9 100644
--- a/mm2src/mm2_bitcoin/chain/src/merkle_root.rs
+++ b/mm2src/mm2_bitcoin/chain/src/merkle_root.rs
@@ -19,7 +19,7 @@ where
     T: AsRef<H256>,
 {
     if hashes.len() == 1 {
-        return hashes[0].as_ref().clone();
+        return *hashes[0].as_ref();
     }
 
     let mut row = Vec::with_capacity(hashes.len() / 2);
diff --git a/mm2src/mm2_bitcoin/chain/src/raw_block.rs b/mm2src/mm2_bitcoin/chain/src/raw_block.rs
new file mode 100644
index 0000000000..075d15ad6a
--- /dev/null
+++ b/mm2src/mm2_bitcoin/chain/src/raw_block.rs
@@ -0,0 +1,80 @@
+use crypto::dhash256;
+use primitives::bytes::Bytes;
+use primitives::hash::H256;
+use ser::serialize;
+use BlockHeader;
+
+pub const MIN_RAW_HEADER_SIZE: usize = 80_usize;
+
+/// Hex-encoded block
+#[derive(Default, PartialEq, Clone, Eq, Hash)]
+pub struct RawBlockHeader(Bytes);
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum RawHeaderError {
+    WrongLengthHeader { min_length: usize },
+}
+
+impl RawBlockHeader {
+    pub fn new(buf: Vec<u8>) -> Result<Self, RawHeaderError> {
+        if buf.len() < MIN_RAW_HEADER_SIZE {
+            return Err(RawHeaderError::WrongLengthHeader {
+                min_length: MIN_RAW_HEADER_SIZE,
+            });
+        }
+        let header = RawBlockHeader(buf.into());
+        Ok(header)
+    }
+
+    /// Calculate the LE header digest
+    pub fn digest(&self) -> H256 { dhash256(self.0.as_slice()) }
+
+    /// Extract the LE tx merkle root from the header
+    pub fn extract_merkle_root(&self) -> H256 {
+        let mut root = H256::default();
+        root.as_mut().copy_from_slice(&self.0.as_ref()[36..68]);
+        root
+    }
+
+    /// Extract the LE parent digest from the header
+    pub fn parent(&self) -> H256 {
+        let mut root = H256::default();
+        root.as_mut().copy_from_slice(&self.0.as_ref()[4..36]);
+        root
+    }
+}
+
+impl From<BlockHeader> for RawBlockHeader {
+    fn from(header: BlockHeader) -> Self {
+        let bytes = serialize(&header);
+        RawBlockHeader(bytes)
+    }
+}
+
+#[cfg(test)]
+mod raw_block_header_tests {
+    use hex::FromHex;
+    use primitives::hash::H256;
+    use raw_block::RawBlockHeader;
+
+    #[test]
+    fn test_raw_header() {
+        // block header of https://kmdexplorer.io/block/01ad31e22fea912a974c3e1eea11dc26348676528a586f77199ac3cfe29e271f
+        let header_hex = "040000008e4e7283b71dd1572d220935db0a1654d1042e92378579f8abab67b143f93a02fa026610d2634b72ff729b9ea7850c0d2c25eeaf7a82878ca42a8e9912028863a2d8a734eb73a4dc734072dbfd12406f1e7121bfe0e3d6c10922495c44e5cc1c91185d5ee519011d0400b9caaf41d4b63a6ab55bb4e6925d46fc3adea7be37b713d3a615e7cf0000fd40050001a80fa65b9a46fdb1506a7a4d26f43e7995d69902489b9f6c4599c88f9c169605cc135258953da0d6299ada4ff81a76ad63c943261078d5dd1918f91cea68b65b7fc362e9df49ba57c2ea5c6dba91591c85eb0d59a1905ac66e2295b7a291a1695301489a3cc7310fd45f2b94e3b8d94f3051e9bbaada1e0641fcec6e0d6230e76753aa9574a3f3e28eaa085959beffd3231dbe1aeea3955328f3a973650a38e31632a4ffc7ec007a3345124c0b99114e2444b3ef0ada75adbd077b247bbf3229adcffbe95bc62daac88f96317d5768540b5db636f8c39a8529a736465ed830ab2c1bbddf523587abe14397a6f1835d248092c4b5b691a955572607093177a5911e317739187b41f4aa662aa6bca0401f1a0a77915ebb6947db686cff549c5f4e7b9dd93123b00a1ae8d411cfb13fa7674de21cbee8e9fc74e12aa6753b261eab3d9256c7c32cc9b16219dad73c61014e7d88d74d5e218f12e11bc47557347ff49a9ab4490647418d2a5c2da1df24d16dfb611173608fe4b10a357b0fa7a1918b9f2d7836c84bf05f384e1e678b2fdd47af0d8e66e739fe45209ede151a180aba1188058a0db093e30bc9851980cf6fbfa5adb612d1146905da662c3347d7e7e569a1041641049d951ab867bc0c6a3863c7667d43f596a849434958cee2b63dc8fa11bd0f38aa96df86ed66461993f64736345313053508c4e939506c08a766f5b6ed0950759f3901bbc4db3dc97e05bf20b9dda4ff242083db304a4e487ac2101b823998371542354e5d534b5b6ae6420cc19b11512108b61208f4d9a5a97263d2c060da893544dea6251bcadc682d2238af35f2b1c2f65a73b89a4e194f9e1eef6f0e5948ef8d0d2862f48fd3356126b00c6a2d3770ecd0d1a78fa34974b454f270b23d461e357c9356c19496522b59ff9d5b4608c542ff89e558798324021704b2cfe9f6c1a70906c43c7a690f16615f198d29fa647d84ce8461fa570b33e3eada2ed7d77e1f280a0d2e9f03c2e1db535d922b1759a191b417595f3c15d8e8b7f810527ff942e18443a3860e67ccba356809ecedc31c5d8db59c7e039dae4b53d126679e8ffa20cc26e8b9d229c8f6ee434ad053f5f4f5a94e249a13afb995aad82b4d90890187e516e114b168fc7c7e291b9738ea578a7bab0ba31030b14ba90b772b577806ea2d17856b0cb9e74254ba582a9f2638ea7ed2ca23be898c6108ff8f466b443537ed9ec56b8771bfbf0f2f6e1092a28a7fd182f111e1dbdd155ea82c6cb72d5f9e6518cc667b8226b5f5c6646125fc851e97cf125f48949f988ed37c4283072fc03dd1da3e35161e17f44c0e22c76f708bb66405737ef24176e291b4fc2eadab876115dc62d48e053a85f0ad132ef07ad5175b036fe39e1ad14fcdcdc6ac5b3daabe05161a72a50545dd812e0f9af133d061b726f491e904d89ee57811ef58d3bda151f577aed381963a30d91fb98dc49413300d132a7021a5e834e266b4ac982d76e00f43f5336b8e8028a0cacfa11813b01e50f71236a73a4c0d0757c1832b0680ada56c80edf070f438ab2bc587542f926ff8d3644b8b8a56c78576f127dec7aed9cb3e1bc2442f978a9df1dc3056a63e653132d0f419213d3cb86e7b61720de1aa3af4b3757a58156970da27560c6629257158452b9d5e4283dc6fe7df42d2fda3352d5b62ce5a984d912777c3b01837df8968a4d494db1b663e0e68197dbf196f21ea11a77095263dec548e2010460840231329d83978885ee2423e8b327785970e27c6c6d436157fb5b56119b19239edbb730ebae013d82c35df4a6e70818a74d1ef7a2e87c090ff90e32939f58ed24e85b492b5750fd2cd14b9b8517136b76b1cc6ccc6f6f027f65f1967a0eb4f32cd6e5d5315";
+        let header_bytes: Vec<u8> = header_hex.from_hex().unwrap();
+        let raw_header = RawBlockHeader::new(header_bytes).unwrap();
+        assert_eq!(
+            raw_header.digest(),
+            H256::from_reversed_str("01ad31e22fea912a974c3e1eea11dc26348676528a586f77199ac3cfe29e271f")
+        );
+        assert_eq!(
+            raw_header.extract_merkle_root(),
+            H256::from_reversed_str("63880212998e2aa48c87827aafee252c0d0c85a79e9b72ff724b63d2106602fa")
+        );
+
+        assert_eq!(
+            raw_header.parent(),
+            H256::from_reversed_str("023af943b167ababf8798537922e04d154160adb3509222d57d11db783724e8e")
+        );
+    }
+}
diff --git a/mm2src/mm2_bitcoin/chain/src/transaction.rs b/mm2src/mm2_bitcoin/chain/src/transaction.rs
index f75e74f212..37d84e09db 100644
--- a/mm2src/mm2_bitcoin/chain/src/transaction.rs
+++ b/mm2src/mm2_bitcoin/chain/src/transaction.rs
@@ -4,10 +4,13 @@
 use bytes::Bytes;
 use constants::{LOCKTIME_THRESHOLD, SEQUENCE_FINAL};
 use crypto::{dhash256, sha256};
+use ext_bitcoin::blockdata::transaction::Transaction as ExtTransaction;
+use ext_bitcoin::consensus::encode::{deserialize as deserialize_ext, Error as EncodeError};
 use hash::{CipherText, EncCipherText, OutCipherText, ZkProof, ZkProofSapling, H256, H512, H64};
 use hex::FromHex;
 use ser::{deserialize, serialize, serialize_with_flags, SERIALIZE_TRANSACTION_WITNESS};
 use ser::{CompactInteger, Deserializable, Error, Reader, Serializable, Stream};
+use std::convert::TryFrom;
 use std::io;
 use std::io::Read;
 
@@ -18,7 +21,7 @@ const WITNESS_FLAG: u8 = 1;
 /// Maximum supported list size (inputs, outputs, etc.)
 const MAX_LIST_SIZE: usize = 8192;
 
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Default, Serializable, Deserializable)]
+#[derive(Clone, Copy, Debug, Default, Deserializable, Eq, Hash, PartialEq, Serializable)]
 pub struct OutPoint {
     pub hash: H256,
     pub index: u32,
@@ -28,11 +31,11 @@ impl OutPoint {
     pub fn null() -> Self {
         OutPoint {
             hash: H256::default(),
-            index: u32::max_value(),
+            index: u32::MAX,
         }
     }
 
-    pub fn is_null(&self) -> bool { self.hash.is_zero() && self.index == u32::max_value() }
+    pub fn is_null(&self) -> bool { self.hash.is_zero() && self.index == u32::MAX }
 }
 
 #[derive(Debug, PartialEq, Default, Clone)]
@@ -195,6 +198,19 @@ impl From<&'static str> for Transaction {
     fn from(s: &'static str) -> Self { deserialize(&s.from_hex::<Vec<u8>>().unwrap() as &[u8]).unwrap() }
 }
 
+impl TryFrom<Transaction> for ExtTransaction {
+    type Error = EncodeError;
+
+    fn try_from(tx: Transaction) -> Result<ExtTransaction, EncodeError> {
+        let tx_hex = if tx.has_witness() {
+            serialize_with_flags(&tx, SERIALIZE_TRANSACTION_WITNESS)
+        } else {
+            serialize(&tx)
+        };
+        deserialize_ext(&tx_hex.take())
+    }
+}
+
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum TxHashAlgo {
@@ -260,8 +276,8 @@ impl Transaction {
     pub fn total_spends(&self) -> u64 {
         let mut result = 0u64;
         for output in self.outputs.iter() {
-            if u64::max_value() - result < output.value {
-                return u64::max_value();
+            if u64::MAX - result < output.value {
+                return u64::MAX;
             }
             result += output.value;
         }
@@ -507,10 +523,11 @@ impl Deserializable for Transaction {
 
 #[cfg(test)]
 mod tests {
-    use super::{Bytes, OutPoint, Transaction, TransactionInput, TransactionOutput};
+    use super::{Bytes, ExtTransaction, OutPoint, Transaction, TransactionInput, TransactionOutput};
     use hash::{H256, H512};
     use hex::ToHex;
     use ser::{deserialize, serialize, serialize_with_flags, Serializable, SERIALIZE_TRANSACTION_WITNESS};
+    use std::convert::TryFrom;
     use TxHashAlgo;
 
     // real transaction from block 80000
@@ -976,4 +993,12 @@ mod tests {
 		};
         assert_eq!(actual, expected);
     }
+
+    #[test]
+    fn test_try_from_tx_to_ext_tx() {
+        // https://live.blockcypher.com/btc-testnet/tx/2be90e03abb4d5328bf7e9467ca9c571aef575837b55f1253119b87e85ccb94f/
+        let tx: Transaction = "010000000001016546e6d844ad0142c8049a839e8deae16c17f0a6587e36e75ff2181ed7020a800100000000ffffffff0247070800000000002200200bbfbd271853ec0a775e5455d4bb19d32818e9b5bda50655ac183fb15c9aa01625910300000000001600149a85cc05e9a722575feb770a217c73fd6145cf0102473044022002eac5d11f3800131985c14a3d1bc03dfe5e694f5731bde39b0d2b183eb7d3d702201d62e7ff2dd433260bf7a8223db400d539a2c4eccd27a5aa24d83f5ad9e9e1750121031ac6d25833a5961e2a8822b2e8b0ac1fd55d90cbbbb18a780552cbd66fc02bb35c099c61".into();
+        let ext_tx = ExtTransaction::try_from(tx.clone()).unwrap();
+        assert_eq!(tx.hash().reversed().to_string(), ext_tx.txid().to_string());
+    }
 }
diff --git a/mm2src/mm2_bitcoin/crypto/Cargo.toml b/mm2src/mm2_bitcoin/crypto/Cargo.toml
index bb6eb7613d..d0e89b0504 100644
--- a/mm2src/mm2_bitcoin/crypto/Cargo.toml
+++ b/mm2src/mm2_bitcoin/crypto/Cargo.toml
@@ -4,10 +4,11 @@ version = "0.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
 [dependencies]
-groestl = "0.8.0"
+groestl = "0.9"
 primitives = { path = "../primitives" }
-ripemd160 = "0.8.0"
-sha-1 = "0.8.1"
-sha2 = "0.8.0"
-sha3 = "0.8.1"
+ripemd160 = "0.9.0"
+sha-1 = "0.9"
+sha2 = "0.9"
+sha3 = "0.9"
 siphasher = "0.1.1"
+serialization = { path = "../serialization" }
diff --git a/mm2src/mm2_bitcoin/crypto/src/lib.rs b/mm2src/mm2_bitcoin/crypto/src/lib.rs
index 4b29c47c6b..afaa9e4102 100644
--- a/mm2src/mm2_bitcoin/crypto/src/lib.rs
+++ b/mm2src/mm2_bitcoin/crypto/src/lib.rs
@@ -1,6 +1,7 @@
 extern crate groestl;
 extern crate primitives;
 extern crate ripemd160;
+extern crate serialization;
 extern crate sha1;
 extern crate sha2;
 extern crate sha3;
@@ -8,9 +9,9 @@ extern crate siphasher;
 
 use groestl::Groestl512;
 use primitives::hash::{H160, H256, H32, H512};
-use ripemd160::Ripemd160;
+use ripemd160::{Digest, Ripemd160};
 use sha1::Sha1;
-use sha2::{Digest, Sha256};
+use sha2::Sha256;
 use sha3::Keccak256;
 use siphasher::sip::SipHasher24;
 use std::hash::Hasher;
@@ -20,7 +21,7 @@ use std::hash::Hasher;
 /// GRS uses double groestl512
 /// SMART uses keccak
 #[allow(clippy::upper_case_acronyms)]
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 pub enum ChecksumType {
     DSHA256,
     DGROESTL512,
@@ -35,40 +36,40 @@ impl Default for ChecksumType {
 #[inline]
 pub fn ripemd160(input: &[u8]) -> H160 {
     let mut hasher = Ripemd160::new();
-    hasher.input(input);
-    (*hasher.result()).into()
+    hasher.update(input);
+    (*hasher.finalize()).into()
 }
 
 /// SHA-1
 #[inline]
 pub fn sha1(input: &[u8]) -> H160 {
     let mut hasher = Sha1::default();
-    hasher.input(input);
-    (*hasher.result()).into()
+    hasher.update(input);
+    (*hasher.finalize()).into()
 }
 
 /// SHA-256
 #[inline]
 pub fn sha256(input: &[u8]) -> H256 {
     let mut hasher = Sha256::new();
-    hasher.input(input);
-    (*hasher.result()).into()
+    hasher.update(input);
+    (*hasher.finalize()).into()
 }
 
 /// Groestl-512
 #[inline]
 pub fn groestl512(input: &[u8]) -> H512 {
     let mut hasher = Groestl512::new();
-    hasher.input(input);
-    (*hasher.result()).into()
+    hasher.update(input);
+    (*hasher.finalize()).into()
 }
 
 /// Keccak-256
 #[inline]
 pub fn keccak256(input: &[u8]) -> H256 {
     let mut hasher = Keccak256::new();
-    hasher.input(input);
-    (*hasher.result()).into()
+    hasher.update(input);
+    (*hasher.finalize()).into()
 }
 
 /// Double Keccak-256
diff --git a/mm2src/mm2_bitcoin/keys/Cargo.toml b/mm2src/mm2_bitcoin/keys/Cargo.toml
index 04f5193eda..ad024e60cb 100644
--- a/mm2src/mm2_bitcoin/keys/Cargo.toml
+++ b/mm2src/mm2_bitcoin/keys/Cargo.toml
@@ -5,11 +5,13 @@ authors = ["debris <marek.kotewicz@gmail.com>"]
 
 [dependencies]
 rustc-hex = "2"
-base58 = "0.1"
+base58 = "0.2"
 bech32 = "0.8.0"
 bitcrypto = { path = "../crypto" }
 derive_more = "0.99"
 lazy_static = "1.4"
+rand = "0.6"
 primitives = { path = "../primitives" }
 secp256k1 = { version = "0.20", features = ["rand"] }
 serde = { version = "1.0", features = ["derive"] }
+serde_derive = "1.0"
diff --git a/mm2src/mm2_bitcoin/keys/src/address.rs b/mm2src/mm2_bitcoin/keys/src/address.rs
index e10305c735..1b37b0f568 100644
--- a/mm2src/mm2_bitcoin/keys/src/address.rs
+++ b/mm2src/mm2_bitcoin/keys/src/address.rs
@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::ops::Deref;
 use std::str::FromStr;
-use {AddressHash, CashAddrType, CashAddress, DisplayLayout, Error, SegwitAddress};
+use {AddressHashEnum, CashAddrType, CashAddress, DisplayLayout, Error, SegwitAddress};
 
 /// There are two address formats currently in use.
 /// https://bitcoin.org/en/developer-reference#address-conversion
@@ -28,12 +28,18 @@ pub enum Type {
     /// https://bitcoin.org/en/glossary/p2sh-address
     P2SH,
     /// Pay to Witness PubKey Hash
-    /// Common P2WPKH which begins with the human readable part followed by 1, eg: bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4.
+    /// Segwit P2WPKH which begins with the human readable part followed by 1 followed by 39 base32 characters
+    /// as the address hash, eg: bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4.
     /// https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki
     P2WPKH,
+    /// Pay to Witness Script Hash
+    /// Segwit P2WSH which begins with the human readable part followed by 1 followed by 59 base32 characters
+    /// as the scripthash, eg: bc1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qccfmv3.
+    /// https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki
+    P2WSH,
 }
 
-#[derive(Clone, Debug, Display, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Display, Deserialize, Eq, Hash, PartialEq, Serialize)]
 #[serde(tag = "format")]
 pub enum AddressFormat {
     /// Standard UTXO address format.
@@ -72,7 +78,7 @@ impl AddressFormat {
 
 // TODO add ScriptType field to this struct for easier use of output_script function
 /// `AddressHash` with prefix and t addr zcash prefix
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct Address {
     /// The prefix of the address.
     pub prefix: u8,
@@ -81,7 +87,7 @@ pub struct Address {
     /// Segwit addr human readable part
     pub hrp: Option<String>,
     /// Public key hash.
-    pub hash: AddressHash,
+    pub hash: AddressHashEnum,
     /// Checksum type
     pub checksum_type: ChecksumType,
     /// Address Format
@@ -123,7 +129,7 @@ impl DisplayLayout for Address {
         }
 
         result.push(self.prefix);
-        result.extend_from_slice(&*self.hash);
+        result.extend_from_slice(&self.hash.to_vec());
         let cs = checksum(&result, &self.checksum_type);
         result.extend_from_slice(&*cs);
 
@@ -138,7 +144,7 @@ impl DisplayLayout for Address {
             25 => {
                 let sum_type = detect_checksum(&data[0..21], &data[21..])?;
 
-                let mut hash = AddressHash::default();
+                let mut hash = AddressHashEnum::default_address_hash();
                 hash.copy_from_slice(&data[1..21]);
 
                 let address = Address {
@@ -155,7 +161,7 @@ impl DisplayLayout for Address {
             26 => {
                 let sum_type = detect_checksum(&data[0..22], &data[22..])?;
 
-                let mut hash = AddressHash::default();
+                let mut hash = AddressHashEnum::default_address_hash();
                 hash.copy_from_slice(&data[2..22]);
 
                 let address = Address {
@@ -182,7 +188,17 @@ impl fmt::Display for Address {
                     .to_string()
                     .fmt(f)
             },
-            _ => self.layout().to_base58().fmt(f),
+            AddressFormat::CashAddress {
+                network,
+                pub_addr_prefix,
+                p2sh_addr_prefix,
+            } => {
+                let cash_address = self
+                    .to_cashaddress(network, *pub_addr_prefix, *p2sh_addr_prefix)
+                    .expect("A valid address");
+                cash_address.encode().expect("A valid address").fmt(f)
+            },
+            AddressFormat::Standard => self.layout().to_base58().fmt(f),
         }
     }
 }
@@ -235,7 +251,7 @@ impl Address {
             return Err("Expect 20 bytes long hash".into());
         }
 
-        let mut hash: AddressHash = Default::default();
+        let mut hash = AddressHashEnum::default_address_hash();
         hash.copy_from_slice(address.hash.as_slice());
 
         let prefix = match address.address_type {
@@ -274,7 +290,7 @@ impl Address {
             ));
         };
 
-        CashAddress::new(network_prefix, self.hash.clone().take().to_vec(), address_type)
+        CashAddress::new(network_prefix, self.hash.to_vec(), address_type)
     }
 
     pub fn from_segwitaddress(
@@ -285,11 +301,13 @@ impl Address {
     ) -> Result<Address, String> {
         let address = SegwitAddress::from_str(segaddr).map_err(|e| e.to_string())?;
 
-        if address.program.len() != 20 {
-            return Err("Expect 20 bytes long hash".into());
-        }
-
-        let mut hash: AddressHash = Default::default();
+        let mut hash = if address.program.len() == 20 {
+            AddressHashEnum::default_address_hash()
+        } else if address.program.len() == 32 {
+            AddressHashEnum::default_witness_script_hash()
+        } else {
+            return Err("Expect either 20 or 32 bytes long hash".into());
+        };
         hash.copy_from_slice(address.program.as_slice());
 
         let hrp = Some(address.hrp);
@@ -314,7 +332,7 @@ impl Address {
 
 #[cfg(test)]
 mod tests {
-    use super::{Address, AddressFormat, CashAddrType, CashAddress, ChecksumType};
+    use super::{Address, AddressFormat, AddressHashEnum, CashAddrType, CashAddress, ChecksumType};
     use crate::NetworkPrefix;
 
     #[test]
@@ -322,7 +340,7 @@ mod tests {
         let address = Address {
             prefix: 0,
             t_addr_prefix: 0,
-            hash: "3f4aa1fedf1f54eeb03b759deadb36676b184911".into(),
+            hash: AddressHashEnum::AddressHash("3f4aa1fedf1f54eeb03b759deadb36676b184911".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -336,7 +354,7 @@ mod tests {
         let address = Address {
             prefix: 60,
             t_addr_prefix: 0,
-            hash: "05aab5342166f8594baf17a7d9bef5d567443327".into(),
+            hash: AddressHashEnum::AddressHash("05aab5342166f8594baf17a7d9bef5d567443327".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -350,7 +368,7 @@ mod tests {
         let address = Address {
             t_addr_prefix: 29,
             prefix: 37,
-            hash: "05aab5342166f8594baf17a7d9bef5d567443327".into(),
+            hash: AddressHashEnum::AddressHash("05aab5342166f8594baf17a7d9bef5d567443327".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -364,7 +382,7 @@ mod tests {
         let address = Address {
             prefix: 85,
             t_addr_prefix: 0,
-            hash: "ca0c3786c96ff7dacd40fdb0f7c196528df35f85".into(),
+            hash: AddressHashEnum::AddressHash("ca0c3786c96ff7dacd40fdb0f7c196528df35f85".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -378,7 +396,7 @@ mod tests {
         let address = Address {
             prefix: 0,
             t_addr_prefix: 0,
-            hash: "3f4aa1fedf1f54eeb03b759deadb36676b184911".into(),
+            hash: AddressHashEnum::AddressHash("3f4aa1fedf1f54eeb03b759deadb36676b184911".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -393,7 +411,7 @@ mod tests {
         let address = Address {
             prefix: 60,
             t_addr_prefix: 0,
-            hash: "05aab5342166f8594baf17a7d9bef5d567443327".into(),
+            hash: AddressHashEnum::AddressHash("05aab5342166f8594baf17a7d9bef5d567443327".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -408,7 +426,7 @@ mod tests {
         let address = Address {
             t_addr_prefix: 29,
             prefix: 37,
-            hash: "05aab5342166f8594baf17a7d9bef5d567443327".into(),
+            hash: AddressHashEnum::AddressHash("05aab5342166f8594baf17a7d9bef5d567443327".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -423,7 +441,7 @@ mod tests {
         let address = Address {
             prefix: 85,
             t_addr_prefix: 0,
-            hash: "ca0c3786c96ff7dacd40fdb0f7c196528df35f85".into(),
+            hash: AddressHashEnum::AddressHash("ca0c3786c96ff7dacd40fdb0f7c196528df35f85".into()),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -438,7 +456,7 @@ mod tests {
         let address = Address {
             prefix: 36,
             t_addr_prefix: 0,
-            hash: "c3f710deb7320b0efa6edb14e3ebeeb9155fa90d".into(),
+            hash: AddressHashEnum::AddressHash("c3f710deb7320b0efa6edb14e3ebeeb9155fa90d".into()),
             checksum_type: ChecksumType::DGROESTL512,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -453,7 +471,7 @@ mod tests {
         let address = Address {
             prefix: 63,
             t_addr_prefix: 0,
-            hash: "56bb05aa20f5a80cf84e90e5dab05be331333e27".into(),
+            hash: AddressHashEnum::AddressHash("56bb05aa20f5a80cf84e90e5dab05be331333e27".into()),
             checksum_type: ChecksumType::KECCAK256,
             hrp: None,
             addr_format: AddressFormat::Standard,
@@ -510,10 +528,12 @@ mod tests {
         let address = Address {
             prefix: 2,
             t_addr_prefix: 0,
-            hash: [
-                140, 0, 44, 191, 189, 83, 144, 173, 47, 216, 127, 59, 80, 232, 159, 100, 156, 132, 78, 192,
-            ]
-            .into(),
+            hash: AddressHashEnum::AddressHash(
+                [
+                    140, 0, 44, 191, 189, 83, 144, 173, 47, 216, 127, 59, 80, 232, 159, 100, 156, 132, 78, 192,
+                ]
+                .into(),
+            ),
             checksum_type: ChecksumType::DSHA256,
             hrp: None,
             addr_format: AddressFormat::CashAddress {
diff --git a/mm2src/mm2_bitcoin/keys/src/cashaddress.rs b/mm2src/mm2_bitcoin/keys/src/cashaddress.rs
index 4d8ffa104b..80dcdab0f8 100644
--- a/mm2src/mm2_bitcoin/keys/src/cashaddress.rs
+++ b/mm2src/mm2_bitcoin/keys/src/cashaddress.rs
@@ -4,7 +4,7 @@ use std::str::FromStr;
 const DEFAULT_PREFIX: NetworkPrefix = NetworkPrefix::BitcoinCash;
 
 #[allow(clippy::upper_case_acronyms)]
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub enum AddressType {
     /// Pay to PubKey Hash
     /// https://bitcoin.org/en/glossary/p2pkh-address
@@ -14,11 +14,15 @@ pub enum AddressType {
     P2SH,
 }
 
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub enum NetworkPrefix {
     BitcoinCash,
     BchTest,
     BchReg,
+    // SLP on BCH mainnet
+    SimpleLedger,
+    // SLP on BCH testnet
+    SlpTest,
     Other(String),
 }
 
@@ -28,6 +32,8 @@ impl fmt::Display for NetworkPrefix {
             NetworkPrefix::BitcoinCash => "bitcoincash",
             NetworkPrefix::BchTest => "bchtest",
             NetworkPrefix::BchReg => "bchreg",
+            NetworkPrefix::SimpleLedger => "simpleledger",
+            NetworkPrefix::SlpTest => "slptest",
             NetworkPrefix::Other(network) => network,
         };
         write!(f, "{}", as_str)
@@ -43,6 +49,8 @@ impl FromStr for NetworkPrefix {
             "bitcoincash" => NetworkPrefix::BitcoinCash,
             "bchtest" => NetworkPrefix::BchTest,
             "bchreg" => NetworkPrefix::BchReg,
+            "simpleledger" => NetworkPrefix::SimpleLedger,
+            "slptest" => NetworkPrefix::SlpTest,
             _ => NetworkPrefix::Other(s),
         };
         Ok(prefix)
@@ -57,7 +65,7 @@ impl NetworkPrefix {
     /// The method converts self to string and returns a byte array with each element
     /// being the corresponding character's right-most 5 bits.
     /// Result additionally includes a null termination byte.
-    fn encode_to_ckecksum(&self) -> Vec<u8> {
+    fn encode_to_checksum(&self) -> Vec<u8> {
         // Grab the right most 5 bits of each char.
         let mut prefix: Vec<u8> = self.to_string().as_bytes().iter().map(|x| x & 0b11111).collect();
         prefix.push(0);
@@ -65,7 +73,7 @@ impl NetworkPrefix {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct CashAddress {
     pub prefix: NetworkPrefix,
     pub hash: Vec<u8>,
@@ -250,7 +258,7 @@ fn addr_type_from_version(version: u8) -> Result<AddressType, String> {
 // CalculateChecksum calculates a BCH checksum for a nibble-packed cashaddress
 // that properly includes the network prefix.
 fn calculate_checksum(prefix: &NetworkPrefix, payload: &[u8]) -> u64 {
-    let mut raw_data = prefix.encode_to_ckecksum();
+    let mut raw_data = prefix.encode_to_checksum();
     raw_data.extend(payload);
     poly_mod(&raw_data)
 }
diff --git a/mm2src/mm2_bitcoin/keys/src/error.rs b/mm2src/mm2_bitcoin/keys/src/error.rs
index 51d6dc306f..fefafc2b83 100644
--- a/mm2src/mm2_bitcoin/keys/src/error.rs
+++ b/mm2src/mm2_bitcoin/keys/src/error.rs
@@ -1,7 +1,7 @@
 use secp256k1::Error as SecpError;
 use std::fmt;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Serialize)]
 pub enum Error {
     InvalidPublic,
     InvalidSecret,
diff --git a/mm2src/mm2_bitcoin/keys/src/keypair.rs b/mm2src/mm2_bitcoin/keys/src/keypair.rs
index 5bcd3cfa65..e3b3db7aae 100644
--- a/mm2src/mm2_bitcoin/keys/src/keypair.rs
+++ b/mm2src/mm2_bitcoin/keys/src/keypair.rs
@@ -7,7 +7,7 @@ use secp256k1::{PublicKey, SecretKey};
 use std::fmt;
 use {Error, Private, Public, Secret};
 
-#[derive(Default, PartialEq)]
+#[derive(Clone, Copy, Default, PartialEq)]
 pub struct KeyPair {
     private: Private,
     public: Public,
@@ -30,8 +30,14 @@ impl fmt::Display for KeyPair {
 impl KeyPair {
     pub fn private(&self) -> &Private { &self.private }
 
+    pub fn private_bytes(&self) -> [u8; 32] { self.private.secret.take() }
+
+    pub fn private_ref(&self) -> &[u8; 32] { &self.private.secret }
+
     pub fn public(&self) -> &Public { &self.public }
 
+    pub fn public_slice(&self) -> &[u8] { &self.public }
+
     pub fn from_private(private: Private) -> Result<KeyPair, Error> {
         let s: SecretKey = SecretKey::from_slice(&*private.secret)?;
         let pub_key = PublicKey::from_secret_key(&SECP_SIGN, &s);
@@ -70,6 +76,21 @@ impl KeyPair {
             public: Public::Normal(public),
         }
     }
+
+    pub fn random_compressed() -> Self {
+        let secp_secret = SecretKey::new(&mut rand::thread_rng());
+        let pub_key = PublicKey::from_secret_key(&SECP_SIGN, &secp_secret);
+
+        KeyPair {
+            private: Private {
+                prefix: 0,
+                secret: (*secp_secret.as_ref()).into(),
+                compressed: true,
+                checksum_type: Default::default(),
+            },
+            public: Public::Compressed(pub_key.serialize().into()),
+        }
+    }
 }
 
 #[cfg(test)]
diff --git a/mm2src/mm2_bitcoin/keys/src/lib.rs b/mm2src/mm2_bitcoin/keys/src/lib.rs
index f68494d2a6..af93a421ea 100644
--- a/mm2src/mm2_bitcoin/keys/src/lib.rs
+++ b/mm2src/mm2_bitcoin/keys/src/lib.rs
@@ -9,6 +9,7 @@ extern crate primitives;
 extern crate rustc_hex as hex;
 extern crate secp256k1;
 extern crate serde;
+#[macro_use] extern crate serde_derive;
 
 mod address;
 mod cashaddress;
@@ -37,15 +38,59 @@ pub use signature::{CompactSignature, Signature};
 use hash::{H160, H256};
 use lazy_static::lazy_static;
 use secp256k1::{Secp256k1, SignOnly, VerifyOnly};
+use std::fmt;
 
-/// 20 bytes long hash derived from public `ripemd160(sha256(public))`
-pub type AddressHash = H160;
 /// 32 bytes long secret key
 pub type Secret = H256;
 /// 32 bytes long signable message
 pub type Message = H256;
 
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub enum AddressHashEnum {
+    /// 20 bytes long hash derived from public `ripemd160(sha256(public))` used in P2PKH, P2SH, P2WPKH
+    AddressHash(H160),
+    /// 32 bytes long hash derived from script `sha256(script)` used in P2WSH
+    WitnessScriptHash(H256),
+}
+
+impl AddressHashEnum {
+    pub fn default_address_hash() -> Self { AddressHashEnum::AddressHash(H160::default()) }
+
+    pub fn default_witness_script_hash() -> Self { AddressHashEnum::WitnessScriptHash(H256::default()) }
+
+    pub fn copy_from_slice(&mut self, src: &[u8]) {
+        match self {
+            AddressHashEnum::AddressHash(h) => h.copy_from_slice(src),
+            AddressHashEnum::WitnessScriptHash(s) => s.copy_from_slice(src),
+        }
+    }
+
+    pub fn to_vec(&self) -> Vec<u8> {
+        match self {
+            AddressHashEnum::AddressHash(h) => h.to_vec(),
+            AddressHashEnum::WitnessScriptHash(s) => s.to_vec(),
+        }
+    }
+
+    pub fn is_address_hash(&self) -> bool { matches!(*self, AddressHashEnum::AddressHash(_)) }
+
+    pub fn is_witness_script_hash(&self) -> bool { matches!(*self, AddressHashEnum::WitnessScriptHash(_)) }
+}
+
+impl fmt::Display for AddressHashEnum {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AddressHashEnum::AddressHash(h) => f.write_str(&h.to_string()),
+            AddressHashEnum::WitnessScriptHash(s) => f.write_str(&s.to_string()),
+        }
+    }
+}
+
+impl From<H160> for AddressHashEnum {
+    fn from(hash: H160) -> Self { AddressHashEnum::AddressHash(hash) }
+}
+
 lazy_static! {
-    static ref SECP_VERIFY: Secp256k1<VerifyOnly> = Secp256k1::verification_only();
-    static ref SECP_SIGN: Secp256k1<SignOnly> = Secp256k1::signing_only();
+    pub static ref SECP_VERIFY: Secp256k1<VerifyOnly> = Secp256k1::verification_only();
+    pub static ref SECP_SIGN: Secp256k1<SignOnly> = Secp256k1::signing_only();
 }
diff --git a/mm2src/mm2_bitcoin/keys/src/private.rs b/mm2src/mm2_bitcoin/keys/src/private.rs
index 800f8f66d7..cb9a4ac44b 100644
--- a/mm2src/mm2_bitcoin/keys/src/private.rs
+++ b/mm2src/mm2_bitcoin/keys/src/private.rs
@@ -11,7 +11,7 @@ use std::str::FromStr;
 use {DisplayLayout, Error, Message, Secret, Signature};
 
 /// Secret with additional network prefix and format type
-#[derive(Default, PartialEq, Clone)]
+#[derive(Clone, Copy, Default, PartialEq)]
 pub struct Private {
     /// The network prefix on which this key should be used.
     pub prefix: u8,
@@ -31,6 +31,19 @@ impl Private {
         let data = signature.serialize_der();
         Ok(data.as_ref().to_vec().into())
     }
+
+    // https://github.com/qtumproject/qtum/blob/master/src/key.cpp#L302
+    pub fn sign_compact(&self, message: &Message) -> Result<Signature, Error> {
+        let secret = SecretKey::from_slice(&*self.secret)?;
+        let message = SecpMessage::from_slice(&**message)?;
+        let signature = SECP_SIGN.sign_recoverable(&message, &secret);
+        let (recover_id, bytes) = signature.serialize_compact();
+        let mut out = bytes.to_vec();
+        let header = 27 + recover_id.to_i32() as u8;
+        let byte: u8 = if self.compressed { header + 4 } else { header };
+        out.insert(0, byte);
+        Ok(out.into())
+    }
 }
 
 impl DisplayLayout for Private {
diff --git a/mm2src/mm2_bitcoin/keys/src/public.rs b/mm2src/mm2_bitcoin/keys/src/public.rs
index cce6b89cdf..7ba0b9a27e 100644
--- a/mm2src/mm2_bitcoin/keys/src/public.rs
+++ b/mm2src/mm2_bitcoin/keys/src/public.rs
@@ -1,12 +1,14 @@
 use crate::SECP_VERIFY;
 use crypto::dhash160;
-use hash::{H264, H520};
+use hash::{H160, H264, H520};
 use hex::ToHex;
-use secp256k1::{Message as SecpMessage, PublicKey, Signature as SecpSignature};
+use secp256k1::{recovery::{RecoverableSignature, RecoveryId},
+                Message as SecpMessage, PublicKey, Signature as SecpSignature};
 use std::{fmt, ops};
-use {AddressHash, Error, Message, Signature};
+use {CompactSignature, Error, Message, Signature};
 
 /// Secret public key
+#[derive(Copy, Clone)]
 pub enum Public {
     /// Normal version of public key
     Normal(H520),
@@ -35,7 +37,7 @@ impl Public {
         }
     }
 
-    pub fn address_hash(&self) -> AddressHash { dhash160(self) }
+    pub fn address_hash(&self) -> H160 { dhash160(self) }
 
     pub fn verify(&self, message: &Message, signature: &Signature) -> Result<bool, Error> {
         let public = match self {
@@ -47,6 +49,26 @@ impl Public {
         let message = SecpMessage::from_slice(&**message)?;
         Ok(SECP_VERIFY.verify(&message, &signature, &public).is_ok())
     }
+
+    pub fn recover_compact(message: &Message, signature: &CompactSignature) -> Result<Self, Error> {
+        if signature[0] < 27 {
+            return Err(Error::InvalidSignature);
+        };
+        let recovery_id = (signature[0] - 27) & 3;
+        let compressed = (signature[0] - 27) & 4 != 0;
+        let recovery_id = RecoveryId::from_i32(recovery_id as i32)?;
+        let signature = RecoverableSignature::from_compact(&signature[1..65], recovery_id)?;
+        let message = SecpMessage::from_slice(&**message)?;
+        let pubkey = SECP_VERIFY.recover(&message, &signature)?;
+        let public = if compressed {
+            let serialized = pubkey.serialize();
+            Public::Compressed(serialized.into())
+        } else {
+            let serialized = pubkey.serialize_uncompressed();
+            Public::Normal(serialized.into())
+        };
+        Ok(public)
+    }
 }
 
 impl ops::Deref for Public {
diff --git a/mm2src/mm2_bitcoin/keys/src/segwitaddress.rs b/mm2src/mm2_bitcoin/keys/src/segwitaddress.rs
index a81d6f2fda..692d6d4663 100644
--- a/mm2src/mm2_bitcoin/keys/src/segwitaddress.rs
+++ b/mm2src/mm2_bitcoin/keys/src/segwitaddress.rs
@@ -2,7 +2,7 @@ use std::fmt;
 use std::str::FromStr;
 
 use bech32;
-use AddressHash;
+use AddressHashEnum;
 
 /// Address error.
 #[derive(Debug, PartialEq)]
@@ -70,7 +70,7 @@ pub struct SegwitAddress {
 }
 
 impl SegwitAddress {
-    pub fn new(hash: &AddressHash, hrp: String) -> SegwitAddress {
+    pub fn new(hash: &AddressHashEnum, hrp: String) -> SegwitAddress {
         SegwitAddress {
             hrp,
             version: bech32::u5::try_from_u8(0).expect("0<32"),
@@ -181,6 +181,7 @@ impl FromStr for SegwitAddress {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crypto::sha256;
     use Public;
 
     fn hex_to_bytes(s: &str) -> Option<Vec<u8>> {
@@ -202,8 +203,22 @@ mod tests {
         let public_key = Public::from_slice(&bytes).unwrap();
         let hash = public_key.address_hash();
         let hrp = "bc";
-        let addr = SegwitAddress::new(&hash, hrp.to_string());
+        let addr = SegwitAddress::new(&AddressHashEnum::AddressHash(hash.into()), hrp.to_string());
         assert_eq!(&addr.to_string(), "bc1qvzvkjn4q3nszqxrv3nraga2r822xjty3ykvkuw");
         assert_eq!(addr.address_type(), Some(AddressType::P2wpkh));
     }
+
+    #[test]
+    fn test_p2wsh_address() {
+        let script = "210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac";
+        let bytes = hex_to_bytes(script).unwrap();
+        let hash = sha256(&bytes);
+        let hrp = "bc";
+        let addr = SegwitAddress::new(&AddressHashEnum::WitnessScriptHash(hash.into()), hrp.to_string());
+        assert_eq!(
+            &addr.to_string(),
+            "bc1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qccfmv3"
+        );
+        assert_eq!(addr.address_type(), Some(AddressType::P2wsh));
+    }
 }
diff --git a/mm2src/mm2_bitcoin/keys/src/signature.rs b/mm2src/mm2_bitcoin/keys/src/signature.rs
index 3032a1bfa5..46edce268f 100644
--- a/mm2src/mm2_bitcoin/keys/src/signature.rs
+++ b/mm2src/mm2_bitcoin/keys/src/signature.rs
@@ -90,3 +90,7 @@ impl From<&'static str> for CompactSignature {
 impl From<H520> for CompactSignature {
     fn from(h: H520) -> Self { CompactSignature(h) }
 }
+
+impl From<Vec<u8>> for CompactSignature {
+    fn from(v: Vec<u8>) -> Self { CompactSignature(H520::from(&v[..])) }
+}
diff --git a/mm2src/mm2_bitcoin/primitives/src/hash.rs b/mm2src/mm2_bitcoin/primitives/src/hash.rs
index bb625e5a57..785653a980 100644
--- a/mm2src/mm2_bitcoin/primitives/src/hash.rs
+++ b/mm2src/mm2_bitcoin/primitives/src/hash.rs
@@ -6,6 +6,7 @@ use std::{cmp, fmt, ops, str};
 
 macro_rules! impl_hash {
     ($name: ident, $size: expr) => {
+        #[derive(Copy)]
         #[repr(C)]
         pub struct $name([u8; $size]);
 
@@ -163,5 +164,5 @@ impl H256 {
     pub fn from_reversed_str(s: &'static str) -> Self { H256::from(s).reversed() }
 
     #[inline]
-    pub fn to_reversed_str(&self) -> String { self.reversed().to_string() }
+    pub fn to_reversed_str(self) -> String { self.reversed().to_string() }
 }
diff --git a/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs b/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs
index b26db0a00c..74971f8362 100644
--- a/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs
@@ -12,16 +12,19 @@ use std::str::FromStr;
 macro_rules! impl_hash {
     ($name: ident, $other: ident, $size: expr) => {
         /// Hash serialization
+        #[derive(Clone, Copy)]
         pub struct $name(pub [u8; $size]);
 
         impl Default for $name {
             fn default() -> Self { $name([0; $size]) }
         }
 
+        impl fmt::Display for $name {
+            fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { write!(f, "{:02x}", self) }
+        }
+
         impl fmt::Debug for $name {
-            fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-                write!(f, "{}", $other::from(self.0.clone()).to_hex::<String>())
-            }
+            fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { write!(f, "{:02x}", self) }
         }
 
         impl<T> From<T> for $name
@@ -85,14 +88,6 @@ macro_rules! impl_hash {
             }
         }
 
-        impl Clone for $name {
-            fn clone(&self) -> Self {
-                let mut r = [0; $size];
-                r.copy_from_slice(&self.0);
-                $name(r)
-            }
-        }
-
         impl serde::Serialize for $name {
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where
@@ -164,8 +159,9 @@ impl_hash!(H256, GlobalH256, 32);
 impl_hash!(H160, GlobalH160, 20);
 
 impl H256 {
+    #[inline]
     pub fn reversed(&self) -> Self {
-        let mut result = self.clone();
+        let mut result = *self;
         result.0.reverse();
         result
     }
diff --git a/mm2src/mm2_bitcoin/rpc/src/v1/types/mod.rs b/mm2src/mm2_bitcoin/rpc/src/v1/types/mod.rs
index 182d91b204..5b65f44062 100644
--- a/mm2src/mm2_bitcoin/rpc/src/v1/types/mod.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/v1/types/mod.rs
@@ -23,3 +23,15 @@ pub use self::transaction::{GetRawTransactionResponse, RawTransaction, SignedTra
                             TransactionInputScript, TransactionOutput, TransactionOutputScript,
                             TransactionOutputWithAddress, TransactionOutputWithScriptData, TransactionOutputs};
 pub use self::uint::U256;
+
+pub trait ToTxHash {
+    fn to_tx_hash(&self) -> String;
+}
+
+impl ToTxHash for Bytes {
+    fn to_tx_hash(&self) -> String { format!("{:02x}", self) }
+}
+
+impl ToTxHash for Vec<u8> {
+    fn to_tx_hash(&self) -> String { Bytes::new(self.clone()).to_tx_hash() }
+}
diff --git a/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs b/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs
index e1ff1477a5..ee2c6316c2 100644
--- a/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs
@@ -30,7 +30,7 @@ pub struct TransactionOutputWithAddress {
     pub amount: f64,
 }
 
-/// Trasaction output of form "data": serialized(output script data)
+/// Transaction output of form "data": serialized(output script data)
 #[derive(Debug, PartialEq)]
 pub struct TransactionOutputWithScriptData {
     /// Serialized script data
@@ -151,7 +151,7 @@ pub struct CoinbaseTransactionInput {
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct SignedTransactionOutput {
     /// Output value in BTC
-    pub value: f64,
+    pub value: Option<f64>,
     /// Output index
     pub n: u32,
     /// Output script
@@ -160,7 +160,16 @@ pub struct SignedTransactionOutput {
 }
 
 impl SignedTransactionOutput {
-    pub fn is_empty(&self) -> bool { self.value == 0.0 && self.script.is_empty() }
+    pub fn is_empty(&self) -> bool { self.value == Some(0.0) && self.script.is_empty() }
+}
+
+fn deserialize_null_default<'de, D, T>(deserializer: D) -> Result<T, D::Error>
+where
+    T: Default + Deserialize<'de>,
+    D: Deserializer<'de>,
+{
+    let opt = Option::deserialize(deserializer)?;
+    Ok(opt.unwrap_or_default())
 }
 
 /// Transaction
@@ -186,18 +195,22 @@ pub struct Transaction {
     pub vout: Vec<SignedTransactionOutput>,
     /// Hash of the block this transaction is included in
     #[serde(default)]
+    #[serde(deserialize_with = "deserialize_null_default")]
     pub blockhash: H256,
     /// Number of confirmations of this transaction
     #[serde(default)]
+    #[serde(deserialize_with = "deserialize_null_default")]
     pub confirmations: u32,
     /// Number of rawconfirmations of this transaction, KMD specific
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rawconfirmations: Option<u32>,
     /// The transaction time in seconds since epoch (Jan 1 1970 GMT)
     #[serde(default)]
+    #[serde(deserialize_with = "deserialize_null_default")]
     pub time: u32,
     /// The block time in seconds since epoch (Jan 1 1970 GMT)
     #[serde(default)]
+    #[serde(deserialize_with = "deserialize_null_default")]
     pub blocktime: u32,
     /// The block height transaction mined in
     #[serde(default)]
@@ -490,7 +503,7 @@ mod tests {
     #[test]
     fn signed_transaction_output_serialize() {
         let txout = SignedTransactionOutput {
-            value: 777.79,
+            value: Some(777.79),
             n: 12,
             script: TransactionOutputScript {
                 asm: "Hello, world!!!".to_owned(),
@@ -512,7 +525,7 @@ mod tests {
     #[test]
     fn signed_transaction_output_deserialize() {
         let txout = SignedTransactionOutput {
-            value: 777.79,
+            value: Some(777.79),
             n: 12,
             script: TransactionOutputScript {
                 asm: "Hello, world!!!".to_owned(),
diff --git a/mm2src/mm2_bitcoin/script/src/builder.rs b/mm2src/mm2_bitcoin/script/src/builder.rs
index 9bf58a5a7a..29bcef65fb 100644
--- a/mm2src/mm2_bitcoin/script/src/builder.rs
+++ b/mm2src/mm2_bitcoin/script/src/builder.rs
@@ -1,7 +1,7 @@
 //! Script builder
 
 use bytes::Bytes;
-use keys::{AddressHash, Public};
+use keys::{AddressHashEnum, Public};
 use {Num, Opcode, Script};
 
 /// Script builder
@@ -12,11 +12,11 @@ pub struct Builder {
 
 impl Builder {
     /// Builds p2pkh script pubkey
-    pub fn build_p2pkh(address: &AddressHash) -> Script {
+    pub fn build_p2pkh(address: &AddressHashEnum) -> Script {
         Builder::default()
             .push_opcode(Opcode::OP_DUP)
             .push_opcode(Opcode::OP_HASH160)
-            .push_bytes(&**address)
+            .push_bytes(&address.to_vec())
             .push_opcode(Opcode::OP_EQUALVERIFY)
             .push_opcode(Opcode::OP_CHECKSIG)
             .into_script()
@@ -31,19 +31,19 @@ impl Builder {
     }
 
     /// Builds p2sh script pubkey
-    pub fn build_p2sh(address: &AddressHash) -> Script {
+    pub fn build_p2sh(address: &AddressHashEnum) -> Script {
         Builder::default()
             .push_opcode(Opcode::OP_HASH160)
-            .push_bytes(&**address)
+            .push_bytes(&address.to_vec())
             .push_opcode(Opcode::OP_EQUAL)
             .into_script()
     }
 
-    /// Builds p2wpkh script pubkey
-    pub fn build_p2wpkh(address: &AddressHash) -> Script {
+    /// Builds p2wpkh or p2wsh script pubkey
+    pub fn build_witness_script(address: &AddressHashEnum) -> Script {
         Builder::default()
             .push_opcode(Opcode::OP_0)
-            .push_bytes(&**address)
+            .push_bytes(&address.to_vec())
             .into_script()
     }
 
diff --git a/mm2src/mm2_bitcoin/script/src/script.rs b/mm2src/mm2_bitcoin/script/src/script.rs
index 11f99aedb1..d27181ef6e 100644
--- a/mm2src/mm2_bitcoin/script/src/script.rs
+++ b/mm2src/mm2_bitcoin/script/src/script.rs
@@ -1,7 +1,7 @@
 //! Serialized script, used inside transaction inputs and outputs.
 
 use bytes::Bytes;
-use keys::{self, AddressHash, Public};
+use keys::{self, AddressHashEnum, Public};
 use std::{fmt, ops};
 use {Error, Opcode};
 
@@ -32,12 +32,12 @@ pub struct ScriptAddress {
     /// The type of the address.
     pub kind: keys::Type,
     /// Public key hash.
-    pub hash: AddressHash,
+    pub hash: AddressHashEnum,
 }
 
 impl ScriptAddress {
     /// Creates P2PKH-type ScriptAddress
-    pub fn new_p2pkh(hash: AddressHash) -> Self {
+    pub fn new_p2pkh(hash: AddressHashEnum) -> Self {
         ScriptAddress {
             kind: keys::Type::P2PKH,
             hash,
@@ -45,24 +45,32 @@ impl ScriptAddress {
     }
 
     /// Creates P2SH-type ScriptAddress
-    pub fn new_p2sh(hash: AddressHash) -> Self {
+    pub fn new_p2sh(hash: AddressHashEnum) -> Self {
         ScriptAddress {
             kind: keys::Type::P2SH,
             hash,
         }
     }
 
-    /// Creates P2SH-type ScriptAddress
-    pub fn new_p2wpkh(hash: AddressHash) -> Self {
+    /// Creates P2WPKH-type ScriptAddress
+    pub fn new_p2wpkh(hash: AddressHashEnum) -> Self {
         ScriptAddress {
             kind: keys::Type::P2WPKH,
             hash,
         }
     }
+
+    /// Creates P2WSH-type ScriptAddress
+    pub fn new_p2wsh(hash: AddressHashEnum) -> Self {
+        ScriptAddress {
+            kind: keys::Type::P2WSH,
+            hash,
+        }
+    }
 }
 
 /// Serialized script, used inside transaction inputs and outputs.
-#[derive(PartialEq, Debug)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct Script {
     data: Bytes,
 }
@@ -406,10 +414,18 @@ impl Script {
                     x if x == Opcode::OP_PUSHBYTES_65 as u8 => &self.data[1..66],
                     _ => unreachable!(), // because we are relying on script_type() checks here
                 })
-                .map(|public| vec![ScriptAddress::new_p2pkh(public.address_hash())])
+                .map(|public| {
+                    vec![ScriptAddress::new_p2pkh(AddressHashEnum::AddressHash(
+                        public.address_hash(),
+                    ))]
+                })
             },
-            ScriptType::PubKeyHash => Ok(vec![ScriptAddress::new_p2pkh(self.data[3..23].into())]),
-            ScriptType::ScriptHash => Ok(vec![ScriptAddress::new_p2sh(self.data[2..22].into())]),
+            ScriptType::PubKeyHash => Ok(vec![ScriptAddress::new_p2pkh(AddressHashEnum::AddressHash(
+                self.data[3..23].into(),
+            ))]),
+            ScriptType::ScriptHash => Ok(vec![ScriptAddress::new_p2sh(AddressHashEnum::AddressHash(
+                self.data[2..22].into(),
+            ))]),
             ScriptType::Multisig => {
                 let mut addresses: Vec<ScriptAddress> = Vec::new();
                 let mut pc = 1;
@@ -421,16 +437,18 @@ impl Script {
                         .data
                         .expect("this method depends on previous check in script_type()");
                     let address = Public::from_slice(data)?.address_hash();
-                    addresses.push(ScriptAddress::new_p2pkh(address));
+                    addresses.push(ScriptAddress::new_p2pkh(AddressHashEnum::AddressHash(address)));
                     pc += instruction.step;
                 }
                 Ok(addresses)
             },
             ScriptType::NullData => Ok(vec![]),
-            ScriptType::WitnessScript => {
-                Ok(vec![]) // TODO
-            },
-            ScriptType::WitnessKey => Ok(vec![ScriptAddress::new_p2wpkh(self.data[2..22].into())]),
+            ScriptType::WitnessScript => Ok(vec![ScriptAddress::new_p2wsh(AddressHashEnum::WitnessScriptHash(
+                self.data[2..34].into(),
+            ))]),
+            ScriptType::WitnessKey => Ok(vec![ScriptAddress::new_p2wpkh(AddressHashEnum::AddressHash(
+                self.data[2..22].into(),
+            ))]),
             ScriptType::CallSender => {
                 Ok(vec![]) // TODO
             },
@@ -740,7 +758,7 @@ OP_ADD
         assert_eq!(script.script_type(), ScriptType::PubKey);
         assert_eq!(
             script.extract_destinations(),
-            Ok(vec![ScriptAddress::new_p2pkh(address),])
+            Ok(vec![ScriptAddress::new_p2pkh(address.into()),])
         );
     }
 
@@ -755,7 +773,7 @@ OP_ADD
         assert_eq!(script.script_type(), ScriptType::PubKey);
         assert_eq!(
             script.extract_destinations(),
-            Ok(vec![ScriptAddress::new_p2pkh(address),])
+            Ok(vec![ScriptAddress::new_p2pkh(address.into()),])
         );
     }
 
@@ -791,7 +809,7 @@ OP_ADD
         )
         .unwrap()
         .hash;
-        let script = Builder::build_p2wpkh(&address);
+        let script = Builder::build_witness_script(&address);
         assert_eq!(script.script_type(), ScriptType::WitnessKey);
         assert_eq!(
             script.extract_destinations(),
@@ -799,6 +817,24 @@ OP_ADD
         );
     }
 
+    #[test]
+    fn test_extract_destinations_witness_script_hash() {
+        let address = Address::from_segwitaddress(
+            "bc1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qccfmv3",
+            ChecksumType::DSHA256,
+            0,
+            0,
+        )
+        .unwrap()
+        .hash;
+        let script = Builder::build_witness_script(&address);
+        assert_eq!(script.script_type(), ScriptType::WitnessScript);
+        assert_eq!(
+            script.extract_destinations(),
+            Ok(vec![ScriptAddress::new_p2wsh(address),])
+        );
+    }
+
     #[test]
     fn test_extract_destinations_multisig() {
         let pubkey1_bytes = [0; 33];
@@ -816,8 +852,8 @@ OP_ADD
         assert_eq!(
             script.extract_destinations(),
             Ok(vec![
-                ScriptAddress::new_p2pkh(address1),
-                ScriptAddress::new_p2pkh(address2),
+                ScriptAddress::new_p2pkh(address1.into()),
+                ScriptAddress::new_p2pkh(address2.into()),
             ])
         );
     }
diff --git a/mm2src/mm2_bitcoin/script/src/sign.rs b/mm2src/mm2_bitcoin/script/src/sign.rs
index f4447c8316..8a654576ad 100644
--- a/mm2src/mm2_bitcoin/script/src/sign.rs
+++ b/mm2src/mm2_bitcoin/script/src/sign.rs
@@ -268,7 +268,7 @@ impl TransactionInputSigner {
 
         let unsigned_input = &self.inputs[input_index];
         TransactionInput {
-            previous_output: unsigned_input.previous_output.clone(),
+            previous_output: unsigned_input.previous_output,
             sequence: unsigned_input.sequence,
             script_sig: script_sig.to_bytes(),
             script_witness: vec![],
@@ -301,7 +301,7 @@ impl TransactionInputSigner {
         let inputs = if sighash.anyone_can_pay {
             let input = &self.inputs[input_index];
             vec![TransactionInput {
-                previous_output: input.previous_output.clone(),
+                previous_output: input.previous_output,
                 script_sig: script_pubkey.to_bytes(),
                 sequence: input.sequence,
                 script_witness: vec![],
@@ -311,7 +311,7 @@ impl TransactionInputSigner {
                 .iter()
                 .enumerate()
                 .map(|(n, input)| TransactionInput {
-                    previous_output: input.previous_output.clone(),
+                    previous_output: input.previous_output,
                     script_sig: if n == input_index {
                         script_pubkey.to_bytes()
                     } else {
@@ -600,8 +600,8 @@ mod tests {
                 UnsignedTransactionInput};
     use bytes::Bytes;
     use chain::{OutPoint, Transaction, TransactionOutput};
-    use hash::H256;
-    use keys::{Address, Private};
+    use hash::{H160, H256};
+    use keys::{Address, AddressHashEnum, Private};
     use script::Script;
     use sign::SignerHashAlgo;
 
@@ -615,13 +615,18 @@ mod tests {
             H256::from_reversed_str("81b4c832d70cb56ff957589752eb4125a4cab78a25a8fc52d6a09e5bd4404d48");
         let previous_output_index = 0;
         let to: Address = "1KKKK6N21XKo48zWKuQKXdvSsCf95ibHFa".into();
+        assert!(to.hash.is_address_hash());
         let previous_output = "76a914df3bd30160e6c6145baaf2c88a8844c13a00d1d588ac".into();
         let current_output: Bytes = "76a914c8e90996c7c6080ee06284600c684ed904d14c5c88ac".into();
         let value = 91234;
         let expected_signature_hash: H256 = "5fda68729a6312e17e641e9a49fac2a4a6a680126610af573caab270d232f850".into();
 
         // this is irrelevant
-        assert_eq!(&current_output[3..23], &*to.hash);
+        let mut hash = H160::default();
+        if let AddressHashEnum::AddressHash(h) = to.hash {
+            hash = h;
+        }
+        assert_eq!(&current_output[3..23], &*hash);
 
         let unsigned_input = UnsignedTransactionInput {
             sequence: 0xffff_ffff,
diff --git a/mm2src/mm2_bitcoin/serialization/Cargo.toml b/mm2src/mm2_bitcoin/serialization/Cargo.toml
index 43762457c0..4dfe63cd51 100644
--- a/mm2src/mm2_bitcoin/serialization/Cargo.toml
+++ b/mm2src/mm2_bitcoin/serialization/Cargo.toml
@@ -6,3 +6,5 @@ authors = ["debris <marek.kotewicz@gmail.com>"]
 [dependencies]
 byteorder = "1.0"
 primitives = { path = "../primitives" }
+derive_more = "0.99"
+test_helpers = { path = "../test_helpers" }
diff --git a/mm2src/mm2_bitcoin/serialization/src/compact_integer.rs b/mm2src/mm2_bitcoin/serialization/src/compact_integer.rs
index b3872de3a5..840145cabd 100644
--- a/mm2src/mm2_bitcoin/serialization/src/compact_integer.rs
+++ b/mm2src/mm2_bitcoin/serialization/src/compact_integer.rs
@@ -3,10 +3,76 @@
 use std::{fmt, io};
 use {Deserializable, Error as ReaderError, Reader, Serializable, Stream};
 
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum CompactIntegerError {
+    ParseError(String),
+}
+
 /// A type of variable-length integer commonly used in the Bitcoin P2P protocol and Bitcoin serialized data structures.
 #[derive(Default, Debug, Clone, Copy, PartialEq)]
 pub struct CompactInteger(u64);
 
+/// Parse a CompactInteger into its data length and the number it represents
+/// Useful for Parsing Vins and Vouts. Returns `ParseError` if insufficient bytes.
+///
+/// # Arguments
+///
+/// * `buf` - A byte-string starting with a CompactInteger
+///
+/// # Returns
+///
+/// * (length, number) - the length of the data in bytes, and the number it represents
+pub fn parse_compact_int<T: AsRef<[u8]> + ?Sized>(buf: &T) -> Result<CompactInteger, CompactIntegerError> {
+    let buf = buf.as_ref();
+    if buf.is_empty() {
+        return Err(CompactIntegerError::ParseError("Empty buffer!".into()));
+    }
+    let length = CompactInteger::data_length(buf[0]) as usize;
+
+    if length == 0 {
+        return Ok(buf[0].into());
+    }
+    if buf.len() < 1 + length {
+        return Err(CompactIntegerError::ParseError("Insufficient bytes!".into()));
+    }
+
+    let mut num_bytes = [0u8; 8];
+    num_bytes[..length].copy_from_slice(&buf[1..=length]);
+
+    Ok(u64::from_le_bytes(num_bytes).into())
+}
+
+impl CompactInteger {
+    /// The underlying number as a usize
+    pub fn as_usize(&self) -> usize { self.0 as usize }
+
+    /// Determine the length of the compact integer when serialized
+    pub fn serialized_length(&self) -> usize {
+        match self.0 {
+            0..=0xfc => 1,
+            0xfd..=0xffff => 3,
+            0x10000..=0xffff_ffff => 5,
+            _ => 9,
+        }
+    }
+
+    /// Determines the length of a CompactInteger in bytes.
+    /// A CompactInteger of > 1 byte is prefixed with a flag indicating its length.
+    ///
+    /// # Arguments
+    ///
+    /// * `flag` - The first byte of a compact_integer
+    pub fn data_length(flag: u8) -> u8 {
+        let length: u8 = match flag {
+            0xfd => 2,
+            0xfe => 4,
+            0xff => 8,
+            _ => 0,
+        };
+        length
+    }
+}
+
 impl fmt::Display for CompactInteger {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { self.0.fmt(f) }
 }
@@ -39,6 +105,10 @@ impl From<u64> for CompactInteger {
     fn from(i: u64) -> Self { CompactInteger(i) }
 }
 
+impl AsRef<u64> for CompactInteger {
+    fn as_ref(&self) -> &u64 { &self.0 }
+}
+
 impl Serializable for CompactInteger {
     fn serialize(&self, stream: &mut Stream) {
         match self.0 {
@@ -85,9 +155,67 @@ impl Deserializable for CompactInteger {
 
 #[cfg(test)]
 mod tests {
-    use super::CompactInteger;
+    use super::{parse_compact_int, CompactInteger, CompactIntegerError};
+    use test_helpers::hex::force_deserialize_hex;
     use {Error as ReaderError, Reader, Stream};
 
+    #[test]
+    fn test_compact_integer_data_length() {
+        let input: u8 = 1;
+        let expected: u8 = 0;
+        assert_eq!(CompactInteger::data_length(input), expected);
+
+        let input: u8 = 253;
+        let expected: u8 = 2;
+        assert_eq!(CompactInteger::data_length(input), expected);
+
+        let input: u8 = 254;
+        let expected: u8 = 4;
+        assert_eq!(CompactInteger::data_length(input), expected);
+
+        let input: u8 = 255;
+        let expected: u8 = 8;
+        assert_eq!(CompactInteger::data_length(input), expected);
+    }
+
+    #[test]
+    fn test_parse_compact_integers() {
+        let input = force_deserialize_hex("0x01");
+        let expected = [0, 1];
+        assert_eq!(parse_compact_int(&input).unwrap().as_usize(), expected[1]);
+
+        let input = force_deserialize_hex("0xff0000000000000000");
+        let expected = [8, 0];
+        assert_eq!(parse_compact_int(&input).unwrap().as_usize(), expected[1]);
+
+        let input = force_deserialize_hex("0xfe03000000");
+        let expected = [4, 3];
+        assert_eq!(parse_compact_int(&input).unwrap().as_usize(), expected[1]);
+
+        let input = force_deserialize_hex("0xfd0001");
+        let expected = [2, 256];
+        assert_eq!(parse_compact_int(&input).unwrap().as_usize(), expected[1]);
+    }
+
+    #[test]
+    fn test_parse_compact_integer_errors() {
+        let input = force_deserialize_hex("0xfd01");
+        let error = parse_compact_int(&input).unwrap_err();
+        assert_eq!(error, CompactIntegerError::ParseError("Insufficient bytes!".into()));
+
+        let input = force_deserialize_hex("0xfe010000");
+        let error = parse_compact_int(&input).unwrap_err();
+        assert_eq!(error, CompactIntegerError::ParseError("Insufficient bytes!".into()));
+
+        let input = force_deserialize_hex("0xff01000000000000");
+        let error = parse_compact_int(&input).unwrap_err();
+        assert_eq!(error, CompactIntegerError::ParseError("Insufficient bytes!".into()));
+
+        let input = force_deserialize_hex("0x");
+        let error = parse_compact_int(&input).unwrap_err();
+        assert_eq!(error, CompactIntegerError::ParseError("Empty buffer!".into()));
+    }
+
     #[test]
     fn test_compact_integer_stream() {
         let mut stream = Stream::default();
diff --git a/mm2src/mm2_bitcoin/serialization/src/lib.rs b/mm2src/mm2_bitcoin/serialization/src/lib.rs
index 1591c9787f..22e806516d 100644
--- a/mm2src/mm2_bitcoin/serialization/src/lib.rs
+++ b/mm2src/mm2_bitcoin/serialization/src/lib.rs
@@ -1,5 +1,7 @@
 extern crate byteorder;
+extern crate derive_more;
 extern crate primitives;
+extern crate test_helpers;
 
 mod compact_integer;
 mod impls;
@@ -9,8 +11,9 @@ mod stream;
 
 pub use primitives::{bytes, compact, hash};
 
-pub use compact_integer::CompactInteger;
+pub use compact_integer::{parse_compact_int, CompactInteger};
 pub use list::List;
-pub use reader::{deserialize, deserialize_iterator, CoinVariant, Deserializable, Error, ReadIterator, Reader};
+pub use reader::{coin_variant_by_ticker, deserialize, deserialize_iterator, CoinVariant, Deserializable, Error,
+                 ReadIterator, Reader};
 pub use stream::{serialize, serialize_list, serialize_with_flags, serialized_list_size,
                  serialized_list_size_with_flags, Serializable, Stream, SERIALIZE_TRANSACTION_WITNESS};
diff --git a/mm2src/mm2_bitcoin/serialization/src/reader.rs b/mm2src/mm2_bitcoin/serialization/src/reader.rs
index a32f539534..6b9045431d 100644
--- a/mm2src/mm2_bitcoin/serialization/src/reader.rs
+++ b/mm2src/mm2_bitcoin/serialization/src/reader.rs
@@ -1,4 +1,5 @@
 use compact_integer::CompactInteger;
+use derive_more::Display;
 use std::{io, marker};
 
 pub fn deserialize<R, T>(buffer: R) -> Result<T, Error>
@@ -27,7 +28,7 @@ where
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Display, PartialEq)]
 pub enum Error {
     MalformedData,
     UnexpectedEnd,
@@ -35,6 +36,8 @@ pub enum Error {
     Custom(String),
 }
 
+impl std::error::Error for Error {}
+
 impl From<io::Error> for Error {
     fn from(_: io::Error) -> Self { Error::UnexpectedEnd }
 }
@@ -48,12 +51,22 @@ pub trait Deserializable {
 
 #[derive(Debug)]
 pub enum CoinVariant {
+    LBC,
     Standard,
     Qtum,
 }
 
 impl CoinVariant {
     pub fn is_qtum(&self) -> bool { matches!(self, CoinVariant::Qtum) }
+
+    pub fn is_lbc(&self) -> bool { matches!(self, CoinVariant::LBC) }
+}
+
+pub fn coin_variant_by_ticker(ticker: &str) -> CoinVariant {
+    match ticker {
+        "LBC" => CoinVariant::LBC,
+        _ => CoinVariant::Standard,
+    }
 }
 
 /// Bitcoin structures reader.
diff --git a/mm2src/mm2_bitcoin/spv_validation/Cargo.toml b/mm2src/mm2_bitcoin/spv_validation/Cargo.toml
new file mode 100644
index 0000000000..ccf46b61ae
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "spv_validation"
+version = "0.1.0"
+authors = ["Roman Sztergbaum <rmscastle@gmail.com>"]
+
+[dependencies]
+chain = {path = "../chain"}
+primitives = { path = "../primitives" }
+ripemd160 = "0.9.0"
+rustc-hex = "2"
+serialization = { path = "../serialization" }
+sha2 = "0.9"
+test_helpers = { path = "../test_helpers" }
+
+[dev-dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
\ No newline at end of file
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/for_tests/spvTestVectors.json b/mm2src/mm2_bitcoin/spv_validation/src/for_tests/spvTestVectors.json
new file mode 100644
index 0000000000..6f19820a5e
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/for_tests/spvTestVectors.json
@@ -0,0 +1,214 @@
+{
+  "hash256": [
+    {
+      "input": "0x00",
+      "output": "0x1406e05881e299367766d313e26c05564ec91bf721d31726bd6e46e60689539a"
+    },
+    {
+      "input": "0x616263",
+      "output": "0x4f8b42c22dd3729b519ba6f68d2da7cc5b2d606d05daed5ad5128cc03e6c6358"
+    }
+  ],
+  "hash256MerkleStep": [
+    {
+      "input": [
+        "0x00",
+        "0x00"
+      ],
+      "output": "0x407feb4a4b8303baf4f84e29a209e0dcfd62e81f88c8edb7675c5a95d90e5c90"
+    },
+    {
+      "input": [
+        "0x00",
+        "0xff"
+      ],
+      "output": "0x63e16be7c46701e1275e7e5c79732685b824520343c51a86a7bb48a044878823"
+    }
+  ],
+  "determineInputLength": [
+    {
+      "input": "0x7bb2b8f32b9ebf13af2b0a2f9dc03797c7b77ccddcac75d1216389abfa7ab3750000000000ffffffffaa15ec17524f1f7bd47ab7caa4c6652cb95eec4c58902984f9b4bcfee444567d0000000000ffffff",
+      "output": 41
+    },
+    {
+      "input": "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd040000000000000000",
+      "output": 41
+    },
+    {
+      "input": "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd0400000002000000000000",
+      "output": 43
+    },
+    {
+      "input": "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd040000000900000000000000000000000000",
+      "output": 50
+    }
+  ],
+  "determineOutputLength": [
+    {
+      "input": "0x00000000000000002200",
+      "output": 43
+    },
+    {
+      "input": "0x00000000000000001600",
+      "output": 31
+    },
+    {
+      "input": "0x0000000000000000206a",
+      "output": 41
+    },
+    {
+      "input": "0x000000000000000002",
+      "output": 11
+    },
+    {
+      "input": "0x000000000000000000",
+      "output": 9
+    },
+    {
+      "input": "0x000000000000000088",
+      "output": 145
+    },
+    {
+      "input": "0x0000000000000000fc",
+      "output": 261
+    }
+  ],
+  "validateVin": [
+    {
+      "input": "0x011746bd867400f3494b8f44c24b83e1aa58c4f0ff25b4a61cffeffd4bc0f9ba300000000000ffffffff",
+      "output": true
+    },
+    {
+      "input": "0xFF1746bd867400f3494b8f44c24b83e1aa58c4f0ff25b4a61cffeffd4bc0f9ba300000000000ffffffff",
+      "output": false
+    },
+    {
+      "input": "0x001746bd867400f3494b8f44c24b83e1aa58c4f0ff25b4a61cffeffd4bc0f9ba300000000000ffffffff",
+      "output": false
+    },
+    {
+      "input": "0x011746bd867400f3494b8f44c24b83e1aa58c4f0ff25b4a61cffeffd4bc0f9ba300000000000ffffff",
+      "output": false
+    },
+    {
+      "input": "0x011746bd867400f3494b8f44c24b83e1aa58c4f0ff25b4a61cffeffd4bc0f9ba300000000000ffffffffEEEE",
+      "output": false
+    },
+    {
+      "input": "0x021746bd867400f3494b8f44c24b83e1aa58c4f0ff25b4a61cffeffd4bc0f9ba300000000000ffffffff",
+      "output": false
+    },
+    {
+      "comment": "0 inputs",
+      "input": "0x001746bd867400f3494b8f44c24b83e1aa58c4f0ff25b4a61cffeffd4bc0f9ba300000000000ffffffff",
+      "output": false
+    },
+    {
+      "comment": "Read overrun",
+      "input": "0xFF",
+      "output": false
+    }
+  ],
+  "validateVout": [
+    {
+      "input": "0x024897070000000000220020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000166a14edb1b5c2f39af0fec151732585b1049b07895211",
+      "output": true
+    },
+    {
+      "input": "0xFF4897070000000000220020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000166a14edb1b5c2f39af0fec151732585b1049b07895211",
+      "output": false
+    },
+    {
+      "input": "0x004897070000000000220020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000166a14edb1b5c2f39af0fec151732585b1049b07895211",
+      "output": false
+    },
+    {
+      "input": "0x024897070000000000220020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000166a14edb1b5c2f39af0fec151732585b1049b078952",
+      "output": false
+    },
+    {
+      "input": "0x024897070000000000220020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000166a14edb1b5c2f39af0fec151732585b1049b0789521111111111111111",
+      "output": false
+    },
+    {
+      "input": "0x024897070000000000ff0020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000166a14edb1b5c2f39af0fec151732585b1049b07895211",
+      "output": false
+    },
+    {
+      "input": "0x024897070000000000220020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000",
+      "output": false
+    },
+    {
+      "input": "0x004897070000000000220020a4333e5612ab1a1043b25755c89b16d55184a42f81799e623e6bc39db8539c180000000000000000",
+      "output": false
+    },
+    {
+      "comment": "Read overrun",
+      "input": "0xFF",
+      "output": false
+    },
+    {
+      "comment": "Read overrun",
+      "input": "0x010102030405060708FF",
+      "output": false
+    }
+  ],
+  "verifyHash256Merkle": [
+    {
+      "input": {
+        "proof": "0x82501c1178fa0b222c1f3d474ec726b832013f0a532b44bb620cce8624a5feb1169e1e83e930853391bc6f35f605c6754cfead57cf8387639d3b4096c54f18f4ff104ccb05421ab93e63f8c3ce5c2c2e9dbb37de2764b3a3175c8166562cac7d",
+        "index": 0
+      },
+      "output": true
+    },
+    {
+      "input": {
+        "proof": "0x169e1e83e930853391bc6f35f605c6754cfead57cf8387639d3b4096c54f18f482501c1178fa0b222c1f3d474ec726b832013f0a532b44bb620cce8624a5feb1ff104ccb05421ab93e63f8c3ce5c2c2e9dbb37de2764b3a3175c8166562cac7d",
+        "index": 1
+      },
+      "output": true
+    },
+    {
+      "input": {
+        "proof": "0x6c1320f4552ba68f3dbdd91f9422405f779b779e21678448e8035c21c1e2edd67a6190a846e318878be71565841d90a78e9e617b2d859d5e0767c13de427be4a2a6a6d55b17316d45ac11c4e613c38b293db606bace5062470d783471cc66c180455e6472ce92d32179994c3d44b75dd9834e1e7438cf9ab5be1ef6edf1e4a8d361dda470aca6e97c3b4056d4b329beba9ffd6a26c86a2a3f8f9ad31826b69ee49693027a439b3149853907afe87031f3bcf484b8bdd2e047d579d2ee2569c16769a33473b652d1d365886f9f9fba64fdea23ab16306ae1484ed632dcd381e5132c401084bc783478306202844b9cf34aff6ab24182206caa6eebc3e016fa373986d08ac9ae256ddda2deedc6662fd8f8a300ecdd38db2c5d6d2765a7515531e7f96f0310f9493cf79be3e60f63d8a6fa0c62ea59312731fd5b71b261abd99f5b908b3166d53532c9557a0f6ce9bc18f7b7619b2257043052a7ff2e5030e838f2e9edcc0f7273fa273a6b3ce2112dbd686f060b5f61deb1abc7247edf1bd6cd7ca4a6c5cfaedbc5905ef4f0511b143a0672ce4fa2dc1ed8852e077e0184febca",
+        "index": 4
+      },
+      "output": true
+    },
+    {
+      "input": {
+        "proof": "0x48e5a1a0e616d8fd92b4ef228c424e0c816799a256c6a90892195ccfc53300d6e35a0d6de94b656694589964a252957e4673a9fb1d2f8b4a92e3f0a7bb654fddb94e5a1e6d7f7f499fd1be5dd30a73bf5584bf137da5fdd77cc21aeb95b9e35788894be019284bd4fbed6dd6118ac2cb6d26bc4be4e423f55a3a48f2874d8d02a65d9c87d07de21d4dfe7b0a9f4a23cc9a58373e9e6931fefdb5afade5df54c91104048df1ee999240617984e18b6f931e2373673d0195b8c6987d7ff7650d5ce53bcec46e13ab4f2da1146a7fc621ee672f62bc22742486392d75e55e67b09960c3386a0b49e75f1723d6ab28ac9a2028a0c72866e2111d79d4817b88e17c821937847768d92837bae3832bb8e5a4ab4434b97e00a6c10182f211f592409068d6f5652400d9a3d1cc150a7fb692e874cc42d76bdafc842f2fe0f835a7c24d2d60c109b187d64571efbaa8047be85821f8e67e0e85f2f5894bc63d00c2ed9d640296ef123ea96da5cf695f22bf7d94be87d49db1ad7ac371ac43c4da4161c8c2",
+        "index": 281
+      },
+      "output": true
+    },
+    {
+      "input": {
+        "proof": "0x54269907e95e412ef574056ea5b0e0debd2290193879e5c295caea777f0ae8b2602ac17ae2e219873600eb2b6fb301f31894121b475f19d394d92122de353e3e47254a20aa67eb76e73f284b11fb1d0e101100753d8ab7818961220cdd26860f756c859e76151b1d368a7f102649eca20ff00bf3e664a1dfa420af1f81077c94c8b9827f337f48d24a0f556bace3a35439451c788b4ba0453de5c8c3fd7e841003b7dd274c3b118e94b2286c725b61e72432a305593e91bf7c0fe1c423d4cb0a21a4fa31617fd9938a1b57649466837632a44faf6f36704a01a39a2e7a545ec3a1e6309f5aadca2171cac2beff0896c6a251c877ad42d1c414293bd7e36a02c5b5415b45f1a13f4a01926f28017ba01b2cca53ec53224acb2934d43499a83a18d3a0d186fe6c8e85faa6bde57b521af40617cb24d59b50933eda6d64a5d6ffc1b3cf4f35d6040e60a67c3f270ef7e237066cf2118d7767a6161ec4f1ff24ac70a2f0d7763665a84f267898e93e5ec693ddb4938aa2d9caca11b1462bc6b772a8743c578ec3d89fd330b90126d2f758e9319c4d3232aed3545bda2fbcb9d39af17209f58088422fc42c5849f910c29ec174fbf89bf4fb25b5600d024773ee5a5e",
+        "index": 781
+      },
+      "output": true
+    },
+    {
+      "input": {
+        "proof": "0x00",
+        "index": 0
+      },
+      "output": false
+    },
+    {
+      "input": {
+        "proof": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "index": 0
+      },
+      "output": true
+    },
+    {
+      "input": {
+        "proof": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "index": 0
+      },
+      "output": false
+    }
+  ]
+}
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/helpers_validation.rs b/mm2src/mm2_bitcoin/spv_validation/src/helpers_validation.rs
new file mode 100644
index 0000000000..a91ff91289
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/helpers_validation.rs
@@ -0,0 +1,558 @@
+use chain::{BlockHeader, RawBlockHeader, RawHeaderError};
+use primitives::hash::H256;
+use primitives::U256;
+use ripemd160::Digest;
+use serialization::parse_compact_int;
+use sha2::Sha256;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum SPVError {
+    /// Overran a checked read on a slice
+    ReadOverrun,
+    /// Attempted to parse a CompactInt without enough bytes
+    BadCompactInt,
+    /// `extract_hash` could not identify the output type.
+    MalformattedOutput,
+    /// Unable to get target from block header
+    UnableToGetTarget,
+    /// Unable to get block header from network or storage
+    UnableToGetHeader,
+    /// Header not exactly 80 bytes.
+    WrongLengthHeader,
+    /// Header chain changed difficulties unexpectedly
+    UnexpectedDifficultyChange,
+    /// Header does not meet its own difficulty target.
+    InsufficientWork,
+    /// Header in chain does not correctly reference parent header.
+    InvalidChain,
+    /// When validating a `BitcoinHeader`, the `hash` field is not the digest
+    /// of the raw header.
+    WrongDigest,
+    /// When validating a `BitcoinHeader`, the `merkle_root` field does not
+    /// match the root found in the raw header.
+    WrongMerkleRoot,
+    /// When validating a `BitcoinHeader`, the `prevhash` field does not
+    /// match the parent hash found in the raw header.
+    WrongPrevHash,
+    /// A `vin` (transaction input vector) is malformatted.
+    InvalidVin,
+    /// A `vout` (transaction output vector) is malformatted or empty.
+    InvalidVout,
+    /// merkle proof connecting the `tx_id_le` to the `confirming_header`.
+    BadMerkleProof,
+    /// Unable to get merkle tree from network or storage
+    UnableToGetMerkle,
+    /// Unable to retrieve block height / block height is zero.
+    InvalidHeight,
+    /// Raises during validation loop
+    Timeout,
+}
+
+impl From<RawHeaderError> for SPVError {
+    fn from(e: RawHeaderError) -> Self {
+        match e {
+            RawHeaderError::WrongLengthHeader { .. } => SPVError::WrongLengthHeader,
+        }
+    }
+}
+
+/// A slice of `H256`s for use in a merkle array
+#[derive(Debug, Clone, PartialEq, Eq)]
+struct MerkleArray<'a>(&'a [u8]);
+
+impl<'a> MerkleArray<'a> {
+    /// Return a new merkle array from a slice
+    pub fn new(slice: &'a [u8]) -> Result<MerkleArray<'a>, SPVError> {
+        if slice.len() % 32 == 0 {
+            Ok(Self(slice))
+        } else {
+            Err(SPVError::BadMerkleProof)
+        }
+    }
+}
+
+impl MerkleArray<'_> {
+    /// The length of the underlying slice
+    fn len(&self) -> usize { self.0.len() / 32 }
+
+    /// Index into the merkle array
+    fn index(&self, index: usize) -> Result<H256, SPVError> {
+        let to_index = (index + 1) * 32;
+        if self.0.len() < to_index {
+            return Err(SPVError::BadMerkleProof);
+        }
+        let mut digest = H256::default();
+        digest.as_mut().copy_from_slice(&self.0[index * 32..to_index]);
+        Ok(digest)
+    }
+}
+
+/// Determines the length of an input from its scriptsig:
+/// 36 for outpoint, 1 for scriptsig length, 4 for sequence.
+///
+/// # Arguments
+///
+/// * `tx_in` - The input as a u8 array
+fn determine_input_length(tx_in: &[u8]) -> Result<usize, SPVError> {
+    if tx_in.len() < 37 {
+        return Err(SPVError::ReadOverrun);
+    }
+    let script_sig_len = parse_compact_int(&tx_in[36..]).map_err(|_| SPVError::BadCompactInt)?;
+    // 40 = 36 (outpoint) + 4 (sequence)
+    Ok(40 + script_sig_len.serialized_length() + script_sig_len.as_usize())
+}
+
+//
+// Outputs
+//
+
+/// Determines the length of an output.
+/// 5 types: WPKH, WSH, PKH, SH, and OP_RETURN.
+///
+/// # Arguments
+///
+/// * `tx_out` - The output
+///
+/// # Errors
+///
+/// * Errors if CompactInt represents a number larger than 253; large CompactInts are not supported.
+fn determine_output_length(tx_out: &[u8]) -> Result<usize, SPVError> {
+    if tx_out.len() < 9 {
+        return Err(SPVError::MalformattedOutput);
+    }
+    let script_pubkey_len = parse_compact_int(&tx_out[8..]).map_err(|_| SPVError::BadCompactInt)?;
+
+    Ok(8 + script_pubkey_len.serialized_length() + script_pubkey_len.as_usize())
+}
+
+//
+// Transaction
+//
+
+/// Checks that the vin passed up is properly formatted;
+/// Consider a vin with a valid vout in its scriptsig.
+///
+/// # Arguments
+///
+/// * `vin` - Raw bytes length-prefixed input vector
+pub(crate) fn validate_vin(vin: &[u8]) -> bool {
+    let n_ins = match parse_compact_int(vin) {
+        Ok(v) => v,
+        Err(_) => return false,
+    };
+
+    let vin_length = vin.len();
+
+    let mut offset = n_ins.serialized_length();
+    if n_ins.as_usize() == 0usize {
+        return false;
+    }
+
+    for _ in 0..n_ins.as_usize() {
+        if offset >= vin_length {
+            return false;
+        }
+        match determine_input_length(&vin[offset as usize..]) {
+            Ok(v) => offset += v as usize,
+            Err(_) => return false,
+        };
+    }
+
+    offset == vin_length
+}
+
+/// Checks that the vout passed up is properly formatted;
+/// Consider a vin with a valid vout in its scriptsig.
+///
+/// # Arguments
+///
+/// * `vout` - Raw bytes length-prefixed output vector
+pub(crate) fn validate_vout(vout: &[u8]) -> bool {
+    let n_outs = match parse_compact_int(vout) {
+        Ok(v) => v,
+        Err(_) => return false,
+    };
+
+    let vout_length = vout.len();
+
+    let mut offset = n_outs.serialized_length();
+    if n_outs.as_usize() == 0usize {
+        return false;
+    }
+
+    for _ in 0..n_outs.as_usize() {
+        if offset >= vout_length {
+            return false;
+        }
+        match determine_output_length(&vout[offset as usize..]) {
+            Ok(v) => offset += v as usize,
+            Err(_) => return false,
+        };
+    }
+
+    offset == vout_length
+}
+
+/// Implements bitcoin's hash256 (double sha2).
+/// Returns the digest.
+///
+/// # Arguments
+///
+/// * `preimage` - The pre-image
+fn hash256(preimages: &[&[u8]]) -> H256 {
+    let mut sha = Sha256::new();
+    for preimage in preimages.iter() {
+        sha.update(preimage);
+    }
+    let digest = sha.finalize();
+
+    let mut second_sha = Sha256::new();
+    second_sha.update(digest);
+    let buf: [u8; 32] = second_sha.finalize().into();
+    buf.into()
+}
+
+/// Concatenates and hashes two inputs for merkle proving.
+///
+/// # Arguments
+///
+/// * `a` - The first hash
+/// * `b` - The second hash
+fn hash256_merkle_step(a: &[u8], b: &[u8]) -> H256 { hash256(&[a, b]) }
+
+/// Verifies a Bitcoin-style merkle tree.
+/// Leaves are 0-indexed.
+/// Note that `index` is not a reliable indicator of location within a block.
+///
+/// # Arguments
+///
+/// * `proof` - The proof. Tightly packed LE sha256 hashes.  The last hash is the root
+/// * `index` - The index of the leaf
+fn verify_hash256_merkle(
+    txid: H256,
+    merkle_root: H256,
+    intermediate_nodes: &MerkleArray,
+    index: u64,
+) -> Result<(), SPVError> {
+    let mut idx = index;
+    let proof_len = intermediate_nodes.len();
+
+    if (proof_len == 0 && txid == merkle_root) || proof_len == 1 {
+        return Ok(());
+    }
+
+    let mut current = txid;
+
+    for i in 0..proof_len {
+        let next = intermediate_nodes.index(i)?;
+
+        if idx % 2 == 1 {
+            current = hash256_merkle_step(next.as_slice(), current.as_slice());
+        } else {
+            current = hash256_merkle_step(current.as_slice(), next.as_slice());
+        }
+        idx >>= 1;
+    }
+
+    if current != merkle_root {
+        return Err(SPVError::BadMerkleProof);
+    }
+
+    Ok(())
+}
+
+/// Evaluates a Bitcoin merkle inclusion proof.
+/// Note that `index` is not a reliable indicator of location within a block.
+///
+/// # Arguments
+///
+/// * `txid` - The txid (LE)
+/// * `merkle_root` - The merkle root (as in the block header) (LE)
+/// * `intermediate_nodes` - The proof's intermediate nodes (digests between leaf and root) (LE)
+/// * `index` - The leaf's index in the tree (0-indexed)
+///
+/// # Notes
+/// Wrapper around `bitcoin_spv::validatespv::prove`
+pub(crate) fn merkle_prove(
+    txid: H256,
+    merkle_root: H256,
+    intermediate_nodes: Vec<H256>,
+    index: u64,
+) -> Result<(), SPVError> {
+    if txid == merkle_root && index == 0 && intermediate_nodes.is_empty() {
+        return Ok(());
+    }
+    let vec: Vec<u8> = intermediate_nodes.into_iter().flat_map(|node| node.take()).collect();
+    let nodes = MerkleArray::new(vec.as_slice())?;
+    verify_hash256_merkle(txid.take().into(), merkle_root.take().into(), &nodes, index)
+}
+
+fn validate_header_prev_hash(actual: &H256, to_compare_with: &H256) -> bool { actual == to_compare_with }
+
+fn validate_header_work(digest: H256, target: &U256) -> bool {
+    let empty = H256::default();
+
+    if digest == empty {
+        return false;
+    }
+
+    U256::from_little_endian(digest.as_slice()) < *target
+}
+
+/// Checks validity of header chain.
+/// Compares the hash of each header to the prevHash in the next header.
+///
+/// # Arguments
+///
+/// * `headers` - Raw byte array of header chain
+/// * `difficulty_check`: Rather the difficulty need to check or not, usefull for chain like Qtum (Pos)
+/// or KMD/SmartChain (Difficulty change NN)
+/// * `constant_difficulty`: If we do not expect difficulty change (BTC difficulty change every 2016 blocks)
+/// use this variable to false when you do not have a chance to use a checkpoint
+///
+/// # Errors
+///
+/// * Errors if header chain is invalid, insufficient work, unexpected difficulty change or unable to get a target
+///
+/// # Notes
+/// Wrapper inspired by `bitcoin_spv::validatespv::validate_header_chain`
+pub fn validate_headers(
+    headers: Vec<BlockHeader>,
+    difficulty_check: bool,
+    constant_difficulty: bool,
+) -> Result<(), SPVError> {
+    let mut previous_hash = H256::default();
+    let mut target = U256::default();
+    for (i, header) in headers.into_iter().enumerate() {
+        let raw_header = RawBlockHeader::from(header.clone());
+        if i == 0 {
+            target = match header.target() {
+                Ok(target) => target,
+                Err(_) => return Err(SPVError::UnableToGetTarget),
+            };
+        }
+        let cur_target = match header.target() {
+            Ok(target) => target,
+            Err(_) => return Err(SPVError::UnableToGetTarget),
+        };
+        if (!constant_difficulty && difficulty_check) && cur_target != target {
+            return Err(SPVError::UnexpectedDifficultyChange);
+        }
+        if i != 0 && !validate_header_prev_hash(&raw_header.parent(), &previous_hash) {
+            return Err(SPVError::InvalidChain);
+        }
+        if difficulty_check && !validate_header_work(raw_header.digest(), &target) {
+            return Err(SPVError::InsufficientWork);
+        }
+        previous_hash = raw_header.digest();
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    extern crate std;
+
+    use super::*;
+    use crate::test_utils::{self};
+    use std::{println, vec};
+    use test_helpers::hex::force_deserialize_hex;
+
+    #[test]
+    fn it_does_bitcoin_hash256() {
+        test_utils::run_test(|fixtures| {
+            let test_cases = test_utils::get_test_cases("hash256", &fixtures);
+            for case in test_cases {
+                let input = force_deserialize_hex(case.input.as_str().unwrap());
+                let mut expected = H256::default();
+                let output = force_deserialize_hex(case.output.as_str().unwrap());
+                expected.as_mut().copy_from_slice(&output);
+                assert_eq!(hash256(&[&input]), expected);
+            }
+        })
+    }
+
+    #[test]
+    fn it_computes_hash256_merkle_steps() {
+        test_utils::run_test(|fixtures| {
+            let test_cases = test_utils::get_test_cases("hash256MerkleStep", &fixtures);
+            for case in test_cases {
+                let inputs = case.input.as_array().unwrap();
+                let a = force_deserialize_hex(inputs[0].as_str().unwrap());
+                let b = force_deserialize_hex(inputs[1].as_str().unwrap());
+                let mut expected = H256::default();
+                let output = force_deserialize_hex(case.output.as_str().unwrap());
+                expected.as_mut().copy_from_slice(&output);
+                assert_eq!(hash256_merkle_step(&a, &b), expected);
+            }
+        })
+    }
+
+    #[test]
+    fn it_determines_input_length() {
+        test_utils::run_test(|fixtures| {
+            let test_cases = test_utils::get_test_cases("determineInputLength", &fixtures);
+            for case in test_cases {
+                let input = force_deserialize_hex(case.input.as_str().unwrap());
+                let expected = case.output.as_u64().unwrap() as usize;
+                assert_eq!(determine_input_length(&input).unwrap(), expected);
+            }
+        })
+    }
+
+    #[test]
+    fn it_determines_output_length() {
+        test_utils::run_test(|fixtures| {
+            let test_cases = test_utils::get_test_cases("determineOutputLength", &fixtures);
+            for case in test_cases {
+                let input = force_deserialize_hex(case.input.as_str().unwrap());
+                let expected = case.output.as_u64().unwrap() as usize;
+                assert_eq!(determine_output_length(&input).unwrap(), expected);
+            }
+        })
+    }
+
+    #[test]
+    fn it_validates_vin_syntax() {
+        test_utils::run_test(|fixtures| {
+            let test_cases = test_utils::get_test_cases("validateVin", &fixtures);
+            for case in test_cases {
+                let input = force_deserialize_hex(case.input.as_str().unwrap());
+                let expected = case.output.as_bool().unwrap();
+                assert_eq!(validate_vin(&input), expected);
+            }
+        })
+    }
+
+    #[test]
+    fn it_validates_vout_syntax() {
+        test_utils::run_test(|fixtures| {
+            let test_cases = test_utils::get_test_cases("validateVout", &fixtures);
+            for case in test_cases {
+                let input = force_deserialize_hex(case.input.as_str().unwrap());
+                let expected = case.output.as_bool().unwrap();
+                assert_eq!(validate_vout(&input), expected);
+            }
+        })
+    }
+
+    #[test]
+    fn it_verifies_hash256_merkles() {
+        test_utils::run_test(|fixtures| {
+            let test_cases = test_utils::get_test_cases("verifyHash256Merkle", &fixtures);
+            for case in test_cases {
+                let inputs = case.input.as_object().unwrap();
+                let extended_proof = force_deserialize_hex(inputs.get("proof").unwrap().as_str().unwrap());
+                let proof_len = extended_proof.len();
+                if proof_len < 32 {
+                    continue;
+                }
+
+                let index = inputs.get("index").unwrap().as_u64().unwrap() as u64;
+                let expected = case
+                    .output
+                    .as_bool()
+                    .unwrap()
+                    .then(|| ())
+                    .ok_or(SPVError::BadMerkleProof);
+
+                // extract root and txid
+                let mut root = H256::default();
+                let mut txid = H256::default();
+                println!("{:?}", extended_proof);
+                root.as_mut().copy_from_slice(&extended_proof[proof_len - 32..]);
+                txid.as_mut().copy_from_slice(&extended_proof[..32]);
+
+                let proof = if proof_len > 64 {
+                    extended_proof[32..proof_len - 32].to_vec()
+                } else {
+                    vec![]
+                };
+
+                println!("{:?} {:?} {:?} {:?}", root, txid, proof, proof.len());
+
+                assert_eq!(
+                    verify_hash256_merkle(txid, root, &MerkleArray::new(&proof).unwrap(), index),
+                    expected
+                );
+            }
+        })
+    }
+
+    #[test]
+    fn test_merkle_prove_inclusion() {
+        // https://rick.explorer.dexstats.info/tx/7e9797a05abafbc1542449766ef9a41838ebbf6d24cd3223d361aa07c51981df
+        // merkle intermediate nodes 2 element
+        let tx_id: H256 = H256::from_reversed_str("7e9797a05abafbc1542449766ef9a41838ebbf6d24cd3223d361aa07c51981df");
+        let merkle_pos = 1;
+        let merkle_root: H256 =
+            H256::from_reversed_str("41f138275d13690e3c5d735e2f88eb6f1aaade1207eb09fa27a65b40711f3ae0").into();
+        let merkle_nodes: Vec<H256> = vec![
+            H256::from_reversed_str("73dfb53e6f49854b09d98500d4899d5c4e703c4fa3a2ddadc2cd7f12b72d4182"),
+            H256::from_reversed_str("4274d707b2308d39a04f2940024d382fa80d994152a50d4258f5a7feead2a563"),
+        ];
+        let result = merkle_prove(tx_id, merkle_root, merkle_nodes, merkle_pos);
+        result.unwrap()
+    }
+
+    #[test]
+    fn test_merkle_prove_inclusion_single_element() {
+        // https://www.blockchain.com/btc/tx/c06fbab289f723c6261d3030ddb6be121f7d2508d77862bb1e484f5cd7f92b25
+        // merkle intermediate nodes single element
+        let tx_id: H256 = H256::from_reversed_str("c06fbab289f723c6261d3030ddb6be121f7d2508d77862bb1e484f5cd7f92b25");
+        let merkle_pos = 0;
+        let merkle_root: H256 =
+            H256::from_reversed_str("8fb300e3fdb6f30a4c67233b997f99fdd518b968b9a3fd65857bfe78b2600719").into();
+        let merkle_nodes: Vec<H256> = vec![H256::from_reversed_str(
+            "5a4ebf66822b0b2d56bd9dc64ece0bc38ee7844a23ff1d7320a88c5fdb2ad3e2",
+        )];
+        let result = merkle_prove(tx_id, merkle_root, merkle_nodes, merkle_pos);
+        result.unwrap()
+    }
+
+    #[test]
+    fn test_merkle_prove_inclusion_complex() {
+        // https://www.blockchain.com/btc/tx/b36bced99cc459506ad2b3af6990920b12f6dc84f9c7ed0dd2c3703f94a4b692
+        // merkle intermediate nodes complex merkle proof inclusion
+        let tx_id: H256 = H256::from_reversed_str("b36bced99cc459506ad2b3af6990920b12f6dc84f9c7ed0dd2c3703f94a4b692");
+        let merkle_pos = 680;
+        let merkle_root: H256 =
+            H256::from_reversed_str("def7a26d91789069dad448cb4b68658b7ba419f9fbd28dce7fe32ed0010e55df").into();
+        let merkle_nodes: Vec<H256> = vec![
+            H256::from_reversed_str("39141331f2b7133e72913460384927b421ffdef3e24b88521e7ac54d30019409"),
+            H256::from_reversed_str("39aeb77571ee0b0cf9feb7e121938b862f3994ff1254b34559378f6f2ed8b1fb"),
+            H256::from_reversed_str("5815f83f4eb2423c708127ea1f47feeabcf005d4aed18701d9692925f152d0b4"),
+            H256::from_reversed_str("efbb90aae6875af1b05a17e53fabe79ca1655329d6e107269a190739bf9d9038"),
+            H256::from_reversed_str("20eb7431ae5a185e89bd2ad89956fc660392ee9d231df58600ac675734013e82"),
+            H256::from_reversed_str("1f1dd980e6196ec4de9037941076a6030debe466dfc177e54447171b64ea99e5"),
+            H256::from_reversed_str("bbc4264359bec656298e31443034fc3ff9877752b765b9665b4da1eb8a32d1ff"),
+            H256::from_reversed_str("71788bf5224f228f390243a2664d41d96bae97ae1e4cfbc39095448e4cd1addd"),
+            H256::from_reversed_str("1b24a907c86e59eb698afeb4303c00fe3ecf8425270134ed3d0e62c6991621f2"),
+            H256::from_reversed_str("7776b46bb148c573d5eabe1436a428f3dae484557fea6efef1da901009ca5f8f"),
+            H256::from_reversed_str("623a90d6122a233b265aab497b13bb64b5d354d2e2112c3f554e51bfa4e6bbd3"),
+            H256::from_reversed_str("3104295d99163e16405b80321238a97d02e2448bb634017e2e027281cc4af9e8"),
+        ];
+        let result = merkle_prove(tx_id, merkle_root, merkle_nodes, merkle_pos);
+        result.unwrap()
+    }
+
+    #[test]
+    fn test_block_headers_no_difficulty_check() {
+        // morty: 1330480, 1330481, 1330482
+        let headers: Vec<BlockHeader> = vec![
+            "04000000bb496ba8d09f8f98b15cdaf5798163bdd70676eb1c8b538f53ab4f83da4a27000db352177c6b5ad2499a906cec33b843fb17fc1ec298cd06c7e7ceb7b62e144232d719d14c15e565c05e84ead95a2f101a1b658ee2f36eb7ca65206e27cfca473de614625be6071f09006c286bc5ec73dd27a09bf687700c06fb04d0b9a063c0aa0746c9db170000fd40050053b27dad1f5a858b78f3154039759e985ed57db10ecb772810d7f158c55083a14b9f2ba26ae9fcb82012186e2528f67c45b7b216a69fe26232ad2d179a141b1b10e4d5f108c7b920b49348f6eef2d70b7f02cb01d8d9992f8f2d7b6608806b10ff329846b188de200aa37c73ac03f6c9b79cf5613c71b7969b4abafdbc1165ad955a049269584c83b36f36a3e9becf2fe81f3b1917475eb13ecfed3813ecc32206078d8c1e2797013dfc6f6a55e06f1c06a07959ef94d53ca0fc81d03cb6f614761156ed4ff1a8e5c9f0b96f3c8c3eeb9a0720cf4ed10397330f49b83439c5083eea1d1785a10d86ca2866d0da4ca746c49118b780c55aa6cd5b4c0491cefa258ecf129307d15e001415b203e89c008f4444b236aa556dbf4f6d05e0c57642cfa142df2f8546f1d37a6b2feaf98496892b41caefbe7dc7bcbb2755752df3dbf00ac1fc558896f14541aea4cc78ec5d00bbe5398fac4a658b1ae3399777f15117c0f3de3c63bc5b3edf6543d172cfc66907f9cf8706e97b14281daeb427801dfb0910743873265ae6bae71dbf22353c321f726e68f747965858f488dd507b7e6adee42509e5720373dce5b111b420c906b0f2cb391cfb9d581e2509da3829d6718469f383e07043694db87db0ce1196449a6c9cd941a8bde507e553c0ca534238dcc93633631926102c87cd0f83720ccff60de8b05b103e086a2c2cb7943f21033a5658235fc52708907e1ea722e726808db0270bf898c51e9dd0745614857783dc11a6dcd7760d4a07ddbd83a2e02b23fa789b79eed22dc411b9b48f71c54f12387065e3ff0638701e0f6a0dd56d0ce395d150b237b60c166352e69b92173b884446d7660f5857458b97c6d4ee54f8a1f60113aff30e54c1f7c572b85dcb7a2419d2f736a9b0a6d99ea549bd74e546251c0b8be7975e9a6d96aa3467b1dc6b024745fdef43b37cf21a657a3247d9adf8c252ef210d9a4e9c7191f698ccc9b10103b8bb811cdcf1a62903786476db8195ffb3cd004c57ad07a7a3c41eee391f66a7697e69409d7a78558720f6a1b9804d72de820b7b6165b8e14a2b1316576022423f22bb82fab16127be7173ddcd43fa7ea5c4474f79321a8c4b792caf12320c3047d026b7d63216a022e83655c2d811d2bd2a559970e9155b979953f9801ce918f690f43f5e3f07f7ce27a6837bf33b2490d9add8549f1e603a750c114bb92740cc3987cb9f948a6229f175a7b577b0b60d885a0a7ef05debe921376a7acdb25eaa8bb72e120e529cd775175012efb454cf41d240a946bf140af20d9a5dbed2e196d91a7ff33c2769f140fa0bb968111e1602221deae8d162e7a471354c2051acb43ec31015aaefa0b08bf1bddbb282e86a1caf45f3b63e4c6427ba9e99aed28ef79711794511511c52daf13b735e02b9833d3467bfd16886606d5555b7cc95ff2fea3b03c82cfe60e8602d9f70a3870f5b755573b955bb300bd3733b5ddf9a61fd3cd281af39520d6dfd8b7e2b165ec91749614a3b5241e2ea12470f91b58cf6163e02dfe79392db70cd17db9497cf59c89ac8377dbd02042f6ed270c8c2bc717623b203b74676890f5f4cd905b25772a25292d76b6f42a094c27eed13793d189e395ed3f28c5731976a7b45184acee45b3cf05a9c62045644dfe39f79cd331e282edae99cea652eb82819415ac2a5c21539cdd636fb835063ace3b6befffaf50bf6866e9b1a2b35037a330faeb18ca1696693dafd26b5f5da8dcd3e50ff09249bdda695f576d25024560b643d873d07293a80fe71998ef6ccd88c0cf9f69326b463c26fe4906faaf454ae68accd7ef3edffefdd2ede23a822a2267332f0791f1c4e6d5ab4661f279f5039b36a4476e56fd5b0461e585ff30a7c661b93f1".into(),
+            "04000000001f22e1bc88c53b1554f8fdcf261fdb09f4cae6ef5e5032b788515f4a60d30d67d1b35fda68abc05f5af39e5ade224a5312b8dcd1f3629a7ff33355bb7ca93e32d719d14c15e565c05e84ead95a2f101a1b658ee2f36eb7ca65206e27cfca478be6146220bb071f49000b055b22a7a4bbafd6b52efb90f963d5f80126c27e437005fb47720e0000fd4005004d9875d71c540f558813142e263f597243bdd8d8105ff3d1ffd62ae51ccf22729debe510f97ab0631701dbd34b73e570597dc8825be6bd669e693037fb701040c273b44745f4e850c2d8aeca7ccab6ef7f462206a16d75358f2e8fddf9d0dbc6333ff55b1813a37f0ba240bd2d897fbd6cfdb1989ac8f3ec93b15ae4360edf84088ac9a4ea7d3d71290532bb51675e7310be1210aa33c184d693f6f7c15c5be1e89356ae3d663d0c548fceac0974fe4cb6c6559f50643280df9508460fd04f9cde55521b4c6d61c644c6c7b7473f9e39b412e3776f5e47b6c466aaf1dc76ff2114e716eb6b9614d0c93cdc229ec13b07057a7f7446c1aac51ef0950d4361fa2d20f22f29ff490bf6d6a2a267c45d88d3152d9f5291695f2f4fba65ca9763cb4176506c73b8162611b6004af7ec8d1ea55a225cca2576e4ac84ac333b663693a2f19f7786340ad9d2212d576a0b4e7700bd7d60de88940dce1f01481f9c41350eefd7b496218bcf70c4c8922dfd18d666d37d10cb0f14dd38e1225ec179dcab5501a4434674d6f9ff9f23c4df5f445cc2accf43189fc99ac56693df373a4207b0dc991009fae4796fd7e49cea4dd139ee72264dfd47f4e1ad2420d635c7a1f37950d022ffdcccc7651b645db0ba0ce94c18dcc902279b4601806beefe05016f1f85411e6562b584da0854db2e36f602d8c4974d385aee4a01d1132082c8cd7c71443162f7d7487c73d8a46f830f72a0d352d957bef5afc33c4447ef33b2491e28000d1f4687e95ffc2b9532d28ae4c48f8551bf527dbe18c672204495f2bd546566fd5770189e28c2de0974130a492ccd8737a8c6e971d02a23c4f9f27410348d1f666f93385bdc81bad8e9a9d1dbffdfa2609ebae52740b457ecd67a3bf0db02a14f5bdf3e25b35b2d3d303094e46e0e3daef559d9f0e074e512bcaf9fcc9d035083eec16806af8a93d27b4ad46754a425b6a02b1ac22f682e48f214d66b379d7042aa39f2c5f3448d05ca4b6360e162f31f197225f4ad579d69207c666711fb3f6ca814efcf430899360cced1168cd69ec0e809a89cf2cf2015f9f895a3dadd4ced6d94793e98201b1da6a0a5d90be5d06925e3ad60b9227f84b9c3060a6db6e7857d8731f975d4a993abf10d84590da02b114625109d864de070813179b651d528f66036c30a0700ee84fc5e59757a509745b64e76fa3396f3c8b01a7724cd434e6d774dad36be8a73ad29f6859352aa15236e7825947396cb98e26b912b19ddc127590e59200c4334d1d96d7585a0e349b920f2e4e59cdedac911214c42c0894f72c8a7423d7aef3ea5ef9a5b650821f46537c65509ad8dcf6558c16c04f9877c737ff81875d9fbe01d23d37e937444cf257b0b57bc1c2a774f2e2bf5f3b0881be0e2282ba97ef6aad797f8fdb4053da4e478575805c7a93076c09847544a8e89f1cb3838df7870bcf61deb2144c6f6349c966b67545703058f9227965b97835b049538fb428431a8461586b022368626d20e9b6bfdd7232a5cc6a0aa214319cb440c45443a2446d1e17713c0e1049f0fd759d1dbff493302140376cfb153330ed455a043189260cb7d2d90333a37d3584f2d907d0a73dccee299ad14141d60d1409cda688464a13b5dab37476641741717d599a60c0ac84d85869ed449f83933ad30e2591157fd1f07b73ecf26f34e91bc00f1ca86ae34ca8231b372cdc2ed18d463ac42f92859d6f0e2c483dbb23d785f1233db2033458af9d7c1e7029ac5cc33ca7d25b2b49fd71b1ae5f5ce969b6e77333bf5fbb5e6645dd0a4d0c6e82eb534ac264ddbe28513e4b82b3578c1a6cbfaa2522aa50985fe2cce43cf3363eaacca0e09c721fd603d43c3a4fdf8dde0c9ff2c054910b16aeef7c4d86b31".into(),
+            "04000000fcead9a1b425124f11aa97e0614120ce87bdddcad655672916f9c4564dc057002bd3df07a4602620282b276359529114ba89b59b16bec235d584c3cf5cc6b2d132d719d14c15e565c05e84ead95a2f101a1b658ee2f36eb7ca65206e27cfca47bfe61462d5b9071f1a001daf299c51afbd74fd75a98ba49a6e40ae8ad92b3afdc1cf215fd6190000fd40050044b5e035b02d138a9704f9513c0865f2733b7c09294ee504c155c283f4895559b6ac39828eac98ad393a642330589e8849040f55ce44f8f2197529d0b0ed57ccdda41f1971e153ec28ac5b4eba968741db374104d65ee234580a83bea1c0cdb67b8bc207057486eb1d90e21ba0cd4f5e9fd834821fafc1517c5d1fceb50ba6f6b102a9b4edac46f2359aec795a4e2458f51114a41289634b3b1cf250e3e38f3689f951278dfa7202a7dfe311cc098fd4a8d02c8f8a74e4a5010b18ee2e60578d5e9f1c094433a73f26e6546e20a574fc261baaa79e9910ab86ed607786a1cc88e7de51ff928d434e26eaef1437f7068c743f26d7c0eea6791e869b101fee8ab41b50af6174c5e6b731a1719f31ee3e6529efef49f31665baedc9382e9665278a84467d479f139fc7a8ef66fef9bd2fd17f7779ee315d458f691a290fa7c2179de8bb91a78458c5290d4aa45b163254006800ba2fce7479511f744fd7de96495c39be93413d8b0b187fe092537e1a7646a66a125b33333f6ecd10085e23ad168b24ee7be69d01ea021a39401e4bd41d818499e7174dd9b85542076c78cb89eeec1c190301b4709dbc963d47926e31bb0235ba6a7029d49458150f6491ac9c973b8a2c893258f907baf4bcb7c39f12b900ba2b2382cd5dd84314ee504ade835ad9a1cb13a7f5928a483ebc9415429810fd99893f2f8f83970b8b47143d617e6f9853e4d86ff378be664218f1c32531143e209f171590dd48216fec879a6b9cbf04432bf4f1a3734b69b6a9f1a358a259a0f9082cfb6c1f3d9d2d9e4522ad651ccce565f06b30c1c0b27252270c2f6608cf4f3288a7e7d4b174e646de05341f7db62b00b5ccb295f058d34b87201148828e9b3f7e08f60e100f810be27eb7f4c471cda7621106fe78bc69ec2bd27acabd55dc094b8626913b7d24d9b60939754700f32574a733a195f8b0220d56f6797de0bcd7b80d561896b816586593409f76e85a7a1035f821dee32a02fdbc26bc4cca375bed418b9d678ac589249a1a5a5b24447ee9b42e33f817066caf3d4e17d0347f6acf0cbf426d4df49413b3d12350edec2681ab9cfecd0825ccfb2649a57391d3f153050dfb4350d60e5e464229ddd6e49ece95557b8ef48c18cbffbe9fc8d7700f611a4b33a2a254afcec638c485e36daf0364da7d4302e488db7b6c41297571048cfea5452e324abb9f9e1043e625fd0853b7e03063d1c3a43aa1ee62d45d890b5e4d10640e775cff6852b6d1acd4a503b3ece3b319cbcf33ff9fdf17b8f852d748db1e05af80507f5d0e1bc44444b155d7da20f7f0b4d6d83368c3bb9e1321b39472a8677ea1d3aca43b453d35edca37b7536d19c26b764958b3c7c30f3211d7b7bb7f6a6d7fd7bf2dda6e7d7b1e533556863549bbe1394a3828596f25029b7e30495e1235f084e5edd133bc29fce4f1e5e514eb1d1cb19fd8dfbb0d130fbec4e288f23dae86311ffd6f4afbaacc2ffe1cc8811a455ba6f5659f82515b56c6ac84277bff5bef98fefc74e002e4a11866a417a429541f8a62df4108e4730d3045f92984bcf1ab2f7d03f8bb1767e91791530cd8eec412919e1f2e341e66a1588a8f485f7aa005787af946b9cb10f6685420b7e1663f66374fddc5e70720507ee2134f3b02df042fcf6db4a5bdd74cc5010793634816fe447cc68e076b225cc1ca872929ef246ce356dc8d8964ff6d7119d071eccb6dc37f75b932c44cdc30723b8357a2761c6de6ab2713e6f6a782538cb731b07950d3f459760a00cc0af406d6848014746b02653636f479d952b46fdeff976e1d159ba46ae7363d5b0042d3905a0bda12aaa6eaae1a5a0d55d4c1930aa1c004cd610866853a247239366aa20f8968ea9ca3d5d6d7321a5d0f2c".into()
+        ];
+        validate_headers(headers, false, false).unwrap()
+    }
+
+    #[test]
+    fn test_block_headers_difficulty_check() {
+        // BTC: 724609, 724610, 724611
+        let headers: Vec<BlockHeader> = vec!["00200020eab6fa183da8f9e4c761b31a67a76fa6a7658eb84c760200000000000000000063cd9585d434ec0db25894ec4b1f03735f10e31709c4395ea67c50c8378f134b972f166278100a17bfd87203".into(), 
+                                             "0000402045c698413fbe8b5bf10635658d2a1cec72062798e51200000000000000000000869617420a4c95b1d3d6d012419d2b6c199cff9b68dd9a790892a4da8466fb056033166278100a1743ac4d5b".into(), 
+                                             "0400e02019d733c1fd76a1fa5950de7bee9d80f107276b93a67204000000000000000000a0d1dee718f5f732c041800e9aa2c25e92be3f6de28278545388db8a6ae27df64c37166278100a170a970c19".into()];
+        validate_headers(headers, true, true).unwrap()
+    }
+}
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/lib.rs b/mm2src/mm2_bitcoin/spv_validation/src/lib.rs
new file mode 100644
index 0000000000..1c30005769
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/lib.rs
@@ -0,0 +1,71 @@
+extern crate chain;
+extern crate primitives;
+extern crate ripemd160;
+extern crate rustc_hex as hex;
+extern crate serialization;
+extern crate sha2;
+extern crate test_helpers;
+
+/// `helpers_validation` Override function modules from bitcoin_spv and adapt for our mm2_bitcoin library
+pub mod helpers_validation;
+
+/// `spv_proof` Contains spv proof validation logic and data structure
+pub mod spv_proof;
+
+#[cfg(test)]
+pub(crate) mod test_utils {
+    extern crate serde;
+    extern crate std;
+
+    use self::serde::Deserialize;
+
+    use std::{fs::File, io::Read, panic, string::String, vec, vec::Vec};
+
+    #[derive(Deserialize)]
+    pub(crate) struct TestCase {
+        pub input: serde_json::Value,
+        pub output: serde_json::Value,
+    }
+
+    fn setup() -> serde_json::Value {
+        let mut file = File::open("./src/for_tests/spvTestVectors.json").unwrap();
+        let mut data = String::new();
+        file.read_to_string(&mut data).unwrap();
+
+        serde_json::from_str(&data).unwrap()
+    }
+
+    fn to_test_case(val: &serde_json::Value) -> TestCase {
+        let o = val.get("output");
+        let output: &serde_json::Value;
+        output = match o {
+            Some(v) => v,
+            None => &serde_json::Value::Null,
+        };
+
+        TestCase {
+            input: val.get("input").unwrap().clone(),
+            output: output.clone(),
+        }
+    }
+
+    pub(crate) fn get_test_cases(name: &str, fixtures: &serde_json::Value) -> Vec<TestCase> {
+        let vals: &Vec<serde_json::Value> = fixtures.get(name).unwrap().as_array().unwrap();
+        let mut cases = vec![];
+        for i in vals {
+            cases.push(to_test_case(&i));
+        }
+        cases
+    }
+
+    pub(crate) fn run_test<T>(test: T)
+    where
+        T: FnOnce(&serde_json::Value) -> () + panic::UnwindSafe,
+    {
+        let fixtures = setup();
+
+        let result = panic::catch_unwind(|| test(&fixtures));
+
+        assert!(result.is_ok())
+    }
+}
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/spv_proof.rs b/mm2src/mm2_bitcoin/spv_validation/src/spv_proof.rs
new file mode 100644
index 0000000000..10df7433dd
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/spv_proof.rs
@@ -0,0 +1,93 @@
+use chain::BlockHeader;
+use chain::RawBlockHeader;
+use helpers_validation::{merkle_prove, validate_vin, validate_vout, SPVError};
+use primitives::hash::H256;
+
+pub const TRY_SPV_PROOF_INTERVAL: u64 = 10;
+
+#[derive(PartialEq, Clone)]
+pub struct SPVProof {
+    /// The tx id
+    pub tx_id: H256,
+    /// The vin serialized
+    pub vin: Vec<u8>,
+    /// The vout serialized
+    pub vout: Vec<u8>,
+    /// The transaction index in the merkle tree
+    pub index: u64,
+    /// The confirming UTXO header
+    pub confirming_header: BlockHeader,
+    /// The Raw confirming UTXO Header
+    pub raw_header: RawBlockHeader,
+    /// The intermediate nodes (digests between leaf and root)
+    pub intermediate_nodes: Vec<H256>,
+}
+
+/// Checks validity of an entire SPV Proof
+///
+/// # Arguments
+///
+/// * `self` - The SPV Proof
+///
+/// # Errors
+///
+/// * Errors if any of the SPV Proof elements are invalid.
+///
+/// # Notes
+/// Re-write with our own types based on `bitcoin_spv::std_types::SPVProof::validate`
+impl SPVProof {
+    pub fn validate_block_header(&self) -> Result<(), SPVError> {
+        if self.confirming_header.hash() != self.raw_header.digest() {
+            return Err(SPVError::WrongDigest);
+        }
+        if self.confirming_header.merkle_root_hash != self.raw_header.extract_merkle_root() {
+            return Err(SPVError::WrongMerkleRoot);
+        }
+        if self.confirming_header.previous_header_hash != self.raw_header.parent() {
+            return Err(SPVError::WrongPrevHash);
+        }
+        Ok(())
+    }
+
+    pub fn validate(&self) -> Result<(), SPVError> {
+        if !validate_vin(self.vin.as_slice()) {
+            return Err(SPVError::InvalidVin);
+        }
+        if !validate_vout(self.vout.as_slice()) {
+            return Err(SPVError::InvalidVout);
+        }
+        self.validate_block_header()?;
+        merkle_prove(
+            self.tx_id,
+            self.confirming_header.merkle_root_hash,
+            self.intermediate_nodes.clone(),
+            self.index,
+        )
+    }
+}
+
+#[cfg(test)]
+mod spv_proof_tests {
+    use chain::BlockHeader;
+    use chain::RawBlockHeader;
+    use hex::FromHex;
+    use serialization::deserialize;
+    use spv_proof::SPVProof;
+
+    #[test]
+    fn test_block_header() {
+        let header_hex = "040000008e4e7283b71dd1572d220935db0a1654d1042e92378579f8abab67b143f93a02fa026610d2634b72ff729b9ea7850c0d2c25eeaf7a82878ca42a8e9912028863a2d8a734eb73a4dc734072dbfd12406f1e7121bfe0e3d6c10922495c44e5cc1c91185d5ee519011d0400b9caaf41d4b63a6ab55bb4e6925d46fc3adea7be37b713d3a615e7cf0000fd40050001a80fa65b9a46fdb1506a7a4d26f43e7995d69902489b9f6c4599c88f9c169605cc135258953da0d6299ada4ff81a76ad63c943261078d5dd1918f91cea68b65b7fc362e9df49ba57c2ea5c6dba91591c85eb0d59a1905ac66e2295b7a291a1695301489a3cc7310fd45f2b94e3b8d94f3051e9bbaada1e0641fcec6e0d6230e76753aa9574a3f3e28eaa085959beffd3231dbe1aeea3955328f3a973650a38e31632a4ffc7ec007a3345124c0b99114e2444b3ef0ada75adbd077b247bbf3229adcffbe95bc62daac88f96317d5768540b5db636f8c39a8529a736465ed830ab2c1bbddf523587abe14397a6f1835d248092c4b5b691a955572607093177a5911e317739187b41f4aa662aa6bca0401f1a0a77915ebb6947db686cff549c5f4e7b9dd93123b00a1ae8d411cfb13fa7674de21cbee8e9fc74e12aa6753b261eab3d9256c7c32cc9b16219dad73c61014e7d88d74d5e218f12e11bc47557347ff49a9ab4490647418d2a5c2da1df24d16dfb611173608fe4b10a357b0fa7a1918b9f2d7836c84bf05f384e1e678b2fdd47af0d8e66e739fe45209ede151a180aba1188058a0db093e30bc9851980cf6fbfa5adb612d1146905da662c3347d7e7e569a1041641049d951ab867bc0c6a3863c7667d43f596a849434958cee2b63dc8fa11bd0f38aa96df86ed66461993f64736345313053508c4e939506c08a766f5b6ed0950759f3901bbc4db3dc97e05bf20b9dda4ff242083db304a4e487ac2101b823998371542354e5d534b5b6ae6420cc19b11512108b61208f4d9a5a97263d2c060da893544dea6251bcadc682d2238af35f2b1c2f65a73b89a4e194f9e1eef6f0e5948ef8d0d2862f48fd3356126b00c6a2d3770ecd0d1a78fa34974b454f270b23d461e357c9356c19496522b59ff9d5b4608c542ff89e558798324021704b2cfe9f6c1a70906c43c7a690f16615f198d29fa647d84ce8461fa570b33e3eada2ed7d77e1f280a0d2e9f03c2e1db535d922b1759a191b417595f3c15d8e8b7f810527ff942e18443a3860e67ccba356809ecedc31c5d8db59c7e039dae4b53d126679e8ffa20cc26e8b9d229c8f6ee434ad053f5f4f5a94e249a13afb995aad82b4d90890187e516e114b168fc7c7e291b9738ea578a7bab0ba31030b14ba90b772b577806ea2d17856b0cb9e74254ba582a9f2638ea7ed2ca23be898c6108ff8f466b443537ed9ec56b8771bfbf0f2f6e1092a28a7fd182f111e1dbdd155ea82c6cb72d5f9e6518cc667b8226b5f5c6646125fc851e97cf125f48949f988ed37c4283072fc03dd1da3e35161e17f44c0e22c76f708bb66405737ef24176e291b4fc2eadab876115dc62d48e053a85f0ad132ef07ad5175b036fe39e1ad14fcdcdc6ac5b3daabe05161a72a50545dd812e0f9af133d061b726f491e904d89ee57811ef58d3bda151f577aed381963a30d91fb98dc49413300d132a7021a5e834e266b4ac982d76e00f43f5336b8e8028a0cacfa11813b01e50f71236a73a4c0d0757c1832b0680ada56c80edf070f438ab2bc587542f926ff8d3644b8b8a56c78576f127dec7aed9cb3e1bc2442f978a9df1dc3056a63e653132d0f419213d3cb86e7b61720de1aa3af4b3757a58156970da27560c6629257158452b9d5e4283dc6fe7df42d2fda3352d5b62ce5a984d912777c3b01837df8968a4d494db1b663e0e68197dbf196f21ea11a77095263dec548e2010460840231329d83978885ee2423e8b327785970e27c6c6d436157fb5b56119b19239edbb730ebae013d82c35df4a6e70818a74d1ef7a2e87c090ff90e32939f58ed24e85b492b5750fd2cd14b9b8517136b76b1cc6ccc6f6f027f65f1967a0eb4f32cd6e5d5315";
+        let header_bytes: Vec<u8> = header_hex.from_hex().unwrap();
+        let header: BlockHeader = deserialize(header_bytes.as_slice()).unwrap();
+        let spv_proof = SPVProof {
+            tx_id: Default::default(),
+            vin: vec![],
+            vout: vec![],
+            index: 0,
+            confirming_header: header,
+            raw_header: RawBlockHeader::new(header_bytes).unwrap(),
+            intermediate_nodes: vec![],
+        };
+        spv_proof.validate_block_header().unwrap()
+    }
+}
diff --git a/mm2src/mm2_bitcoin/test_helpers/Cargo.toml b/mm2src/mm2_bitcoin/test_helpers/Cargo.toml
new file mode 100644
index 0000000000..b059f530dc
--- /dev/null
+++ b/mm2src/mm2_bitcoin/test_helpers/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "test_helpers"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+hex = "0.4.2"
diff --git a/mm2src/mm2_bitcoin/test_helpers/src/hex.rs b/mm2src/mm2_bitcoin/test_helpers/src/hex.rs
new file mode 100644
index 0000000000..971bac4142
--- /dev/null
+++ b/mm2src/mm2_bitcoin/test_helpers/src/hex.rs
@@ -0,0 +1,32 @@
+/// Strips the '0x' prefix off of hex string so it can be deserialized.
+///
+/// # Arguments
+///
+/// * `s` - The hex str
+fn strip_0x_prefix(s: &str) -> &str {
+    if &s[..2] == "0x" {
+        &s[2..]
+    } else {
+        s
+    }
+}
+
+/// Deserializes a hex string into a u8 array.
+///
+/// # Arguments
+///
+/// * `s` - The hex string
+fn deserialize_hex(s: &str) -> Result<Vec<u8>, hex::FromHexError> { hex::decode(&strip_0x_prefix(s)) }
+
+/// Deserialize a hex string into bytes.
+/// Panics if the string is malformatted.
+///
+/// # Arguments
+///
+/// * `s` - The hex string
+///
+/// # Panics
+///
+/// When the string is not validly formatted hex.
+#[inline]
+pub fn force_deserialize_hex(s: &str) -> Vec<u8> { deserialize_hex(s).unwrap() }
diff --git a/mm2src/mm2_bitcoin/test_helpers/src/lib.rs b/mm2src/mm2_bitcoin/test_helpers/src/lib.rs
new file mode 100644
index 0000000000..ce02e677d6
--- /dev/null
+++ b/mm2src/mm2_bitcoin/test_helpers/src/lib.rs
@@ -0,0 +1 @@
+pub mod hex;
diff --git a/mm2src/mm2_core/Cargo.toml b/mm2src/mm2_core/Cargo.toml
new file mode 100644
index 0000000000..0624806623
--- /dev/null
+++ b/mm2src/mm2_core/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "mm2_core"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+doctest = false
+
+[dependencies]
+async-trait = "0.1"
+arrayref = "0.3"
+cfg-if = "1.0"
+common = { path = "../common" }
+db_common = { path = "../db_common" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+hex = "0.4.2"
+keys = { path = "../mm2_bitcoin/keys" }
+lazy_static = "1.4"
+primitives = { path = "../mm2_bitcoin/primitives" }
+rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
+serde = "1"
+serde_bytes = "0.11"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+shared_ref_counter = { path = "../common/shared_ref_counter" }
+uuid = { version = "0.7", features = ["serde", "v4"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+gstuff = { version = "0.7", features = ["nightly"] }
+mm2_rpc = { path = "../mm2_rpc" }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+gstuff = { version = "0.7", features = ["crossterm", "nightly"] }
diff --git a/mm2src/mm2_core/src/event_dispatcher.rs b/mm2src/mm2_core/src/event_dispatcher.rs
new file mode 100644
index 0000000000..47de527142
--- /dev/null
+++ b/mm2src/mm2_core/src/event_dispatcher.rs
@@ -0,0 +1,148 @@
+use crate::mm_ctx::MmArc;
+use async_trait::async_trait;
+use std::any::TypeId;
+use std::collections::{HashMap, HashSet};
+
+pub type Listeners<EventType> = Vec<Box<dyn EventListener<Event = EventType>>>;
+pub type DispatchTable = HashMap<TypeId, Vec<usize>>;
+
+#[async_trait]
+pub trait EventListener: 'static + Send + Sync {
+    type Event;
+    async fn process_event_async(&self, ctx: MmArc, event: Self::Event);
+    fn get_desired_events(&self) -> Vec<TypeId>;
+    fn listener_id(&self) -> &'static str;
+}
+
+pub trait EventUniqueId {
+    fn event_id(&self) -> TypeId;
+}
+
+pub struct Dispatcher<EventType> {
+    listeners: Listeners<EventType>,
+    listeners_id: HashSet<String>,
+    dispatch_table: DispatchTable,
+}
+
+impl<EventType> Default for Dispatcher<EventType>
+where
+    EventType: Clone + EventUniqueId,
+{
+    fn default() -> Self {
+        Dispatcher {
+            listeners: vec![],
+            listeners_id: Default::default(),
+            dispatch_table: Default::default(),
+        }
+    }
+}
+
+impl<EventType: 'static> Dispatcher<EventType>
+where
+    EventType: Clone + EventUniqueId,
+{
+    pub fn add_listener(&mut self, listen: impl EventListener<Event = EventType>) {
+        if self.listeners_id.contains(listen.listener_id()) {
+            return;
+        }
+        self.listeners_id.insert(listen.listener_id().to_string());
+        let id = self.listeners.len();
+        let events = listen.get_desired_events();
+        self.listeners.push(Box::new(listen));
+        for ev in events {
+            self.dispatch_table.entry(ev).or_default().push(id);
+        }
+    }
+
+    pub async fn dispatch_async(&self, ctx: MmArc, ev: EventType) {
+        if let Some(interested) = self.dispatch_table.get(&ev.event_id()) {
+            for id in interested.iter().copied() {
+                self.listeners[id].process_event_async(ctx.clone(), ev.clone()).await;
+            }
+        }
+    }
+
+    #[cfg(test)]
+    pub fn nb_listeners(&self) -> usize { self.listeners.len() }
+}
+
+#[cfg(test)]
+mod event_dispatcher_tests {
+    use crate::event_dispatcher::{Dispatcher, EventListener, EventUniqueId};
+    use crate::mm_ctx::{MmArc, MmCtxBuilder};
+    use async_trait::async_trait;
+    use common::block_on;
+    use std::any::TypeId;
+    use std::ops::Deref;
+    use std::sync::Arc;
+    use uuid::Uuid;
+
+    #[derive(Clone, Default)]
+    struct EventSwapStatusChanged {
+        uuid: Uuid,
+        status: String,
+    }
+
+    impl EventSwapStatusChanged {
+        fn event_id() -> TypeId { TypeId::of::<EventSwapStatusChanged>() }
+    }
+
+    #[derive(Clone)]
+    enum AppEvents {
+        EventSwapStatusChanged(EventSwapStatusChanged),
+    }
+
+    impl EventUniqueId for AppEvents {
+        fn event_id(&self) -> TypeId {
+            match self {
+                AppEvents::EventSwapStatusChanged(_) => EventSwapStatusChanged::event_id(),
+            }
+        }
+    }
+
+    #[derive(Default)]
+    struct ListenerSwapStatusChanged;
+
+    #[derive(Clone)]
+    struct ListenerSwapStatusChangedArc(Arc<ListenerSwapStatusChanged>);
+
+    impl Deref for ListenerSwapStatusChangedArc {
+        type Target = ListenerSwapStatusChanged;
+        fn deref(&self) -> &ListenerSwapStatusChanged { &*self.0 }
+    }
+
+    #[async_trait]
+    impl EventListener for ListenerSwapStatusChangedArc {
+        type Event = AppEvents;
+
+        async fn process_event_async(&self, _ctx: MmArc, event: Self::Event) {
+            match event {
+                AppEvents::EventSwapStatusChanged(swap) => {
+                    assert_eq!(swap.uuid.to_string(), "00000000-0000-0000-0000-000000000000");
+                    assert_eq!(swap.status, "Started");
+                },
+            }
+        }
+
+        fn get_desired_events(&self) -> Vec<TypeId> { vec![EventSwapStatusChanged::event_id()] }
+
+        fn listener_id(&self) -> &'static str { "listener_swap_status_changed" }
+    }
+
+    #[test]
+    fn test_dispatcher() {
+        let mut dispatcher: Dispatcher<AppEvents> = Default::default();
+        let listener = ListenerSwapStatusChanged::default();
+        let res = ListenerSwapStatusChangedArc(Arc::new(listener));
+        dispatcher.add_listener(res.clone());
+        assert_eq!(dispatcher.nb_listeners(), 1);
+
+        let event = AppEvents::EventSwapStatusChanged(EventSwapStatusChanged {
+            uuid: Default::default(),
+            status: "Started".to_string(),
+        });
+        block_on(dispatcher.dispatch_async(MmCtxBuilder::new().into_mm_arc(), event));
+        dispatcher.add_listener(res);
+        assert_eq!(dispatcher.nb_listeners(), 1);
+    }
+}
diff --git a/mm2src/mm2_core/src/lib.rs b/mm2src/mm2_core/src/lib.rs
new file mode 100644
index 0000000000..3eb5ecc6ae
--- /dev/null
+++ b/mm2src/mm2_core/src/lib.rs
@@ -0,0 +1,24 @@
+use derive_more::Display;
+use rand::{thread_rng, Rng};
+
+pub mod event_dispatcher;
+pub mod mm_ctx;
+
+#[derive(Clone, Copy, Display, PartialEq)]
+pub enum DbNamespaceId {
+    #[display(fmt = "MAIN")]
+    Main,
+    #[display(fmt = "TEST_{}", _0)]
+    Test(u64),
+}
+
+impl Default for DbNamespaceId {
+    fn default() -> Self { DbNamespaceId::Main }
+}
+
+impl DbNamespaceId {
+    pub fn for_test() -> DbNamespaceId {
+        let mut rng = thread_rng();
+        DbNamespaceId::Test(rng.gen())
+    }
+}
diff --git a/mm2src/common/mm_ctx.rs b/mm2src/mm2_core/src/mm_ctx.rs
similarity index 76%
rename from mm2src/common/mm_ctx.rs
rename to mm2src/mm2_core/src/mm_ctx.rs
index 13c87d1cd9..cff1011622 100644
--- a/mm2src/common/mm_ctx.rs
+++ b/mm2src/mm2_core/src/mm_ctx.rs
@@ -1,28 +1,35 @@
-use crate::log::{self, LogState};
-use crate::mm_metrics::{MetricsArc, MetricsOps};
-use crate::{bits256, small_rng};
-use gstuff::Constructible;
+use arrayref::array_ref;
+#[cfg(any(not(target_arch = "wasm32"), feature = "track-ctx-pointer"))]
+use common::executor::Timer;
+use common::log::{self, LogLevel, LogState};
+use common::mm_metrics::{MetricsArc, MetricsOps};
+use common::{bits256, cfg_native, cfg_wasm32, small_rng};
+use futures::future::AbortHandle;
+use gstuff::{try_s, Constructible, ERR, ERRL};
 use keys::KeyPair;
+use lazy_static::lazy_static;
 use primitives::hash::H160;
 use rand::Rng;
+use serde::{Deserialize, Serialize};
 use serde_bytes::ByteBuf;
 use serde_json::{self as json, Value as Json};
+use shared_ref_counter::{SharedRc, WeakRc};
 use std::any::Any;
 use std::collections::hash_map::{Entry, HashMap};
 use std::collections::HashSet;
 use std::fmt;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex, Weak};
+use std::sync::{Arc, Mutex};
 
 cfg_wasm32! {
-    use crate::wasm_rpc::WasmRpcSender;
+    use mm2_rpc::wasm_rpc::WasmRpcSender;
+    use crate::DbNamespaceId;
 }
 
 cfg_native! {
-    use crate::executor::Timer;
-    use crate::mm_metrics::prometheus;
-    use rusqlite::Connection;
+    use common::mm_metrics::prometheus;
+    use db_common::sqlite::rusqlite::Connection;
     use std::net::{IpAddr, SocketAddr};
     use std::sync::MutexGuard;
 }
@@ -76,10 +83,15 @@ pub struct MmCtx {
     /// The context belonging to the `ordermatch` mod: `OrdermatchContext`.
     pub ordermatch_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
     pub rate_limit_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
+    pub simple_market_maker_bot_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
+    pub dispatcher_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
+    pub message_service_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
     pub p2p_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
     pub peer_id: Constructible<String>,
     /// The context belonging to the `coins` crate: `CoinsContext`.
     pub coins_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
+    pub coins_activation_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
+    pub crypto_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
     /// RIPEMD160(SHA256(x)) where x is secp256k1 pubkey derived from passphrase.
     pub rmd160: Constructible<H160>,
     /// secp256k1 key pair derived from passphrase.
@@ -95,8 +107,12 @@ pub struct MmCtx {
     #[cfg(target_arch = "wasm32")]
     pub wasm_rpc: Constructible<WasmRpcSender>,
     #[cfg(not(target_arch = "wasm32"))]
-    pub sqlite_connection: Constructible<Mutex<Connection>>,
+    pub sqlite_connection: Constructible<Arc<Mutex<Connection>>>,
     pub mm_version: String,
+    pub mm_init_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
+    pub abort_handlers: Mutex<Vec<AbortHandle>>,
+    #[cfg(target_arch = "wasm32")]
+    pub db_namespace: DbNamespaceId,
 }
 
 impl MmCtx {
@@ -112,9 +128,14 @@ impl MmCtx {
             stop_listeners: Mutex::new(Vec::new()),
             ordermatch_ctx: Mutex::new(None),
             rate_limit_ctx: Mutex::new(None),
+            simple_market_maker_bot_ctx: Mutex::new(None),
+            dispatcher_ctx: Mutex::new(None),
+            message_service_ctx: Mutex::new(None),
             p2p_ctx: Mutex::new(None),
             peer_id: Constructible::default(),
             coins_ctx: Mutex::new(None),
+            coins_activation_ctx: Mutex::new(None),
+            crypto_ctx: Mutex::new(None),
             rmd160: Constructible::default(),
             secp256k1_key_pair: Constructible::default(),
             coins_needed_for_kick_start: Mutex::new(HashSet::new()),
@@ -125,6 +146,10 @@ impl MmCtx {
             #[cfg(not(target_arch = "wasm32"))]
             sqlite_connection: Constructible::default(),
             mm_version: "".into(),
+            mm_init_ctx: Mutex::new(None),
+            abort_handlers: Mutex::new(Vec::new()),
+            #[cfg(target_arch = "wasm32")]
+            db_namespace: DbNamespaceId::Main,
         }
     }
 
@@ -141,7 +166,7 @@ impl MmCtx {
         if port < 1000 {
             return ERR!("rpcport < 1000");
         }
-        if port > u16::max_value() as u64 {
+        if port > u16::MAX as u64 {
             return ERR!("rpcport > u16");
         }
 
@@ -178,26 +203,16 @@ impl MmCtx {
     }
 
     pub fn netid(&self) -> u16 {
-        let big = self.conf["netid"].as_u64().unwrap_or(0);
-        if big > u16::max_value().into() {
-            panic!("netid {} is too big", big)
+        let netid = self.conf["netid"].as_u64().unwrap_or(0);
+        if netid > u16::MAX.into() {
+            panic!("netid {} is too big", netid)
         }
-        big as u16
+        netid as u16
     }
 
-    pub fn stop(&self) -> Result<(), String> {
-        try_s!(self.stop.pin(true));
-        let mut stop_listeners = self.stop_listeners.lock().expect("Can't lock stop_listeners");
-        // NB: It is important that we `drain` the `stop_listeners` rather than simply iterating over them
-        // because otherwise there might be reference counting instances remaining in a listener
-        // that would prevent the contexts from properly `Drop`ping.
-        for mut listener in stop_listeners.drain(..) {
-            if let Err(err) = listener() {
-                log! ({"MmCtx::stop] Listener error: {}", err})
-            }
-        }
-        Ok(())
-    }
+    pub fn p2p_in_memory(&self) -> bool { self.conf["p2p_in_memory"].as_bool().unwrap_or(false) }
+
+    pub fn p2p_in_memory_port(&self) -> Option<u64> { self.conf["p2p_in_memory_port"].as_u64() }
 
     /// True if the MarketMaker instance needs to stop.
     pub fn is_stopping(&self) -> bool { self.stop.copy_or(false) }
@@ -208,7 +223,7 @@ impl MmCtx {
         let mut stop_listeners = self.stop_listeners.lock().expect("Can't lock stop_listeners");
         if self.stop.copy_or(false) {
             if let Err(err) = cb() {
-                log! ({"MmCtx::on_stop] Listener error: {}", err})
+                log::error!("MmCtx::on_stop] Listener error: {}", err)
             }
         } else {
             stop_listeners.push(cb)
@@ -224,6 +239,10 @@ impl MmCtx {
         }
     }
 
+    /// Get a reference to the secp256k1 key pair as option.
+    /// Can be used in no-login functions to check if the passphrase is set
+    pub fn secp256k1_key_pair_as_option(&self) -> Option<&KeyPair> { self.secp256k1_key_pair.as_option() }
+
     /// This is our public ID, allowing us to be different from other peers.
     /// This should also be our public key which we'd use for message verification.
     pub fn public_id(&self) -> Result<bits256, String> {
@@ -247,7 +266,7 @@ impl MmCtx {
         let sqlite_file_path = self.dbdir().join("MM2.db");
         log::debug!("Trying to open SQLite database file {}", sqlite_file_path.display());
         let connection = try_s!(Connection::open(sqlite_file_path));
-        try_s!(self.sqlite_connection.pin(Mutex::new(connection)));
+        try_s!(self.sqlite_connection.pin(Arc::new(Mutex::new(connection))));
         Ok(())
     }
 
@@ -264,6 +283,17 @@ impl Default for MmCtx {
     fn default() -> Self { Self::with_log_state(LogState::in_memory()) }
 }
 
+impl Drop for MmCtx {
+    fn drop(&mut self) {
+        let ffi_handle = self
+            .ffi_handle
+            .as_option()
+            .map(|handle| handle.to_string())
+            .unwrap_or_else(|| "UNKNOWN".to_owned());
+        log::info!("MmCtx ({}) has been dropped", ffi_handle)
+    }
+}
+
 // We don't want to send `MmCtx` across threads, it will only obstruct the normal use case
 // (and might result in undefined behaviour if there's a C struct or value in the context that is aliased from the various MM threads).
 // Only the `MmArc` is `Send`.
@@ -271,22 +301,29 @@ impl Default for MmCtx {
 // which will likely come useful during the gradual port.
 //not-implemented-on-stable// impl !Send for MmCtx {}
 
-pub struct MmArc(pub Arc<MmCtx>);
+pub struct MmArc(pub SharedRc<MmCtx>);
+
 // NB: Explicit `Send` and `Sync` marks here should become unnecessary later,
 // after we finish the initial port and replace the C values with the corresponding Rust alternatives.
+#[allow(clippy::non_send_fields_in_send_ty)]
 unsafe impl Send for MmArc {}
 unsafe impl Sync for MmArc {}
+
 impl Clone for MmArc {
+    #[track_caller]
     fn clone(&self) -> MmArc { MmArc(self.0.clone()) }
 }
+
 impl Deref for MmArc {
     type Target = MmCtx;
-    fn deref(&self) -> &MmCtx { &*self.0 }
+    fn deref(&self) -> &MmCtx { &self.0 }
 }
 
 #[derive(Clone, Default)]
-pub struct MmWeak(Weak<MmCtx>);
+pub struct MmWeak(WeakRc<MmCtx>);
+
 // Same as `MmArc`.
+#[allow(clippy::non_send_fields_in_send_ty)]
 unsafe impl Send for MmWeak {}
 unsafe impl Sync for MmWeak {}
 
@@ -299,15 +336,13 @@ impl MmWeak {
 
 impl fmt::Debug for MmWeak {
     fn fmt(&self, ft: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        let ctx = MmArc::from_weak(self);
-        wite! (ft, "MmWeak("
-            if let Some (ctx) = ctx {
-                match ctx.ffi_handle() {
-                    Ok (k) => {(k)}
-                    Err (err) => {"err " (err)}
-                }
-            } else {'-'}
-        ')')
+        match MmArc::from_weak(self) {
+            Some(ctx) => match ctx.ffi_handle() {
+                Ok(ffi_handle) => write!(ft, "MmWeak({})", ffi_handle),
+                Err(err) => write!(ft, "MmWeak(ERROR({}))", err),
+            },
+            None => write!(ft, "MmWeak(-)"),
+        }
     }
 }
 
@@ -334,6 +369,51 @@ struct NativeCtx {
 }
 
 impl MmArc {
+    pub fn new(ctx: MmCtx) -> MmArc { MmArc(SharedRc::new(ctx)) }
+
+    pub fn stop(&self) -> Result<(), String> {
+        try_s!(self.stop.pin(true));
+        for handler in self.abort_handlers.lock().unwrap().drain(..) {
+            handler.abort();
+        }
+        let mut stop_listeners = self.stop_listeners.lock().expect("Can't lock stop_listeners");
+        // NB: It is important that we `drain` the `stop_listeners` rather than simply iterating over them
+        // because otherwise there might be reference counting instances remaining in a listener
+        // that would prevent the contexts from properly `Drop`ping.
+        for mut listener in stop_listeners.drain(..) {
+            if let Err(err) = listener() {
+                log::error!("MmCtx::stop] Listener error: {}", err)
+            }
+        }
+
+        #[cfg(feature = "track-ctx-pointer")]
+        self.track_ctx_pointer();
+
+        Ok(())
+    }
+
+    #[cfg(feature = "track-ctx-pointer")]
+    fn track_ctx_pointer(&self) {
+        let ctx_weak = self.weak();
+        let fut = async move {
+            let level = log::log_crate::Level::Info;
+            loop {
+                Timer::sleep(5.).await;
+                match MmArc::from_weak(&ctx_weak) {
+                    Some(ctx) => ctx.log_existing_pointers(level),
+                    None => {
+                        log::info!("MmCtx was dropped. Stop the loop");
+                        break;
+                    },
+                }
+            }
+        };
+        crate::executor::spawn(fut);
+    }
+
+    #[cfg(feature = "track-ctx-pointer")]
+    pub fn log_existing_pointers(&self, level: log::log_crate::Level) { self.0.log_existing_pointers(level, "MmArc") }
+
     /// Unique context identifier, allowing us to more easily pass the context through the FFI boundaries.
     pub fn ffi_handle(&self) -> Result<u32, String> {
         let mut mm_ctx_ffi = try_s!(MM_CTX_FFI.lock());
@@ -365,6 +445,7 @@ impl MmArc {
 
     /// Tries getting access to the MM context.  
     /// Fails if an invalid MM context handler is passed (no such context or dropped context).
+    #[track_caller]
     pub fn from_ffi_handle(ffi_handle: u32) -> Result<MmArc, String> {
         if ffi_handle == 0 {
             return ERR!("MmArc] Zeroed ffi_handle");
@@ -379,10 +460,11 @@ impl MmArc {
         }
     }
 
-    /// Generates a weak link, to track the context without prolonging its life.
-    pub fn weak(&self) -> MmWeak { MmWeak(Arc::downgrade(&self.0)) }
+    /// Generates a weak pointer, to track the allocated data without prolonging its life.
+    pub fn weak(&self) -> MmWeak { MmWeak(SharedRc::downgrade(&self.0)) }
 
-    /// Tries to obtain the MM context from the weak link.
+    /// Tries to obtain the MM context from the weak pointer.
+    #[track_caller]
     pub fn from_weak(weak: &MmWeak) -> Option<MmArc> { weak.0.upgrade().map(MmArc) }
 
     /// Init metrics with dashboard.
@@ -460,8 +542,11 @@ where
 #[derive(Default)]
 pub struct MmCtxBuilder {
     conf: Option<Json>,
+    log_level: LogLevel,
     key_pair: Option<KeyPair>,
     version: String,
+    #[cfg(target_arch = "wasm32")]
+    db_namespace: DbNamespaceId,
 }
 
 impl MmCtxBuilder {
@@ -472,6 +557,11 @@ impl MmCtxBuilder {
         self
     }
 
+    pub fn with_log_level(mut self, level: LogLevel) -> Self {
+        self.log_level = level;
+        self
+    }
+
     pub fn with_secp256k1_key_pair(mut self, key_pair: KeyPair) -> Self {
         self.key_pair = Some(key_pair);
         self
@@ -482,14 +572,21 @@ impl MmCtxBuilder {
         self
     }
 
+    #[cfg(target_arch = "wasm32")]
+    pub fn with_test_db_namespace(mut self) -> Self {
+        self.db_namespace = DbNamespaceId::for_test();
+        self
+    }
+
     pub fn into_mm_arc(self) -> MmArc {
         // NB: We avoid recreating LogState
         // in order not to interfere with the integration tests checking LogState drop on shutdown.
-        let log = if let Some(ref conf) = self.conf {
+        let mut log = if let Some(ref conf) = self.conf {
             LogState::mm(conf)
         } else {
             LogState::in_memory()
         };
+        log.set_level(self.log_level);
         let mut ctx = MmCtx::with_log_state(log);
         ctx.mm_version = self.version;
         if let Some(conf) = self.conf {
@@ -501,6 +598,11 @@ impl MmCtxBuilder {
             ctx.secp256k1_key_pair.pin(key_pair).unwrap();
         }
 
-        MmArc(Arc::new(ctx))
+        #[cfg(target_arch = "wasm32")]
+        {
+            ctx.db_namespace = self.db_namespace;
+        }
+
+        MmArc::new(ctx)
     }
 }
diff --git a/mm2src/mm2_db/Cargo.toml b/mm2src/mm2_db/Cargo.toml
new file mode 100644
index 0000000000..1af5966337
--- /dev/null
+++ b/mm2src/mm2_db/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "mm2_db"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+async-trait = "0.1"
+common = { path = "../common" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+itertools = "0.10"
+hex = "0.4.2"
+js-sys = "0.3.27"
+lazy_static = "1.4"
+mm2_core = { path = "../mm2_core" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_number = { path = "../mm2_number" }
+num-traits = "0.2"
+primitives = { path = "../mm2_bitcoin/primitives" }
+rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
+serde = "1"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
+wasm-bindgen-futures = { version = "0.4.1" }
+wasm-bindgen-test = { version = "0.3.2" }
+web-sys = { version = "0.3.55", features = ["console", "CloseEvent", "DomException", "ErrorEvent", "IdbDatabase", "IdbCursor", "IdbCursorWithValue", "IdbFactory", "IdbIndex", "IdbIndexParameters", "IdbObjectStore", "IdbObjectStoreParameters", "IdbOpenDbRequest", "IdbKeyRange", "IdbTransaction", "IdbTransactionMode", "IdbVersionChangeEvent", "MessageEvent", "WebSocket"] }
diff --git a/mm2src/mm2_db/src/indexed_db/be_big_uint.rs b/mm2src/mm2_db/src/indexed_db/be_big_uint.rs
new file mode 100644
index 0000000000..d4fe529c45
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/be_big_uint.rs
@@ -0,0 +1,217 @@
+//! This module contains the `BeBigUint` number representation
+//! that is intended to be used as an index in `IndexedDb`.
+//! `BeBigUint` solves the problem related to `BigInt` built in JavaScript
+//! that can't be used as an index in [`IdbKeyRange::range`] due to `IndexedDb` implementation:
+//!
+//! ```js
+//! // Chromium: `Failed to execute 'bound' on 'IDBKeyRange': The parameter is not a valid key.`
+//! // Firefox: `DataError: Data provided to an operation does not meet requirements.`
+//! range = IDBKeyRange.bound(['RICK', BigInt(1)], ['RICK', BigInt(2)]);
+//! ```
+//!
+//! Please note `wasm-bindgen` converts `u64`, `i64`, `u128`, `i128` types to `BigInt`,
+//! so we can't use them as indexes in [`IdbKeyRange::range`].
+//!
+//! As a solution we could use `BigIntStr`, but the comparison of stringified numbers
+//! doesn't work properly in some cases like in the following:
+//!
+//! ```
+//! assert(3000 < 200000);
+//! assert("3000" < "200000"); // fail due to the first characters '3' < '2'
+//! ```
+//!
+//! Another way is to serialize numbers as byte arrays or digits (`u32`) arrays
+//! using [`num_bigint::BigUint::to_bytes_be`] or [`num_bigint::BigUint::to_u32_digits`].
+//! But the problem is the same - comparison of such serialized numbers doesn't work properly.
+//!
+//! ```
+//! // BigUint::from(3000).to_bytes_be() => [11, 184]
+//! // BigUint::from(200000).to_bytes_be() => [3, 13, 64]
+//! assert(3000 < 200000);
+//! assert([11, 184] < [3, 13, 64]); // fail due to the first bytes `11 > 3`
+//! ```
+//!
+//! `BeBigUint` solves the previous problem by adding the number of digits required to represent a big integer.
+//! `BeBigUint` serializes into array of `u32` digits because `IndexedDb` is optimized to store and compare it.
+//!
+//! ```
+//! // BeBigUint::from(u128::MAX / 2).to_be_digits() => [4, 4294967295, 4294967295, 4294967295, 2147483647],
+//! // where `4` is the number of digits representing `u128::MAX / 2`.
+//! // BeBigUint::from(u64::MAX / 2).to_be_digits() => [2, 4294967295, 2147483647],
+//! // where `2` is the number of digits representing `u64::MAX / 2`.
+//! assert(u64::MAX / 2 < u128::MAX / 2);
+//! // The following check passes due to the first bytes `2 < 4`.
+//! assert([2, 4294967295, 2147483647] < [4, 4294967295, 4294967295, 4294967295, 2147483647]);
+//! ```
+
+use common::ifrom_inner;
+use derive_more::Display;
+use mm2_number::BigUint;
+use num_traits::ToPrimitive;
+use serde::de::Error as DeError;
+use serde::ser::Error as SerError;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt;
+use std::fmt::Formatter;
+use std::ops::Add;
+
+#[derive(Debug, Display)]
+pub enum BigUintError {
+    #[display(fmt = "Expected at least one digit")]
+    NoDigits,
+    #[display(fmt = "Unexpected number of digits: expected '{}', found '{}'", expected, found)]
+    InvalidNumberOfDigits { expected: u32, found: usize },
+    #[display(fmt = "The number is too large: {}", _0)]
+    NumberIsTooLarge(BigUint),
+}
+
+impl std::error::Error for BigUintError {}
+
+/// The big number representation that is intended to be used as an index in `IndexedDb`
+#[derive(Clone, Default, Eq, Ord, PartialEq, PartialOrd)]
+pub struct BeBigUint(BigUint);
+
+impl BeBigUint {
+    /// Serializes the inner big number into array of `u32` digits.
+    ///
+    /// # Representation
+    ///
+    /// The big integer serializes into array of `u32` digits in big-endian order.
+    /// The first digits is **always** the number of digits used to represent the big integer.
+    pub fn to_be_digits(&self) -> Result<Vec<u32>, BigUintError> {
+        // Get u32 digits in little-endian byte order.
+        let mut digits = self.0.to_u32_digits();
+        let bytes_len = digits.len();
+        if bytes_len > (u32::MAX as usize) {
+            return Err(BigUintError::NumberIsTooLarge(self.0.clone()));
+        }
+
+        // Reorder the digits from little-endian to big-endian byte order.
+        digits.reverse();
+
+        digits.insert(0, bytes_len as u32);
+        Ok(digits)
+    }
+
+    /// Deserializes a big number from the array of `u32` digits.
+    /// The array is expected to be in big-endian order.
+    /// For more information see [`BeBigUint::to_be_digits`].
+    pub fn from_be_digits(mut be_digits: Vec<u32>) -> Result<BeBigUint, BigUintError> {
+        if be_digits.is_empty() {
+            return Err(BigUintError::NoDigits);
+        }
+        // First digit is the expected number of digits that represent the big integer.
+        let expected = be_digits[0];
+        // An actual number of digits that are considered as a representation of the big integer.
+        let found = be_digits.len() - 1;
+        if found != expected as usize {
+            return Err(BigUintError::InvalidNumberOfDigits { expected, found });
+        }
+
+        // Reorder the digits from big-endian to little-endian byte order.
+        be_digits.reverse();
+        // Remove the number of digits.
+        be_digits.pop();
+        Ok(BeBigUint(BigUint::new(be_digits)))
+    }
+}
+
+impl fmt::Debug for BeBigUint {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }
+}
+
+impl fmt::Display for BeBigUint {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }
+}
+
+impl From<BigUint> for BeBigUint {
+    fn from(int: BigUint) -> Self { BeBigUint(int) }
+}
+
+impl From<BeBigUint> for BigUint {
+    fn from(int: BeBigUint) -> Self { int.0 }
+}
+
+ifrom_inner!(BeBigUint, BigUint, u8 u16 u32 u64 usize u128);
+
+impl<T> Add<T> for BeBigUint
+where
+    BigUint: From<T>,
+{
+    type Output = BeBigUint;
+
+    fn add(self, rhs: T) -> Self::Output { BeBigUint::from(self.0 + BigUint::from(rhs)) }
+}
+
+impl ToPrimitive for BeBigUint {
+    #[inline]
+    fn to_i64(&self) -> Option<i64> { self.0.to_i64() }
+
+    #[inline]
+    fn to_i128(&self) -> Option<i128> { self.0.to_i128() }
+
+    #[inline]
+    fn to_u64(&self) -> Option<u64> { self.0.to_u64() }
+
+    #[inline]
+    fn to_u128(&self) -> Option<u128> { self.0.to_u128() }
+}
+
+impl Serialize for BeBigUint {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.to_be_digits().map_err(S::Error::custom)?.serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for BeBigUint {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let be_digits: Vec<u32> = Vec::deserialize(deserializer)?;
+        BeBigUint::from_be_digits(be_digits).map_err(D::Error::custom)
+    }
+}
+
+mod tests {
+    use super::*;
+    use serde_json::{self as json, json, Value as Json};
+    use wasm_bindgen_test::*;
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    fn test_be_big_uint_ser_de() {
+        fn test_ser_de_impl<U>(initial_int: U, expected_ser: Json)
+        where
+            BeBigUint: From<U>,
+        {
+            let int = BeBigUint::from(initial_int);
+            let int_ser = json::to_value(&int).unwrap();
+            assert_eq!(int_ser, expected_ser);
+            let int_de: BeBigUint = json::from_value(int_ser).unwrap();
+            assert_eq!(int, int_de);
+        }
+
+        test_ser_de_impl(0u32, json!([0]));
+        test_ser_de_impl(1u32, json!([1, 1]));
+        test_ser_de_impl(2u32, json!([1, 2]));
+        test_ser_de_impl(u8::MAX, json!([1, (u8::MAX as u32)]));
+        test_ser_de_impl(u16::MAX, json!([1, (u16::MAX as u32)]));
+        test_ser_de_impl((u32::MAX as u64) + 1, json!([2, 1, 0]));
+        test_ser_de_impl(u64::MAX / 2, json!([2, u32::MAX / 2, u32::MAX]));
+        test_ser_de_impl(u64::MAX / 2 + 1, json!([2, u32::MAX / 2 + 1, 0]));
+        test_ser_de_impl(u128::MAX / 2, json!([4, u32::MAX / 2, u32::MAX, u32::MAX, u32::MAX]));
+        test_ser_de_impl(u128::MAX / 2 + 1, json!([4, u32::MAX / 2 + 1, 0, 0, 0]));
+        test_ser_de_impl(u128::MAX, json!([4, u32::MAX, u32::MAX, u32::MAX, u32::MAX]));
+    }
+
+    #[wasm_bindgen_test]
+    fn test_be_big_uint_debug_display() {
+        let num = BeBigUint::from(1023u32);
+        assert_eq!("1023", format!("{:?}", num));
+        assert_eq!("1023", num.to_string());
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/db_driver.rs b/mm2src/mm2_db/src/indexed_db/db_driver.rs
new file mode 100644
index 0000000000..08d45de7d2
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/db_driver.rs
@@ -0,0 +1,111 @@
+//! The representation of [Indexed DB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API).
+//! This module consists of low-level Rust wrappers over basic JS structures like `IDBDatabase`, `IDBTransaction`, `IDBObjectStore` etc.
+//!
+//! # Usage
+//!
+//! Since the wrappers represented below are not `Send`, it's strongly recommended NOT to use them directly.
+//! Please consider using a higher-level interface from `indexed_db.rs`.
+
+use common::log::{error, info};
+use common::stringify_js_error;
+use futures::channel::mpsc;
+use js_sys::Array;
+use lazy_static::lazy_static;
+use mm2_err_handle::prelude::*;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::collections::HashSet;
+use std::fmt;
+use std::sync::Mutex;
+use wasm_bindgen::prelude::*;
+use web_sys::{IdbDatabase, IdbTransactionMode};
+
+#[path = "drivers/builder.rs"] mod builder;
+#[path = "drivers/cursor/cursor.rs"] pub(super) mod cursor;
+#[path = "drivers/object_store.rs"] mod object_store;
+#[path = "drivers/transaction.rs"] mod transaction;
+#[path = "drivers/upgrader.rs"] mod upgrader;
+
+pub use builder::{IdbDatabaseBuilder, InitDbError, InitDbResult};
+pub use object_store::IdbObjectStoreImpl;
+pub use transaction::{DbTransactionError, DbTransactionResult, IdbTransactionImpl};
+pub use upgrader::{DbUpgrader, OnUpgradeError, OnUpgradeNeededCb, OnUpgradeResult};
+
+lazy_static! {
+    static ref OPEN_DATABASES: Mutex<HashSet<String>> = Mutex::new(HashSet::new());
+}
+
+pub(crate) const PASS_THROUGH: fn(JsValue) -> JsValue = |event| event;
+
+pub type ItemId = u32;
+
+#[derive(Debug, Deserialize, Serialize)]
+struct InternalItem {
+    _item_id: ItemId,
+    #[serde(flatten)]
+    item: Json,
+}
+
+impl InternalItem {
+    pub fn into_pair(self) -> (ItemId, Json) { (self._item_id, self.item) }
+}
+
+pub struct IdbDatabaseImpl {
+    db: IdbDatabase,
+    db_name: String,
+    tables: HashSet<String>,
+}
+
+impl !Send for IdbDatabaseImpl {}
+
+impl fmt::Debug for IdbDatabaseImpl {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "IndexedDb {{ db_name: {:?}, tables: {:?} }}",
+            self.db_name, self.tables
+        )
+    }
+}
+
+impl IdbDatabaseImpl {
+    pub fn transaction(&self) -> DbTransactionResult<IdbTransactionImpl> {
+        let store_names = Array::new();
+        for table in self.tables.iter() {
+            store_names.push(&JsValue::from(table));
+        }
+
+        match self
+            .db
+            .transaction_with_str_sequence_and_mode(&store_names, IdbTransactionMode::Readwrite)
+        {
+            Ok(transaction) => Ok(IdbTransactionImpl::init(transaction, self.tables.clone())),
+            Err(e) => MmError::err(DbTransactionError::ErrorCreatingTransaction(stringify_js_error(&e))),
+        }
+    }
+}
+
+impl Drop for IdbDatabaseImpl {
+    fn drop(&mut self) {
+        info!("'{}' database has been closed", self.db_name);
+        self.db.close();
+        let mut open_databases = OPEN_DATABASES.lock().expect("!OPEN_DATABASES.lock()");
+        open_databases.remove(&self.db_name);
+    }
+}
+
+/// Please note the `Event` type can be `JsValue`. It doesn't lead to a runtime error, because [`JsValue::dyn_into<JsValue>()`] returns itself.
+fn construct_event_closure<F, Event>(mut f: F, mut event_tx: mpsc::Sender<Event>) -> Closure<dyn FnMut(JsValue)>
+where
+    F: FnMut(JsValue) -> Event + 'static,
+    Event: fmt::Debug + 'static,
+{
+    Closure::new(move |event: JsValue| {
+        let open_event = f(event);
+        if let Err(e) = event_tx.try_send(open_event) {
+            let error = e.to_string();
+            let event = e.into_inner();
+            error!("Error sending the '{:?}' event: {}", event, error);
+        }
+    })
+}
diff --git a/mm2src/mm2_db/src/indexed_db/db_lock.rs b/mm2src/mm2_db/src/indexed_db/db_lock.rs
new file mode 100644
index 0000000000..6dcf10550d
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/db_lock.rs
@@ -0,0 +1,57 @@
+use super::{DbIdentifier, DbInstance, InitDbResult};
+use futures::lock::{MappedMutexGuard as AsyncMappedMutexGuard, Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
+use mm2_core::{mm_ctx::MmArc, DbNamespaceId};
+use primitives::hash::H160;
+use std::sync::{Arc, Weak};
+
+/// The mapped mutex guard.
+/// This implements `Deref<Db>`.
+pub type DbLocked<'a, Db> = AsyncMappedMutexGuard<'a, Option<Db>, Db>;
+pub type SharedDb<Db> = Arc<ConstructibleDb<Db>>;
+pub type WeakDb<Db> = Weak<ConstructibleDb<Db>>;
+
+pub struct ConstructibleDb<Db> {
+    /// It's better to use something like [`Constructible`], but it doesn't provide a method to get the inner value by the mutable reference.
+    mutex: AsyncMutex<Option<Db>>,
+    db_namespace: DbNamespaceId,
+    wallet_rmd160: H160,
+}
+
+impl<Db: DbInstance> ConstructibleDb<Db> {
+    pub fn new_shared(ctx: &MmArc) -> SharedDb<Db> { Arc::new(Self::new(ctx)) }
+
+    pub fn new(ctx: &MmArc) -> Self {
+        ConstructibleDb {
+            mutex: AsyncMutex::new(None),
+            db_namespace: ctx.db_namespace,
+            wallet_rmd160: ctx.rmd160().clone(),
+        }
+    }
+
+    /// Locks the given mutex and checks if the inner database is initialized already or not,
+    /// initializes it if it's required, and returns the locked instance.
+    pub async fn get_or_initialize(&self) -> InitDbResult<DbLocked<'_, Db>> {
+        let mut locked_db = self.mutex.lock().await;
+        // Db is initialized already
+        if locked_db.is_some() {
+            return Ok(unwrap_db_instance(locked_db));
+        }
+
+        let db_id = DbIdentifier::new::<Db>(self.db_namespace, self.wallet_rmd160.clone());
+
+        let db = Db::init(db_id).await?;
+        *locked_db = Some(db);
+        Ok(unwrap_db_instance(locked_db))
+    }
+}
+
+/// # Panics
+///
+/// This function will `panic!()` if the inner value of the `guard` is `None`.
+fn unwrap_db_instance<Db>(guard: AsyncMutexGuard<'_, Option<Db>>) -> DbLocked<'_, Db> {
+    AsyncMutexGuard::map(guard, |wrapped_db| {
+        wrapped_db
+            .as_mut()
+            .expect("The locked 'Option<Db>' must contain a value")
+    })
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/builder.rs b/mm2src/mm2_db/src/indexed_db/drivers/builder.rs
new file mode 100644
index 0000000000..ef8c6ea086
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/builder.rs
@@ -0,0 +1,231 @@
+use super::{construct_event_closure, DbUpgrader, IdbDatabaseImpl, OnUpgradeError, OnUpgradeNeededCb, OPEN_DATABASES};
+use common::{log::info, stringify_js_error};
+use derive_more::Display;
+use futures::channel::mpsc;
+use futures::StreamExt;
+use mm2_err_handle::prelude::*;
+use std::collections::{HashMap, HashSet};
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::JsCast;
+use web_sys::{IdbDatabase, IdbOpenDbRequest, IdbTransaction, IdbVersionChangeEvent};
+
+pub type InitDbResult<T> = Result<T, MmError<InitDbError>>;
+
+#[derive(Debug, Display, PartialEq)]
+pub enum InitDbError {
+    #[display(fmt = "Cannot initialize a Database without tables")]
+    EmptyTableList,
+    #[display(fmt = "Database '{}' is open already", db_name)]
+    DbIsOpenAlready { db_name: String },
+    #[display(fmt = "It seems this browser doesn't support 'IndexedDb': {}", _0)]
+    NotSupported(String),
+    #[display(fmt = "Invalid Database version: {}", _0)]
+    InvalidVersion(String),
+    #[display(fmt = "Couldn't open Database: {}", _0)]
+    OpeningError(String),
+    #[display(fmt = "Type mismatch: expected '{}', found '{}'", expected, found)]
+    TypeMismatch { expected: String, found: String },
+    #[display(fmt = "Error occurred due to an unexpected state: {:?}", _0)]
+    UnexpectedState(String),
+    #[display(
+        fmt = "Error occurred due to the Database upgrading from {} to {} version: {}",
+        old_version,
+        new_version,
+        error
+    )]
+    UpgradingError {
+        old_version: u32,
+        new_version: u32,
+        error: OnUpgradeError,
+    },
+}
+
+pub struct IdbDatabaseBuilder {
+    db_name: String,
+    db_version: u32,
+    tables: HashMap<String, OnUpgradeNeededCb>,
+}
+
+impl IdbDatabaseBuilder {
+    pub fn new(db_name: &str) -> IdbDatabaseBuilder {
+        IdbDatabaseBuilder {
+            db_name: db_name.to_owned(),
+            db_version: 1,
+            tables: HashMap::new(),
+        }
+    }
+
+    pub fn with_version(mut self, db_version: u32) -> IdbDatabaseBuilder {
+        self.db_version = db_version;
+        self
+    }
+
+    pub fn with_tables<Tables>(mut self, tables: Tables) -> IdbDatabaseBuilder
+    where
+        Tables: IntoIterator<Item = (String, OnUpgradeNeededCb)>,
+    {
+        self.tables.extend(tables);
+        self
+    }
+
+    pub async fn build(self) -> InitDbResult<IdbDatabaseImpl> {
+        Self::check_if_db_is_not_open(&self.db_name)?;
+        let (table_names, on_upgrade_needed_handlers) = Self::tables_into_parts(self.tables)?;
+        info!("Open '{}' database with tables: {:?}", self.db_name, table_names);
+
+        let window = web_sys::window().expect("!window");
+        let indexed_db = match window.indexed_db() {
+            Ok(Some(db)) => db,
+            Ok(None) => return MmError::err(InitDbError::NotSupported("Unknown error".to_owned())),
+            Err(e) => return MmError::err(InitDbError::NotSupported(stringify_js_error(&e))),
+        };
+
+        let db_request = match indexed_db.open_with_u32(&self.db_name, self.db_version) {
+            Ok(r) => r,
+            Err(e) => return MmError::err(InitDbError::InvalidVersion(stringify_js_error(&e))),
+        };
+        let (tx, mut rx) = mpsc::channel(1);
+
+        let onerror_closure = construct_event_closure(DbOpenEvent::Failed, tx.clone());
+        let onsuccess_closure = construct_event_closure(DbOpenEvent::Success, tx.clone());
+        let onupgradeneeded_closure = construct_event_closure(DbOpenEvent::UpgradeNeeded, tx.clone());
+
+        db_request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
+        db_request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));
+        db_request.set_onupgradeneeded(Some(onupgradeneeded_closure.as_ref().unchecked_ref()));
+
+        let mut on_upgrade_needed_handlers = Some(on_upgrade_needed_handlers);
+        while let Some(event) = rx.next().await {
+            match event {
+                DbOpenEvent::Failed(e) => return MmError::err(InitDbError::OpeningError(stringify_js_error(&e))),
+                DbOpenEvent::UpgradeNeeded(event) => {
+                    Self::on_upgrade_needed(event, &db_request, &mut on_upgrade_needed_handlers)?
+                },
+                DbOpenEvent::Success(_) => {
+                    let db = Self::get_db_from_request(&db_request)?;
+                    Self::cache_open_db(self.db_name.clone());
+
+                    return Ok(IdbDatabaseImpl {
+                        db,
+                        db_name: self.db_name,
+                        tables: table_names,
+                    });
+                },
+            }
+        }
+        unreachable!("The event channel must not be closed before either 'DbOpenEvent::Success' or 'DbOpenEvent::Failed' is received");
+    }
+
+    fn on_upgrade_needed(
+        event: JsValue,
+        db_request: &IdbOpenDbRequest,
+        handlers: &mut Option<Vec<OnUpgradeNeededCb>>,
+    ) -> InitDbResult<()> {
+        let handlers = match handlers.take() {
+            Some(handlers) => handlers,
+            None => {
+                return MmError::err(InitDbError::UnexpectedState(
+                    "'IndexedDbBuilder::on_upgraded_needed' was called twice".to_owned(),
+                ))
+            },
+        };
+
+        let db = Self::get_db_from_request(&db_request)?;
+        let transaction = Self::get_transaction_from_request(&db_request)?;
+
+        let version_event = match event.dyn_into::<IdbVersionChangeEvent>() {
+            Ok(version) => version,
+            Err(e) => {
+                return MmError::err(InitDbError::TypeMismatch {
+                    expected: "IdbVersionChangeEvent".to_owned(),
+                    found: format!("{:?}", e),
+                })
+            },
+        };
+        let old_version = version_event.old_version() as u32;
+        let new_version = version_event
+            .new_version()
+            .ok_or(MmError::new(InitDbError::InvalidVersion(
+                "Expected a new_version".to_owned(),
+            )))? as u32;
+
+        let upgrader = DbUpgrader::new(db, transaction);
+        for on_upgrade_needed_cb in handlers {
+            on_upgrade_needed_cb(&upgrader, old_version, new_version).mm_err(|error| InitDbError::UpgradingError {
+                old_version,
+                new_version,
+                error,
+            })?;
+        }
+        Ok(())
+    }
+
+    fn cache_open_db(db_name: String) {
+        let mut open_databases = OPEN_DATABASES.lock().expect("!OPEN_DATABASES.lock()");
+        open_databases.insert(db_name);
+    }
+
+    fn check_if_db_is_not_open(db_name: &str) -> InitDbResult<()> {
+        let open_databases = OPEN_DATABASES.lock().expect("!OPEN_DATABASES.lock()");
+        if open_databases.contains(db_name) {
+            MmError::err(InitDbError::DbIsOpenAlready {
+                db_name: db_name.to_owned(),
+            })
+        } else {
+            Ok(())
+        }
+    }
+
+    fn get_db_from_request(db_request: &IdbOpenDbRequest) -> InitDbResult<IdbDatabase> {
+        let db_result = match db_request.result() {
+            Ok(res) => res,
+            Err(e) => return MmError::err(InitDbError::UnexpectedState(stringify_js_error(&e))),
+        };
+        db_result.dyn_into::<IdbDatabase>().map_err(|db_result| {
+            MmError::new(InitDbError::TypeMismatch {
+                expected: "IdbDatabase".to_owned(),
+                found: format!("{:?}", db_result),
+            })
+        })
+    }
+
+    fn get_transaction_from_request(db_request: &IdbOpenDbRequest) -> InitDbResult<IdbTransaction> {
+        let transaction = match db_request.transaction() {
+            Some(res) => res,
+            None => {
+                return MmError::err(InitDbError::UnexpectedState(
+                    "Expected 'IdbOpenDbRequest::transaction'".to_owned(),
+                ))
+            },
+        };
+        transaction.dyn_into::<IdbTransaction>().map_err(|transaction| {
+            MmError::new(InitDbError::TypeMismatch {
+                expected: "IdbTransaction".to_owned(),
+                found: format!("{:?}", transaction),
+            })
+        })
+    }
+
+    fn tables_into_parts(
+        tables: HashMap<String, OnUpgradeNeededCb>,
+    ) -> InitDbResult<(HashSet<String>, Vec<OnUpgradeNeededCb>)> {
+        if tables.is_empty() {
+            return MmError::err(InitDbError::EmptyTableList);
+        }
+
+        let mut table_names = HashSet::with_capacity(tables.len());
+        let mut on_upgrade_needed_handlers = Vec::with_capacity(tables.len());
+        for (table_name, handler) in tables {
+            table_names.insert(table_name);
+            on_upgrade_needed_handlers.push(handler);
+        }
+        Ok((table_names, on_upgrade_needed_handlers))
+    }
+}
+
+#[derive(Debug)]
+enum DbOpenEvent {
+    Failed(JsValue),
+    UpgradeNeeded(JsValue),
+    Success(JsValue),
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/cursor/cursor.rs b/mm2src/mm2_db/src/indexed_db/drivers/cursor/cursor.rs
new file mode 100644
index 0000000000..694fec6f16
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/cursor/cursor.rs
@@ -0,0 +1,326 @@
+use super::construct_event_closure;
+use crate::indexed_db::db_driver::{InternalItem, ItemId};
+use crate::indexed_db::BeBigUint;
+use async_trait::async_trait;
+use common::wasm::{deserialize_from_js, serialize_to_js, stringify_js_error};
+use derive_more::Display;
+use futures::channel::mpsc;
+use futures::StreamExt;
+use js_sys::Array;
+use mm2_err_handle::prelude::*;
+use serde_json::{self as json, Value as Json};
+use std::convert::TryInto;
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::JsCast;
+use web_sys::{IdbCursorWithValue, IdbIndex, IdbKeyRange, IdbRequest};
+
+mod multi_key_bound_cursor;
+mod multi_key_cursor;
+mod single_key_bound_cursor;
+mod single_key_cursor;
+
+pub use multi_key_bound_cursor::IdbMultiKeyBoundCursor;
+pub use multi_key_cursor::IdbMultiKeyCursor;
+pub use single_key_bound_cursor::IdbSingleKeyBoundCursor;
+pub use single_key_cursor::IdbSingleKeyCursor;
+
+pub type CursorResult<T> = Result<T, MmError<CursorError>>;
+pub type DbFilter = Box<dyn FnMut(&Json) -> (CollectItemAction, CollectCursorAction) + Send>;
+
+#[derive(Debug, Display, PartialEq)]
+pub enum CursorError {
+    #[display(
+        fmt = "Error serializing the '{}' value of the index field '{}' : {:?}",
+        value,
+        field,
+        description
+    )]
+    ErrorSerializingIndexFieldValue {
+        field: String,
+        value: String,
+        description: String,
+    },
+    #[display(fmt = "Error deserializing the an index key: {:?}", description)]
+    ErrorDeserializingIndexValue { description: String },
+    #[display(fmt = "Error deserializing an item: {:?}", _0)]
+    ErrorDeserializingItem(String),
+    #[display(fmt = "Error opening cursor: {:?}", description)]
+    ErrorOpeningCursor { description: String },
+    #[display(fmt = "Cursor advance error: {:?}", description)]
+    AdvanceError { description: String },
+    #[display(fmt = "Invalid key range: {:?}", description)]
+    InvalidKeyRange { description: String },
+    #[display(fmt = "Type mismatch: expected '{}', found '{}'", expected, found)]
+    TypeMismatch { expected: String, found: String },
+    #[display(
+        fmt = "Incorrect number of keys per a DB index: expected '{}', found '{}'",
+        expected,
+        found
+    )]
+    IncorrectNumberOfKeysPerIndex { expected: usize, found: usize },
+    #[display(fmt = "Error occurred due to an unexpected state: {:?}", _0)]
+    UnexpectedState(String),
+    #[display(fmt = "Incorrect usage of the cursor: {:?}", description)]
+    IncorrectUsage { description: String },
+}
+
+impl CursorError {
+    fn type_mismatch(expected: &str, found: &Json) -> CursorError {
+        CursorError::TypeMismatch {
+            expected: expected.to_owned(),
+            found: format!("{:?}", found),
+        }
+    }
+}
+
+/// The value types that are guaranteed ordered as we expect.
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub enum CursorBoundValue {
+    Uint(u32),
+    Int(i32),
+    BigUint(BeBigUint),
+}
+
+impl From<u32> for CursorBoundValue {
+    fn from(uint: u32) -> Self { CursorBoundValue::Uint(uint) }
+}
+
+impl From<i32> for CursorBoundValue {
+    fn from(int: i32) -> Self { CursorBoundValue::Int(int) }
+}
+
+impl From<u64> for CursorBoundValue {
+    fn from(uint: u64) -> Self { CursorBoundValue::BigUint(BeBigUint::from(uint)) }
+}
+
+impl From<usize> for CursorBoundValue {
+    fn from(uint: usize) -> Self { CursorBoundValue::BigUint(BeBigUint::from(uint)) }
+}
+
+impl From<u128> for CursorBoundValue {
+    fn from(uint: u128) -> Self { CursorBoundValue::BigUint(BeBigUint::from(uint)) }
+}
+
+impl From<BeBigUint> for CursorBoundValue {
+    fn from(uint: BeBigUint) -> Self { CursorBoundValue::BigUint(uint) }
+}
+
+impl CursorBoundValue {
+    fn next(&self) -> CursorBoundValue {
+        match self {
+            CursorBoundValue::Uint(uint) => CursorBoundValue::Uint(*uint + 1),
+            CursorBoundValue::Int(int) => CursorBoundValue::Int(*int + 1),
+            CursorBoundValue::BigUint(int) => CursorBoundValue::BigUint(int.clone() + 1u64),
+        }
+    }
+
+    pub fn to_js_value(&self) -> CursorResult<JsValue> {
+        match self {
+            CursorBoundValue::Uint(uint) => Ok(JsValue::from(*uint as u32)),
+            CursorBoundValue::Int(int) => Ok(JsValue::from(*int as i32)),
+            CursorBoundValue::BigUint(int) => serialize_to_js(int).map_to_mm(|e| CursorError::InvalidKeyRange {
+                description: e.to_string(),
+            }),
+        }
+    }
+
+    fn same_inner_type(&self, other: &Self) -> bool {
+        // `matches` macro leads to the following error:
+        // (CursorBoundValue::Uint(_), CursorBoundValue::Uint(_))
+        // ^ no rules expected this token in macro call
+        match (self, other) {
+            (CursorBoundValue::Int(_), CursorBoundValue::Int(_))
+            | (CursorBoundValue::Uint(_), CursorBoundValue::Uint(_))
+            | (CursorBoundValue::BigUint(_), CursorBoundValue::BigUint(_)) => true,
+            _ => false,
+        }
+    }
+
+    fn deserialize_with_expected_type(value: &Json, expected: &Self) -> CursorResult<CursorBoundValue> {
+        match expected {
+            CursorBoundValue::Uint(_) => {
+                let uint64 = value.as_u64().or_mm_err(|| CursorError::type_mismatch("u32", value))?;
+                let uint = uint64
+                    .try_into()
+                    .map_to_mm(|_| CursorError::type_mismatch("u32", value))?;
+                Ok(CursorBoundValue::Uint(uint))
+            },
+            CursorBoundValue::Int(_) => {
+                let int64 = value.as_i64().or_mm_err(|| CursorError::type_mismatch("i32", value))?;
+                let int = int64
+                    .try_into()
+                    .map_to_mm(|_| CursorError::type_mismatch("i32", value))?;
+                Ok(CursorBoundValue::Int(int))
+            },
+            CursorBoundValue::BigUint(_) => json::from_value::<BeBigUint>(value.clone())
+                .map(CursorBoundValue::BigUint)
+                .map_to_mm(|_| CursorError::type_mismatch("BeBigUint", value)),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq)]
+pub enum CollectCursorAction {
+    Continue,
+    ContinueWithValue(JsValue),
+    Stop,
+}
+
+#[derive(Debug, PartialEq)]
+pub enum CollectItemAction {
+    Include,
+    Skip,
+}
+
+#[async_trait(?Send)]
+pub trait CursorOps: Sized {
+    fn db_index(&self) -> &IdbIndex;
+
+    fn key_range(&self) -> CursorResult<Option<IdbKeyRange>>;
+
+    fn on_collect_iter(&mut self, key: JsValue, value: &Json)
+        -> CursorResult<(CollectItemAction, CollectCursorAction)>;
+
+    /// Collect items that match the specified bounds.
+    async fn collect(mut self) -> CursorResult<Vec<(ItemId, Json)>> {
+        let (tx, mut rx) = mpsc::channel(1);
+
+        let db_index = self.db_index();
+        let cursor_request_result = match self.key_range()? {
+            Some(key_range) => db_index.open_cursor_with_range(&key_range),
+            None => db_index.open_cursor(),
+        };
+        let cursor_request = cursor_request_result.map_err(|e| CursorError::ErrorOpeningCursor {
+            description: stringify_js_error(&e),
+        })?;
+
+        let onsuccess_closure = construct_event_closure(Ok, tx.clone());
+        let onerror_closure = construct_event_closure(Err, tx);
+
+        cursor_request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));
+        cursor_request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
+
+        let mut collected_items = Vec::new();
+
+        while let Some(event) = rx.next().await {
+            let _cursor_event = event.map_to_mm(|e| CursorError::ErrorOpeningCursor {
+                description: stringify_js_error(&e),
+            })?;
+
+            let cursor = match cursor_from_request(&cursor_request)? {
+                Some(cursor) => cursor,
+                // no more items, stop the loop
+                None => break,
+            };
+
+            let (key, js_value) = match (cursor.key(), cursor.value()) {
+                (Ok(key), Ok(js_value)) => (key, js_value),
+                // no more items, stop the loop
+                _ => break,
+            };
+
+            let item: InternalItem =
+                deserialize_from_js(js_value).map_to_mm(|e| CursorError::ErrorDeserializingItem(e.to_string()))?;
+
+            let (item_action, cursor_action) = self.on_collect_iter(key, &item.item)?;
+            match item_action {
+                CollectItemAction::Include => collected_items.push(item.into_pair()),
+                CollectItemAction::Skip => (),
+            }
+
+            match cursor_action {
+                CollectCursorAction::Continue => cursor.continue_().map_to_mm(|e| CursorError::AdvanceError {
+                    description: stringify_js_error(&e),
+                })?,
+                CollectCursorAction::ContinueWithValue(next_value) => {
+                    cursor
+                        .continue_with_key(&next_value)
+                        .map_to_mm(|e| CursorError::AdvanceError {
+                            description: stringify_js_error(&e),
+                        })?
+                },
+                // don't advance the cursor, just stop the loop
+                CollectCursorAction::Stop => break,
+            }
+        }
+
+        Ok(collected_items)
+    }
+}
+
+pub struct IdbCursorBuilder {
+    db_index: IdbIndex,
+}
+
+impl IdbCursorBuilder {
+    pub fn new(db_index: IdbIndex) -> IdbCursorBuilder { IdbCursorBuilder { db_index } }
+
+    /// Returns a cursor that is a representation of a range that includes records
+    /// whose value of the `field_name` field equals to the `field_value` value.
+    pub fn single_key_cursor(
+        self,
+        field_name: String,
+        field_value: Json,
+        collect_filter: Option<DbFilter>,
+    ) -> IdbSingleKeyCursor {
+        IdbSingleKeyCursor::new(self.db_index, field_name, field_value, collect_filter)
+    }
+
+    /// Returns a cursor that is a representation of a range that includes records
+    /// whose value of the `field_name` field is lower than `lower_bound` and greater than `upper_bound`.
+    pub fn single_key_bound_cursor(
+        self,
+        field_name: String,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+        collect_filter: Option<DbFilter>,
+    ) -> CursorResult<IdbSingleKeyBoundCursor> {
+        IdbSingleKeyBoundCursor::new(self.db_index, field_name, lower_bound, upper_bound, collect_filter)
+    }
+
+    /// Returns a cursor that is a representation of a range that includes records
+    /// whose fields have only the specified values `only_values`.
+    pub fn multi_key_cursor(
+        self,
+        only_values: Vec<(String, Json)>,
+        collect_filter: Option<DbFilter>,
+    ) -> CursorResult<IdbMultiKeyCursor> {
+        IdbMultiKeyCursor::new(self.db_index, only_values, collect_filter)
+    }
+
+    /// Returns a cursor that is a representation of a range that includes records
+    /// with the multiple `only` and `bound` restrictions.
+    pub fn multi_key_bound_cursor(
+        self,
+        only_values: Vec<(String, Json)>,
+        bound_values: Vec<(String, CursorBoundValue, CursorBoundValue)>,
+        collect_filter: Option<DbFilter>,
+    ) -> CursorResult<IdbMultiKeyBoundCursor> {
+        IdbMultiKeyBoundCursor::new(self.db_index, only_values, bound_values, collect_filter)
+    }
+}
+
+fn index_key_as_array(index_key: JsValue) -> CursorResult<Array> {
+    index_key.dyn_into::<Array>().map_err(|index_key| {
+        MmError::new(CursorError::TypeMismatch {
+            expected: "js_sys::Array".to_owned(),
+            found: format!("{:?}", index_key),
+        })
+    })
+}
+
+fn cursor_from_request(request: &IdbRequest) -> CursorResult<Option<IdbCursorWithValue>> {
+    let db_result = request
+        .result()
+        .map_to_mm(|e| CursorError::UnexpectedState(stringify_js_error(&e)))?;
+    if db_result.is_null() {
+        return Ok(None);
+    }
+    db_result
+        .dyn_into::<IdbCursorWithValue>()
+        .map(Some)
+        .map_to_mm(|db_result| CursorError::TypeMismatch {
+            expected: "IdbCursorWithValue".to_owned(),
+            found: format!("{:?}", db_result),
+        })
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/cursor/multi_key_bound_cursor.rs b/mm2src/mm2_db/src/indexed_db/drivers/cursor/multi_key_bound_cursor.rs
new file mode 100644
index 0000000000..836204e94b
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/cursor/multi_key_bound_cursor.rs
@@ -0,0 +1,560 @@
+use super::{index_key_as_array, CollectCursorAction, CollectItemAction, CursorBoundValue, CursorError, CursorOps,
+            CursorResult, DbFilter};
+use async_trait::async_trait;
+use common::{deserialize_from_js, serialize_to_js, stringify_js_error};
+use js_sys::Array;
+use mm2_err_handle::prelude::*;
+use serde_json::{json, Value as Json};
+use wasm_bindgen::prelude::*;
+use web_sys::{IdbIndex, IdbKeyRange};
+
+/// The representation of a range that includes records
+/// with the multiple `only` and `bound` restrictions.
+/// https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange/bound
+pub struct IdbMultiKeyBoundCursor {
+    db_index: IdbIndex,
+    only_values: Vec<(String, Json)>,
+    bound_values: Vec<(String, CursorBoundValue, CursorBoundValue)>,
+    /// An additional predicate that may be used to filter records.
+    collect_filter: Option<DbFilter>,
+}
+
+impl IdbMultiKeyBoundCursor {
+    pub(super) fn new(
+        db_index: IdbIndex,
+        only_values: Vec<(String, Json)>,
+        bound_values: Vec<(String, CursorBoundValue, CursorBoundValue)>,
+        collect_filter: Option<DbFilter>,
+    ) -> CursorResult<IdbMultiKeyBoundCursor> {
+        Self::check_bounds(&only_values, &bound_values)?;
+        Ok(IdbMultiKeyBoundCursor {
+            db_index,
+            only_values,
+            bound_values,
+            collect_filter,
+        })
+    }
+
+    fn check_bounds(
+        only_values: &Vec<(String, Json)>,
+        bound_values: &Vec<(String, CursorBoundValue, CursorBoundValue)>,
+    ) -> CursorResult<()> {
+        if bound_values.is_empty() || (only_values.len() + bound_values.len() < 2) {
+            let description = format!(
+                "Incorrect usage of 'IdbMultipleBoundCursor': expected more than one cursor bound, found '{}' only_values, '{}' bound_values",
+                only_values.len(),
+                bound_values.len()
+            );
+            return MmError::err(CursorError::IncorrectUsage { description });
+        }
+        for (_index, lower_bound, upper_bound) in bound_values {
+            if !lower_bound.same_inner_type(upper_bound) {
+                let description = format!(
+                    "Expected same inner type of lower and upper bounds, found: {:?}, {:?}",
+                    lower_bound, upper_bound
+                );
+                return MmError::err(CursorError::InvalidKeyRange { description });
+            }
+            if lower_bound > upper_bound {
+                let description = format!(
+                    "lower_bound '{:?}' is expected to be less or equal to upper_bound '{:?}'",
+                    lower_bound, upper_bound
+                );
+                return MmError::err(CursorError::InvalidKeyRange { description });
+            }
+        }
+        Ok(())
+    }
+
+    /// Fill the given `array` with the lower values of the corresponding key bounds
+    /// starting from the `starting_from_idx` index of [`IdbMultiKeyBoundCursor::bound_values`].
+    fn fill_array_with_lower_values_starting_from_idx(
+        &self,
+        array: &Array,
+        starting_from_bound: usize,
+    ) -> CursorResult<()> {
+        let mut idx = starting_from_bound;
+        while idx < self.bound_values.len() {
+            let (_index, lower_value, _upper_value) = &self.bound_values[idx];
+            array.push(&lower_value.to_js_value()?);
+            idx += 1;
+        }
+        Ok(())
+    }
+}
+
+#[async_trait(?Send)]
+impl CursorOps for IdbMultiKeyBoundCursor {
+    fn db_index(&self) -> &IdbIndex { &self.db_index }
+
+    fn key_range(&self) -> CursorResult<Option<IdbKeyRange>> {
+        let lower = Array::new();
+        let upper = Array::new();
+
+        // first, push the `only` values
+        for (field, value) in self.only_values.iter() {
+            let js_value = serialize_to_js(value).map_to_mm(|e| CursorError::ErrorSerializingIndexFieldValue {
+                field: field.to_owned(),
+                value: format!("{:?}", value),
+                description: e.to_string(),
+            })?;
+            lower.push(&js_value);
+            upper.push(&js_value);
+        }
+
+        for (_index, lower_value, upper_value) in self.bound_values.iter() {
+            let lower_js_value = lower_value.to_js_value()?;
+            let upper_js_value = upper_value.to_js_value()?;
+
+            lower.push(&lower_js_value);
+            upper.push(&upper_js_value);
+        }
+
+        let key_range = IdbKeyRange::bound(&lower, &upper).map_to_mm(|e| CursorError::InvalidKeyRange {
+            description: stringify_js_error(&e),
+        })?;
+        Ok(Some(key_range))
+    }
+
+    /// The range `IDBKeyRange.bound([2,2], [4,4])` includes values like `[3,0]` and `[3,5]` as `[2,2] < [3,0] < [3,5] < [4,4]`,
+    /// so we need to do additional filtering.
+    /// For more information on why it's required, see https://stackoverflow.com/a/32976384.
+    fn on_collect_iter(
+        &mut self,
+        index_key: JsValue,
+        value: &Json,
+    ) -> CursorResult<(CollectItemAction, CollectCursorAction)> {
+        let index_keys_js_array = index_key_as_array(index_key)?;
+        let index_keys: Vec<Json> = index_keys_js_array
+            .iter()
+            .map(|js_value| {
+                deserialize_from_js(js_value).map_to_mm(|e| CursorError::ErrorDeserializingIndexValue {
+                    description: e.to_string(),
+                })
+            }) // Item = Result<Json, MmError<CursorError>>
+            .collect::<Result<Vec<Json>, MmError<CursorError>>>()?;
+
+        let expected_keys = self.only_values.len() + self.bound_values.len();
+        if index_keys.len() != expected_keys {
+            return MmError::err(CursorError::IncorrectNumberOfKeysPerIndex {
+                expected: expected_keys,
+                found: index_keys.len(),
+            });
+        }
+
+        // Since we've put `only_values` to the start of the lower and upper indexes, we have to check only `bound` values.
+        let mut idx_in_index = self.only_values.len();
+        let mut idx_in_bounds = 0;
+
+        // The value consists of:
+        // * idx of the last increased key in the `index_keys`;
+        // * idx of the last increased key in the [`IdbMultiKeyBoundCursor::bound_values`];
+        // * the last increased key.
+        let mut last_increased_index_key: Option<(usize, usize, CursorBoundValue)> = None;
+
+        while idx_in_bounds < self.bound_values.len() {
+            let (_index, lower_bound, upper_bound) = &self.bound_values[idx_in_bounds];
+
+            let actual_index_value = &index_keys[idx_in_index];
+            // We expect that the lower and upper bounds have the same inner type as it's checked in [`IdbMultiKeyBoundCursor::check_bounds`].
+            let actual_index_value = CursorBoundValue::deserialize_with_expected_type(actual_index_value, lower_bound)?;
+
+            if &actual_index_value < lower_bound {
+                // A case №1, similar to the following:
+                // Got `[4, 1]`, but lower bound is `[3, 4]` and upper bound is `[5, 8]`.
+                // Obviously, this index is out of the expected range, so we have to continue iterating
+                // with an index `[4, 4]` to skip values like `[4, 2]`, `[4, 3]`.
+
+                // It means, we have to continue iterating with a DB index, whose `[0, idx_in_index)` keys are the same as in `index_keys`,
+                // but with the lowest keys starting from `idx_in_index`.
+                let new_index = index_keys_js_array.slice(0, idx_in_index as u32);
+                self.fill_array_with_lower_values_starting_from_idx(&new_index, idx_in_bounds)?;
+
+                return Ok((
+                    // the `actual_index_value` is not in our expected bounds
+                    CollectItemAction::Skip,
+                    CollectCursorAction::ContinueWithValue(new_index.into()),
+                ));
+            }
+            if &actual_index_value > upper_bound {
+                // A case №2, similar to the following:
+                // Got `[4, 6]`, but lower bound is `[3, 2]` and upper bound is `[5, 4]`.
+                // Obviously, this index is out of the expected range, so we have to continue iterating
+                // with an index `[5, 2]` to skip values like `[4, 7]`, `[4, 8]` etc.
+
+                // It means, we have to continue iterating with a DB index that is greater than actual `index` but is in the given bounds.
+                if let Some((last_increased_idx_in_index, last_increased_idx_in_bounds, last_increased_value)) =
+                    last_increased_index_key
+                {
+                    let new_index = index_keys_js_array.slice(0, last_increased_idx_in_index as u32);
+                    new_index.push(&last_increased_value.to_js_value()?);
+                    self.fill_array_with_lower_values_starting_from_idx(&new_index, last_increased_idx_in_bounds + 1)?;
+
+                    return Ok((
+                        // the `actual_index_value` is not in our expected bounds
+                        CollectItemAction::Skip,
+                        CollectCursorAction::ContinueWithValue(new_index.into()),
+                    ));
+                }
+
+                // otherwise there is no an index greater than actual `index`, stop the cursor
+                return Ok((CollectItemAction::Skip, CollectCursorAction::Stop));
+            }
+
+            let increased_index_key = actual_index_value.next();
+            if &increased_index_key <= upper_bound {
+                last_increased_index_key = Some((idx_in_index, idx_in_bounds, increased_index_key));
+            } // otherwise we don't need to remember this value that can't be increased
+
+            idx_in_index += 1;
+            idx_in_bounds += 1;
+        }
+
+        // `index_key` is in our expected bounds
+        if let Some(ref mut filter) = self.collect_filter {
+            return Ok(filter(value));
+        }
+        Ok((CollectItemAction::Include, CollectCursorAction::Continue))
+    }
+}
+
+mod tests {
+    use super::*;
+    use common::log::wasm_log::register_wasm_log;
+    use wasm_bindgen::JsCast;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    /// The given indexes are expected to be in the bound.
+    fn test_in_bound_indexes(cursor: &mut IdbMultiKeyBoundCursor, input_indexes: Vec<Json>) {
+        for input_index in input_indexes {
+            let input_index_js_value = serialize_to_js(&input_index).unwrap();
+            let result = cursor.on_collect_iter(input_index_js_value, &Json::Null);
+            assert_eq!(
+                result,
+                Ok((CollectItemAction::Include, CollectCursorAction::Continue)),
+                "'{}' index is expected to be in a bound",
+                input_index
+            );
+        }
+    }
+
+    /// `input_indexes` consists of the pairs of:
+    /// * Index that is out of bound;
+    /// * Next index that is expected to be returned.
+    fn test_out_of_bound_indexes_with_next(cursor: &mut IdbMultiKeyBoundCursor, input_indexes: Vec<(Json, Json)>) {
+        for (input_index, expected_next) in input_indexes {
+            let input_index_js_value = serialize_to_js(&input_index).unwrap();
+            let (item_action, cursor_action) = cursor
+                .on_collect_iter(input_index_js_value, &Json::Null)
+                .expect(&format!("Error due to the index '{:?}'", input_index));
+
+            let actual_next: Json = match cursor_action {
+                CollectCursorAction::ContinueWithValue(next_index_js_value) => {
+                    deserialize_from_js(next_index_js_value).expect("Error deserializing next index}")
+                },
+                action => panic!(
+                    "Expected 'CollectCursorAction::ContinueWithValue', found '{:?}'",
+                    action
+                ),
+            };
+            assert_eq!(item_action, CollectItemAction::Skip);
+            assert_eq!(actual_next, expected_next);
+        }
+    }
+
+    // `input_indexes` are expected to be out of bound and can't be found next index to continue.
+    fn test_out_of_bound_indexes(cursor: &mut IdbMultiKeyBoundCursor, input_indexes: Vec<Json>) {
+        for input_index in input_indexes {
+            let input_index_js_value = serialize_to_js(&input_index).unwrap();
+            let result = cursor.on_collect_iter(input_index_js_value, &Json::Null);
+            assert_eq!(
+                result,
+                Ok((CollectItemAction::Skip, CollectCursorAction::Stop)),
+                "'{}' index is expected to be out of bound",
+                input_index
+            );
+        }
+    }
+
+    /// This test doesn't check [`IdbMultiKeyBoundCursor::filter`].
+    #[wasm_bindgen_test]
+    fn test_on_collect_iter_multiple_only_and_bound_values() {
+        register_wasm_log();
+
+        let only_values = vec![
+            ("field1".to_owned(), json!("value1")),
+            ("field2".to_owned(), json!(2)),
+            ("field3".to_owned(), json!("value 3")),
+        ];
+        let bound_values = vec![
+            (
+                "field4".to_owned(),
+                CursorBoundValue::Uint(2), // lower bound
+                CursorBoundValue::Uint(5), // upper bound
+            ),
+            (
+                "field5".to_owned(),
+                CursorBoundValue::Int(-10), // lower bound
+                CursorBoundValue::Int(10),  // upper bound
+            ),
+            (
+                "field6".to_owned(),
+                CursorBoundValue::Uint(7), // lower bound
+                CursorBoundValue::Uint(7), // upper bound
+            ),
+            (
+                "field7".to_owned(),
+                CursorBoundValue::Int(-1), // lower bound
+                CursorBoundValue::Int(1),  // upper bound
+            ),
+        ];
+
+        // Use [`wasm_bindgen::JsCast::unchecked_from_js`] to create not-valid `IdbIndex`
+        // that is not used by [`IdbMultiKeyBoundCursor::on_collect_iter`] anyway.
+        let db_index = IdbIndex::unchecked_from_js(JsValue::NULL);
+        let mut cursor = IdbMultiKeyBoundCursor::new(db_index, only_values, bound_values, None).unwrap();
+
+        //////////////////
+
+        // The following inexes are expected to be in the bound.
+        let in_bound_keys: Vec<_> = vec![
+            json!(["value1", 2, "value 3", 2, 0, 7, 1]),
+            json!(["value1", 2, "value 3", 3, 3, 7, -1]),
+            json!(["value1", 2, "value 3", 3, 3, 7, 0]),
+            json!(["value1", 2, "value 3", 5, -10, 7, 1]),
+            json!(["value1", 2, "value 3", 5, 10, 7, 1]),
+        ];
+        test_in_bound_indexes(&mut cursor, in_bound_keys);
+
+        //////////////////
+
+        let out_of_bound_indexes_with_next: Vec<_> = vec![
+            // Case №1
+            (
+                json!(["value1", 2, "value 3", 2, 0, 7, -2]),
+                json!(["value1", 2, "value 3", 2, 0, 7, -1]),
+            ),
+            // Case №1
+            (
+                json!(["value1", 2, "value 3", 2, 0, 6, 1]),
+                json!(["value1", 2, "value 3", 2, 0, 7, -1]),
+            ),
+            // Case №1
+            (
+                json!(["value1", 2, "value 3", 1, 10, 7, 1]),
+                json!(["value1", 2, "value 3", 2, -10, 7, -1]),
+            ),
+            // Case №1
+            (
+                json!(["value1", 2, "value 3", 3, -100, 5, 100]),
+                json!(["value1", 2, "value 3", 3, -10, 7, -1]),
+            ),
+            // Case №1
+            (
+                json!(["value1", 2, "value 3", 2, -10, 7, -2]),
+                json!(["value1", 2, "value 3", 2, -10, 7, -1]),
+            ),
+            // Case №2
+            (
+                json!(["value1", 2, "value 3", 3, 0, 8, 1]),
+                json!(["value1", 2, "value 3", 3, 1, 7, -1]),
+            ),
+            // Case №2
+            (
+                json!(["value1", 2, "value 3", 3, 10, 8, 1]),
+                json!(["value1", 2, "value 3", 4, -10, 7, -1]),
+            ),
+            // Case №2
+            (
+                json!(["value1", 2, "value 3", 3, 10, 7, 2]),
+                json!(["value1", 2, "value 3", 4, -10, 7, -1]),
+            ),
+        ];
+        test_out_of_bound_indexes_with_next(&mut cursor, out_of_bound_indexes_with_next);
+
+        //////////////////
+
+        let out_of_bound_indexes: Vec<_> = vec![
+            json!(["value1", 2, "value 3", 5, 10, 7, 2]),
+            json!(["value1", 2, "value 3", 5, 10, 8, 1]),
+            json!(["value1", 2, "value 3", 5, 11, 7, 1]),
+            json!(["value1", 2, "value 3", 6, 10, 7, 1]),
+            json!(["value1", 2, "value 3", 6, -10, 7, 0]),
+        ];
+        test_out_of_bound_indexes(&mut cursor, out_of_bound_indexes);
+    }
+
+    /// This test doesn't check [`IdbMultiKeyBoundCursor::filter`].
+    #[wasm_bindgen_test]
+    fn test_on_collect_iter_multiple_bound_values() {
+        register_wasm_log();
+
+        let only_values = Vec::new();
+        let bound_values = vec![
+            (
+                "field1".to_owned(),
+                CursorBoundValue::Uint(2), // lower bound
+                CursorBoundValue::Uint(5), // upper bound
+            ),
+            (
+                "field2".to_owned(),
+                CursorBoundValue::Int(-10), // lower bound
+                CursorBoundValue::Int(10),  // upper bound
+            ),
+        ];
+
+        // Use [`wasm_bindgen::JsCast::unchecked_from_js`] to create not-valid `IdbIndex`
+        // that is not used by [`IdbMultiKeyBoundCursor::on_collect_iter`] anyway.
+        let db_index = IdbIndex::unchecked_from_js(JsValue::NULL);
+        let mut cursor = IdbMultiKeyBoundCursor::new(db_index, only_values, bound_values, None).unwrap();
+
+        //////////////////
+
+        // The following inexes are expected to be in the bound.
+        let in_bound_keys: Vec<_> = vec![
+            json!([2, -10]),
+            json!([2, 0]),
+            json!([2, 10]),
+            json!([5, -10]),
+            json!([5, 10]),
+        ];
+        test_in_bound_indexes(&mut cursor, in_bound_keys);
+
+        //////////////////
+
+        let out_of_bound_indexes_with_next: Vec<_> = vec![
+            // Case №1
+            (json!([2, -100]), json!([2, -10])),
+            // Case №1
+            (json!([1, 10]), json!([2, -10])),
+            // Case №1
+            (json!([1, -100]), json!([2, -10])),
+            // Case №1
+            (json!([5, -11]), json!([5, -10])),
+            // Case №2
+            (json!([2, 11]), json!([3, -10])),
+            // Case №2
+            (json!([4, 101]), json!([5, -10])),
+        ];
+        test_out_of_bound_indexes_with_next(&mut cursor, out_of_bound_indexes_with_next);
+
+        //////////////////
+
+        let out_of_bound_indexes: Vec<_> = vec![
+            //
+            json!([5, 11]),
+            json!([6, 10]),
+            json!([6, -10]),
+        ];
+        test_out_of_bound_indexes(&mut cursor, out_of_bound_indexes);
+    }
+
+    /// This test doesn't check [`IdbMultiKeyBoundCursor::filter`].
+    #[wasm_bindgen_test]
+    fn test_on_collect_iter_single_only_and_bound_values() {
+        register_wasm_log();
+
+        let only_values = vec![("field1".to_owned(), json!(2))];
+        let bound_values = vec![(
+            "field2".to_owned(),
+            CursorBoundValue::Uint(2), // lower bound
+            CursorBoundValue::Uint(5), // upper bound
+        )];
+
+        // Use [`wasm_bindgen::JsCast::unchecked_from_js`] to create not-valid `IdbIndex`
+        // that is not used by [`IdbMultiKeyBoundCursor::on_collect_iter`] anyway.
+        let db_index = IdbIndex::unchecked_from_js(JsValue::NULL);
+        let mut cursor = IdbMultiKeyBoundCursor::new(db_index, only_values, bound_values, None).unwrap();
+
+        //////////////////
+
+        // The following inexes are expected to be in the bound.
+        let in_bound_keys: Vec<_> = vec![
+            //
+            json!([2, 2]),
+            json!([2, 3]),
+            json!([2, 4]),
+            json!([2, 5]),
+        ];
+        test_in_bound_indexes(&mut cursor, in_bound_keys);
+
+        //////////////////
+
+        let out_of_bound_indexes_with_next: Vec<_> = vec![
+            // Case №1
+            (json!([2, 0]), json!([2, 2])),
+            // Case №1
+            (json!([2, 1]), json!([2, 2])),
+        ];
+        test_out_of_bound_indexes_with_next(&mut cursor, out_of_bound_indexes_with_next);
+
+        //////////////////
+
+        let out_of_bound_indexes: Vec<_> = vec![
+            //
+            json!([2, 6]),
+            json!([6, 7]),
+            json!([6, 100]),
+        ];
+        test_out_of_bound_indexes(&mut cursor, out_of_bound_indexes);
+    }
+
+    #[wasm_bindgen_test]
+    fn test_on_collect_iter_error() {
+        register_wasm_log();
+
+        let only_values = vec![("field1".to_owned(), json!(2u32))];
+        let bound_values = vec![(
+            "field2".to_owned(),
+            CursorBoundValue::Uint(2), // lower bound
+            CursorBoundValue::Uint(5), // upper bound
+        )];
+
+        // Use [`wasm_bindgen::JsCast::unchecked_from_js`] to create not-valid `IdbIndex`
+        // that is not used by [`IdbMultiKeyBoundCursor::on_collect_iter`] anyway.
+        let db_index = IdbIndex::unchecked_from_js(JsValue::NULL);
+        let mut cursor = IdbMultiKeyBoundCursor::new(db_index, only_values, bound_values, None).unwrap();
+
+        //////////////////
+
+        // The following indexes must lead to the `CursorError::TypeMismatch` error.
+        let input_indexes: Vec<_> = vec![
+            // the second field is expected to be `i32`, but it's `u32`
+            (json!([2, -10]), "u32"),
+            (json!([2, "a string value"]), "u32"),
+            // the indexes are expected to be arrays
+            (json!(2), "js_sys::Array"),
+            (json!("Foo"), "js_sys::Array"),
+        ];
+        for (input_index, expected_type) in input_indexes {
+            let input_index_js_value = serialize_to_js(&input_index).unwrap();
+            let error = cursor
+                .on_collect_iter(input_index_js_value, &Json::Null)
+                .expect_err(&format!("'{:?}' must lead to 'CursorError::TypeMismatch'", input_index));
+            match error.into_inner() {
+                CursorError::TypeMismatch { expected, .. } => assert_eq!(expected, expected_type),
+                e => panic!("Expected 'CursorError::TypeMismatch', found '{:?}'", e),
+            }
+        }
+
+        // The following indexes have unexpected size.
+        let input_indexes: Vec<_> = vec![
+            //
+            json!([2]),
+            json!([2, 10, 1]),
+            json!([2, 10, 1, 2]),
+        ];
+        for input_index in input_indexes {
+            let input_index_js_value = serialize_to_js(&input_index).unwrap();
+            let error = cursor
+                .on_collect_iter(input_index_js_value, &Json::Null)
+                .expect_err(&format!("'{:?}' must lead to 'CursorError::TypeMismatch'", input_index));
+            match error.into_inner() {
+                CursorError::IncorrectNumberOfKeysPerIndex { .. } => (),
+                e => panic!("Expected 'CursorError::IncorrectNumberOfKeysPerIndex', found '{:?}'", e),
+            }
+        }
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/cursor/multi_key_cursor.rs b/mm2src/mm2_db/src/indexed_db/drivers/cursor/multi_key_cursor.rs
new file mode 100644
index 0000000000..c161ada34e
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/cursor/multi_key_cursor.rs
@@ -0,0 +1,78 @@
+use super::{CollectCursorAction, CollectItemAction, CursorError, CursorOps, CursorResult, DbFilter};
+use async_trait::async_trait;
+use common::{serialize_to_js, stringify_js_error};
+use js_sys::Array;
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+use wasm_bindgen::prelude::*;
+use web_sys::{IdbIndex, IdbKeyRange};
+
+/// The representation of a range that includes records
+/// whose fields have only the specified [`IdbSingleCursor::only_values`] values.
+/// https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange/only
+pub struct IdbMultiKeyCursor {
+    db_index: IdbIndex,
+    only_values: Vec<(String, Json)>,
+    /// An additional predicate that can be used to filter records.
+    collect_filter: Option<DbFilter>,
+}
+
+impl IdbMultiKeyCursor {
+    pub(super) fn new(
+        db_index: IdbIndex,
+        only_values: Vec<(String, Json)>,
+        collect_filter: Option<DbFilter>,
+    ) -> CursorResult<IdbMultiKeyCursor> {
+        Self::check_only_values(&only_values)?;
+        Ok(IdbMultiKeyCursor {
+            db_index,
+            only_values,
+            collect_filter,
+        })
+    }
+
+    fn check_only_values(only_values: &Vec<(String, Json)>) -> CursorResult<()> {
+        if only_values.len() < 2 {
+            let description = format!(
+                "Incorrect usage of 'IdbMultiKeyCursor': expected more than one cursor bound, found '{}'",
+                only_values.len(),
+            );
+            return MmError::err(CursorError::IncorrectUsage { description });
+        }
+        Ok(())
+    }
+}
+
+#[async_trait(?Send)]
+impl CursorOps for IdbMultiKeyCursor {
+    fn db_index(&self) -> &IdbIndex { &self.db_index }
+
+    fn key_range(&self) -> CursorResult<Option<IdbKeyRange>> {
+        let only = Array::new();
+
+        for (field, value) in self.only_values.iter() {
+            let js_value = serialize_to_js(value).map_to_mm(|e| CursorError::ErrorSerializingIndexFieldValue {
+                field: field.to_owned(),
+                value: format!("{:?}", value),
+                description: e.to_string(),
+            })?;
+            only.push(&js_value);
+        }
+
+        let key_range = IdbKeyRange::only(&only).map_to_mm(|e| CursorError::InvalidKeyRange {
+            description: stringify_js_error(&e),
+        })?;
+        Ok(Some(key_range))
+    }
+
+    fn on_collect_iter(
+        &mut self,
+        _key: JsValue,
+        value: &Json,
+    ) -> CursorResult<(CollectItemAction, CollectCursorAction)> {
+        if let Some(ref mut filter) = self.collect_filter {
+            return Ok(filter(value));
+        }
+        Ok((CollectItemAction::Include, CollectCursorAction::Continue))
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/cursor/single_key_bound_cursor.rs b/mm2src/mm2_db/src/indexed_db/drivers/cursor/single_key_bound_cursor.rs
new file mode 100644
index 0000000000..d3138f09e9
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/cursor/single_key_bound_cursor.rs
@@ -0,0 +1,81 @@
+use super::{CollectCursorAction, CollectItemAction, CursorBoundValue, CursorError, CursorOps, CursorResult, DbFilter};
+use async_trait::async_trait;
+use common::{log::warn, stringify_js_error};
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+use wasm_bindgen::prelude::*;
+use web_sys::{IdbIndex, IdbKeyRange};
+
+/// The representation of a range that includes records
+/// whose value of the [`IdbSingleBoundCursor::field_name`] field is lower than [`IdbSingleBoundCursor::lower_bound_value`]
+/// and greater than [`IdbSingleBoundCursor::upper_bound_value`].
+/// https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange/bound
+pub struct IdbSingleKeyBoundCursor {
+    db_index: IdbIndex,
+    #[allow(dead_code)]
+    field_name: String,
+    lower_bound: CursorBoundValue,
+    upper_bound: CursorBoundValue,
+    /// An additional predicate that may be used to filter records.
+    collect_filter: Option<DbFilter>,
+}
+
+impl IdbSingleKeyBoundCursor {
+    pub(super) fn new(
+        db_index: IdbIndex,
+        field_name: String,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+        collect_filter: Option<DbFilter>,
+    ) -> CursorResult<IdbSingleKeyBoundCursor> {
+        Self::check_bounds(&lower_bound, &upper_bound)?;
+        Ok(IdbSingleKeyBoundCursor {
+            db_index,
+            field_name,
+            lower_bound,
+            upper_bound,
+            collect_filter,
+        })
+    }
+}
+
+impl IdbSingleKeyBoundCursor {
+    fn check_bounds(lower_bound: &CursorBoundValue, upper_bound: &CursorBoundValue) -> CursorResult<()> {
+        if lower_bound > upper_bound {
+            let description = format!(
+                "Incorrect usage of 'IdbSingleKeyBoundCursor': lower_bound '{:?}' is expected to be less or equal to upper_bound '{:?}'",
+                lower_bound,
+                upper_bound
+            );
+            return MmError::err(CursorError::InvalidKeyRange { description });
+        }
+        if lower_bound == upper_bound {
+            warn!("lower_bound '{:?}' equals to upper_bound '{:?}'. Consider using 'IdbObjectStoreImpl::get_items' instead", lower_bound, upper_bound);
+        }
+        Ok(())
+    }
+}
+
+#[async_trait(?Send)]
+impl CursorOps for IdbSingleKeyBoundCursor {
+    fn db_index(&self) -> &IdbIndex { &self.db_index }
+
+    fn key_range(&self) -> CursorResult<Option<IdbKeyRange>> {
+        let key_range = IdbKeyRange::bound(&self.lower_bound.to_js_value()?, &self.upper_bound.to_js_value()?)
+            .map_to_mm(|e| CursorError::InvalidKeyRange {
+                description: stringify_js_error(&e),
+            })?;
+        Ok(Some(key_range))
+    }
+
+    fn on_collect_iter(
+        &mut self,
+        _key: JsValue,
+        value: &Json,
+    ) -> CursorResult<(CollectItemAction, CollectCursorAction)> {
+        if let Some(ref mut filter) = self.collect_filter {
+            return Ok(filter(value));
+        }
+        Ok((CollectItemAction::Include, CollectCursorAction::Continue))
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/cursor/single_key_cursor.rs b/mm2src/mm2_db/src/indexed_db/drivers/cursor/single_key_cursor.rs
new file mode 100644
index 0000000000..f24f0da1f8
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/cursor/single_key_cursor.rs
@@ -0,0 +1,68 @@
+use super::{CollectCursorAction, CollectItemAction, CursorError, CursorOps, CursorResult, DbFilter};
+use async_trait::async_trait;
+use common::{log::warn, serialize_to_js, stringify_js_error};
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+use wasm_bindgen::prelude::*;
+use web_sys::{IdbIndex, IdbKeyRange};
+
+/// The representation of a range that includes records
+/// whose value of the [`IdbSingleKeyCursor::field_name`] field equals to the [`IdbSingleKeyCursor::field_value`] value.
+/// https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange/only
+pub struct IdbSingleKeyCursor {
+    db_index: IdbIndex,
+    #[allow(dead_code)]
+    field_name: String,
+    field_value: Json,
+    /// An additional predicate that may be used to filter records.
+    collect_filter: Option<DbFilter>,
+}
+
+impl IdbSingleKeyCursor {
+    pub(super) fn new(
+        db_index: IdbIndex,
+        field_name: String,
+        field_value: Json,
+        filter: Option<DbFilter>,
+    ) -> IdbSingleKeyCursor {
+        if filter.is_none() {
+            warn!("Consider using 'IdbObjectStoreImpl::get_items' instead of 'IdbSingleKeyCursor'");
+        }
+        IdbSingleKeyCursor {
+            db_index,
+            field_name,
+            field_value,
+            collect_filter: None,
+        }
+    }
+}
+
+#[async_trait(?Send)]
+impl CursorOps for IdbSingleKeyCursor {
+    fn db_index(&self) -> &IdbIndex { &self.db_index }
+
+    fn key_range(&self) -> CursorResult<Option<IdbKeyRange>> {
+        let js_value =
+            serialize_to_js(&self.field_value).map_to_mm(|e| CursorError::ErrorSerializingIndexFieldValue {
+                field: self.field_name.clone(),
+                value: format!("{:?}", self.field_value),
+                description: e.to_string(),
+            })?;
+
+        let key_range = IdbKeyRange::only(&js_value).map_to_mm(|e| CursorError::InvalidKeyRange {
+            description: stringify_js_error(&e),
+        })?;
+        Ok(Some(key_range))
+    }
+
+    fn on_collect_iter(
+        &mut self,
+        _key: JsValue,
+        value: &Json,
+    ) -> CursorResult<(CollectItemAction, CollectCursorAction)> {
+        if let Some(ref mut filter) = self.collect_filter {
+            return Ok(filter(value));
+        }
+        Ok((CollectItemAction::Include, CollectCursorAction::Continue))
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/object_store.rs b/mm2src/mm2_db/src/indexed_db/drivers/object_store.rs
new file mode 100644
index 0000000000..53c9be6104
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/object_store.rs
@@ -0,0 +1,334 @@
+use super::{construct_event_closure, DbTransactionError, DbTransactionResult, InternalItem, ItemId};
+use crate::indexed_db::db_driver::cursor::IdbCursorBuilder;
+use common::{deserialize_from_js, serialize_to_js, stringify_js_error};
+use futures::channel::mpsc;
+use futures::StreamExt;
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::JsCast;
+use web_sys::{IdbObjectStore, IdbRequest};
+
+pub struct IdbObjectStoreImpl {
+    pub(crate) object_store: IdbObjectStore,
+    pub(crate) aborted: Arc<AtomicBool>,
+}
+
+impl !Send for IdbObjectStoreImpl {}
+
+impl IdbObjectStoreImpl {
+    pub(crate) fn aborted(&self) -> bool { self.aborted.load(Ordering::Relaxed) }
+
+    pub(crate) async fn add_item(&self, item: &Json) -> DbTransactionResult<ItemId> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        // The [`InternalItem::item`] is a flatten field, so if we add the item without the [`InternalItem::_item_id`] id,
+        // it will be calculated automatically.
+        let js_value = match serialize_to_js(item) {
+            Ok(value) => value,
+            Err(e) => return MmError::err(DbTransactionError::ErrorSerializingItem(e.to_string())),
+        };
+        let add_request = match self.object_store.add(&js_value) {
+            Ok(request) => request,
+            Err(e) => return MmError::err(DbTransactionError::ErrorUploadingItem(stringify_js_error(&e))),
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&add_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&add_request);
+            return MmError::err(DbTransactionError::ErrorUploadingItem(error));
+        }
+
+        Self::item_id_from_completed_request(&add_request)
+    }
+
+    pub(crate) async fn get_items(
+        &self,
+        index_str: &str,
+        index_value: Json,
+    ) -> DbTransactionResult<Vec<(ItemId, Json)>> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let index = index_str.to_owned();
+        let index_value_js = try_serialize_index_value!(serialize_to_js(&index_value), index_str);
+
+        let db_index = match self.object_store.index(index_str) {
+            Ok(index) => index,
+            Err(_) => return MmError::err(DbTransactionError::NoSuchIndex { index }),
+        };
+        let get_request = match db_index.get_all_with_key(&index_value_js) {
+            Ok(request) => request,
+            Err(e) => {
+                return MmError::err(DbTransactionError::InvalidIndex {
+                    index,
+                    index_value,
+                    description: stringify_js_error(&e),
+                })
+            },
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&get_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&get_request);
+            return MmError::err(DbTransactionError::ErrorGettingItems(error));
+        }
+
+        Self::items_from_completed_request(&get_request)
+    }
+
+    pub(crate) async fn get_item_ids(&self, index_str: &str, index_value: Json) -> DbTransactionResult<Vec<ItemId>> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let index = index_str.to_owned();
+        let index_value_js = try_serialize_index_value!(serialize_to_js(&index_value), index);
+
+        let db_index = match self.object_store.index(index_str) {
+            Ok(index) => index,
+            Err(_) => return MmError::err(DbTransactionError::NoSuchIndex { index }),
+        };
+        let get_request = match db_index.get_all_keys_with_key(&index_value_js) {
+            Ok(request) => request,
+            Err(e) => {
+                return MmError::err(DbTransactionError::InvalidIndex {
+                    index,
+                    index_value,
+                    description: stringify_js_error(&e),
+                })
+            },
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&get_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&get_request);
+            return MmError::err(DbTransactionError::ErrorGettingItems(error));
+        }
+
+        Self::item_ids_from_completed_request(&get_request)
+    }
+
+    pub(crate) async fn get_all_items(&self) -> DbTransactionResult<Vec<(ItemId, Json)>> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let get_request = match self.object_store.get_all() {
+            Ok(request) => request,
+            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&get_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&get_request);
+            return MmError::err(DbTransactionError::ErrorGettingItems(error));
+        }
+
+        Self::items_from_completed_request(&get_request)
+    }
+
+    pub(crate) async fn count(&self, index_str: &str, index_value: Json) -> DbTransactionResult<usize> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let index = index_str.to_owned();
+        let index_value_js = try_serialize_index_value!(serialize_to_js(&index_value), index);
+
+        let db_index = match self.object_store.index(index_str) {
+            Ok(index) => index,
+            Err(_) => return MmError::err(DbTransactionError::NoSuchIndex { index }),
+        };
+        let count_request = match db_index.count_with_key(&index_value_js) {
+            Ok(request) => request,
+            Err(e) => {
+                return MmError::err(DbTransactionError::InvalidIndex {
+                    index,
+                    index_value,
+                    description: stringify_js_error(&e),
+                })
+            },
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&count_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&count_request);
+            return MmError::err(DbTransactionError::ErrorCountingItems(error));
+        }
+
+        Self::count_from_completed_request(&count_request)
+    }
+
+    pub(crate) async fn count_all(&self) -> DbTransactionResult<usize> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let count_request = match self.object_store.count() {
+            Ok(request) => request,
+            Err(e) => return MmError::err(DbTransactionError::ErrorCountingItems(stringify_js_error(&e))),
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&count_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&count_request);
+            return MmError::err(DbTransactionError::ErrorCountingItems(error));
+        }
+
+        Self::count_from_completed_request(&count_request)
+    }
+
+    pub(crate) async fn replace_item(&self, _item_id: ItemId, item: Json) -> DbTransactionResult<ItemId> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let item_with_key = InternalItem { _item_id, item };
+        let js_value = match serialize_to_js(&item_with_key) {
+            Ok(value) => value,
+            Err(e) => return MmError::err(DbTransactionError::ErrorSerializingItem(e.to_string())),
+        };
+        let replace_request = match self.object_store.put(&js_value) {
+            Ok(request) => request,
+            Err(e) => return MmError::err(DbTransactionError::ErrorUploadingItem(stringify_js_error(&e))),
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&replace_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&replace_request);
+            return MmError::err(DbTransactionError::ErrorUploadingItem(error));
+        }
+
+        Self::item_id_from_completed_request(&replace_request)
+    }
+
+    pub(crate) async fn delete_item(&self, item_id: ItemId) -> DbTransactionResult<()> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let item_id = JsValue::from(item_id);
+
+        let delete_request = match self.object_store.delete(&item_id) {
+            Ok(request) => request,
+            Err(e) => return MmError::err(DbTransactionError::ErrorDeletingItems(stringify_js_error(&e))),
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&delete_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&delete_request);
+            return MmError::err(DbTransactionError::ErrorDeletingItems(error));
+        }
+
+        Ok(())
+    }
+
+    pub(crate) async fn clear(&self) -> DbTransactionResult<()> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        let clear_request = match self.object_store.clear() {
+            Ok(request) => request,
+            Err(e) => return MmError::err(DbTransactionError::ErrorDeletingItems(stringify_js_error(&e))),
+        };
+
+        if let Err(_error_event) = Self::wait_for_request_complete(&clear_request).await {
+            self.aborted.store(true, Ordering::Relaxed);
+            let error = Self::error_from_failed_request(&clear_request);
+            return MmError::err(DbTransactionError::ErrorDeletingItems(error));
+        }
+
+        Ok(())
+    }
+
+    pub(crate) fn cursor_builder(&self, index_str: &str) -> DbTransactionResult<IdbCursorBuilder> {
+        let db_index = match self.object_store.index(index_str) {
+            Ok(index) => index,
+            Err(_) => {
+                return MmError::err(DbTransactionError::NoSuchIndex {
+                    index: index_str.to_owned(),
+                })
+            },
+        };
+        Ok(IdbCursorBuilder::new(db_index))
+    }
+
+    async fn wait_for_request_complete(request: &IdbRequest) -> Result<JsValue, JsValue> {
+        let (tx, mut rx) = mpsc::channel(2);
+
+        let onsuccess_closure = construct_event_closure(Ok, tx.clone());
+        let onerror_closure = construct_event_closure(Err, tx.clone());
+
+        request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));
+        request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
+
+        rx.next().await.expect("The request event channel must not be closed")
+    }
+
+    fn item_id_from_completed_request(request: &IdbRequest) -> DbTransactionResult<ItemId> {
+        let result_js_value = match request.result() {
+            Ok(res) => res,
+            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
+        };
+
+        deserialize_from_js(result_js_value).map_to_mm(|e| DbTransactionError::ErrorDeserializingItem(e.to_string()))
+    }
+
+    fn items_from_completed_request(request: &IdbRequest) -> DbTransactionResult<Vec<(ItemId, Json)>> {
+        let result_js_value = match request.result() {
+            Ok(res) => res,
+            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
+        };
+
+        if result_js_value.is_null() || result_js_value.is_undefined() {
+            return Ok(Vec::new());
+        }
+
+        let items: Vec<InternalItem> = match deserialize_from_js(result_js_value) {
+            Ok(items) => items,
+            Err(e) => return MmError::err(DbTransactionError::ErrorDeserializingItem(e.to_string())),
+        };
+
+        Ok(items.into_iter().map(|item| (item._item_id, item.item)).collect())
+    }
+
+    fn item_ids_from_completed_request(request: &IdbRequest) -> DbTransactionResult<Vec<ItemId>> {
+        let result_js_value = match request.result() {
+            Ok(res) => res,
+            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
+        };
+
+        if result_js_value.is_null() || result_js_value.is_undefined() {
+            return Ok(Vec::new());
+        }
+
+        deserialize_from_js(result_js_value).map_to_mm(|e| DbTransactionError::ErrorDeserializingItem(e.to_string()))
+    }
+
+    fn count_from_completed_request(request: &IdbRequest) -> DbTransactionResult<usize> {
+        let result_js_value = match request.result() {
+            Ok(res) => res,
+            Err(e) => return MmError::err(DbTransactionError::UnexpectedState(stringify_js_error(&e))),
+        };
+
+        if result_js_value.is_null() || result_js_value.is_undefined() {
+            return Ok(0);
+        }
+
+        deserialize_from_js(result_js_value).map_to_mm(|e| DbTransactionError::ErrorDeserializingItem(e.to_string()))
+    }
+
+    fn error_from_failed_request(request: &IdbRequest) -> String {
+        match request.error() {
+            Ok(Some(exception)) => format!("{:?}", exception),
+            _ => "Unknown".to_owned(),
+        }
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/transaction.rs b/mm2src/mm2_db/src/indexed_db/drivers/transaction.rs
new file mode 100644
index 0000000000..b95e175dc4
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/transaction.rs
@@ -0,0 +1,113 @@
+use super::{construct_event_closure, IdbObjectStoreImpl, PASS_THROUGH};
+use common::wasm::stringify_js_error;
+use derive_more::Display;
+use futures::channel::mpsc;
+use futures::StreamExt;
+use mm2_err_handle::prelude::*;
+use serde_json::Value as Json;
+use std::collections::HashSet;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use wasm_bindgen::JsCast;
+use web_sys::IdbTransaction;
+
+pub type DbTransactionResult<T> = Result<T, MmError<DbTransactionError>>;
+
+#[derive(Debug, Display, PartialEq)]
+pub enum DbTransactionError {
+    #[display(fmt = "No such table '{}'", table)]
+    NoSuchTable { table: String },
+    #[display(fmt = "Error creating DbTransaction: {:?}", _0)]
+    ErrorCreatingTransaction(String),
+    #[display(fmt = "Error opening the '{}' table: {}", table, description)]
+    ErrorOpeningTable { table: String, description: String },
+    #[display(fmt = "Error serializing the '{}' index: {:?}", index, description)]
+    ErrorSerializingIndex { index: String, description: String },
+    #[display(fmt = "Error serializing an item: {:?}", _0)]
+    ErrorSerializingItem(String),
+    #[display(fmt = "Error deserializing an item: {:?}", _0)]
+    ErrorDeserializingItem(String),
+    #[display(fmt = "Error uploading an item: {:?}", _0)]
+    ErrorUploadingItem(String),
+    #[display(fmt = "Error getting items: {:?}", _0)]
+    ErrorGettingItems(String),
+    #[display(fmt = "Error counting items: {:?}", _0)]
+    ErrorCountingItems(String),
+    #[display(fmt = "Error deleting items: {:?}", _0)]
+    ErrorDeletingItems(String),
+    #[display(fmt = "Expected only one item by the unique '{}' index, got {}", index, got_items)]
+    MultipleItemsByUniqueIndex { index: String, got_items: usize },
+    #[display(fmt = "No such index '{}'", index)]
+    NoSuchIndex { index: String },
+    #[display(fmt = "Invalid index '{}:{}': {:?}", index, index_value, description)]
+    InvalidIndex {
+        index: String,
+        index_value: Json,
+        description: String,
+    },
+    #[display(fmt = "Error occurred due to an unexpected state: {:?}", _0)]
+    UnexpectedState(String),
+    #[display(fmt = "Transaction was aborted")]
+    TransactionAborted,
+}
+
+pub struct IdbTransactionImpl {
+    transaction: IdbTransaction,
+    tables: HashSet<String>,
+    aborted: Arc<AtomicBool>,
+}
+
+impl !Send for IdbTransactionImpl {}
+
+impl IdbTransactionImpl {
+    pub(crate) fn aborted(&self) -> bool { self.aborted.load(Ordering::Relaxed) }
+
+    pub(crate) fn open_table(&self, table_name: &str) -> DbTransactionResult<IdbObjectStoreImpl> {
+        if self.aborted.load(Ordering::Relaxed) {
+            return MmError::err(DbTransactionError::TransactionAborted);
+        }
+
+        if !self.tables.contains(table_name) {
+            let table = table_name.to_owned();
+            return MmError::err(DbTransactionError::NoSuchTable { table });
+        }
+
+        match self.transaction.object_store(table_name) {
+            Ok(object_store) => Ok(IdbObjectStoreImpl {
+                object_store,
+                aborted: self.aborted.clone(),
+            }),
+            Err(e) => MmError::err(DbTransactionError::ErrorOpeningTable {
+                table: table_name.to_owned(),
+                description: stringify_js_error(&e),
+            }),
+        }
+    }
+
+    pub(crate) fn init(transaction: IdbTransaction, tables: HashSet<String>) -> IdbTransactionImpl {
+        let (event_tx, mut event_rx) = mpsc::channel(2);
+        let onabort_closure = construct_event_closure(PASS_THROUGH, event_tx);
+
+        // Don't set the `onerror` closure, because the `onabort` is called immediately after the error.
+        transaction.set_onabort(Some(onabort_closure.as_ref().unchecked_ref()));
+
+        let aborted = Arc::new(AtomicBool::new(false));
+        let aborted_c = aborted.clone();
+
+        // move the closures into this async block to keep it alive until either `oncomplete` or `onabort` handler is called
+        let fut = async move {
+            let _abort_data = event_rx.next().await.expect("The event channel must not be closed");
+            aborted_c.store(true, Ordering::Relaxed);
+
+            // do any action to move the closures into this async block to keep it alive until the `state_machine` finishes
+            drop(onabort_closure);
+        };
+
+        wasm_bindgen_futures::spawn_local(fut);
+        IdbTransactionImpl {
+            transaction,
+            tables,
+            aborted,
+        }
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/upgrader.rs b/mm2src/mm2_db/src/indexed_db/drivers/upgrader.rs
new file mode 100644
index 0000000000..fcc90b7623
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/drivers/upgrader.rs
@@ -0,0 +1,100 @@
+use common::stringify_js_error;
+use derive_more::Display;
+use js_sys::Array;
+use mm2_err_handle::prelude::*;
+use wasm_bindgen::prelude::*;
+use web_sys::{IdbDatabase, IdbIndexParameters, IdbObjectStore, IdbObjectStoreParameters, IdbTransaction};
+
+const ITEM_KEY_PATH: &str = "_item_id";
+
+pub type OnUpgradeResult<T> = Result<T, MmError<OnUpgradeError>>;
+pub type OnUpgradeNeededCb = Box<dyn FnOnce(&DbUpgrader, u32, u32) -> OnUpgradeResult<()> + Send>;
+
+#[derive(Debug, Display, PartialEq)]
+pub enum OnUpgradeError {
+    #[display(fmt = "Error occurred due to creating the '{}' table: {}", table, description)]
+    ErrorCreatingTable { table: String, description: String },
+    #[display(fmt = "Error occurred due to opening the '{}' table: {}", table, description)]
+    ErrorOpeningTable { table: String, description: String },
+    #[display(fmt = "Error occurred due to creating the '{}' index: {}", index, description)]
+    ErrorCreatingIndex { index: String, description: String },
+}
+
+pub struct DbUpgrader {
+    db: IdbDatabase,
+    transaction: IdbTransaction,
+}
+
+impl DbUpgrader {
+    pub(crate) fn new(db: IdbDatabase, transaction: IdbTransaction) -> DbUpgrader { DbUpgrader { db, transaction } }
+
+    pub fn create_table(&self, table: &str) -> OnUpgradeResult<TableUpgrader> {
+        // We use the [in-line](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API/Basic_Concepts_Behind_IndexedDB#gloss_inline_key) primary keys.
+        let key_path = JsValue::from(ITEM_KEY_PATH);
+
+        let mut params = IdbObjectStoreParameters::new();
+        params.key_path(Some(&key_path));
+        params.auto_increment(true);
+
+        match self.db.create_object_store_with_optional_parameters(table, &params) {
+            Ok(object_store) => Ok(TableUpgrader { object_store }),
+            Err(e) => MmError::err(OnUpgradeError::ErrorCreatingTable {
+                table: table.to_owned(),
+                description: stringify_js_error(&e),
+            }),
+        }
+    }
+
+    /// Open the `table` if it was created already.
+    pub fn open_table(&self, table: &str) -> OnUpgradeResult<TableUpgrader> {
+        match self.transaction.object_store(table) {
+            Ok(object_store) => Ok(TableUpgrader { object_store }),
+            Err(e) => MmError::err(OnUpgradeError::ErrorOpeningTable {
+                table: table.to_owned(),
+                description: stringify_js_error(&e),
+            }),
+        }
+    }
+}
+
+pub struct TableUpgrader {
+    object_store: IdbObjectStore,
+}
+
+impl TableUpgrader {
+    /// Creates an index.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/createIndex
+    pub fn create_index(&self, index: &str, unique: bool) -> OnUpgradeResult<()> {
+        let mut params = IdbIndexParameters::new();
+        params.unique(unique);
+        self.object_store
+            .create_index_with_str_and_optional_parameters(index, index, &params)
+            .map(|_| ())
+            .map_to_mm(|e| OnUpgradeError::ErrorCreatingIndex {
+                index: index.to_owned(),
+                description: stringify_js_error(&e),
+            })
+    }
+
+    /// Creates an index with the multiple keys.
+    /// Each key of the index has to be a field of the table.
+    /// Such indexes are used to find records that satisfy constraints imposed on multiple fields.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/createIndex
+    pub fn create_multi_index(&self, index: &str, fields: &[&str], unique: bool) -> OnUpgradeResult<()> {
+        let mut params = IdbIndexParameters::new();
+        params.unique(unique);
+
+        let fields_key_path = Array::new();
+        for field in fields {
+            fields_key_path.push(&JsValue::from(*field));
+        }
+
+        self.object_store
+            .create_index_with_str_sequence_and_optional_parameters(index, &fields_key_path, &params)
+            .map(|_| ())
+            .map_to_mm(|e| OnUpgradeError::ErrorCreatingIndex {
+                index: index.to_owned(),
+                description: stringify_js_error(&e),
+            })
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/indexed_cursor.rs b/mm2src/mm2_db/src/indexed_db/indexed_cursor.rs
new file mode 100644
index 0000000000..e04c622ddf
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/indexed_cursor.rs
@@ -0,0 +1,1032 @@
+//! # Usage
+//!
+//! As an example, the following table will be used:
+//!
+//! | uuid                                   | base_coin | rel_coin | base_coin_value | started_at |
+//! | "c52659d7-4e13-41f5-9c1a-30cc2f646033" | "RICK"    | "MORTY"  | 10              | 1000000029 |
+//! | "5acb0e63-8b26-469e-81df-7dd9e4a9ad15" | "RICK"    | "MORTY"  | 13              | 1000000030 |
+//! | "9db641f5-4300-4527-9fa6-f1c391d42c35" | "RICK"    | "MORTY"  | 1.2             | 1000000031 |
+//!
+//! with the `search_index` index created by:
+//! ```rust
+//! TableUpgrader::create_multi_index(self, "search_index", &["base_coin", "rel_coin", "started_at"]).unwrap();
+//! ```
+//!
+//! If you want to find all `RICK/MORTY` swaps where
+//! 1) `10 <= base_coin_value <= 13`
+//! 2) `started_at <= 1000000030`,
+//! you can use [`WithBound::bound`] along with [`WithOnly::only`]:
+//! ```rust
+//! let table = open_table_somehow();
+//! let all_rick_morty_swaps = table.open_cursor("search_index")
+//!     .only("base_coin", "RICK", "MORTY")?
+//!     .bound("base_coin_value", 10, 13)
+//!     .bound("started_at", 1000000030.into(), u32::MAX.into())
+//!     .collect()
+//!     .await?;
+//! ```
+//!
+//! # Under the hood
+//!
+//! In the example above, [`CursorOps::collect`] actually creates a JavaScript cursor with the specified key range:
+//! ```js
+//! var key_range = IDBKeyRange.bound(['RICK', 'MORTY', 10, 1000000030], ['RICK', 'MORTY', 13, 9999999999]);
+//! var cursor = table.index('search_index').openCursor(key_range);
+//! ```
+//!
+//! And after that, the database engine compares each record with the specified min and max bounds sequentially from one field to another.
+//! Please note `['RICK', 'MORTY', 10, 1000000029]` <= `['RICK', 'MORTY', 11, 2000000000]`.
+//!
+//! # Important
+//!
+//! Please make sure all keys of the index are specified
+//! by the [`IdbBoundCursorBuilder::only`] or/and [`IdbBoundCursorBuilder::bound`] methods,
+//! and they are specified in the same order as they were declared on [`TableUpgrader::create_multi_index`].
+//!
+//! It's important because if you skip f the `started_at` key, for example, the bounds will be:
+//! min = ['RICK', 'MORTY', 10], max = ['RICK', 'MORTY', 13],
+//! but an actual record ['RICK', 'MORTY', 13, 1000000030] will not be included in the result,
+//! because ['RICK', 'MORTY', 13] < ['RICK', 'MORTY', 13, 1000000030],
+//! although it is expected to be within the specified bounds.
+
+use crate::indexed_db::db_driver::cursor::{CollectCursorAction, CollectItemAction, CursorBoundValue, CursorOps,
+                                           DbFilter, IdbCursorBuilder};
+pub use crate::indexed_db::db_driver::cursor::{CursorError, CursorResult};
+use crate::indexed_db::{ItemId, TableSignature};
+use async_trait::async_trait;
+use futures::channel::{mpsc, oneshot};
+use futures::StreamExt;
+use mm2_err_handle::prelude::*;
+use serde::Serialize;
+use serde_json::{self as json, Value as Json};
+use std::fmt;
+use std::marker::PhantomData;
+
+pub(super) type DbCursorEventTx = mpsc::UnboundedSender<DbCursorEvent>;
+pub(super) type DbCursorEventRx = mpsc::UnboundedReceiver<DbCursorEvent>;
+
+pub enum DbCursorEvent {
+    Collect {
+        options: CursorCollectOptions,
+        result_tx: oneshot::Sender<CursorResult<Vec<(ItemId, Json)>>>,
+    },
+}
+
+pub enum CursorCollectOptions {
+    SingleKey {
+        field_name: String,
+        field_value: Json,
+        filter: Option<DbFilter>,
+    },
+    SingleKeyBound {
+        field_name: String,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+        filter: Option<DbFilter>,
+    },
+    MultiKey {
+        keys: Vec<(String, Json)>,
+        filter: Option<DbFilter>,
+    },
+    MultiKeyBound {
+        only_keys: Vec<(String, Json)>,
+        bound_keys: Vec<(String, CursorBoundValue, CursorBoundValue)>,
+        filter: Option<DbFilter>,
+    },
+}
+
+pub async fn cursor_event_loop(mut rx: DbCursorEventRx, cursor_builder: IdbCursorBuilder) {
+    while let Some(event) = rx.next().await {
+        match event {
+            DbCursorEvent::Collect { options, result_tx } => {
+                on_collect_cursor_event(result_tx, options, cursor_builder).await;
+                return;
+            },
+        }
+    }
+}
+
+async fn on_collect_cursor_event(
+    result_tx: oneshot::Sender<CursorResult<Vec<(ItemId, Json)>>>,
+    options: CursorCollectOptions,
+    cursor_builder: IdbCursorBuilder,
+) {
+    async fn on_collect_cursor_event_impl(
+        options: CursorCollectOptions,
+        cursor_builder: IdbCursorBuilder,
+    ) -> CursorResult<Vec<(ItemId, Json)>> {
+        match options {
+            CursorCollectOptions::SingleKey {
+                field_name,
+                field_value,
+                filter,
+            } => {
+                cursor_builder
+                    .single_key_cursor(field_name, field_value, filter)
+                    .collect()
+                    .await
+            },
+            CursorCollectOptions::SingleKeyBound {
+                field_name,
+                lower_bound,
+                upper_bound,
+                filter,
+            } => {
+                cursor_builder
+                    .single_key_bound_cursor(field_name, lower_bound, upper_bound, filter)?
+                    .collect()
+                    .await
+            },
+            CursorCollectOptions::MultiKey { keys, filter } => {
+                cursor_builder.multi_key_cursor(keys, filter)?.collect().await
+            },
+            CursorCollectOptions::MultiKeyBound {
+                only_keys,
+                bound_keys,
+                filter,
+            } => {
+                cursor_builder
+                    .multi_key_bound_cursor(only_keys, bound_keys, filter)?
+                    .collect()
+                    .await
+            },
+        }
+    }
+
+    let result = on_collect_cursor_event_impl(options, cursor_builder).await;
+    result_tx.send(result).ok();
+}
+
+pub trait WithOnly: Sized {
+    type ResultCursor;
+
+    fn only<Value>(self, field_name: &str, field_value: Value) -> CursorResult<Self::ResultCursor>
+    where
+        Value: Serialize + fmt::Debug,
+    {
+        let field_value_str = format!("{:?}", field_value);
+        let field_value = json::to_value(field_value).map_to_mm(|e| CursorError::ErrorSerializingIndexFieldValue {
+            field: field_name.to_owned(),
+            value: field_value_str,
+            description: e.to_string(),
+        })?;
+        Ok(self.only_json(field_name, field_value))
+    }
+
+    fn only_json(self, field_name: &str, field_value: Json) -> Self::ResultCursor;
+}
+
+pub trait WithBound: Sized {
+    type ResultCursor;
+
+    fn bound<Value>(self, field_name: &str, lower_bound: Value, upper_bound: Value) -> Self::ResultCursor
+    where
+        CursorBoundValue: From<Value>,
+    {
+        let lower_bound = CursorBoundValue::from(lower_bound);
+        let upper_bound = CursorBoundValue::from(upper_bound);
+        self.bound_values(field_name, lower_bound, upper_bound)
+    }
+
+    fn bound_values(
+        self,
+        field_name: &str,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+    ) -> Self::ResultCursor;
+}
+
+pub trait WithFilter: Sized {
+    fn filter<F>(self, filter: F) -> Self
+    where
+        F: FnMut(&Json) -> (CollectItemAction, CollectCursorAction) + Send + 'static,
+    {
+        let filter = Box::new(filter);
+        self.filter_boxed(filter)
+    }
+
+    fn filter_boxed(self, filter: DbFilter) -> Self;
+}
+
+#[async_trait]
+pub trait CollectCursor<Table: TableSignature> {
+    async fn collect(self) -> CursorResult<Vec<(ItemId, Table)>>;
+}
+
+#[async_trait]
+impl<Table: TableSignature, T: CollectCursorImpl<Table> + Send> CollectCursor<Table> for T {
+    async fn collect(self) -> CursorResult<Vec<(ItemId, Table)>> { self.collect_impl().await }
+}
+
+#[async_trait]
+pub(crate) trait CollectCursorImpl<Table: TableSignature>: Sized {
+    fn into_collect_options(self) -> CursorCollectOptions;
+
+    fn event_tx(&self) -> DbCursorEventTx;
+
+    async fn collect_impl(self) -> CursorResult<Vec<(ItemId, Table)>> {
+        let event_tx = self.event_tx();
+        let options = self.into_collect_options();
+
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = DbCursorEvent::Collect { result_tx, options };
+        let items: Vec<(ItemId, Json)> = send_event_recv_response(&event_tx, event, result_rx).await?;
+
+        items
+            .into_iter()
+            .map(|(item_id, item)| json::from_value(item).map(|item| (item_id, item)))
+            .map(|res| res.map_to_mm(|e| CursorError::ErrorDeserializingItem(e.to_string())))
+            // Item = CursorResult<(ItemId, Table)>
+            .collect()
+    }
+}
+
+pub struct DbEmptyCursor<'a, Table: TableSignature> {
+    event_tx: DbCursorEventTx,
+    filter: Option<DbFilter>,
+    phantom: PhantomData<&'a Table>,
+}
+
+impl<'a, Table: TableSignature> WithOnly for DbEmptyCursor<'a, Table> {
+    type ResultCursor = DbSingleKeyCursor<'a, Table>;
+
+    fn only_json(self, field_name: &str, field_value: Json) -> Self::ResultCursor {
+        DbSingleKeyCursor {
+            event_tx: self.event_tx,
+            field_name: field_name.to_owned(),
+            field_value,
+            filter: self.filter,
+            phantom: PhantomData::default(),
+        }
+    }
+}
+
+impl<'a, Table: TableSignature> WithBound for DbEmptyCursor<'a, Table> {
+    type ResultCursor = DbSingleKeyBoundCursor<'a, Table>;
+
+    fn bound_values(
+        self,
+        field_name: &str,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+    ) -> Self::ResultCursor {
+        DbSingleKeyBoundCursor {
+            event_tx: self.event_tx,
+            field_name: field_name.to_owned(),
+            lower_bound,
+            upper_bound,
+            filter: self.filter,
+            phantom: PhantomData::default(),
+        }
+    }
+}
+
+impl<'a, Table: TableSignature> WithFilter for DbEmptyCursor<'a, Table> {
+    fn filter_boxed(mut self, filter: DbFilter) -> Self {
+        self.filter = Some(filter);
+        self
+    }
+}
+
+impl<'a, Table: TableSignature> DbEmptyCursor<'a, Table> {
+    pub(super) fn new(event_tx: DbCursorEventTx) -> DbEmptyCursor<'a, Table> {
+        DbEmptyCursor {
+            event_tx,
+            filter: None,
+            phantom: PhantomData::default(),
+        }
+    }
+}
+
+pub struct DbSingleKeyCursor<'a, Table: TableSignature> {
+    event_tx: DbCursorEventTx,
+    field_name: String,
+    field_value: Json,
+    filter: Option<DbFilter>,
+    phantom: PhantomData<&'a Table>,
+}
+
+impl<'a, Table: TableSignature> WithOnly for DbSingleKeyCursor<'a, Table> {
+    type ResultCursor = DbMultiKeyCursor<'a, Table>;
+
+    fn only_json(self, field_name: &str, field_value: Json) -> Self::ResultCursor {
+        let keys = vec![
+            (self.field_name, self.field_value),
+            (field_name.to_owned(), field_value),
+        ];
+        DbMultiKeyCursor {
+            event_tx: self.event_tx,
+            keys,
+            filter: self.filter,
+            phantom: PhantomData::default(),
+        }
+    }
+}
+
+impl<'a, Table: TableSignature> WithBound for DbSingleKeyCursor<'a, Table> {
+    type ResultCursor = DbMultiKeyBoundCursor<'a, Table>;
+
+    fn bound_values(
+        self,
+        field_name: &str,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+    ) -> Self::ResultCursor {
+        let only_keys = vec![(self.field_name, self.field_value)];
+        let bound_keys = vec![(field_name.to_owned(), lower_bound, upper_bound)];
+        DbMultiKeyBoundCursor {
+            event_tx: self.event_tx,
+            only_keys,
+            bound_keys,
+            filter: self.filter,
+            phantom: PhantomData::default(),
+        }
+    }
+}
+
+impl<'a, Table: TableSignature> WithFilter for DbSingleKeyCursor<'a, Table> {
+    fn filter_boxed(mut self, filter: DbFilter) -> Self {
+        self.filter = Some(filter);
+        self
+    }
+}
+
+#[async_trait]
+impl<'a, Table: TableSignature> CollectCursorImpl<Table> for DbSingleKeyCursor<'a, Table> {
+    fn into_collect_options(self) -> CursorCollectOptions {
+        CursorCollectOptions::SingleKey {
+            field_name: self.field_name,
+            field_value: self.field_value,
+            filter: self.filter,
+        }
+    }
+
+    fn event_tx(&self) -> DbCursorEventTx { self.event_tx.clone() }
+}
+
+/// `DbSingleKeyBoundCursor` doesn't implement `WithOnly` trait, because indexes MUST start with `only` values.
+pub struct DbSingleKeyBoundCursor<'a, Table: TableSignature> {
+    event_tx: DbCursorEventTx,
+    field_name: String,
+    lower_bound: CursorBoundValue,
+    upper_bound: CursorBoundValue,
+    filter: Option<DbFilter>,
+    phantom: PhantomData<&'a Table>,
+}
+
+impl<'a, Table: TableSignature> WithBound for DbSingleKeyBoundCursor<'a, Table> {
+    type ResultCursor = DbMultiKeyBoundCursor<'a, Table>;
+
+    fn bound_values(
+        self,
+        field_name: &str,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+    ) -> Self::ResultCursor {
+        let bound_keys = vec![
+            (self.field_name, self.lower_bound, self.upper_bound),
+            (field_name.to_owned(), lower_bound, upper_bound),
+        ];
+        DbMultiKeyBoundCursor {
+            event_tx: self.event_tx,
+            only_keys: Vec::new(),
+            bound_keys,
+            filter: self.filter,
+            phantom: PhantomData::default(),
+        }
+    }
+}
+
+impl<'a, Table: TableSignature> WithFilter for DbSingleKeyBoundCursor<'a, Table> {
+    fn filter_boxed(mut self, filter: DbFilter) -> Self {
+        self.filter = Some(filter);
+        self
+    }
+}
+
+#[async_trait]
+impl<'a, Table: TableSignature> CollectCursorImpl<Table> for DbSingleKeyBoundCursor<'a, Table> {
+    fn into_collect_options(self) -> CursorCollectOptions {
+        CursorCollectOptions::SingleKeyBound {
+            field_name: self.field_name,
+            lower_bound: self.lower_bound,
+            upper_bound: self.upper_bound,
+            filter: self.filter,
+        }
+    }
+
+    fn event_tx(&self) -> DbCursorEventTx { self.event_tx.clone() }
+}
+
+pub struct DbMultiKeyCursor<'a, Table: TableSignature> {
+    event_tx: DbCursorEventTx,
+    keys: Vec<(String, Json)>,
+    filter: Option<DbFilter>,
+    phantom: PhantomData<&'a Table>,
+}
+
+impl<'a, Table: TableSignature> WithOnly for DbMultiKeyCursor<'a, Table> {
+    type ResultCursor = DbMultiKeyCursor<'a, Table>;
+
+    fn only_json(mut self, field_name: &str, field_value: Json) -> Self::ResultCursor {
+        self.keys.push((field_name.to_owned(), field_value));
+        self
+    }
+}
+
+impl<'a, Table: TableSignature> WithBound for DbMultiKeyCursor<'a, Table> {
+    type ResultCursor = DbMultiKeyBoundCursor<'a, Table>;
+
+    fn bound_values(
+        self,
+        field_name: &str,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+    ) -> Self::ResultCursor {
+        DbMultiKeyBoundCursor {
+            event_tx: self.event_tx,
+            only_keys: self.keys,
+            bound_keys: vec![(field_name.to_owned(), lower_bound, upper_bound)],
+            filter: self.filter,
+            phantom: PhantomData::default(),
+        }
+    }
+}
+
+impl<'a, Table: TableSignature> WithFilter for DbMultiKeyCursor<'a, Table> {
+    fn filter_boxed(mut self, filter: DbFilter) -> Self {
+        self.filter = Some(filter);
+        self
+    }
+}
+
+#[async_trait]
+impl<'a, Table: TableSignature> CollectCursorImpl<Table> for DbMultiKeyCursor<'a, Table> {
+    fn into_collect_options(self) -> CursorCollectOptions {
+        CursorCollectOptions::MultiKey {
+            keys: self.keys,
+            filter: self.filter,
+        }
+    }
+
+    fn event_tx(&self) -> DbCursorEventTx { self.event_tx.clone() }
+}
+
+/// `DbMultiKeyBoundCursor` doesn't implement `WithOnly` trait, because indexes MUST start with `only` values.
+pub struct DbMultiKeyBoundCursor<'a, Table: TableSignature> {
+    event_tx: DbCursorEventTx,
+    only_keys: Vec<(String, Json)>,
+    bound_keys: Vec<(String, CursorBoundValue, CursorBoundValue)>,
+    filter: Option<DbFilter>,
+    phantom: PhantomData<&'a Table>,
+}
+
+impl<'a, Table: TableSignature> WithBound for DbMultiKeyBoundCursor<'a, Table> {
+    type ResultCursor = DbMultiKeyBoundCursor<'a, Table>;
+
+    fn bound_values(
+        mut self,
+        field_name: &str,
+        lower_bound: CursorBoundValue,
+        upper_bound: CursorBoundValue,
+    ) -> Self::ResultCursor {
+        self.bound_keys.push((field_name.to_owned(), lower_bound, upper_bound));
+        self
+    }
+}
+
+impl<'a, Table: TableSignature> WithFilter for DbMultiKeyBoundCursor<'a, Table> {
+    fn filter_boxed(mut self, filter: DbFilter) -> Self {
+        self.filter = Some(filter);
+        self
+    }
+}
+
+#[async_trait]
+impl<'a, Table: TableSignature> CollectCursorImpl<Table> for DbMultiKeyBoundCursor<'a, Table> {
+    fn into_collect_options(self) -> CursorCollectOptions {
+        CursorCollectOptions::MultiKeyBound {
+            only_keys: self.only_keys,
+            bound_keys: self.bound_keys,
+            filter: self.filter,
+        }
+    }
+
+    fn event_tx(&self) -> DbCursorEventTx { self.event_tx.clone() }
+}
+
+async fn send_event_recv_response<Event, Result>(
+    event_tx: &mpsc::UnboundedSender<Event>,
+    event: Event,
+    result_rx: oneshot::Receiver<CursorResult<Result>>,
+) -> CursorResult<Result> {
+    if let Err(e) = event_tx.unbounded_send(event) {
+        let error = format!("Error sending event: {}", e);
+        return MmError::err(CursorError::UnexpectedState(error));
+    }
+    match result_rx.await {
+        Ok(result) => result,
+        Err(e) => {
+            let error = format!("Error receiving result: {}", e);
+            MmError::err(CursorError::UnexpectedState(error))
+        },
+    }
+}
+
+mod tests {
+    use super::*;
+    use crate::indexed_db::{BeBigUint, DbIdentifier, DbTable, DbUpgrader, IndexedDbBuilder, OnUpgradeResult};
+    use common::log::wasm_log::register_wasm_log;
+    use itertools::Itertools;
+    use serde::{Deserialize, Serialize};
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    macro_rules! swap_item {
+        ($uuid:literal, $base_coin:literal, $rel_coin:literal, $base_coin_value:expr, $rel_coin_value:expr, $started_at:expr) => {
+            SwapTable {
+                uuid: $uuid.to_owned(),
+                base_coin: $base_coin.to_owned(),
+                rel_coin: $rel_coin.to_owned(),
+                base_coin_value: $base_coin_value,
+                rel_coin_value: $rel_coin_value,
+                started_at: $started_at,
+            }
+        };
+    }
+
+    #[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize)]
+    #[serde(deny_unknown_fields)]
+    struct SwapTable {
+        uuid: String,
+        base_coin: String,
+        rel_coin: String,
+        base_coin_value: u32,
+        rel_coin_value: u32,
+        started_at: i32,
+    }
+
+    impl TableSignature for SwapTable {
+        fn table_name() -> &'static str { "swap_test_table" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, _new_version: u32) -> OnUpgradeResult<()> {
+            if old_version > 0 {
+                // the table is initialized already
+                return Ok(());
+            }
+            let table_upgrader = upgrader.create_table("swap_test_table")?;
+            table_upgrader.create_index("base_coin", false)?;
+            table_upgrader.create_index("rel_coin_value", false)?;
+            table_upgrader.create_multi_index(
+                "all_fields_index",
+                &[
+                    "base_coin",
+                    "rel_coin",
+                    "base_coin_value",
+                    "rel_coin_value",
+                    "started_at",
+                ],
+                false,
+            )?;
+            table_upgrader.create_multi_index(
+                "basecoin_basecoinvalue_startedat_index",
+                &["base_coin", "base_coin_value", "started_at"],
+                false,
+            )
+        }
+    }
+
+    async fn fill_table<Table>(table: &DbTable<'_, Table>, items: Vec<Table>)
+    where
+        Table: TableSignature + std::fmt::Debug,
+    {
+        for item in items {
+            table
+                .add_item(&item)
+                .await
+                .expect(&format!("Error adding {:?} item", item));
+        }
+    }
+
+    /// The table with `BeBigUint` parameters.
+    #[derive(Clone, Debug, Default, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize)]
+    #[serde(deny_unknown_fields)]
+    struct TimestampTable {
+        timestamp_x: BeBigUint,
+        timestamp_y: u32,
+        timestamp_z: BeBigUint,
+    }
+
+    impl TimestampTable {
+        fn new<X, Z>(timestamp_x: X, timestamp_y: u32, timestamp_z: Z) -> TimestampTable
+        where
+            BeBigUint: From<X>,
+            BeBigUint: From<Z>,
+        {
+            TimestampTable {
+                timestamp_x: BeBigUint::from(timestamp_x),
+                timestamp_y,
+                timestamp_z: BeBigUint::from(timestamp_z),
+            }
+        }
+    }
+
+    impl TableSignature for TimestampTable {
+        fn table_name() -> &'static str { "timestamp_table" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, _new_version: u32) -> OnUpgradeResult<()> {
+            if old_version > 0 {
+                // the table is initialized already
+                return Ok(());
+            }
+            let table_upgrader = upgrader.create_table("timestamp_table")?;
+            table_upgrader.create_index("timestamp_x", false)?;
+            table_upgrader.create_multi_index("timestamp_xyz", &["timestamp_x", "timestamp_y", "timestamp_z"], false)
+        }
+    }
+
+    /// Test if `BeBigUint` works properly as an `IndexedDb` index.
+    #[wasm_bindgen_test]
+    async fn test_be_big_uint_index() {
+        const DB_NAME: &str = "TEST_BE_BIG_UINT_INDEX";
+        const DB_VERSION: u32 = 1;
+
+        let numbers: Vec<BeBigUint> = vec![
+            0u32.into(),
+            1u32.into(),
+            2u32.into(),
+            BeBigUint::from(u8::MAX - 1),
+            BeBigUint::from(u8::MAX),
+            BeBigUint::from(u8::MAX) + 1u64,
+            BeBigUint::from(u16::MAX - 1),
+            BeBigUint::from(u16::MAX),
+            BeBigUint::from(u16::MAX) + 1u64,
+            BeBigUint::from(u32::MAX - 1),
+            BeBigUint::from(u32::MAX),
+            BeBigUint::from(u32::MAX) + 1u64,
+            BeBigUint::from(u64::MAX - 1),
+            BeBigUint::from(u64::MAX),
+            BeBigUint::from(u64::MAX) + 1u64,
+            BeBigUint::from(u128::MAX - 1),
+            BeBigUint::from(u128::MAX),
+            BeBigUint::from(u128::MAX) + 1u64,
+        ];
+
+        // Convert `numbers` into `Vec<TimeStampTable>`.
+        let items = numbers
+            .iter()
+            .cloned()
+            .map(|timestamp_x| TimestampTable {
+                timestamp_x,
+                ..TimestampTable::default()
+            })
+            .collect();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TimestampTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction");
+        let table = transaction
+            .table::<TimestampTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+        fill_table(&table, items).await;
+
+        // Test the cursor index for each combination of numbers (lower, upper).
+        for num_x in numbers.iter() {
+            for num_y in numbers.iter() {
+                if num_x > num_y {
+                    continue;
+                }
+
+                // Get every item that satisfies the following [num_x, num_y] bound.
+                let actual_items = table
+                    .open_cursor("timestamp_x")
+                    .await
+                    .expect("!DbTable::open_cursor")
+                    .bound("timestamp_x", num_x.clone(), num_y.clone())
+                    .collect()
+                    .await
+                    .expect("!DbSingleKeyBoundCursor::collect")
+                    .into_iter()
+                    // Map `(ItemId, TimestampTable)` into `BeBigUint`.
+                    .map(|(_item_id, item)| item.timestamp_x)
+                    .sorted()
+                    .collect::<Vec<_>>();
+                // Get `BeBigUint` numbers that should have been returned by the cursor above.
+                let expected = numbers
+                    .iter()
+                    .cloned()
+                    .filter(|num| num_x <= num && num <= num_y)
+                    .sorted()
+                    .collect::<Vec<_>>();
+                assert_eq!(actual_items, expected);
+            }
+        }
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_collect_single_key_cursor() {
+        const DB_NAME: &str = "TEST_COLLECT_SINGLE_KEY_CURSOR";
+        const DB_VERSION: u32 = 1;
+
+        register_wasm_log();
+
+        let items = vec![
+            swap_item!("uuid1", "RICK", "MORTY", 10, 1, 700), // +
+            swap_item!("uuid2", "MORTY", "KMD", 95000, 1, 721),
+            swap_item!("uuid3", "RICK", "XYZ", 7, 6, 721),   // +
+            swap_item!("uuid4", "RICK", "MORTY", 8, 6, 721), // +
+            swap_item!("uuid5", "KMD", "MORTY", 12, 3, 721),
+            swap_item!("uuid6", "QRC20", "RICK", 2, 2, 721),
+        ];
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<SwapTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction");
+        let table = transaction
+            .table::<SwapTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+        fill_table(&table, items).await;
+
+        let mut actual_items = table
+            .open_cursor("base_coin")
+            .await
+            .expect("!DbTable::open_cursor")
+            .only("base_coin", "RICK")
+            .expect("!DbEmptyCursor::only")
+            .collect()
+            .await
+            .expect("!DbSingleKeyCursor::collect")
+            .into_iter()
+            .map(|(_item_id, item)| item)
+            .collect::<Vec<_>>();
+        actual_items.sort();
+
+        let mut expected_items = vec![
+            swap_item!("uuid1", "RICK", "MORTY", 10, 1, 700),
+            swap_item!("uuid3", "RICK", "XYZ", 7, 6, 721),
+            swap_item!("uuid4", "RICK", "MORTY", 8, 6, 721),
+        ];
+        expected_items.sort();
+
+        assert_eq!(actual_items, expected_items);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_collect_single_key_bound_cursor() {
+        const DB_NAME: &str = "TEST_COLLECT_SINGLE_KEY_BOUND_CURSOR";
+        const DB_VERSION: u32 = 1;
+
+        register_wasm_log();
+
+        let items = vec![
+            swap_item!("uuid1", "RICK", "MORTY", 10, 3, 700),
+            swap_item!("uuid2", "MORTY", "KMD", 95000, 1, 721),
+            swap_item!("uuid3", "RICK", "XYZ", 7, u32::MAX, 1281), // +
+            swap_item!("uuid4", "RICK", "MORTY", 8, 6, 92),        // +
+            swap_item!("uuid5", "QRC20", "RICK", 2, 4, 721),
+            swap_item!("uuid6", "KMD", "MORTY", 12, 3124, 214), // +
+        ];
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<SwapTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction");
+        let table = transaction
+            .table::<SwapTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+        fill_table(&table, items).await;
+
+        let mut actual_items = table
+            .open_cursor("rel_coin_value")
+            .await
+            .expect("!DbTable::open_cursor")
+            .bound("rel_coin_value", 5u32, u32::MAX)
+            .collect()
+            .await
+            .expect("!DbSingleKeyCursor::collect")
+            .into_iter()
+            .map(|(_item_id, item)| item)
+            .collect::<Vec<_>>();
+        actual_items.sort();
+
+        let mut expected_items = vec![
+            swap_item!("uuid3", "RICK", "XYZ", 7, u32::MAX, 1281),
+            swap_item!("uuid4", "RICK", "MORTY", 8, 6, 92),
+            swap_item!("uuid6", "KMD", "MORTY", 12, 3124, 214),
+        ];
+        expected_items.sort();
+
+        assert_eq!(actual_items, expected_items);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_collect_multi_key_cursor() {
+        const DB_NAME: &str = "TEST_COLLECT_MULTI_KEY_CURSOR";
+        const DB_VERSION: u32 = 1;
+
+        register_wasm_log();
+
+        let items = vec![
+            swap_item!("uuid1", "RICK", "MORTY", 12, 1, 700),
+            swap_item!("uuid2", "RICK", "KMD", 95000, 6, 721),
+            swap_item!("uuid3", "RICK", "MORTY", 12, 5, 720),
+            swap_item!("uuid4", "RICK", "MORTY", 12, 3, 721), // +
+            swap_item!("uuid5", "QRC20", "MORTY", 51, 221, 182),
+            swap_item!("uuid6", "QRC20", "RICK", 12, 6, 121),
+            swap_item!("uuid7", "RICK", "QRC20", 12, 6, 721), // +
+            swap_item!("uuid8", "FIRO", "DOGE", 12, 8, 721),
+            swap_item!("uuid9", "RICK", "DOGE", 115, 1221, 721),
+            swap_item!("uuid10", "RICK", "tQTUM", 12, 6, 721), // +
+            swap_item!("uuid11", "MORTY", "RICK", 12, 7, 677),
+            swap_item!("uuid12", "tBTC", "RICK", 92, 6, 721),
+        ];
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<SwapTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction");
+        let table = transaction
+            .table::<SwapTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+        fill_table(&table, items).await;
+
+        let mut actual_items = table
+            .open_cursor("basecoin_basecoinvalue_startedat_index")
+            .await
+            .expect("!DbTable::open_cursor")
+            .only("base_coin", "RICK")
+            .expect("!DbEmptyCursor::only")
+            .only("base_coin_value", 12)
+            .expect("!DbSingleKeyCursor::only")
+            .only("started_at", 721)
+            .expect("!DbMultiKeyCursor::only")
+            .collect()
+            .await
+            .expect("!DbMultiKeyCursor::collect")
+            .into_iter()
+            .map(|(_item_id, item)| item)
+            .collect::<Vec<_>>();
+        actual_items.sort();
+
+        let mut expected_items = vec![
+            swap_item!("uuid4", "RICK", "MORTY", 12, 3, 721),
+            swap_item!("uuid7", "RICK", "QRC20", 12, 6, 721),
+            swap_item!("uuid10", "RICK", "tQTUM", 12, 6, 721),
+        ];
+        expected_items.sort();
+
+        assert_eq!(actual_items, expected_items);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_collect_multi_key_bound_cursor() {
+        const DB_NAME: &str = "TEST_COLLECT_MULTI_KEY_BOUND_CURSOR";
+        const DB_VERSION: u32 = 1;
+
+        register_wasm_log();
+
+        let items = vec![
+            swap_item!("uuid1", "MORTY", "RICK", 12, 10, 999),
+            swap_item!("uuid2", "RICK", "QRC20", 4, 12, 557),
+            swap_item!("uuid3", "RICK", "QRC20", 8, 11, 795), // +
+            swap_item!("uuid4", "MORTY", "QRC20", 2, 10, 596),
+            swap_item!("uuid5", "tQTUM", "MORTY", 1, 8, 709),
+            swap_item!("uuid6", "tQTUM", "RICK", 5, 90, 555),
+            swap_item!("uuid7", "RICK", "QRC20", 66, 88, 744),
+            swap_item!("uuid8", "DOGE", "DOGE", 5, 12, 714),
+            swap_item!("uuid9", "RICK", "QRC20", 7, 10, 743), // +
+            swap_item!("uuid10", "FIRO", "tQTUM", 7, 11, 777),
+            swap_item!("uuid11", "RICK", "MORTY", 91, 11, 1061),
+            swap_item!("uuid12", "tBTC", "tQTUM", 4, 771, 745),
+            swap_item!("uuid13", "RICK", "QRC20", 3, 11, 759), // +
+            swap_item!("uuid14", "DOGE", "tBTC", 4, 6, 895),
+            swap_item!("uuid15", "RICK", "QRC20", 723, 19, 558),
+            swap_item!("uuid16", "FIRO", "tBTC", 5, 10, 724),
+            swap_item!("uuid17", "RICK", "tBTC", 5, 13, 636),
+            swap_item!("uuid18", "RICK", "QRC20", 7, 33, 864),
+            swap_item!("uuid19", "DOGE", "tBTC", 55, 12, 723),
+            swap_item!("uuid20", "RICK", "QRC20", 5, 11, 785), // +
+            swap_item!("uuid21", "FIRO", "tBTC", 24, 1, 605),
+            swap_item!("uuid22", "RICK", "QRC20", 9, 10, 734),
+            swap_item!("uuid23", "tBTC", "tBTC", 7, 99, 834),
+            swap_item!("uuid24", "RICK", "QRC20", 8, 12, 849),
+            swap_item!("uuid25", "DOGE", "tBTC", 9, 10, 711),
+        ];
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<SwapTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction");
+        let table = transaction
+            .table::<SwapTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+        fill_table(&table, items).await;
+
+        let actual_items = table
+            .open_cursor("all_fields_index")
+            .await
+            .expect("!DbTable::open_cursor")
+            .only("base_coin", "RICK")
+            .expect("!DbEmptyCursor::only")
+            .only("rel_coin", "QRC20")
+            .expect("!DbEmptyCursor::only")
+            .bound("base_coin_value", 3u32, 8u32)
+            .bound("rel_coin_value", 10u32, 12u32)
+            .bound("started_at", 600i32, 800i32)
+            .collect()
+            .await
+            .expect("!DbMultiKeyCursor::collect")
+            .into_iter()
+            .map(|(_item_id, item)| item)
+            .collect::<Vec<_>>();
+
+        // Items are expected to be sorted in the following order.
+        let expected_items = vec![
+            swap_item!("uuid13", "RICK", "QRC20", 3, 11, 759),
+            swap_item!("uuid20", "RICK", "QRC20", 5, 11, 785),
+            swap_item!("uuid9", "RICK", "QRC20", 7, 10, 743),
+            swap_item!("uuid3", "RICK", "QRC20", 8, 11, 795),
+        ];
+
+        assert_eq!(actual_items, expected_items);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_collect_multi_key_bound_cursor_big_int() {
+        const DB_NAME: &str = "TEST_COLLECT_MULTI_KEY_BOUND_CURSOR_BIG_INT";
+        const DB_VERSION: u32 = 1;
+
+        register_wasm_log();
+
+        let items = vec![
+            TimestampTable::new(u64::MAX, 6, u128::MAX - 3),
+            TimestampTable::new(u64::MAX - 1, 0, u128::MAX - 2), // +
+            TimestampTable::new(u64::MAX - 2, 1, u128::MAX / 2),
+            TimestampTable::new(u128::MAX / 2, 3, 4u64),
+            TimestampTable::new(u64::MAX - 1, 1, u128::MAX / 2), // +
+            TimestampTable::new(u128::MAX, 5, u64::MAX),         // +
+            TimestampTable::new(u64::MAX - 1, 0, u64::MAX - 1),
+            TimestampTable::new(u128::MAX, 2, u64::MAX as u128 + 1), // +
+        ];
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TimestampTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction");
+        let table = transaction
+            .table::<TimestampTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+        fill_table(&table, items).await;
+
+        let actual_items = table
+            .open_cursor("timestamp_xyz")
+            .await
+            .expect("!DbTable::open_cursor")
+            .bound("timestamp_x", BeBigUint::from(u64::MAX - 1), BeBigUint::from(u128::MAX))
+            .bound("timestamp_y", 0u32, 5u32)
+            .bound("timestamp_z", BeBigUint::from(u64::MAX), BeBigUint::from(u128::MAX - 2))
+            .collect()
+            .await
+            .expect("!DbMultiKeyCursor::collect")
+            .into_iter()
+            .map(|(_item_id, item)| item)
+            .collect::<Vec<_>>();
+
+        // Items are expected to be sorted in the following order.
+        let expected_items = vec![
+            TimestampTable::new(u64::MAX - 1, 0, u128::MAX - 2),
+            TimestampTable::new(u64::MAX - 1, 1, u128::MAX / 2),
+            TimestampTable::new(u128::MAX, 2, u64::MAX as u128 + 1),
+            TimestampTable::new(u128::MAX, 5, u64::MAX),
+        ];
+
+        assert_eq!(actual_items, expected_items);
+    }
+}
diff --git a/mm2src/mm2_db/src/indexed_db/indexed_db.rs b/mm2src/mm2_db/src/indexed_db/indexed_db.rs
new file mode 100644
index 0000000000..28d499a075
--- /dev/null
+++ b/mm2src/mm2_db/src/indexed_db/indexed_db.rs
@@ -0,0 +1,1477 @@
+//! The representation of [Indexed DB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)
+//! based on low-level interface described in `db_driver.rs`.
+//!
+//! # Implementation
+//!
+//! Since the wrappers represented in `db_driver.rs` are not `Send`,
+//! the implementation below initializes and spawns a `IdbDatabaseImpl` database instance locally
+//! and communicate with it through the `mpsc` channel.
+
+use async_trait::async_trait;
+use common::executor::spawn_local;
+use common::log::debug;
+use derive_more::Display;
+use futures::channel::{mpsc, oneshot};
+use futures::StreamExt;
+use mm2_core::DbNamespaceId;
+use mm2_err_handle::prelude::*;
+use primitives::hash::H160;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+use serde_json::{self as json, Value as Json};
+use std::collections::HashMap;
+use std::marker::PhantomData;
+use std::sync::Mutex;
+
+macro_rules! try_serialize_index_value {
+    ($exp:expr, $index:expr) => {{
+        match $exp {
+            Ok(res) => res,
+            Err(ser_err) => {
+                return MmError::err(DbTransactionError::ErrorSerializingIndex {
+                    index: $index.to_owned(),
+                    description: ser_err.to_string(),
+                })
+            },
+        }
+    }};
+}
+
+mod be_big_uint;
+mod db_driver;
+mod db_lock;
+mod indexed_cursor;
+
+pub use be_big_uint::BeBigUint;
+pub use db_driver::{DbTransactionError, DbTransactionResult, DbUpgrader, InitDbError, InitDbResult, ItemId,
+                    OnUpgradeError, OnUpgradeResult};
+pub use db_lock::{ConstructibleDb, DbLocked, SharedDb, WeakDb};
+
+use db_driver::{IdbDatabaseBuilder, IdbDatabaseImpl, IdbObjectStoreImpl, IdbTransactionImpl, OnUpgradeNeededCb};
+use indexed_cursor::{cursor_event_loop, DbCursorEventTx, DbEmptyCursor};
+
+type DbEventTx = mpsc::UnboundedSender<internal::DbEvent>;
+type DbTransactionEventTx = mpsc::UnboundedSender<internal::DbTransactionEvent>;
+type DbTableEventTx = mpsc::UnboundedSender<internal::DbTableEvent>;
+
+pub mod cursor_prelude {
+    pub use crate::indexed_db::indexed_cursor::{CollectCursor, CursorError, CursorResult, WithBound, WithFilter,
+                                                WithOnly};
+}
+
+pub trait TableSignature: DeserializeOwned + Serialize + 'static {
+    fn table_name() -> &'static str;
+
+    fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()>;
+}
+
+#[async_trait]
+pub trait DbInstance: Sized {
+    fn db_name() -> &'static str;
+
+    async fn init(db_id: DbIdentifier) -> InitDbResult<Self>;
+}
+
+#[derive(Clone, Display)]
+#[display(fmt = "{}::{}::{}", namespace_id, "self.display_rmd160()", db_name)]
+pub struct DbIdentifier {
+    namespace_id: DbNamespaceId,
+    /// The `RIPEMD160(SHA256(x))` where x is secp256k1 pubkey derived from passphrase.
+    /// This value is used to distinguish different databases corresponding to user's different seed phrases.
+    wallet_rmd160: H160,
+    db_name: &'static str,
+}
+
+impl DbIdentifier {
+    pub fn db_name(&self) -> &'static str { self.db_name }
+
+    pub fn new<Db: DbInstance>(namespace_id: DbNamespaceId, wallet_rmd160: H160) -> DbIdentifier {
+        DbIdentifier {
+            namespace_id,
+            wallet_rmd160,
+            db_name: Db::db_name(),
+        }
+    }
+
+    pub fn for_test(db_name: &'static str) -> DbIdentifier {
+        DbIdentifier {
+            namespace_id: DbNamespaceId::for_test(),
+            wallet_rmd160: H160::default(),
+            db_name,
+        }
+    }
+
+    pub fn display_rmd160(&self) -> String { hex::encode(&*self.wallet_rmd160) }
+}
+
+pub struct IndexedDbBuilder {
+    db_name: String,
+    db_version: u32,
+    tables: HashMap<String, OnUpgradeNeededCb>,
+}
+
+impl IndexedDbBuilder {
+    pub fn new(db_id: DbIdentifier) -> IndexedDbBuilder {
+        IndexedDbBuilder {
+            db_name: db_id.to_string(),
+            db_version: 1,
+            tables: HashMap::new(),
+        }
+    }
+
+    pub fn with_version(mut self, db_version: u32) -> IndexedDbBuilder {
+        self.db_version = db_version;
+        self
+    }
+
+    pub fn with_table<Table: TableSignature>(mut self) -> IndexedDbBuilder {
+        let on_upgrade_needed_cb = Box::new(Table::on_upgrade_needed);
+        self.tables.insert(Table::table_name().to_owned(), on_upgrade_needed_cb);
+        self
+    }
+
+    pub async fn build(self) -> InitDbResult<IndexedDb> {
+        let (init_tx, init_rx) = oneshot::channel();
+        let (event_tx, event_rx) = mpsc::unbounded();
+
+        self.init_and_spawn(init_tx, event_rx);
+        init_rx.await.expect("The init channel must not be closed")?;
+        Ok(IndexedDb { event_tx })
+    }
+
+    fn init_and_spawn(
+        self,
+        init_tx: oneshot::Sender<InitDbResult<()>>,
+        event_rx: mpsc::UnboundedReceiver<internal::DbEvent>,
+    ) {
+        let fut = async move {
+            let db = match IdbDatabaseBuilder::new(&self.db_name)
+                .with_version(self.db_version)
+                .with_tables(self.tables.into_iter())
+                .build()
+                .await
+            {
+                Ok(db) => db,
+                Err(e) => {
+                    // ignore if the receiver is closed
+                    let _res = init_tx.send(Err(e));
+                    return;
+                },
+            };
+
+            // ignore if the receiver is closed
+            let _res = init_tx.send(Ok(()));
+            // run the event loop
+            IndexedDb::event_loop(event_rx, db).await;
+        };
+        spawn_local(fut);
+    }
+}
+
+pub struct IndexedDb {
+    event_tx: DbEventTx,
+}
+
+async fn send_event_recv_response<Event, Result>(
+    event_tx: &mpsc::UnboundedSender<Event>,
+    event: Event,
+    result_rx: oneshot::Receiver<DbTransactionResult<Result>>,
+) -> DbTransactionResult<Result> {
+    if let Err(e) = event_tx.unbounded_send(event) {
+        let error = format!("Error sending event: {}", e);
+        return MmError::err(DbTransactionError::UnexpectedState(error));
+    }
+    match result_rx.await {
+        Ok(result) => result,
+        Err(e) => {
+            let error = format!("Error receiving result: {}", e);
+            MmError::err(DbTransactionError::UnexpectedState(error))
+        },
+    }
+}
+
+impl IndexedDb {
+    pub async fn transaction(&self) -> DbTransactionResult<DbTransaction<'_>> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbEvent::CreateTransaction { result_tx };
+        let transaction_event_tx = send_event_recv_response(&self.event_tx, event, result_rx).await?;
+        Ok(DbTransaction {
+            event_tx: transaction_event_tx,
+            phantom: PhantomData::default(),
+        })
+    }
+
+    async fn event_loop(mut rx: mpsc::UnboundedReceiver<internal::DbEvent>, db: IdbDatabaseImpl) {
+        while let Some(event) = rx.next().await {
+            match event {
+                internal::DbEvent::CreateTransaction { result_tx } => Self::create_transaction(&db, result_tx),
+            }
+        }
+    }
+
+    fn create_transaction(db: &IdbDatabaseImpl, result_tx: oneshot::Sender<DbTransactionResult<DbTransactionEventTx>>) {
+        let transaction = match db.transaction() {
+            Ok(transaction) => transaction,
+            Err(e) => {
+                // ignore if the receiver is closed
+                result_tx.send(Err(e)).ok();
+                return;
+            },
+        };
+        let (transaction_event_tx, transaction_event_rx) = mpsc::unbounded();
+        // spawn the event loop
+        let fut = async move { DbTransaction::event_loop(transaction_event_rx, transaction).await };
+        spawn_local(fut);
+        // ignore if the receiver is closed
+        result_tx.send(Ok(transaction_event_tx)).ok();
+    }
+}
+
+pub struct DbTransaction<'a> {
+    event_tx: DbTransactionEventTx,
+    phantom: PhantomData<&'a ()>,
+}
+
+impl DbTransaction<'_> {
+    pub async fn table<Table: TableSignature>(&self) -> DbTransactionResult<DbTable<'_, Table>> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTransactionEvent::OpenTable {
+            table_name: Table::table_name().to_owned(),
+            result_tx,
+        };
+        let transaction_event_tx = send_event_recv_response(&self.event_tx, event, result_rx).await?;
+        Ok(DbTable {
+            event_tx: transaction_event_tx,
+            phantom: PhantomData::default(),
+        })
+    }
+
+    pub async fn aborted(&self) -> DbTransactionResult<bool> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTransactionEvent::IsAborted { result_tx };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    async fn event_loop(
+        mut rx: mpsc::UnboundedReceiver<internal::DbTransactionEvent>,
+        transaction: IdbTransactionImpl,
+    ) {
+        while let Some(event) = rx.next().await {
+            match event {
+                internal::DbTransactionEvent::OpenTable { table_name, result_tx } => {
+                    Self::open_table(&transaction, table_name, result_tx)
+                },
+                internal::DbTransactionEvent::IsAborted { result_tx } => {
+                    result_tx.send(Ok(transaction.aborted())).ok();
+                },
+            }
+        }
+    }
+
+    fn open_table(
+        transaction: &IdbTransactionImpl,
+        table_name: String,
+        result_tx: oneshot::Sender<DbTransactionResult<mpsc::UnboundedSender<internal::DbTableEvent>>>,
+    ) {
+        let table = match transaction.open_table(&table_name) {
+            Ok(table) => table,
+            Err(e) => {
+                // ignore if the receiver is closed
+                result_tx.send(Err(e)).ok();
+                return;
+            },
+        };
+        let (table_event_tx, table_event_rx) = mpsc::unbounded();
+        let fut = async move { table_event_loop(table_event_rx, table).await };
+        spawn_local(fut);
+        // ignore if the receiver is closed
+        result_tx.send(Ok(table_event_tx)).ok();
+    }
+}
+
+pub struct DbTable<'a, Table: TableSignature> {
+    event_tx: DbTableEventTx,
+    phantom: PhantomData<&'a Table>,
+}
+
+pub enum AddOrIgnoreResult {
+    Added(ItemId),
+    ExistAlready(ItemId),
+}
+
+impl<Table: TableSignature> DbTable<'_, Table> {
+    /// Adds the given item to the table.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/add
+    pub async fn add_item(&self, item: &Table) -> DbTransactionResult<ItemId> {
+        let item = json::to_value(&item).map_to_mm(|e| DbTransactionError::ErrorSerializingItem(e.to_string()))?;
+
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::AddItem { item, result_tx };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    /// Adds the given `item` if there are no items with the same `index`.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/add
+    ///
+    /// * `index` - the name of a corresponding `Table`'s field by which records will be searched.
+    /// * `index_value` - the value of the `index`, therefore the value of a corresponding `Table`'s field.
+    pub async fn add_item_or_ignore_by_unique_index<Value>(
+        &self,
+        index: &str,
+        index_value: Value,
+        item: &Table,
+    ) -> DbTransactionResult<AddOrIgnoreResult>
+    where
+        Value: Serialize,
+    {
+        let ids = self.get_item_ids(index, index_value).await?;
+        match ids.len() {
+            0 => self.add_item(item).await.map(AddOrIgnoreResult::Added),
+            1 => Ok(AddOrIgnoreResult::ExistAlready(ids[0])),
+            got_items => {
+                return MmError::err(DbTransactionError::MultipleItemsByUniqueIndex {
+                    index: index.to_owned(),
+                    got_items,
+                });
+            },
+        }
+    }
+
+    /// Adds the given `item` if there are no items with the same multiple indexes.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/add
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn add_item_or_ignore_by_unique_multi_index(
+        &self,
+        multi_index: MultiIndex,
+        item: &Table,
+    ) -> DbTransactionResult<AddOrIgnoreResult> {
+        self.add_item_or_ignore_by_unique_index(&multi_index.index, multi_index.values, item)
+            .await
+    }
+
+    /// Queries items from the store matching the specified `index`.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/getAllKeys
+    ///
+    /// * `index` - the name of a corresponding `Table`'s field by which records will be searched.
+    /// * `index_value` - the value of the `index`, therefore the value of a corresponding `Table`'s field.
+    pub async fn get_items<Value>(&self, index: &str, index_value: Value) -> DbTransactionResult<Vec<(ItemId, Table)>>
+    where
+        Value: Serialize,
+    {
+        let (result_tx, result_rx) = oneshot::channel();
+        let index_value = try_serialize_index_value!(json::to_value(index_value), index);
+        let event = internal::DbTableEvent::GetItems {
+            index: index.to_owned(),
+            index_value,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx)
+            .await
+            .and_then(|items| Self::deserialize_items(items))
+    }
+
+    /// Queries items from the store matching the specified multiple indexes.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/getAllKeys
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn get_items_by_multi_index(&self, multi_index: MultiIndex) -> DbTransactionResult<Vec<(ItemId, Table)>> {
+        self.get_items(&multi_index.index, multi_index.values).await
+    }
+
+    /// Queries an item from the store matching the specified **unique** `index`.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/getAllKeys
+    ///
+    /// * `index` - the name of a corresponding `Table`'s field by which records will be searched.
+    /// * `index_value` - the value of the `index`, therefore the value of a corresponding `Table`'s field.
+    ///
+    pub async fn get_item_by_unique_index<Value>(
+        &self,
+        index: &str,
+        index_value: Value,
+    ) -> DbTransactionResult<Option<(ItemId, Table)>>
+    where
+        Value: Serialize,
+    {
+        let items = self.get_items(index, index_value).await?;
+        if items.len() > 1 {
+            return MmError::err(DbTransactionError::MultipleItemsByUniqueIndex {
+                index: index.to_owned(),
+                got_items: items.len(),
+            });
+        }
+        Ok(items.into_iter().next())
+    }
+
+    /// Queries an item from the store matching the specified **unique** multiple indexes.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/getAllKeys
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn get_item_by_unique_multi_index(
+        &self,
+        multi_index: MultiIndex,
+    ) -> DbTransactionResult<Option<(ItemId, Table)>> {
+        self.get_item_by_unique_index(&multi_index.index, multi_index.values)
+            .await
+    }
+
+    /// Queries IDs of items from the store matching the specified `index`.
+    /// Such IDs can be used to delete, replace items.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/getAllKeys
+    ///
+    /// * `index` - the name of a corresponding `Table`'s field by which records will be searched.
+    /// * `index_value` - the value of the `index`, therefore the value of a corresponding `Table`'s field.
+    pub async fn get_item_ids<Value>(&self, index: &str, index_value: Value) -> DbTransactionResult<Vec<ItemId>>
+    where
+        Value: Serialize,
+    {
+        let (result_tx, result_rx) = oneshot::channel();
+        let index_value = try_serialize_index_value!(json::to_value(index_value), index);
+        let event = internal::DbTableEvent::GetItemIds {
+            index: index.to_owned(),
+            index_value,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    /// Queries IDs of items from the store matching the specified multiple indexes.
+    /// Such IDs can be used to delete, replace items.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/getAllKeys
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn get_item_ids_by_multi_index(&self, multi_index: MultiIndex) -> DbTransactionResult<Vec<ItemId>> {
+        self.get_item_ids(&multi_index.index, multi_index.values).await
+    }
+
+    /// Queries all items from the store.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/getAll
+    pub async fn get_all_items(&self) -> DbTransactionResult<Vec<(ItemId, Table)>> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::GetAllItems { result_tx };
+        send_event_recv_response(&self.event_tx, event, result_rx)
+            .await
+            .and_then(|items| Self::deserialize_items(items))
+    }
+
+    /// Returns the number of items matching the specified `index`.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/count
+    ///
+    /// * `index` - the name of a corresponding `Table`'s field by which records will be searched.
+    /// * `index_value` - the value of the `index`, therefore the value of a corresponding `Table`'s field.
+    pub async fn count<Value: Serialize>(&self, index: &str, index_value: Value) -> DbTransactionResult<usize> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let index_value = try_serialize_index_value!(json::to_value(index_value), index);
+        let event = internal::DbTableEvent::Count {
+            index: index.to_owned(),
+            index_value,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    /// Returns the number of items matching the specified multiple indexes.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/count
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn count_by_multi_index(&self, multi_index: MultiIndex) -> DbTransactionResult<usize> {
+        self.count(&multi_index.index, multi_index.values).await
+    }
+
+    /// Returns the number of items in the store.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/count
+    pub async fn count_all(&self) -> DbTransactionResult<usize> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::CountAll { result_tx };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    /// Adds the given `item` of replace the previous one.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/put
+    pub async fn replace_item(&self, item_id: ItemId, item: &Table) -> DbTransactionResult<ItemId> {
+        let item = json::to_value(item).map_to_mm(|e| DbTransactionError::ErrorSerializingItem(e.to_string()))?;
+
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::ReplaceItem {
+            item_id,
+            item,
+            result_tx,
+        };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    /// Adds the given `item` or replace the previous one if such item with the specified `index` exists already.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/put
+    ///
+    /// * `index` - the name of a corresponding `Table`'s field by which records will be searched.
+    /// * `index_value` - the value of the `index`, therefore the value of a corresponding `Table`'s field.
+    pub async fn replace_item_by_unique_index<Value>(
+        &self,
+        index: &str,
+        index_value: Value,
+        item: &Table,
+    ) -> DbTransactionResult<ItemId>
+    where
+        Value: Serialize,
+    {
+        let ids = self.get_item_ids(index, index_value).await?;
+        match ids.len() {
+            0 => self.add_item(item).await,
+            1 => {
+                let item_id = ids[0];
+                self.replace_item(item_id, item).await
+            },
+            got_items => {
+                return MmError::err(DbTransactionError::MultipleItemsByUniqueIndex {
+                    index: index.to_owned(),
+                    got_items,
+                });
+            },
+        }
+    }
+
+    /// Adds the given `item` or replace the previous one if such item with the specified multiple indexes exists already.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/put
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn replace_item_by_unique_multi_index(
+        &self,
+        multi_index: MultiIndex,
+        item: &Table,
+    ) -> DbTransactionResult<ItemId> {
+        self.replace_item_by_unique_index(&multi_index.index, multi_index.values, item)
+            .await
+    }
+
+    /// Deletes an item from the store by the specified `item_id`.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/delete
+    pub async fn delete_item(&self, item_id: ItemId) -> DbTransactionResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::DeleteItem { item_id, result_tx };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    /// Tries to find an item by the **unique** `index` and removes it if it exists.
+    /// Returns `Ok(None)` if there is no an item with the given `index`.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/delete
+    ///
+    /// * `index` - the name of a corresponding `Table`'s field by which records will be searched.
+    /// * `index_value` - the value of the `index`, therefore the value of a corresponding `Table`'s field.
+    pub async fn delete_item_by_unique_index<Value>(
+        &self,
+        index: &str,
+        index_value: Value,
+    ) -> DbTransactionResult<Option<ItemId>>
+    where
+        Value: Serialize,
+    {
+        let ids = self.get_item_ids(index, index_value).await?;
+        match ids.len() {
+            0 => Ok(None),
+            1 => {
+                let item_id = ids[0];
+                self.delete_item(item_id).await?;
+                Ok(Some(item_id))
+            },
+            got_items => MmError::err(DbTransactionError::MultipleItemsByUniqueIndex {
+                index: index.to_owned(),
+                got_items,
+            }),
+        }
+    }
+
+    /// Tries to find an item matching the specified **unique** multiple indexes and removes the item if it exists.
+    /// Returns `Ok(None)` if there is no an item with the given keys.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/delete
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn delete_item_by_unique_multi_index(
+        &self,
+        multi_index: MultiIndex,
+    ) -> DbTransactionResult<Option<ItemId>> {
+        self.delete_item_by_unique_index(&multi_index.index, multi_index.values)
+            .await
+    }
+
+    /// Tries to find items matching the given `index` and removes them from the store.
+    /// Returns IDs of removed items.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/delete
+    pub async fn delete_items_by_index<Value>(
+        &self,
+        index: &str,
+        index_value: Value,
+    ) -> DbTransactionResult<Vec<ItemId>>
+    where
+        Value: Serialize,
+    {
+        let ids = self.get_item_ids(index, index_value).await?;
+        for item_id in ids.iter() {
+            self.delete_item(*item_id).await?;
+        }
+        Ok(ids)
+    }
+
+    /// Tries to find items matching the given multiple indexes and removes them from the store.
+    /// Returns IDs of removed items.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/delete
+    ///
+    /// For more details on multiple indexes see [`TableUpgrader::create_multi_index`].
+    pub async fn delete_items_by_multi_index(&self, multi_index: MultiIndex) -> DbTransactionResult<Vec<ItemId>> {
+        self.delete_items_by_index(&multi_index.index, multi_index.values).await
+    }
+
+    /// Deletes all items from the store.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/clear
+    pub async fn clear(&self) -> DbTransactionResult<()> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::Clear { result_tx };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    /// Opens a cursor by the specified `index`.
+    /// https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/openCursor
+    pub async fn open_cursor(&self, index: &str) -> DbTransactionResult<DbEmptyCursor<'_, Table>> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::OpenCursor {
+            index: index.to_owned(),
+            result_tx,
+        };
+        let cursor_event_tx = send_event_recv_response(&self.event_tx, event, result_rx).await?;
+        Ok(DbEmptyCursor::new(cursor_event_tx))
+    }
+
+    /// Whether the transaction is aborted.
+    pub async fn aborted(&self) -> DbTransactionResult<bool> {
+        let (result_tx, result_rx) = oneshot::channel();
+        let event = internal::DbTableEvent::IsAborted { result_tx };
+        send_event_recv_response(&self.event_tx, event, result_rx).await
+    }
+
+    fn deserialize_items(items: Vec<(ItemId, Json)>) -> DbTransactionResult<Vec<(ItemId, Table)>> {
+        items
+            .into_iter()
+            .map(|(item_id, item)| {
+                let item: Table =
+                    json::from_value(item).map_to_mm(|e| DbTransactionError::ErrorDeserializingItem(e.to_string()))?;
+                Ok((item_id, item))
+            })
+            .collect()
+    }
+}
+
+/// This event loop cannot be part of the `DbTable`, because the `Table` type parameter is not known when this function is called.
+async fn table_event_loop(mut rx: mpsc::UnboundedReceiver<internal::DbTableEvent>, table: IdbObjectStoreImpl) {
+    while let Some(event) = rx.next().await {
+        match event {
+            internal::DbTableEvent::AddItem { item, result_tx } => {
+                let res = table.add_item(&item).await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::GetItems {
+                index,
+                index_value,
+                result_tx,
+            } => {
+                let res = table.get_items(&index, index_value).await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::GetItemIds {
+                index,
+                index_value,
+                result_tx,
+            } => {
+                let res = table.get_item_ids(&index, index_value).await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::GetAllItems { result_tx } => {
+                let res = table.get_all_items().await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::Count {
+                index,
+                index_value,
+                result_tx,
+            } => {
+                let res = table.count(&index, index_value).await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::CountAll { result_tx } => {
+                let res = table.count_all().await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::ReplaceItem {
+                item_id,
+                item,
+                result_tx,
+            } => {
+                let res = table.replace_item(item_id, item).await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::DeleteItem { item_id, result_tx } => {
+                let res = table.delete_item(item_id).await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::Clear { result_tx } => {
+                let res = table.clear().await;
+                result_tx.send(res).ok();
+            },
+            internal::DbTableEvent::IsAborted { result_tx } => {
+                result_tx.send(Ok(table.aborted())).ok();
+            },
+            internal::DbTableEvent::OpenCursor { index, result_tx } => {
+                open_cursor(&table, index, result_tx);
+            },
+        }
+    }
+}
+
+pub struct MultiIndex {
+    index: String,
+    values: Vec<Json>,
+}
+
+impl MultiIndex {
+    pub fn new(index: &str) -> MultiIndex {
+        MultiIndex {
+            index: index.to_owned(),
+            values: Vec::new(),
+        }
+    }
+
+    pub fn push<Value: Serialize>(&mut self, value: Value) -> DbTransactionResult<&mut Self> {
+        let index_value = try_serialize_index_value!(json::to_value(value), self.index);
+        self.values.push(index_value);
+        Ok(self)
+    }
+
+    pub fn with_value<Value: Serialize>(mut self, value: Value) -> DbTransactionResult<Self> {
+        self.push(value)?;
+        Ok(self)
+    }
+}
+
+fn open_cursor(
+    table: &IdbObjectStoreImpl,
+    index: String,
+    result_tx: oneshot::Sender<DbTransactionResult<DbCursorEventTx>>,
+) {
+    let cursor_builder = match table.cursor_builder(&index) {
+        Ok(builder) => builder,
+        Err(e) => {
+            result_tx.send(Err(e)).ok();
+            return;
+        },
+    };
+    let (event_tx, event_rx) = mpsc::unbounded();
+    let fut = async move { cursor_event_loop(event_rx, cursor_builder).await };
+    spawn_local(fut);
+    // ignore if the receiver is closed
+    result_tx.send(Ok(event_tx)).ok();
+}
+
+/// Internal events.
+mod internal {
+    use super::*;
+
+    pub(super) enum DbEvent {
+        CreateTransaction {
+            result_tx: oneshot::Sender<DbTransactionResult<DbTransactionEventTx>>,
+        },
+    }
+
+    pub(super) enum DbTransactionEvent {
+        OpenTable {
+            table_name: String,
+            result_tx: oneshot::Sender<DbTransactionResult<mpsc::UnboundedSender<DbTableEvent>>>,
+        },
+        IsAborted {
+            result_tx: oneshot::Sender<DbTransactionResult<bool>>,
+        },
+    }
+
+    pub(super) enum DbTableEvent {
+        AddItem {
+            item: Json,
+            result_tx: oneshot::Sender<DbTransactionResult<ItemId>>,
+        },
+        GetItems {
+            index: String,
+            index_value: Json,
+            result_tx: oneshot::Sender<DbTransactionResult<Vec<(ItemId, Json)>>>,
+        },
+        GetItemIds {
+            index: String,
+            index_value: Json,
+            result_tx: oneshot::Sender<DbTransactionResult<Vec<ItemId>>>,
+        },
+        GetAllItems {
+            result_tx: oneshot::Sender<DbTransactionResult<Vec<(ItemId, Json)>>>,
+        },
+        Count {
+            index: String,
+            index_value: Json,
+            result_tx: oneshot::Sender<DbTransactionResult<usize>>,
+        },
+        CountAll {
+            result_tx: oneshot::Sender<DbTransactionResult<usize>>,
+        },
+        ReplaceItem {
+            item_id: ItemId,
+            item: Json,
+            result_tx: oneshot::Sender<DbTransactionResult<ItemId>>,
+        },
+        DeleteItem {
+            item_id: ItemId,
+            result_tx: oneshot::Sender<DbTransactionResult<()>>,
+        },
+        Clear {
+            result_tx: oneshot::Sender<DbTransactionResult<()>>,
+        },
+        IsAborted {
+            result_tx: oneshot::Sender<DbTransactionResult<bool>>,
+        },
+        OpenCursor {
+            index: String,
+            result_tx: oneshot::Sender<DbTransactionResult<DbCursorEventTx>>,
+        },
+    }
+}
+
+mod tests {
+    use super::*;
+    use common::log::wasm_log::register_wasm_log;
+    use lazy_static::lazy_static;
+    use serde::{Deserialize, Serialize};
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+    #[serde(deny_unknown_fields)]
+    struct TxTable {
+        ticker: String,
+        tx_hash: String,
+        block_height: u64,
+    }
+
+    impl TableSignature for TxTable {
+        fn table_name() -> &'static str { "tx_table" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, _new_version: u32) -> OnUpgradeResult<()> {
+            if old_version > 0 {
+                // the table is initialized already
+                return Ok(());
+            }
+            let table_upgrader = upgrader.create_table("tx_table")?;
+            table_upgrader.create_index("ticker", false)?;
+            table_upgrader.create_index("tx_hash", true)
+        }
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_add_get_item() {
+        const DB_NAME: &str = "TEST_ADD_GET_ITEM";
+        const DB_VERSION: u32 = 1;
+
+        let rick_tx_1 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 10000,
+        };
+        let rick_tx_2 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
+            block_height: 10000,
+        };
+        let morty_tx_1 = TxTable {
+            ticker: "MORTY".to_owned(),
+            tx_hash: "1fc789133239260ed16361190a026a88cab2243935f02f1ccd794f1d06a22246".to_owned(),
+            block_height: 20000,
+        };
+
+        register_wasm_log();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let rick_tx_1_id = table
+            .add_item(&rick_tx_1)
+            .await
+            .expect("!Couldn't add a 'RICK' transaction");
+        let rick_tx_2_id = table
+            .add_item(&rick_tx_2)
+            .await
+            .expect("!Couldn't add a 'RICK' transaction with the different 'tx_hash'");
+        let morty_tx_1_id = table
+            .add_item(&morty_tx_1)
+            .await
+            .expect("!Couldn't add a 'MORTY' transaction");
+        assert!(rick_tx_1_id != rick_tx_2_id && rick_tx_2_id != morty_tx_1_id);
+
+        let actual_rick_txs = table
+            .get_items("ticker", "RICK")
+            .await
+            .expect("!Couldn't get items by the index 'ticker=RICK'");
+        let expected_rick_txs = vec![(rick_tx_1_id, rick_tx_1), (rick_tx_2_id, rick_tx_2.clone())];
+        assert_eq!(actual_rick_txs, expected_rick_txs);
+
+        let actual_rick_tx_ids = table
+            .get_item_ids("ticker", "RICK")
+            .await
+            .expect("Couldn't get item ids by the index 'ticker=RICK'");
+        let expected_rick_tx_ids = vec![rick_tx_1_id, rick_tx_2_id];
+        assert_eq!(actual_rick_tx_ids, expected_rick_tx_ids);
+
+        let actual_rick_2_tx = table
+            .get_items(
+                "tx_hash",
+                "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424",
+            )
+            .await
+            .expect("!Couldn't get items by the index 'tx_hash'");
+        let expected_rick_txs = vec![(rick_tx_2_id, rick_tx_2)];
+        assert_eq!(actual_rick_2_tx, expected_rick_txs);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_add_item_or_ignore() {
+        const DB_NAME: &str = "TEST_ADD_ITEM_OR_IGNORE";
+        const DB_VERSION: u32 = 1;
+        const TX_HASH: &str = "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f";
+
+        let tx_1 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: TX_HASH.to_owned(),
+            block_height: 10000,
+        };
+        let tx_2 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: TX_HASH.to_owned(),
+            block_height: 20000,
+        };
+
+        register_wasm_log();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let tx_1_id = match table
+            .add_item_or_ignore_by_unique_index("tx_hash", TX_HASH, &tx_1)
+            .await
+            .expect("!Couldn't add a 'RICK' transaction")
+        {
+            AddOrIgnoreResult::Added(item_id) => item_id,
+            AddOrIgnoreResult::ExistAlready(unknown_tx_id) => {
+                panic!("Transaction should be added: found '{}'", unknown_tx_id)
+            },
+        };
+        let found_tx_id = match table
+            .add_item_or_ignore_by_unique_index("tx_hash", TX_HASH, &tx_2)
+            .await
+            .expect("'add_item_or_ignore_by_unique_index' failed, but should just ignore the transaction")
+        {
+            // Transaction shouldn't be added since we added `tx_1` with the same `tx_hash` already.
+            AddOrIgnoreResult::Added(_) => panic!("'add_item_or_ignore_by_unique_index' shouldn't have added 'tx_2'"),
+            AddOrIgnoreResult::ExistAlready(exist_tx_id) => exist_tx_id,
+        };
+        assert_eq!(tx_1_id, found_tx_id);
+
+        let actual_txs = table.get_all_items().await.expect("Couldn't get items");
+        assert_eq!(actual_txs, vec![(tx_1_id, tx_1)]);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_count() {
+        const DB_NAME: &str = "TEST_COUNT";
+        const DB_VERSION: u32 = 1;
+
+        let rick_tx_1 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 10000,
+        };
+        let rick_tx_2 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
+            block_height: 10000,
+        };
+        let morty_tx_1 = TxTable {
+            ticker: "MORTY".to_owned(),
+            tx_hash: "1fc789133239260ed16361190a026a88cab2243935f02f1ccd794f1d06a22246".to_owned(),
+            block_height: 20000,
+        };
+
+        register_wasm_log();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        table
+            .add_item(&rick_tx_1)
+            .await
+            .expect("!Couldn't add a 'RICK' transaction");
+        table
+            .add_item(&rick_tx_2)
+            .await
+            .expect("!Couldn't add a 'RICK' transaction with the different 'tx_hash'");
+        table
+            .add_item(&morty_tx_1)
+            .await
+            .expect("!Couldn't add a 'MORTY' transaction");
+
+        assert_eq!(3, table.count_all().await.expect("!IndexedDb::count_all()"));
+        assert_eq!(2, table.count("ticker", "RICK").await.expect("!IndexedDb::count()"));
+        assert_eq!(1, table.count("ticker", "MORTY").await.expect("!IndexedDb::count()"));
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_replace_item() {
+        const DB_NAME: &str = "TEST_REPLACE_ITEM";
+        const DB_VERSION: u32 = 1;
+
+        let rick_tx_1 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 10000,
+        };
+        let rick_tx_2 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
+            block_height: 10000,
+        };
+        let rick_tx_1_updated = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 20000,
+        };
+
+        register_wasm_log();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let rick_tx_1_id = table.add_item(&rick_tx_1).await.expect("Couldn't add an item");
+        let rick_tx_2_id = table.add_item(&rick_tx_2).await.expect("Couldn't add an item");
+
+        // Open new transaction.
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        // Try to add the updated RICK tx item with the same [`TxTable::tx_hash`].
+        // [`TxTable::tx_hash`] is a unique index, so this operation must fail.
+        let err = table
+            .add_item(&rick_tx_1_updated)
+            .await
+            .expect_err("'DbTable::add_item' should have failed");
+        match err.into_inner() {
+            DbTransactionError::ErrorUploadingItem(err) => debug!("error: {}", err),
+            e => panic!("Expected 'DbTransactionError::ErrorUploadingItem', found: {:?}", e),
+        }
+        assert_eq!(table.aborted().await, Ok(true));
+        assert_eq!(transaction.aborted().await, Ok(true));
+
+        // But we should be able to replace the updated item.
+        // Since the last operation failed, we have to reopen the transaction.
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let rick_tx_1_updated_id = table
+            .replace_item(rick_tx_1_id, &rick_tx_1_updated)
+            .await
+            .expect("!Couldn't replace an item");
+        assert_eq!(rick_tx_1_updated_id, rick_tx_1_id);
+
+        let actual_rick_txs = table
+            .get_items("ticker", "RICK")
+            .await
+            .expect("Couldn't get items by the index 'ticker=RICK'");
+        assert_eq!(actual_rick_txs, vec![
+            (rick_tx_1_id, rick_tx_1_updated),
+            (rick_tx_2_id, rick_tx_2)
+        ]);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_delete_item() {
+        const DB_NAME: &str = "TEST_DELETE_ITEM";
+        const DB_VERSION: u32 = 1;
+
+        let rick_tx_1 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 10000,
+        };
+        let rick_tx_2 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
+            block_height: 10000,
+        };
+
+        register_wasm_log();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let rick_tx_1_id = table.add_item(&rick_tx_1).await.expect("Couldn't add an item");
+        let rick_tx_2_id = table.add_item(&rick_tx_2).await.expect("Couldn't add an item");
+
+        table.delete_item(rick_tx_1_id).await.expect("Couldn't delete an item");
+
+        let actual_rick_txs = table
+            .get_items("ticker", "RICK")
+            .await
+            .expect("Couldn't get items by the index 'ticker=RICK'");
+        assert_eq!(actual_rick_txs, vec![(rick_tx_2_id, rick_tx_2)]);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_clear() {
+        const DB_NAME: &str = "TEST_CLEAR";
+        const DB_VERSION: u32 = 1;
+
+        let rick_tx_1 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 10000,
+        };
+        let rick_tx_2 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
+            block_height: 10000,
+        };
+
+        register_wasm_log();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let _rick_tx_1_id = table.add_item(&rick_tx_1).await.expect("Couldn't add an item");
+        let _rick_tx_2_id = table.add_item(&rick_tx_2).await.expect("Couldn't add an item");
+
+        table.clear().await.expect("Couldn't clear the database");
+
+        let actual_rick_txs = table
+            .get_items("ticker", "RICK")
+            .await
+            .expect("Couldn't get items by the index 'ticker=RICK'");
+        assert!(actual_rick_txs.is_empty());
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_upgrade_needed() {
+        const DB_NAME: &str = "TEST_UPGRADE_NEEDED";
+
+        lazy_static! {
+            static ref LAST_VERSIONS: Mutex<Option<(u32, u32)>> = Mutex::new(None);
+        }
+
+        #[derive(Serialize, Deserialize)]
+        struct UpgradableTable;
+
+        impl TableSignature for UpgradableTable {
+            fn table_name() -> &'static str { "upgradable_table" }
+
+            fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+                let mut versions = LAST_VERSIONS.lock().expect("!old_new_versions.lock()");
+                *versions = Some((old_version, new_version));
+
+                match (old_version, new_version) {
+                    (0, 1) => {
+                        let table = upgrader.create_table("upgradable_table")?;
+                        table.create_index("first_index", false)?;
+                    },
+                    (0, 2) => {
+                        let table = upgrader.create_table("upgradable_table")?;
+                        table.create_index("first_index", false)?;
+                        table.create_index("second_index", false)?;
+                    },
+                    (1, 2) => {
+                        let table = upgrader.open_table("upgradable_table")?;
+                        table.create_index("second_index", false)?;
+                    },
+                    v => panic!("Unexpected old, new versions: {:?}", v),
+                }
+                Ok(())
+            }
+        }
+
+        async fn init_and_check(
+            db_identifier: DbIdentifier,
+            version: u32,
+            expected_old_new_versions: Option<(u32, u32)>,
+        ) -> Result<(), String> {
+            let mut versions = LAST_VERSIONS.lock().expect("!LAST_VERSIONS.lock()");
+            *versions = None;
+            drop(versions);
+
+            let _db = IndexedDbBuilder::new(db_identifier)
+                .with_version(version)
+                .with_table::<UpgradableTable>()
+                .build()
+                .await
+                .map_err(|e| format!("{}", e))?;
+
+            let actual_versions = LAST_VERSIONS.lock().unwrap();
+            if *actual_versions == expected_old_new_versions {
+                Ok(())
+            } else {
+                Err(format!(
+                    "Expected {:?}, found {:?}",
+                    expected_old_new_versions, actual_versions
+                ))
+            }
+        }
+
+        register_wasm_log();
+
+        let db_identifier = DbIdentifier::for_test(DB_NAME);
+
+        init_and_check(db_identifier.clone(), 1, Some((0, 1))).await.unwrap();
+        init_and_check(db_identifier.clone(), 2, Some((1, 2))).await.unwrap();
+        // the same 2 version, `on_upgrade_needed` must not be called
+        init_and_check(db_identifier, 2, None).await.unwrap();
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_open_twice() {
+        const DB_NAME: &str = "TEST_OPEN_TWICE";
+        const DB_VERSION: u32 = 1;
+
+        register_wasm_log();
+        let db_identifier = DbIdentifier::for_test(DB_NAME);
+
+        let _db = IndexedDbBuilder::new(db_identifier.clone())
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init first time");
+
+        match IndexedDbBuilder::new(db_identifier.clone())
+            .with_version(DB_VERSION + 1)
+            .with_table::<TxTable>()
+            .build()
+            .await
+        {
+            Ok(_) => panic!("!IndexedDb::init should have failed"),
+            Err(e) => assert_eq!(e.into_inner(), InitDbError::DbIsOpenAlready {
+                db_name: db_identifier.to_string()
+            }),
+        }
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_open_close_and_open() {
+        const DB_NAME: &str = "TEST_OPEN_CLOSE_AND_OPEN";
+        const DB_VERSION: u32 = 1;
+
+        register_wasm_log();
+        let db_identifier = DbIdentifier::for_test(DB_NAME);
+
+        let db = IndexedDbBuilder::new(db_identifier.clone())
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init first time");
+        drop(db);
+
+        let _db = IndexedDbBuilder::new(db_identifier)
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init second time");
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_non_string_index() {
+        const DB_NAME: &str = "TEST_NON_STRING_INDEX";
+        const DB_VERSION: u32 = 1;
+
+        #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+        struct Uuid(Vec<u64>);
+
+        #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+        #[serde(deny_unknown_fields)]
+        struct SwapTable {
+            swap_uuid: Uuid,
+            started_at: u64,
+            some_data: String,
+        }
+
+        impl TableSignature for SwapTable {
+            fn table_name() -> &'static str { "swap_table" }
+
+            fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, _new_version: u32) -> OnUpgradeResult<()> {
+                if old_version > 0 {
+                    // the table is initialized already
+                    return Ok(());
+                }
+                let table_upgrader = upgrader.create_table("swap_table")?;
+                table_upgrader.create_index("swap_uuid", false)?;
+                table_upgrader.create_index("started_at", false)
+            }
+        }
+
+        register_wasm_log();
+
+        let swap_1 = SwapTable {
+            swap_uuid: Uuid(vec![1, 2, 3]),
+            started_at: 123,
+            some_data: "Some data 1".to_owned(),
+        };
+        let swap_2 = SwapTable {
+            swap_uuid: Uuid(vec![3, 2, 1]),
+            started_at: 321,
+            some_data: "Some data 2".to_owned(),
+        };
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<SwapTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<SwapTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let swap_1_id = table.add_item(&swap_1).await.expect("Couldn't add an item");
+        let swap_2_id = table.add_item(&swap_2).await.expect("Couldn't add an item");
+
+        let actual = table
+            .get_items("swap_uuid", vec![3, 2, 1])
+            .await
+            .expect("Couldn't get items");
+        assert_eq!(actual, vec![(swap_2_id, swap_2)]);
+
+        let actual = table.get_items("started_at", 123).await.expect("Couldn't get items");
+        assert_eq!(actual, vec![(swap_1_id, swap_1)]);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_transaction_abort_on_error() {
+        const DB_NAME: &str = "TEST_TRANSACTION_ABORT_ON_ERROR";
+        const DB_VERSION: u32 = 1;
+
+        let tx_1 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 10000,
+        };
+        let tx_2 = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "ba881ecca15b5d4593f14f25debbcdfe25f101fd2e9cf8d0b5d92d19813d4424".to_owned(),
+            block_height: 10000,
+        };
+        // The transaction has the same `tx_hash` as `tx_1`.
+        let invalid_tx = TxTable {
+            ticker: "RICK".to_owned(),
+            tx_hash: "0a0fda88364b960000f445351fe7678317a1e0c80584de0413377ede00ba696f".to_owned(),
+            block_height: 20000,
+        };
+
+        register_wasm_log();
+
+        let db = IndexedDbBuilder::new(DbIdentifier::for_test(DB_NAME))
+            .with_version(DB_VERSION)
+            .with_table::<TxTable>()
+            .build()
+            .await
+            .expect("!IndexedDb::init");
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let _tx_1_id = table.add_item(&tx_1).await.expect("Couldn't add an item");
+        let _tx_2_id = table.add_item(&tx_2).await.expect("Couldn't add an item");
+
+        // Try to add the updated RICK tx item with the same [`TxTable::tx_hash`].
+        // [`TxTable::tx_hash`] is a unique index, so this operation must fail.
+        let _err = table
+            .add_item(&invalid_tx)
+            .await
+            .expect_err("'DbTable::add_item' should have failed");
+        assert_eq!(table.aborted().await, Ok(true));
+        assert_eq!(transaction.aborted().await, Ok(true));
+
+        // Check if `tx_1` and `tx_2` hasn't been uploaded.
+        // Since the last operation failed, we have to reopen the transaction.
+        let transaction = db.transaction().await.expect("!IndexedDb::transaction()");
+        let table = transaction
+            .table::<TxTable>()
+            .await
+            .expect("!DbTransaction::open_table");
+
+        let actual_txs = table
+            .get_items("ticker", "RICK")
+            .await
+            .expect("Couldn't get items by the index 'ticker=RICK'");
+        assert!(actual_txs.is_empty());
+    }
+}
diff --git a/mm2src/mm2_db/src/lib.rs b/mm2src/mm2_db/src/lib.rs
new file mode 100644
index 0000000000..3a07456131
--- /dev/null
+++ b/mm2src/mm2_db/src/lib.rs
@@ -0,0 +1,5 @@
+#![feature(negative_impls)]
+
+#[cfg(target_arch = "wasm32")]
+#[path = "indexed_db/indexed_db.rs"]
+pub mod indexed_db;
diff --git a/mm2src/mm2_err_handle/Cargo.toml b/mm2src/mm2_err_handle/Cargo.toml
new file mode 100644
index 0000000000..9e80043bad
--- /dev/null
+++ b/mm2src/mm2_err_handle/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "mm2_err_handle"
+version = "0.1.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+futures01 = { version = "0.1", package = "futures" }
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+derive_more = "0.99"
+itertools = "0.10"
+serde = { version = "1.0", features = ["derive"] }
+ser_error = { path = "../derives/ser_error" }
+ser_error_derive = { path = "../derives/ser_error_derive" }
+common = { path = "../common" }
+http = "0.2"
diff --git a/mm2src/mm2_err_handle/src/lib.rs b/mm2src/mm2_err_handle/src/lib.rs
new file mode 100644
index 0000000000..fe15619899
--- /dev/null
+++ b/mm2src/mm2_err_handle/src/lib.rs
@@ -0,0 +1,19 @@
+#![feature(negative_impls)]
+#![feature(auto_traits)]
+
+pub mod map_mm_error;
+pub mod map_to_mm;
+pub mod map_to_mm_fut;
+pub mod mm_error;
+pub mod mm_json_error;
+pub mod or_mm_error;
+
+pub mod prelude {
+    pub use crate::map_mm_error::MapMmError;
+    pub use crate::map_to_mm::MapToMmResult;
+    pub use crate::map_to_mm_fut::MapToMmFutureExt;
+    pub use crate::mm_error::{MmError, MmResult, NotEqual, NotMmError, SerMmErrorType};
+    pub use crate::mm_json_error::MmJsonError;
+    pub use crate::or_mm_error::OrMmError;
+    pub use ser_error::SerializeErrorType;
+}
diff --git a/mm2src/common/mm_error/map_mm_error.rs b/mm2src/mm2_err_handle/src/map_mm_error.rs
similarity index 78%
rename from mm2src/common/mm_error/map_mm_error.rs
rename to mm2src/mm2_err_handle/src/map_mm_error.rs
index c96670c64a..3f1e3718ec 100644
--- a/mm2src/common/mm_error/map_mm_error.rs
+++ b/mm2src/mm2_err_handle/src/map_mm_error.rs
@@ -1,5 +1,4 @@
-use super::{MmError, NotMmError, TraceLocation};
-use std::panic::Location;
+use crate::mm_error::{MmError, NotMmError};
 
 pub trait MapMmError<T, E1, E2: NotMmError> {
     fn mm_err<F>(self, f: F) -> Result<T, MmError<E2>>
@@ -34,12 +33,7 @@ where
         // do not use [`Result::map_err`], because we should keep the `track_caller` chain
         match self {
             Ok(x) => Ok(x),
-            Err(e1) => {
-                let e2 = f(e1.etype);
-                let mut trace = e1.trace;
-                trace.push(TraceLocation::from(Location::caller()));
-                Err(MmError { etype: e2, trace })
-            },
+            Err(e1) => Err(e1.map(f)),
         }
     }
 }
diff --git a/mm2src/common/mm_error/map_to_mm.rs b/mm2src/mm2_err_handle/src/map_to_mm.rs
similarity index 95%
rename from mm2src/common/mm_error/map_to_mm.rs
rename to mm2src/mm2_err_handle/src/map_to_mm.rs
index 77f55aa5d5..568df94ab1 100644
--- a/mm2src/common/mm_error/map_to_mm.rs
+++ b/mm2src/mm2_err_handle/src/map_to_mm.rs
@@ -1,4 +1,4 @@
-use super::{MmError, NotMmError};
+use crate::mm_error::{MmError, NotMmError};
 
 pub trait MapToMmResult<T, E1, E2>
 where
diff --git a/mm2src/common/mm_error/map_to_mm_fut.rs b/mm2src/mm2_err_handle/src/map_to_mm_fut.rs
similarity index 97%
rename from mm2src/common/mm_error/map_to_mm_fut.rs
rename to mm2src/mm2_err_handle/src/map_to_mm_fut.rs
index f6681d894b..01de1b7d7e 100644
--- a/mm2src/common/mm_error/map_to_mm_fut.rs
+++ b/mm2src/mm2_err_handle/src/map_to_mm_fut.rs
@@ -1,4 +1,4 @@
-use super::{MmError, NotMmError, TraceLocation};
+use crate::mm_error::{MmError, NotMmError, TraceLocation};
 use futures01::{Future, Poll};
 use std::panic::Location;
 
diff --git a/mm2src/common/mm_error/mm_error.rs b/mm2src/mm2_err_handle/src/mm_error.rs
similarity index 76%
rename from mm2src/common/mm_error/mm_error.rs
rename to mm2src/mm2_err_handle/src/mm_error.rs
index 6f3232c753..a41cbbf66b 100644
--- a/mm2src/common/mm_error/mm_error.rs
+++ b/mm2src/mm2_err_handle/src/mm_error.rs
@@ -84,28 +84,17 @@
 //!  }
 //! ```
 
-use crate::{HttpStatusCode, NotSame};
+use common::{filename, HttpStatusCode};
 use derive_more::Display;
 use http::StatusCode;
 use itertools::Itertools;
 use ser_error::SerializeErrorType;
 use serde::{Serialize, Serializer};
+use std::cell::UnsafeCell;
 use std::fmt;
 use std::panic::Location;
 
-pub mod prelude {
-    pub use crate::mm_error::map_mm_error::MapMmError;
-    pub use crate::mm_error::map_to_mm::MapToMmResult;
-    pub use crate::mm_error::map_to_mm_fut::MapToMmFutureExt;
-    pub use crate::mm_error::or_mm_error::OrMmError;
-    pub use crate::mm_error::{MmError, NotMmError, SerMmErrorType};
-    pub use ser_error::SerializeErrorType;
-}
-
-mod map_mm_error;
-mod map_to_mm;
-mod map_to_mm_fut;
-mod or_mm_error;
+pub type MmResult<T, E> = Result<T, MmError<E>>;
 
 pub auto trait NotMmError {}
 
@@ -115,34 +104,33 @@ impl<E> !NotMmError for MmError<E> {}
 /// e.g for Box<dyn Trait>.
 impl<T: ?Sized> NotMmError for Box<T> {}
 
+impl<T: ?Sized> NotMmError for UnsafeCell<T> {}
+
 pub trait SerMmErrorType: SerializeErrorType + fmt::Display + NotMmError {}
 
 impl<E> SerMmErrorType for E where E: SerializeErrorType + fmt::Display + NotMmError {}
 
 /// The unified error representation tracing an error path.
-#[derive(Debug, Display, Eq, PartialEq)]
+#[derive(Clone, Debug, Display, Eq, PartialEq)]
 #[display(fmt = "{} {}", "trace.formatted()", etype)]
 pub struct MmError<E: NotMmError> {
-    etype: E,
-    trace: Vec<TraceLocation>,
+    pub(crate) etype: E,
+    pub(crate) trace: Vec<TraceLocation>,
 }
 
+pub auto trait NotEqual {}
+impl<X> !NotEqual for (X, X) {}
+impl<T: ?Sized> NotEqual for Box<T> {}
+
 /// Track the location whenever `MmError<E2>::from(MmError<E1>)` is called.
 impl<E1, E2> From<MmError<E1>> for MmError<E2>
 where
     E1: NotMmError,
     E2: From<E1> + NotMmError,
-    (E1, E2): NotSame,
+    (E1, E2): NotEqual,
 {
     #[track_caller]
-    fn from(orig: MmError<E1>) -> Self {
-        let mut trace = orig.trace;
-        trace.push(TraceLocation::from(Location::caller()));
-        MmError {
-            etype: E2::from(orig.etype),
-            trace,
-        }
-    }
+    fn from(orig: MmError<E1>) -> Self { orig.map(E2::from) }
 }
 
 /// Track the location whenever `MmError<E2>::from(E1)` is called.
@@ -190,6 +178,14 @@ where
     fn status_code(&self) -> StatusCode { self.etype.status_code() }
 }
 
+pub struct MmErrorTrace {
+    trace: Vec<TraceLocation>,
+}
+
+impl MmErrorTrace {
+    pub fn new(trace: Vec<TraceLocation>) -> MmErrorTrace { MmErrorTrace { trace } }
+}
+
 impl<E: NotMmError> MmError<E> {
     #[track_caller]
     pub fn new(etype: E) -> MmError<E> {
@@ -200,9 +196,38 @@ impl<E: NotMmError> MmError<E> {
         }
     }
 
+    #[track_caller]
+    pub fn new_with_trace(etype: E, mut trace: MmErrorTrace) -> MmError<E> {
+        trace.trace.push(TraceLocation::from(Location::caller()));
+        MmError {
+            etype,
+            trace: trace.trace,
+        }
+    }
+
+    pub fn split(self) -> (E, MmErrorTrace) { (self.etype, MmErrorTrace::new(self.trace)) }
+
+    #[track_caller]
+    pub fn map<MapE, F>(mut self, f: F) -> MmError<MapE>
+    where
+        MapE: NotMmError,
+        F: FnOnce(E) -> MapE,
+    {
+        self.trace.push(TraceLocation::from(Location::caller()));
+        MmError {
+            etype: f(self.etype),
+            trace: self.trace,
+        }
+    }
+
     #[track_caller]
     pub fn err<T>(etype: E) -> Result<T, MmError<E>> { Err(MmError::new(etype)) }
 
+    #[track_caller]
+    pub fn err_with_trace<T>(etype: E, trace: MmErrorTrace) -> Result<T, MmError<E>> {
+        Err(MmError::new_with_trace(etype, trace))
+    }
+
     pub fn get_inner(&self) -> &E { &self.etype }
 
     pub fn into_inner(self) -> E { self.etype }
@@ -239,7 +264,7 @@ pub trait FormattedTrace {
 /// ```txt
 /// location_file:379]
 /// ```
-#[derive(Debug, Display, Eq, PartialEq)]
+#[derive(Clone, Debug, Display, Eq, PartialEq)]
 #[display(fmt = "{}:{}]", file, line)]
 pub struct TraceLocation {
     file: &'static str,
@@ -249,7 +274,7 @@ pub struct TraceLocation {
 impl From<&'static Location<'static>> for TraceLocation {
     fn from(location: &'static Location<'static>) -> Self {
         TraceLocation {
-            file: gstuff::filename(location.file()),
+            file: filename(location.file()),
             line: location.line(),
         }
     }
@@ -279,10 +304,11 @@ impl<T: FormattedTrace> FormattedTrace for Vec<T> {
 
 #[cfg(test)]
 mod tests {
-    use super::prelude::*;
     use super::*;
+    use crate::prelude::*;
     use futures01::Future;
-    use serde_json as json;
+    use ser_error_derive::SerializeErrorType;
+    use serde_json::{self as json, json};
 
     enum ErrorKind {
         NotSufficientBalance { actual: u64, required: u64 },
@@ -380,4 +406,57 @@ mod tests {
         assert_eq!(mm_err.etype, 8);
         assert_eq!(mm_err.trace, vec![TraceLocation::new("mm_error", into_mm_line)]);
     }
+
+    #[derive(Display)]
+    #[allow(dead_code)]
+    enum ForwardedErrorWithBox {
+        #[display(fmt = "Not sufficient balance. Top up your balance by {}", missing)]
+        NotSufficientBalance {
+            missing: u64,
+        },
+        Box(Box<dyn std::error::Error>),
+    }
+
+    impl From<ErrorKind> for ForwardedErrorWithBox {
+        fn from(kind: ErrorKind) -> Self {
+            match kind {
+                ErrorKind::NotSufficientBalance { actual, required } => ForwardedErrorWithBox::NotSufficientBalance {
+                    missing: required - actual,
+                },
+            }
+        }
+    }
+
+    #[test]
+    // Testing that error conversion works for error containing Box<dyn ...>
+    fn test_mm_error_with_box() {
+        const GENERATED_LINE: u32 = line!() + 2;
+        fn generate_error_for_box(actual: u64, required: u64) -> Result<(), MmError<ErrorKind>> {
+            Err(MmError::new(ErrorKind::NotSufficientBalance { actual, required }))
+        }
+
+        const FORWARDED_LINE: u32 = line!() + 2;
+        fn forward_error_for_box(actual: u64, required: u64) -> Result<(), MmError<ForwardedErrorWithBox>> {
+            let _ = generate_error_for_box(actual, required)?;
+            unreachable!("'generate_error' must return an error")
+        }
+
+        let actual = 1000;
+        let required = 1500;
+        let missing = required - actual;
+        let error = forward_error_for_box(actual, required).expect_err("'forward_error' must return an error");
+
+        let expected_display = format!(
+            "mm_error:{}] mm_error:{}] Not sufficient balance. Top up your balance by {}",
+            FORWARDED_LINE, GENERATED_LINE, missing
+        );
+        assert_eq!(error.to_string(), expected_display);
+
+        // the path is deduplicated
+        let expected_path = "mm_error";
+        assert_eq!(error.path(), expected_path);
+
+        let expected_stack_trace = format!("mm_error:{}] mm_error:{}]", FORWARDED_LINE, GENERATED_LINE);
+        assert_eq!(error.stack_trace(), expected_stack_trace);
+    }
 }
diff --git a/mm2src/mm2_err_handle/src/mm_json_error.rs b/mm2src/mm2_err_handle/src/mm_json_error.rs
new file mode 100644
index 0000000000..14423121d1
--- /dev/null
+++ b/mm2src/mm2_err_handle/src/mm_json_error.rs
@@ -0,0 +1,44 @@
+use crate::mm_error::{MmError, NotMmError};
+use common::SerializationError;
+use ser_error::SerializeErrorType;
+use serde::{Deserialize, Serialize};
+use serde_json::{self as json, Error as JsonError, Value as Json};
+use std::fmt;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct MmJsonError(Json);
+
+impl fmt::Display for MmJsonError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }
+}
+
+/// We are sure that `MmJsonError` is constructed from a type that implements `SerializeErrorTypeImpl`.
+/// See [`MmJsonError::new`].
+impl ser_error::__private::SerializeErrorTypeImpl for MmJsonError {}
+
+impl MmJsonError {
+    pub fn new<E: SerializeErrorType>(error: E) -> Result<MmJsonError, JsonError> {
+        json::to_value(error).map(MmJsonError)
+    }
+
+    pub fn new_or_serialization_error<E: SerializeErrorType>(error: E) -> MmJsonError {
+        match MmJsonError::new(error) {
+            Ok(mm_json_error) => mm_json_error,
+            Err(serialization_error) => MmJsonError::serialization_error(serialization_error),
+        }
+    }
+
+    pub fn from_mm_error<E: SerializeErrorType + NotMmError>(
+        error: MmError<E>,
+    ) -> Result<MmError<MmJsonError>, JsonError> {
+        let (etype, trace) = error.split();
+        let etype_json = MmJsonError::new(etype)?;
+        Ok(MmError::new_with_trace(etype_json, trace))
+    }
+
+    /// Generate `MmJsonError` from a serialization error.
+    pub fn serialization_error<E: serde::ser::Error>(e: E) -> MmJsonError {
+        MmJsonError::new(SerializationError::from_error(e))
+            .expect("serialization of 'SerializationError' is expected to be successful")
+    }
+}
diff --git a/mm2src/common/mm_error/or_mm_error.rs b/mm2src/mm2_err_handle/src/or_mm_error.rs
similarity index 94%
rename from mm2src/common/mm_error/or_mm_error.rs
rename to mm2src/mm2_err_handle/src/or_mm_error.rs
index d16f8142d7..da5710ba96 100644
--- a/mm2src/common/mm_error/or_mm_error.rs
+++ b/mm2src/mm2_err_handle/src/or_mm_error.rs
@@ -1,4 +1,4 @@
-use super::{MmError, NotMmError};
+use crate::mm_error::{MmError, NotMmError};
 
 pub trait OrMmError<T, E: NotMmError> {
     fn or_mm_err<F>(self, f: F) -> Result<T, MmError<E>>
diff --git a/mm2src/mm2_io/Cargo.toml b/mm2src/mm2_io/Cargo.toml
new file mode 100644
index 0000000000..767d39547c
--- /dev/null
+++ b/mm2src/mm2_io/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "mm2_io"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+common = { path = "../common" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+serde = "1"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+derive_more = "0.99"
+async-std = { version = "1.5", features = ["unstable"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+gstuff = { version = "0.7", features = ["nightly"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+gstuff = { version = "0.7", features = ["crossterm", "nightly"] }
diff --git a/mm2src/common/file_lock.rs b/mm2src/mm2_io/src/file_lock.rs
similarity index 67%
rename from mm2src/common/file_lock.rs
rename to mm2src/mm2_io/src/file_lock.rs
index 353774eeb0..d529d5987f 100644
--- a/mm2src/common/file_lock.rs
+++ b/mm2src/mm2_io/src/file_lock.rs
@@ -1,5 +1,19 @@
-use crate::{now_float, now_ms};
-use std::path::Path;
+use derive_more::Display;
+use gstuff::{now_float, now_ms};
+use mm2_err_handle::prelude::*;
+use std::path::{Path, PathBuf};
+
+pub type FileLockResult<T> = std::result::Result<T, MmError<FileLockError>>;
+
+#[derive(Debug, Display)]
+pub enum FileLockError {
+    #[display(fmt = "Error reading timestamp from {:?}: {}", path, error)]
+    ErrorReadingTimestamp { path: PathBuf, error: String },
+    #[display(fmt = "Error writing timestamp to {:?}: {}", path, error)]
+    ErrorWritingTimestamp { path: PathBuf, error: String },
+    #[display(fmt = "Error creating {:?}: {}", path, error)]
+    ErrorCreatingLockFile { path: PathBuf, error: String },
+}
 
 pub struct FileLock<T: AsRef<Path>> {
     /// Filesystem path of the lock file.
@@ -10,20 +24,26 @@ pub struct FileLock<T: AsRef<Path>> {
 }
 
 /// Records timestamp to a file contents.
-fn touch(path: &dyn AsRef<Path>, timestamp: u64) -> Result<(), String> {
-    std::fs::write(path.as_ref(), timestamp.to_string()).map_err(|e| ERRL!("{:?}", e))
+fn touch(path: &dyn AsRef<Path>, timestamp: u64) -> FileLockResult<()> {
+    std::fs::write(path.as_ref(), timestamp.to_string()).map_to_mm(|error| FileLockError::ErrorWritingTimestamp {
+        path: path.as_ref().to_path_buf(),
+        error: error.to_string(),
+    })
 }
 
 /// Attempts to read timestamp recorded to a file
-fn read_timestamp(path: &dyn AsRef<Path>) -> Result<Option<u64>, String> {
+fn read_timestamp(path: &dyn AsRef<Path>) -> FileLockResult<Option<u64>> {
     match std::fs::read_to_string(path) {
         Ok(content) => Ok(content.parse().ok()),
-        Err(e) => ERR!("{:?}", e),
+        Err(e) => MmError::err(FileLockError::ErrorReadingTimestamp {
+            path: path.as_ref().to_path_buf(),
+            error: e.to_string(),
+        }),
     }
 }
 
 impl<T: AsRef<Path>> FileLock<T> {
-    pub fn lock(lock_path: T, ttl_sec: f64) -> Result<Option<FileLock<T>>, String> {
+    pub fn lock(lock_path: T, ttl_sec: f64) -> FileLockResult<Option<FileLock<T>>> {
         match std::fs::OpenOptions::new()
             .write(true)
             .create_new(true)
@@ -31,34 +51,36 @@ impl<T: AsRef<Path>> FileLock<T> {
         {
             Ok(_) => {
                 let file_lock = FileLock { lock_path, ttl_sec };
-                try_s!(file_lock.touch());
+                file_lock.touch()?;
                 Ok(Some(file_lock))
             },
             Err(ref ie) if ie.kind() == std::io::ErrorKind::AlreadyExists => {
                 // See if the existing lock is old enough to be discarded.
-                match read_timestamp(&lock_path) {
-                    Ok(Some(lm)) => {
+                match read_timestamp(&lock_path)? {
+                    Some(lm) => {
                         if now_float() - lm as f64 > ttl_sec {
                             let file_lock = FileLock { lock_path, ttl_sec };
-                            try_s!(file_lock.touch());
+                            file_lock.touch()?;
                             Ok(Some(file_lock))
                         } else {
                             Ok(None)
                         }
                     },
-                    Ok(None) => {
+                    None => {
                         let file_lock = FileLock { lock_path, ttl_sec };
-                        try_s!(file_lock.touch());
+                        file_lock.touch()?;
                         Ok(Some(file_lock))
                     },
-                    Err(ie) => ERR!("Error checking {:?}: {}", lock_path.as_ref(), ie),
                 }
             },
-            Err(ie) => ERR!("Error creating {:?}: {}", lock_path.as_ref(), ie),
+            Err(ie) => MmError::err(FileLockError::ErrorCreatingLockFile {
+                path: lock_path.as_ref().to_path_buf(),
+                error: ie.to_string(),
+            }),
         }
     }
 
-    pub fn touch(&self) -> Result<(), String> { touch(&self.lock_path, now_ms() / 1000) }
+    pub fn touch(&self) -> FileLockResult<()> { touch(&self.lock_path, now_ms() / 1000) }
 }
 
 impl<T: AsRef<Path>> Drop for FileLock<T> {
diff --git a/mm2src/mm2_io/src/fs.rs b/mm2src/mm2_io/src/fs.rs
new file mode 100644
index 0000000000..76ff7e2864
--- /dev/null
+++ b/mm2src/mm2_io/src/fs.rs
@@ -0,0 +1,273 @@
+use async_std::fs as async_fs;
+use common::log::{error, LogOnError};
+use derive_more::Display;
+use futures::AsyncWriteExt;
+use gstuff::{try_s, ERR, ERRL};
+use mm2_err_handle::prelude::*;
+use rand::random;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+use serde_json::{self as json, Error as JsonError};
+use std::ffi::OsStr;
+use std::fs::{self, DirEntry};
+use std::io::{self, Read, Write};
+use std::path::{Path, PathBuf};
+use std::time::UNIX_EPOCH;
+
+pub type FsJsonResult<T> = Result<T, MmError<FsJsonError>>;
+pub type IoResult<T> = Result<T, MmError<io::Error>>;
+
+#[derive(Display)]
+pub enum FsJsonError {
+    IoReading(io::Error),
+    IoWriting(io::Error),
+    Serializing(JsonError),
+    Deserializing(JsonError),
+}
+
+pub fn check_dir_operations(dir_path: &Path) -> Result<(), io::Error> {
+    let r: [u8; 32] = random();
+    let mut check: Vec<u8> = Vec::with_capacity(r.len());
+    let fname = dir_path.join("checkval");
+    let mut fp = fs::File::create(&fname)?;
+    fp.write_all(&r)?;
+    drop(fp);
+    let mut fp = fs::File::open(&fname)?;
+    fp.read_to_end(&mut check)?;
+    if check.len() != r.len() {
+        return Err(io::Error::new(
+            std::io::ErrorKind::UnexpectedEof,
+            format!("Expected same data length when reading file: {:?}", fname),
+        ));
+    }
+    if check != r {
+        return Err(io::Error::new(
+            std::io::ErrorKind::InvalidData,
+            format!("Expected the same {:?} data: {:?} != {:?}", fname, r, check),
+        ));
+    }
+    Ok(())
+}
+
+/// Invokes `OS_ensure_directory`,
+/// then prints an error and returns `false` if the directory is not writable.
+pub fn ensure_dir_is_writable(dir_path: &Path) -> bool {
+    if dir_path.exists() && !dir_path.is_dir() {
+        error!("The {} is not a directory", dir_path.display());
+        return false;
+    } else if let Err(e) = std::fs::create_dir_all(dir_path) {
+        error!("Could not create dir {}, error {}", dir_path.display(), e);
+        return false;
+    }
+    check_dir_operations(dir_path).error_log_passthrough().is_ok()
+}
+
+pub fn ensure_file_is_writable(file_path: &Path) -> Result<(), String> {
+    if fs::File::open(file_path).is_err() {
+        // try to create file if opening fails
+        if let Err(e) = fs::OpenOptions::new().write(true).create_new(true).open(file_path) {
+            return ERR!("{} when trying to create the file {}", e, file_path.display());
+        }
+    } else {
+        // try to open file in write append mode
+        if let Err(e) = fs::OpenOptions::new().write(true).append(true).open(file_path) {
+            return ERR!(
+                "{} when trying to open the file {} in write mode",
+                e,
+                file_path.display()
+            );
+        }
+    }
+    Ok(())
+}
+
+pub fn slurp(path: &dyn AsRef<Path>) -> Result<Vec<u8>, String> { Ok(gstuff::slurp(path)) }
+
+pub fn safe_slurp(path: &dyn AsRef<Path>) -> Result<Vec<u8>, String> {
+    let mut file = match fs::File::open(path) {
+        Ok(f) => f,
+        Err(ref err) if err.kind() == io::ErrorKind::NotFound => return Ok(Vec::new()),
+        Err(err) => return ERR!("Can't open {:?}: {}", path.as_ref(), err),
+    };
+    let mut buf = Vec::new();
+    try_s!(file.read_to_end(&mut buf));
+    Ok(buf)
+}
+
+pub fn remove_file(path: &dyn AsRef<Path>) -> Result<(), String> {
+    try_s!(fs::remove_file(path));
+    Ok(())
+}
+
+pub async fn remove_file_async<P: AsRef<Path>>(path: P) -> IoResult<()> {
+    Ok(async_fs::remove_file(path.as_ref()).await?)
+}
+
+pub fn write(path: &dyn AsRef<Path>, contents: &dyn AsRef<[u8]>) -> Result<(), String> {
+    try_s!(fs::write(path, contents));
+    Ok(())
+}
+
+/// Read a folder asynchronously and return a list of files.
+pub async fn read_dir_async<P: AsRef<Path>>(dir: P) -> IoResult<Vec<PathBuf>> {
+    use futures::StreamExt;
+
+    let mut result = Vec::new();
+    let mut entries = async_fs::read_dir(dir.as_ref()).await?;
+
+    while let Some(entry) = entries.next().await {
+        let entry = match entry {
+            Ok(entry) => entry,
+            Err(e) => {
+                error!("Error '{}' reading from dir {}", e, dir.as_ref().display());
+                continue;
+            },
+        };
+        result.push(entry.path().into());
+    }
+    Ok(result)
+}
+
+/// Read a folder and return a list of files with their last-modified ms timestamps.
+pub fn read_dir(dir: &dyn AsRef<Path>) -> Result<Vec<(u64, PathBuf)>, String> {
+    let entries = try_s!(dir.as_ref().read_dir())
+        .filter_map(|dir_entry| {
+            let entry = match dir_entry {
+                Ok(ent) => ent,
+                Err(e) => {
+                    error!("Error '{}' reading from dir {}", e, dir.as_ref().display());
+                    return None;
+                },
+            };
+
+            let metadata = match entry.metadata() {
+                Ok(m) => m,
+                Err(e) => {
+                    error!("Error '{}' getting file {} meta", e, entry.path().display());
+                    return None;
+                },
+            };
+
+            let m_time = match metadata.modified() {
+                Ok(time) => time,
+                Err(e) => {
+                    error!("Error '{}' getting file {} m_time", e, entry.path().display());
+                    return None;
+                },
+            };
+
+            let lm = m_time.duration_since(UNIX_EPOCH).expect("!duration_since").as_millis();
+            assert!(lm < u64::MAX as u128);
+            let lm = lm as u64;
+
+            let path = entry.path();
+            if path.extension() == Some(OsStr::new("json")) {
+                Some((lm, path))
+            } else {
+                None
+            }
+        })
+        .collect();
+
+    Ok(entries)
+}
+
+pub async fn read_json<T>(path: &Path) -> FsJsonResult<Option<T>>
+where
+    T: DeserializeOwned,
+{
+    let content = match async_fs::read(path).await {
+        Ok(content) => content,
+        Err(e) if e.kind() == io::ErrorKind::NotFound => return Ok(None),
+        Err(e) => return MmError::err(FsJsonError::IoReading(e)),
+    };
+    json::from_slice(&content).map_to_mm(FsJsonError::Deserializing)
+}
+
+/// Read the `dir_path` entries trying to deserialize each as the `T` type.
+/// Please note that files that couldn't be deserialized are skipped.
+pub async fn read_dir_json<T>(dir_path: &Path) -> FsJsonResult<Vec<T>>
+where
+    T: DeserializeOwned,
+{
+    let json_ext = Some(OsStr::new("json"));
+    let entries: Vec<_> = read_dir_async(dir_path)
+        .await
+        .mm_err(FsJsonError::IoReading)?
+        .into_iter()
+        .filter(|path| path.extension() == json_ext)
+        .collect();
+    let type_name = std::any::type_name::<T>();
+
+    let mut result = Vec::new();
+    for file_path in entries {
+        match read_json(&file_path).await {
+            Ok(Some(t)) => result.push(t),
+            Ok(None) => {
+                error!(
+                    "Expected '{}' type at the file {}, found 'None'",
+                    type_name,
+                    file_path.display()
+                );
+                continue;
+            },
+            Err(e) => {
+                error!(
+                    "Error reading '{}' from the file {}: {}",
+                    type_name,
+                    file_path.display(),
+                    e
+                );
+                continue;
+            },
+        };
+    }
+    Ok(result)
+}
+
+pub async fn write_json<T>(t: &T, path: &Path, use_tmp_file: bool) -> FsJsonResult<()>
+where
+    T: Serialize,
+{
+    let content = json::to_vec(t).map_to_mm(FsJsonError::Serializing)?;
+
+    let path_tmp = if use_tmp_file {
+        PathBuf::from(format!("{}.tmp", path.display()))
+    } else {
+        path.to_path_buf()
+    };
+
+    let fs_fut = async {
+        let mut file = async_fs::File::create(&path_tmp).await?;
+        file.write_all(&content).await?;
+        file.flush().await?;
+
+        if use_tmp_file {
+            async_fs::rename(path_tmp, path).await?;
+        }
+        Ok(())
+    };
+
+    let res: io::Result<_> = fs_fut.await;
+    res.map_to_mm(FsJsonError::IoWriting)
+}
+
+pub fn json_dir_entries(path: &dyn AsRef<Path>) -> Result<Vec<DirEntry>, String> {
+    Ok(try_s!(path.as_ref().read_dir())
+        .filter_map(|dir_entry| {
+            let entry = match dir_entry {
+                Ok(ent) => ent,
+                Err(e) => {
+                    error!("Error '{}' reading from dir {}", e, path.as_ref().display());
+                    return None;
+                },
+            };
+
+            if entry.path().extension() == Some(OsStr::new("json")) {
+                Some(entry)
+            } else {
+                None
+            }
+        })
+        .collect())
+}
diff --git a/mm2src/mm2_io/src/lib.rs b/mm2src/mm2_io/src/lib.rs
new file mode 100644
index 0000000000..057bce861a
--- /dev/null
+++ b/mm2src/mm2_io/src/lib.rs
@@ -0,0 +1,2 @@
+#[cfg(not(target_arch = "wasm32"))] pub mod file_lock;
+#[cfg(not(target_arch = "wasm32"))] pub mod fs;
diff --git a/mm2src/mm2_libp2p/Cargo.toml b/mm2src/mm2_libp2p/Cargo.toml
index 5c17536436..77356fd1b2 100644
--- a/mm2src/mm2_libp2p/Cargo.toml
+++ b/mm2src/mm2_libp2p/Cargo.toml
@@ -8,22 +8,21 @@ edition = "2018"
 
 [dependencies]
 async-trait = "0.1"
-async-std = { version = "1.6.2", features = ["unstable"] }
 atomicdex-gossipsub = { path = "../gossipsub" }
+derive_more = "0.99"
 libp2p-floodsub = { path = "../floodsub" }
-env_logger = "0.7.1"
 futures = { version = "0.3.1", package = "futures", features = ["compat", "async-await"] }
+futures-rustls = { version = "0.21.1" }
 hex = "0.4.2"
 lazy_static = "1.4"
 secp256k1 = { version = "0.20", features = ["rand"] }
 log = "0.4.8"
-num-bigint = { version = "0.2", features = ["serde", "std"] }
-num-rational = { version = "0.2", features = ["serde", "bigint", "bigint-std"] }
 rand = { package = "rand", version = "0.7", features = ["std", "wasm-bindgen"] }
+regex = "1"
 rmp-serde = "0.14.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11.5"
-sha2 = "0.9.0"
+sha2 = "0.9"
 void = "1.0"
 wasm-timer = "0.2.4"
 
@@ -35,3 +34,8 @@ libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", default-features =
 getrandom = { version = "0.2", features = ["js"] } # see https://docs.rs/getrandom/0.2.0/getrandom/#webassembly-support
 libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", default-features = false, features = ["floodsub", "mplex", "noise", "ping", "request-response", "secp256k1", "wasm-ext", "wasm-ext-websocket"] }
 wasm-bindgen-futures = "0.4.21"
+
+[dev-dependencies]
+async-std = { version = "1.6.2", features = ["unstable"] }
+env_logger = "0.7.1"
+serde_json = "1.0"
diff --git a/mm2src/mm2_libp2p/src/adex_ping.rs b/mm2src/mm2_libp2p/src/adex_ping.rs
index afd546c34e..73ffb94d83 100644
--- a/mm2src/mm2_libp2p/src/adex_ping.rs
+++ b/mm2src/mm2_libp2p/src/adex_ping.rs
@@ -1,3 +1,4 @@
+use libp2p::swarm::NetworkBehaviour;
 use libp2p::{ping::{Ping, PingConfig, PingEvent},
              swarm::{CloseConnection, NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters},
              NetworkBehaviour};
@@ -12,12 +13,12 @@ use void::Void;
 /// Libp2p has unclear ConnectionHandlers keep alive logic so in some cases even if Ping handler emits Close event the
 /// connection is kept active which is undesirable.
 #[derive(NetworkBehaviour)]
-#[behaviour(out_event = "Void")]
+#[behaviour(out_event = "Void", event_process = true)]
 #[behaviour(poll_method = "poll_event")]
 pub struct AdexPing {
     ping: Ping,
     #[behaviour(ignore)]
-    events: VecDeque<NetworkBehaviourAction<Void, Void>>,
+    events: VecDeque<NetworkBehaviourAction<Void, <Self as NetworkBehaviour>::ConnectionHandler>>,
 }
 
 impl NetworkBehaviourEventProcess<PingEvent> for AdexPing {
@@ -45,7 +46,7 @@ impl AdexPing {
         &mut self,
         _cx: &mut Context,
         _params: &mut impl PollParameters,
-    ) -> Poll<NetworkBehaviourAction<Void, Void>> {
+    ) -> Poll<NetworkBehaviourAction<Void, <Self as NetworkBehaviour>::ConnectionHandler>> {
         if let Some(event) = self.events.pop_front() {
             return Poll::Ready(event);
         }
diff --git a/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs b/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
index 22a6c60a71..98385c5486 100644
--- a/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
+++ b/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
@@ -1,21 +1,25 @@
 use crate::{adex_ping::AdexPing,
+            network::{get_all_network_seednodes, NETID_7777},
             peers_exchange::{PeerAddresses, PeersExchange},
             request_response::{build_request_response_behaviour, PeerRequest, PeerResponse, RequestResponseBehaviour,
                                RequestResponseBehaviourEvent, RequestResponseSender},
-            runtime::{SwarmRuntimeOps, SWARM_RUNTIME}};
+            runtime::{SwarmRuntimeOps, SWARM_RUNTIME},
+            NetworkInfo, NetworkPorts, RelayAddress, RelayAddressError};
 use atomicdex_gossipsub::{Gossipsub, GossipsubConfigBuilder, GossipsubEvent, GossipsubMessage, MessageId, Topic,
                           TopicHash};
+use derive_more::Display;
 use futures::{channel::{mpsc::{channel, Receiver, Sender},
                         oneshot},
               future::{abortable, join_all, poll_fn, AbortHandle},
               Future, SinkExt, StreamExt};
-use libp2p::swarm::{IntoProtocolsHandler, NetworkBehaviour, ProtocolsHandler};
+use futures_rustls::rustls;
+use libp2p::core::transport::Boxed as BoxedTransport;
 use libp2p::{core::{ConnectedPoint, Multiaddr, Transport},
              identity,
              multiaddr::Protocol,
              noise,
              request_response::ResponseChannel,
-             swarm::{ExpandedSwarm, NetworkBehaviourEventProcess, Swarm},
+             swarm::{NetworkBehaviourEventProcess, Swarm},
              NetworkBehaviour, PeerId};
 use libp2p_floodsub::{Floodsub, FloodsubEvent, Topic as FloodsubTopic};
 use log::{debug, error, info};
@@ -25,7 +29,6 @@ use std::{collections::hash_map::{DefaultHasher, HashMap},
           hash::{Hash, Hasher},
           iter,
           net::IpAddr,
-          str::FromStr,
           task::{Context, Poll},
           time::Duration};
 use void::Void;
@@ -41,7 +44,6 @@ const CONNECTED_RELAYS_CHECK_INTERVAL: Duration = Duration::from_secs(30);
 const ANNOUNCE_INTERVAL: Duration = Duration::from_secs(600);
 const ANNOUNCE_INITIAL_DELAY: Duration = Duration::from_secs(60);
 const CHANNEL_BUF_SIZE: usize = 1024 * 8;
-const NETID_7777: u16 = 7777;
 
 /// Returns info about connected peers
 pub async fn get_peers_info(mut cmd_tx: AdexCmdTx) -> HashMap<String, Vec<String>> {
@@ -101,6 +103,11 @@ pub enum AdexBehaviourCmd {
         topics: Vec<String>,
         msg: Vec<u8>,
     },
+    PublishMsgFrom {
+        topics: Vec<String>,
+        msg: Vec<u8>,
+        from: PeerId,
+    },
     /// Request relays sequential until a response is received.
     RequestAnyRelay {
         req: Vec<u8>,
@@ -227,7 +234,9 @@ impl From<GossipsubEvent> for AdexBehaviourEvent {
 
 /// AtomicDEX libp2p Network behaviour implementation
 #[derive(NetworkBehaviour)]
+#[behaviour(event_process = true)]
 pub struct AtomicDexBehaviour {
+    floodsub: Floodsub,
     #[behaviour(ignore)]
     event_tx: Sender<AdexBehaviourEvent>,
     #[behaviour(ignore)]
@@ -236,7 +245,6 @@ pub struct AtomicDexBehaviour {
     cmd_rx: Receiver<AdexBehaviourCmd>,
     #[behaviour(ignore)]
     netid: u16,
-    floodsub: Floodsub,
     gossipsub: Gossipsub,
     request_response: RequestResponseBehaviour,
     peers_exchange: PeersExchange,
@@ -261,6 +269,10 @@ impl AtomicDexBehaviour {
             AdexBehaviourCmd::PublishMsg { topics, msg } => {
                 self.gossipsub.publish_many(topics.into_iter().map(Topic::new), msg);
             },
+            AdexBehaviourCmd::PublishMsgFrom { topics, msg, from } => {
+                self.gossipsub
+                    .publish_many_from(topics.into_iter().map(Topic::new), msg, from);
+            },
             AdexBehaviourCmd::RequestAnyRelay { req, response_tx } => {
                 let relays = self.gossipsub.get_relay_mesh();
                 // spawn the `request_any_peer` future
@@ -306,7 +318,7 @@ impl AtomicDexBehaviour {
                         let connected_points = connected_points
                             .into_iter()
                             .map(|(_conn_id, point)| match point {
-                                ConnectedPoint::Dialer { address } => address.to_string(),
+                                ConnectedPoint::Dialer { address, .. } => address.to_string(),
                                 ConnectedPoint::Listener { send_back_addr, .. } => send_back_addr.to_string(),
                             })
                             .collect();
@@ -453,13 +465,7 @@ impl NetworkBehaviourEventProcess<RequestResponseBehaviourEvent> for AtomicDexBe
 }
 
 /// Custom types mapping the complex associated types of AtomicDexBehaviour to the ExpandedSwarm
-type AdexSwarmHandler = <<AtomicDexBehaviour as NetworkBehaviour>::ProtocolsHandler as IntoProtocolsHandler>::Handler;
-type AtomicDexSwarm = ExpandedSwarm<
-    AtomicDexBehaviour,
-    <AdexSwarmHandler as ProtocolsHandler>::InEvent,
-    <AdexSwarmHandler as ProtocolsHandler>::OutEvent,
-    <AtomicDexBehaviour as NetworkBehaviour>::ProtocolsHandler,
->;
+type AtomicDexSwarm = Swarm<AtomicDexBehaviour>;
 
 fn maintain_connection_to_relays(swarm: &mut AtomicDexSwarm, bootstrap_addresses: &[Multiaddr]) {
     let behaviour = swarm.behaviour();
@@ -486,7 +492,7 @@ fn maintain_connection_to_relays(swarm: &mut AtomicDexSwarm, bootstrap_addresses
                 .collect::<Vec<_>>()
                 .choose_multiple(&mut rng, connect_bootstrap_num)
             {
-                if let Err(e) = libp2p::Swarm::dial_addr(swarm, (*addr).clone()) {
+                if let Err(e) = libp2p::Swarm::dial(swarm, (*addr).clone()) {
                     error!("Bootstrap addr {} dial error {}", addr, e);
                 }
             }
@@ -496,7 +502,7 @@ fn maintain_connection_to_relays(swarm: &mut AtomicDexSwarm, bootstrap_addresses
                 if swarm.behaviour().gossipsub.is_connected_to_addr(&addr) {
                     continue;
                 }
-                if let Err(e) = libp2p::Swarm::dial_addr(swarm, addr.clone()) {
+                if let Err(e) = libp2p::Swarm::dial(swarm, addr.clone()) {
                     error!("Peer {} address {} dial error {}", peer, addr, e);
                 }
             }
@@ -545,68 +551,52 @@ fn announce_my_addresses(swarm: &mut AtomicDexSwarm) {
     }
 }
 
-const ALL_NETID_7777_SEEDNODES: &[(&str, &str)] = &[
-    (
-        "12D3KooWEsuiKcQaBaKEzuMtT6uFjs89P1E8MK3wGRZbeuCbCw6P",
-        "168.119.236.241",
-    ),
-    (
-        "12D3KooWKxavLCJVrQ5Gk1kd9m6cohctGQBmiKPS9XQFoXEoyGmS",
-        "168.119.236.249",
-    ),
-    (
-        "12D3KooWAToxtunEBWCoAHjefSv74Nsmxranw8juy3eKEdrQyGRF",
-        "168.119.236.240",
-    ),
-    (
-        "12D3KooWSmEi8ypaVzFA1AGde2RjxNW5Pvxw3qa2fVe48PjNs63R",
-        "168.119.236.239",
-    ),
-    (
-        "12D3KooWHKkHiNhZtKceQehHhPqwU5W1jXpoVBgS1qst899GjvTm",
-        "168.119.236.251",
-    ),
-    ("12D3KooWMrjLmrv8hNgAoVf1RfumfjyPStzd4nv5XL47zN4ZKisb", "168.119.237.8"),
-    (
-        "12D3KooWL6yrrNACb7t7RPyTEPxKmq8jtrcbkcNd6H5G2hK7bXaL",
-        "168.119.236.233",
-    ),
-    (
-        "12D3KooWHBeCnJdzNk51G4mLnao9cDsjuqiMTEo5wMFXrd25bd1F",
-        "168.119.236.243",
-    ),
-    (
-        "12D3KooW9soGyPfX6kcyh3uVXNHq1y2dPmQNt2veKgdLXkBiCVKq",
-        "168.119.236.246",
-    ),
-    ("12D3KooWPR2RoPi19vQtLugjCdvVmCcGLP2iXAzbDfP3tp81ZL4d", "168.119.237.13"),
-    ("12D3KooWKu8pMTgteWacwFjN7zRWWHb3bctyTvHU3xx5x4x6qDYY", "195.201.91.96"),
-    ("12D3KooWJWBnkVsVNjiqUEPjLyHpiSmQVAJ5t6qt1Txv5ctJi9Xd", "195.201.91.53"),
-    (
-        "12D3KooWGrUpCAbkxhPRioNs64sbUmPmpEcou6hYfrqQvxfWDEuf",
-        "168.119.174.126",
-    ),
-    ("12D3KooWEaZpH61H4yuQkaNG5AsyGdpBhKRppaLdAY52a774ab5u", "46.4.78.11"),
-    ("12D3KooWAd5gPXwX7eDvKWwkr2FZGfoJceKDCA53SHmTFFVkrN7Q", "46.4.87.18"),
-];
+#[derive(Debug, Display)]
+pub enum AdexBehaviourError {
+    #[display(fmt = "{}", _0)]
+    ParsingRelayAddress(RelayAddressError),
+}
+
+impl From<RelayAddressError> for AdexBehaviourError {
+    fn from(e: RelayAddressError) -> Self { AdexBehaviourError::ParsingRelayAddress(e) }
+}
+
+pub struct WssCerts {
+    pub server_priv_key: rustls::PrivateKey,
+    pub certs: Vec<rustls::Certificate>,
+}
 
 pub enum NodeType {
     Light {
-        network_port: u16,
+        network_ports: NetworkPorts,
     },
+    LightInMemory,
     Relay {
         ip: IpAddr,
-        network_port: u16,
-        network_ws_port: u16,
+        network_ports: NetworkPorts,
+        wss_certs: Option<WssCerts>,
+    },
+    RelayInMemory {
+        port: u64,
     },
 }
 
 impl NodeType {
-    pub fn is_relay(&self) -> bool { matches!(self, NodeType::Relay { .. }) }
+    pub fn to_network_info(&self) -> NetworkInfo {
+        match self {
+            NodeType::Light { network_ports } | NodeType::Relay { network_ports, .. } => NetworkInfo::Distributed {
+                network_ports: *network_ports,
+            },
+            NodeType::LightInMemory | NodeType::RelayInMemory { .. } => NetworkInfo::InMemory,
+        }
+    }
 
-    pub fn network_port(&self) -> u16 {
+    pub fn is_relay(&self) -> bool { matches!(self, NodeType::Relay { .. } | NodeType::RelayInMemory { .. }) }
+
+    pub fn wss_certs(&self) -> Option<&WssCerts> {
         match self {
-            NodeType::Light { network_port } | NodeType::Relay { network_port, .. } => *network_port,
+            NodeType::Relay { wss_certs, .. } => wss_certs.as_ref(),
+            _ => None,
         }
     }
 }
@@ -620,15 +610,14 @@ pub async fn spawn_gossipsub(
     netid: u16,
     force_key: Option<[u8; 32]>,
     spawn_fn: fn(Box<dyn Future<Output = ()> + Send + Unpin + 'static>) -> (),
-    to_dial: Vec<String>,
+    to_dial: Vec<RelayAddress>,
     node_type: NodeType,
     on_poll: impl Fn(&AtomicDexSwarm) + Send + 'static,
-) -> (Sender<AdexBehaviourCmd>, AdexEventRx, PeerId, AbortHandle) {
+) -> Result<(Sender<AdexBehaviourCmd>, AdexEventRx, PeerId, AbortHandle), AdexBehaviourError> {
     let (result_tx, result_rx) = futures::channel::oneshot::channel();
     let fut = async move {
-        let (cmd_tx, event_rx, peer_id, p2p_abort) =
-            start_gossipsub(netid, force_key, spawn_fn, to_dial, node_type, on_poll);
-        result_tx.send((cmd_tx, event_rx, peer_id, p2p_abort)).unwrap();
+        let result = start_gossipsub(netid, force_key, spawn_fn, to_dial, node_type, on_poll);
+        result_tx.send(result).unwrap();
     };
 
     // `Libp2p` must be spawned on the tokio runtime
@@ -650,53 +639,33 @@ fn start_gossipsub(
     netid: u16,
     force_key: Option<[u8; 32]>,
     spawn_fn: fn(Box<dyn Future<Output = ()> + Send + Unpin + 'static>) -> (),
-    to_dial: Vec<String>,
+    to_dial: Vec<RelayAddress>,
     node_type: NodeType,
     on_poll: impl Fn(&AtomicDexSwarm) + Send + 'static,
-) -> (Sender<AdexBehaviourCmd>, AdexEventRx, PeerId, AbortHandle) {
+) -> Result<(Sender<AdexBehaviourCmd>, AdexEventRx, PeerId, AbortHandle), AdexBehaviourError> {
     let i_am_relay = node_type.is_relay();
     let mut rng = rand::thread_rng();
     let local_key = generate_ed25519_keypair(&mut rng, force_key);
     let local_peer_id = PeerId::from(local_key.public());
     info!("Local peer id: {:?}", local_peer_id);
-    let network_port = node_type.network_port();
-
-    #[cfg(target_arch = "wasm32")]
-    let transport = {
-        let websocket = libp2p::wasm_ext::ffi::websocket_transport();
-        libp2p::wasm_ext::ExtTransport::new(websocket)
-    };
-
-    #[cfg(not(target_arch = "wasm32"))]
-    let transport = {
-        let tcp = libp2p::tcp::TokioTcpConfig::new().nodelay(true);
-        let dns_tcp =
-            libp2p::dns::TokioDnsConfig::custom(tcp, libp2p::dns::ResolverConfig::google(), Default::default())
-                .unwrap();
-        let ws_dns_tcp = libp2p::websocket::WsConfig::new(dns_tcp.clone());
-        dns_tcp.or_transport(ws_dns_tcp)
-    };
 
     let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
         .into_authentic(&local_key)
         .expect("Signing libp2p-noise static DH keypair failed.");
 
-    // Set up an encrypted Transport over the Mplex protocol
-    let transport = transport
-        .upgrade(libp2p::core::upgrade::Version::V1)
-        .authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-        .multiplex(libp2p::mplex::MplexConfig::default())
-        .timeout(std::time::Duration::from_secs(20))
-        .map(|(peer, muxer), _| (peer, libp2p::core::muxing::StreamMuxerBox::new(muxer)))
-        .boxed();
+    let network_info = node_type.to_network_info();
+    let transport = match network_info {
+        NetworkInfo::InMemory => build_memory_transport(noise_keys),
+        NetworkInfo::Distributed { .. } => build_dns_ws_transport(noise_keys, node_type.wss_certs()),
+    };
 
     let (cmd_tx, cmd_rx) = channel(CHANNEL_BUF_SIZE);
     let (event_tx, event_rx) = channel(CHANNEL_BUF_SIZE);
 
-    let bootstrap: Vec<Multiaddr> = to_dial
+    let bootstrap = to_dial
         .into_iter()
-        .map(|addr| parse_relay_address(addr, network_port))
-        .collect();
+        .map(|addr| addr.try_to_multiaddr(network_info))
+        .collect::<Result<Vec<Multiaddr>, _>>()?;
 
     let (mesh_n_low, mesh_n, mesh_n_high) = if i_am_relay { (4, 6, 12) } else { (2, 3, 4) };
 
@@ -728,11 +697,12 @@ fn start_gossipsub(
 
         let floodsub = Floodsub::new(local_peer_id, netid != NETID_7777);
 
-        let mut peers_exchange = PeersExchange::new(network_port);
-        if netid == NETID_7777 {
-            for (peer_id, address) in ALL_NETID_7777_SEEDNODES {
-                let peer_id = PeerId::from_str(peer_id).expect("valid peer id");
-                let multiaddr = parse_relay_address((*address).to_owned(), network_port);
+        let mut peers_exchange = PeersExchange::new(network_info);
+        if !network_info.in_memory() {
+            // Please note WASM nodes don't support `PeersExchange` currently,
+            // so `get_all_network_seednodes` returns an empty list.
+            for (peer_id, addr) in get_all_network_seednodes(netid) {
+                let multiaddr = addr.try_to_multiaddr(network_info)?;
                 peers_exchange.add_peer_addresses_to_known_peers(&peer_id, iter::once(multiaddr).collect());
                 gossipsub.add_explicit_relay(peer_id);
             }
@@ -745,11 +715,11 @@ fn start_gossipsub(
         let ping = AdexPing::new();
 
         let adex_behavior = AtomicDexBehaviour {
+            floodsub,
             event_tx,
             spawn_fn,
             cmd_rx,
             netid,
-            floodsub,
             gossipsub,
             request_response,
             peers_exchange,
@@ -764,20 +734,28 @@ fn start_gossipsub(
         .floodsub
         .subscribe(FloodsubTopic::new(PEERS_TOPIC.to_owned()));
 
-    if let NodeType::Relay {
-        ip,
-        network_port,
-        network_ws_port,
-    } = node_type
-    {
-        let dns_addr: Multiaddr = format!("/ip4/{}/tcp/{}", ip, network_port).parse().unwrap();
-        let ws_addr: Multiaddr = format!("/ip4/{}/tcp/{}/ws", ip, network_ws_port).parse().unwrap();
-        libp2p::Swarm::listen_on(&mut swarm, dns_addr).unwrap();
-        libp2p::Swarm::listen_on(&mut swarm, ws_addr).unwrap();
+    match node_type {
+        NodeType::Relay {
+            ip,
+            network_ports,
+            wss_certs,
+        } => {
+            let dns_addr: Multiaddr = format!("/ip4/{}/tcp/{}", ip, network_ports.tcp).parse().unwrap();
+            libp2p::Swarm::listen_on(&mut swarm, dns_addr).unwrap();
+            if wss_certs.is_some() {
+                let wss_addr: Multiaddr = format!("/ip4/{}/tcp/{}/wss", ip, network_ports.wss).parse().unwrap();
+                libp2p::Swarm::listen_on(&mut swarm, wss_addr).unwrap();
+            }
+        },
+        NodeType::RelayInMemory { port } => {
+            let memory_addr: Multiaddr = format!("/memory/{}", port).parse().unwrap();
+            libp2p::Swarm::listen_on(&mut swarm, memory_addr).unwrap();
+        },
+        _ => (),
     }
 
     for relay in bootstrap.choose_multiple(&mut rng, mesh_n) {
-        match libp2p::Swarm::dial_addr(&mut swarm, relay.clone()) {
+        match libp2p::Swarm::dial(&mut swarm, relay.clone()) {
             Ok(_) => info!("Dialed {}", relay),
             Err(e) => error!("Dial {:?} failed: {:?}", relay, e),
         }
@@ -829,7 +807,72 @@ fn start_gossipsub(
     let (polling_fut, abort_handle) = abortable(polling_fut);
     SWARM_RUNTIME.spawn(polling_fut);
 
-    (cmd_tx, event_rx, local_peer_id, abort_handle)
+    Ok((cmd_tx, event_rx, local_peer_id, abort_handle))
+}
+
+#[cfg(target_arch = "wasm32")]
+fn build_dns_ws_transport(
+    noise_keys: libp2p::noise::AuthenticKeypair<libp2p::noise::X25519Spec>,
+    _wss_certs: Option<&WssCerts>,
+) -> BoxedTransport<(PeerId, libp2p::core::muxing::StreamMuxerBox)> {
+    let websocket = libp2p::wasm_ext::ffi::websocket_transport();
+    let transport = libp2p::wasm_ext::ExtTransport::new(websocket);
+    upgrade_transport(transport, noise_keys)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn build_dns_ws_transport(
+    noise_keys: libp2p::noise::AuthenticKeypair<libp2p::noise::X25519Spec>,
+    wss_certs: Option<&WssCerts>,
+) -> BoxedTransport<(PeerId, libp2p::core::muxing::StreamMuxerBox)> {
+    use libp2p::websocket::tls as libp2p_tls;
+
+    let tcp = libp2p::tcp::TokioTcpConfig::new().nodelay(true);
+    let dns_tcp =
+        libp2p::dns::TokioDnsConfig::custom(tcp, libp2p::dns::ResolverConfig::google(), Default::default()).unwrap();
+    let mut ws_dns_tcp = libp2p::websocket::WsConfig::new(dns_tcp.clone());
+
+    if let Some(certs) = wss_certs {
+        let server_priv_key = libp2p_tls::PrivateKey::new(certs.server_priv_key.0.clone());
+        let certs = certs
+            .certs
+            .iter()
+            .map(|cert| libp2p_tls::Certificate::new(cert.0.clone()));
+        let wss_config = libp2p_tls::Config::new(server_priv_key, certs).unwrap();
+        ws_dns_tcp.set_tls_config(wss_config);
+    }
+
+    let transport = dns_tcp.or_transport(ws_dns_tcp);
+    upgrade_transport(transport, noise_keys)
+}
+
+fn build_memory_transport(
+    noise_keys: libp2p::noise::AuthenticKeypair<libp2p::noise::X25519Spec>,
+) -> BoxedTransport<(PeerId, libp2p::core::muxing::StreamMuxerBox)> {
+    let transport = libp2p::core::transport::MemoryTransport::default();
+    upgrade_transport(transport, noise_keys)
+}
+
+/// Set up an encrypted Transport over the Mplex protocol.
+fn upgrade_transport<T>(
+    transport: T,
+    noise_keys: libp2p::noise::AuthenticKeypair<libp2p::noise::X25519Spec>,
+) -> BoxedTransport<(PeerId, libp2p::core::muxing::StreamMuxerBox)>
+where
+    T: Transport + Send + Sync + 'static,
+    T::Output: futures::AsyncRead + futures::AsyncWrite + Unpin + Send + 'static,
+    T::ListenerUpgrade: Send,
+    T::Listener: Send,
+    T::Dial: Send,
+    T::Error: Send + Sync + 'static,
+{
+    transport
+        .upgrade(libp2p::core::upgrade::Version::V1)
+        .authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
+        .multiplex(libp2p::mplex::MplexConfig::default())
+        .timeout(std::time::Duration::from_secs(20))
+        .map(|(peer, muxer), _| (peer, libp2p::core::muxing::StreamMuxerBox::new(muxer)))
+        .boxed()
 }
 
 fn generate_ed25519_keypair<R: Rng>(rng: &mut R, force_key: Option<[u8; 32]>) -> identity::Keypair {
@@ -846,36 +889,6 @@ fn generate_ed25519_keypair<R: Rng>(rng: &mut R, force_key: Option<[u8; 32]>) ->
     identity::Keypair::Ed25519(keypair)
 }
 
-/// `addr` is expected to be either `/dns/<DOMAIN>/tcp/<PORT>` or `/ipv4/<IP_ADDR>/tcp/<PORT>` or an IPv4 address.
-#[cfg(target_arch = "wasm32")]
-pub fn parse_relay_address(addr: String, port: u16) -> Multiaddr {
-    let dns = addr.starts_with("/dns") && addr.contains("/tcp/") && addr.ends_with("/ws");
-    let ip4 = addr.starts_with("/ip4/") && addr.contains("/tcp/") && addr.ends_with("/ws");
-    if dns || ip4 {
-        return Multiaddr::from_str(&addr).unwrap();
-    }
-    // check if the address is IPv4
-    std::net::Ipv4Addr::from_str(&addr).unwrap();
-    Multiaddr::from_str(&format!("/ip4/{}/tcp/{}/ws", addr, port)).unwrap()
-}
-
-/// If the `addr` is in the "/ip4/{addr}/tcp/{port}" format then parse the `addr` immediately to the `Multiaddr`,
-/// else construct the "/ip4/{addr}/tcp/{port}" from the `addr` and `port` values.
-#[cfg(all(test, not(target_arch = "wasm32")))]
-pub fn parse_relay_address(addr: String, port: u16) -> Multiaddr {
-    if addr.starts_with("/ip4/") && addr.contains("/tcp/") {
-        return addr.parse().unwrap();
-    }
-
-    format!("/ip4/{}/tcp/{}", addr, port).parse().unwrap()
-}
-
-/// The `addr` is expected to be an IP of the relay.
-#[cfg(all(not(test), not(target_arch = "wasm32")))]
-pub fn parse_relay_address(ipv4_addr: String, port: u16) -> Multiaddr {
-    format!("/ip4/{}/tcp/{}", ipv4_addr, port).parse().unwrap()
-}
-
 /// Request the peers sequential until a `PeerResponse::Ok()` will not be received.
 async fn request_any_peer(
     peers: Vec<PeerId>,
diff --git a/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs b/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs
index 0f8b1f594d..05346dc974 100644
--- a/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs
+++ b/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs
@@ -1,15 +1,15 @@
-use super::{spawn_gossipsub, AdexBehaviourCmd, AdexBehaviourEvent, AdexResponse, NodeType};
+use super::{spawn_gossipsub, AdexBehaviourCmd, AdexBehaviourEvent, AdexResponse, NodeType, RelayAddress};
 use async_std::task::spawn;
 use futures::channel::{mpsc, oneshot};
 use futures::{Future, SinkExt, StreamExt};
 use libp2p::PeerId;
-use std::sync::atomic::{AtomicBool, AtomicU16, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-static TEST_LISTEN_PORT: AtomicU16 = AtomicU16::new(57780);
+static TEST_LISTEN_PORT: AtomicU64 = AtomicU64::new(1);
 
-fn next_port() -> u16 { TEST_LISTEN_PORT.fetch_add(100, Ordering::Relaxed) }
+fn next_port() -> u64 { TEST_LISTEN_PORT.fetch_add(1, Ordering::Relaxed) }
 
 fn spawn_boxed(fut: Box<dyn Future<Output = ()> + Send + Unpin + 'static>) { spawn(fut); }
 
@@ -19,19 +19,15 @@ struct Node {
 }
 
 impl Node {
-    async fn spawn<F>(ip: String, network_port: u16, seednodes: Vec<String>, on_event: F) -> Node
+    async fn spawn<F>(port: u64, seednodes: Vec<u64>, on_event: F) -> Node
     where
         F: Fn(mpsc::Sender<AdexBehaviourCmd>, AdexBehaviourEvent) + Send + 'static,
     {
-        let my_address = ip.parse().unwrap();
-
-        let node_type = NodeType::Relay {
-            ip: my_address,
-            network_port,
-            network_ws_port: network_port + 10,
-        };
-        let (cmd_tx, mut event_rx, peer_id, _) =
-            spawn_gossipsub(333, None, spawn_boxed, seednodes, node_type, |_| {}).await;
+        let node_type = NodeType::RelayInMemory { port };
+        let seednodes = seednodes.into_iter().map(RelayAddress::Memory).collect();
+        let (cmd_tx, mut event_rx, peer_id, _) = spawn_gossipsub(333, None, spawn_boxed, seednodes, node_type, |_| {})
+            .await
+            .expect("Error spawning AdexBehaviour");
 
         // spawn a response future
         let cmd_tx_fut = cmd_tx.clone();
@@ -86,7 +82,7 @@ async fn test_request_response_ok() {
     let request_received_cpy = request_received.clone();
 
     let node1_port = next_port();
-    let node1 = Node::spawn("127.0.0.1".into(), node1_port, vec![], move |mut cmd_tx, event| {
+    let node1 = Node::spawn(node1_port, vec![], move |mut cmd_tx, event| {
         let (request, response_channel) = match event {
             AdexBehaviourEvent::PeerRequest {
                 request,
@@ -108,13 +104,7 @@ async fn test_request_response_ok() {
     })
     .await;
 
-    let mut node2 = Node::spawn(
-        "127.0.0.1".into(),
-        next_port(),
-        vec![format!("/ip4/127.0.0.1/tcp/{}", node1_port)],
-        |_, _| (),
-    )
-    .await;
+    let mut node2 = Node::spawn(next_port(), vec![node1_port], |_, _| ()).await;
 
     node2.wait_peers(1).await;
 
@@ -197,7 +187,7 @@ async fn test_request_response_ok_three_peers() {
     for _ in 0..3 {
         let handler = request_handler.clone();
         let receiver_port = next_port();
-        let receiver = Node::spawn("127.0.0.1".into(), receiver_port, vec![], move |cmd_tx, event| {
+        let receiver = Node::spawn(receiver_port, vec![], move |cmd_tx, event| {
             let mut handler = handler.lock().unwrap();
             handler.handle(cmd_tx, event)
         })
@@ -206,12 +196,8 @@ async fn test_request_response_ok_three_peers() {
     }
 
     let mut sender = Node::spawn(
-        "127.0.0.1".into(),
         next_port(),
-        receivers
-            .iter()
-            .map(|(port, _)| format!("/ip4/127.0.0.1/tcp/{}", port))
-            .collect(),
+        receivers.iter().map(|(port, _)| *port).collect(),
         |_, _| (),
     )
     .await;
@@ -238,7 +224,7 @@ async fn test_request_response_none() {
     let request_received_cpy = request_received.clone();
 
     let node1_port = next_port();
-    let _node1 = Node::spawn("127.0.0.1".into(), node1_port, vec![], move |mut cmd_tx, event| {
+    let _node1 = Node::spawn(node1_port, vec![], move |mut cmd_tx, event| {
         let (request, response_channel) = match event {
             AdexBehaviourEvent::PeerRequest {
                 request,
@@ -258,13 +244,7 @@ async fn test_request_response_none() {
     })
     .await;
 
-    let mut node2 = Node::spawn(
-        "127.0.0.1".into(),
-        next_port(),
-        vec![format!("/ip4/127.0.0.1/tcp/{}", node1_port)],
-        |_, _| (),
-    )
-    .await;
+    let mut node2 = Node::spawn(next_port(), vec![node1_port], |_, _| ()).await;
 
     node2.wait_peers(1).await;
 
@@ -285,7 +265,7 @@ async fn test_request_peers_ok_three_peers() {
     let _ = env_logger::try_init();
 
     let receiver1_port = next_port();
-    let receiver1 = Node::spawn("127.0.0.1".into(), receiver1_port, vec![], move |mut cmd_tx, event| {
+    let receiver1 = Node::spawn(receiver1_port, vec![], move |mut cmd_tx, event| {
         let (request, response_channel) = match event {
             AdexBehaviourEvent::PeerRequest {
                 request,
@@ -305,7 +285,7 @@ async fn test_request_peers_ok_three_peers() {
     .await;
 
     let receiver2_port = next_port();
-    let receiver2 = Node::spawn("127.0.0.1".into(), receiver2_port, vec![], move |mut cmd_tx, event| {
+    let receiver2 = Node::spawn(receiver2_port, vec![], move |mut cmd_tx, event| {
         let (request, response_channel) = match event {
             AdexBehaviourEvent::PeerRequest {
                 request,
@@ -327,7 +307,7 @@ async fn test_request_peers_ok_three_peers() {
     .await;
 
     let receiver3_port = next_port();
-    let receiver3 = Node::spawn("127.0.0.1".into(), receiver3_port, vec![], move |mut cmd_tx, event| {
+    let receiver3 = Node::spawn(receiver3_port, vec![], move |mut cmd_tx, event| {
         let (request, response_channel) = match event {
             AdexBehaviourEvent::PeerRequest {
                 request,
@@ -348,13 +328,8 @@ async fn test_request_peers_ok_three_peers() {
     })
     .await;
     let mut sender = Node::spawn(
-        "127.0.0.1".into(),
         next_port(),
-        vec![
-            format!("/ip4/127.0.0.1/tcp/{}", receiver1_port),
-            format!("/ip4/127.0.0.1/tcp/{}", receiver2_port),
-            format!("/ip4/127.0.0.1/tcp/{}", receiver3_port),
-        ],
+        vec![receiver1_port, receiver2_port, receiver3_port],
         |_, _| (),
     )
     .await;
diff --git a/mm2src/mm2_libp2p/src/lib.rs b/mm2src/mm2_libp2p/src/lib.rs
index 674ddde210..403c2909cd 100644
--- a/mm2src/mm2_libp2p/src/lib.rs
+++ b/mm2src/mm2_libp2p/src/lib.rs
@@ -1,27 +1,53 @@
 #![feature(ip)]
 
+#[macro_use] extern crate lazy_static;
+
 mod adex_ping;
 pub mod atomicdex_behaviour;
+mod network;
 pub mod peers_exchange;
+pub mod relay_address;
 pub mod request_response;
 mod runtime;
 
 use lazy_static::lazy_static;
 use secp256k1::{Message as SecpMessage, PublicKey as Secp256k1Pubkey, Secp256k1, SecretKey, SignOnly, Signature,
                 VerifyOnly};
-use serde::{de, ser::Serializer, Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 
-pub use atomicdex_behaviour::{spawn_gossipsub, NodeType};
+pub use atomicdex_behaviour::{spawn_gossipsub, AdexBehaviourError, NodeType, WssCerts};
 pub use atomicdex_gossipsub::{GossipsubEvent, GossipsubMessage, MessageId};
-pub use libp2p::PeerId;
+pub use libp2p::identity::error::DecodingError;
+pub use libp2p::identity::secp256k1::PublicKey as Libp2pSecpPublic;
+pub use libp2p::identity::PublicKey as Libp2pPublic;
+pub use libp2p::{Multiaddr, PeerId};
 pub use peers_exchange::PeerAddresses;
+pub use relay_address::{RelayAddress, RelayAddressError};
+use serde::{de, Deserialize, Serialize, Serializer};
 
 lazy_static! {
     static ref SECP_VERIFY: Secp256k1<VerifyOnly> = Secp256k1::verification_only();
     static ref SECP_SIGN: Secp256k1<SignOnly> = Secp256k1::signing_only();
 }
 
+#[derive(Clone, Copy)]
+pub enum NetworkInfo {
+    /// The in-memory network.
+    InMemory,
+    /// The distributed network (out of the app memory).
+    Distributed { network_ports: NetworkPorts },
+}
+
+impl NetworkInfo {
+    pub fn in_memory(&self) -> bool { matches!(self, NetworkInfo::InMemory) }
+}
+
+#[derive(Clone, Copy)]
+pub struct NetworkPorts {
+    pub tcp: u16,
+    pub wss: u16,
+}
+
 pub fn encode_message<T: Serialize>(message: &T) -> Result<Vec<u8>, rmp_serde::encode::Error> {
     rmp_serde::to_vec(message)
 }
diff --git a/mm2src/mm2_libp2p/src/network.rs b/mm2src/mm2_libp2p/src/network.rs
new file mode 100644
index 0000000000..dc8dd2292c
--- /dev/null
+++ b/mm2src/mm2_libp2p/src/network.rs
@@ -0,0 +1,70 @@
+use crate::RelayAddress;
+use libp2p::PeerId;
+
+pub const NETID_7777: u16 = 7777;
+
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+const ALL_NETID_7777_SEEDNODES: &[(&str, &str)] = &[
+    (
+        "12D3KooWEsuiKcQaBaKEzuMtT6uFjs89P1E8MK3wGRZbeuCbCw6P",
+        "168.119.236.241",
+    ),
+    (
+        "12D3KooWKxavLCJVrQ5Gk1kd9m6cohctGQBmiKPS9XQFoXEoyGmS",
+        "168.119.236.249",
+    ),
+    (
+        "12D3KooWAToxtunEBWCoAHjefSv74Nsmxranw8juy3eKEdrQyGRF",
+        "168.119.236.240",
+    ),
+    (
+        "12D3KooWSmEi8ypaVzFA1AGde2RjxNW5Pvxw3qa2fVe48PjNs63R",
+        "168.119.236.239",
+    ),
+    (
+        "12D3KooWHKkHiNhZtKceQehHhPqwU5W1jXpoVBgS1qst899GjvTm",
+        "168.119.236.251",
+    ),
+    ("12D3KooWMrjLmrv8hNgAoVf1RfumfjyPStzd4nv5XL47zN4ZKisb", "168.119.237.8"),
+    (
+        "12D3KooWL6yrrNACb7t7RPyTEPxKmq8jtrcbkcNd6H5G2hK7bXaL",
+        "168.119.236.233",
+    ),
+    (
+        "12D3KooWHBeCnJdzNk51G4mLnao9cDsjuqiMTEo5wMFXrd25bd1F",
+        "168.119.236.243",
+    ),
+    (
+        "12D3KooW9soGyPfX6kcyh3uVXNHq1y2dPmQNt2veKgdLXkBiCVKq",
+        "168.119.236.246",
+    ),
+    ("12D3KooWPR2RoPi19vQtLugjCdvVmCcGLP2iXAzbDfP3tp81ZL4d", "168.119.237.13"),
+    ("12D3KooWKu8pMTgteWacwFjN7zRWWHb3bctyTvHU3xx5x4x6qDYY", "195.201.91.96"),
+    ("12D3KooWJWBnkVsVNjiqUEPjLyHpiSmQVAJ5t6qt1Txv5ctJi9Xd", "195.201.91.53"),
+    (
+        "12D3KooWGrUpCAbkxhPRioNs64sbUmPmpEcou6hYfrqQvxfWDEuf",
+        "168.119.174.126",
+    ),
+    ("12D3KooWEaZpH61H4yuQkaNG5AsyGdpBhKRppaLdAY52a774ab5u", "46.4.78.11"),
+    ("12D3KooWAd5gPXwX7eDvKWwkr2FZGfoJceKDCA53SHmTFFVkrN7Q", "46.4.87.18"),
+];
+
+#[cfg(target_arch = "wasm32")]
+pub fn get_all_network_seednodes(_netid: u16) -> Vec<(PeerId, RelayAddress)> { Vec::new() }
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn get_all_network_seednodes(netid: u16) -> Vec<(PeerId, RelayAddress)> {
+    use std::str::FromStr;
+
+    if netid != NETID_7777 {
+        return Vec::new();
+    }
+    ALL_NETID_7777_SEEDNODES
+        .iter()
+        .map(|(peer_id, ipv4)| {
+            let peer_id = PeerId::from_str(*peer_id).expect("valid peer id");
+            let address = RelayAddress::IPv4(ipv4.to_string());
+            (peer_id, address)
+        })
+        .collect()
+}
diff --git a/mm2src/mm2_libp2p/src/peers_exchange.rs b/mm2src/mm2_libp2p/src/peers_exchange.rs
index 82ee0fd176..8bc43af8d4 100644
--- a/mm2src/mm2_libp2p/src/peers_exchange.rs
+++ b/mm2src/mm2_libp2p/src/peers_exchange.rs
@@ -1,9 +1,10 @@
 use crate::request_response::Codec;
+use crate::NetworkInfo;
 use futures::StreamExt;
 use libp2p::swarm::NetworkBehaviour;
 use libp2p::{multiaddr::{Multiaddr, Protocol},
-             request_response::{handler::RequestProtocol, ProtocolName, ProtocolSupport, RequestResponse,
-                                RequestResponseConfig, RequestResponseEvent, RequestResponseMessage},
+             request_response::{ProtocolName, ProtocolSupport, RequestResponse, RequestResponseConfig,
+                                RequestResponseEvent, RequestResponseMessage},
              swarm::{NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters},
              NetworkBehaviour, PeerId};
 use log::{error, info, warn};
@@ -71,7 +72,7 @@ pub enum PeersExchangeResponse {
 
 /// Behaviour that requests known peers list from other peers at random
 #[derive(NetworkBehaviour)]
-#[behaviour(poll_method = "poll")]
+#[behaviour(poll_method = "poll", event_process = true)]
 pub struct PeersExchange {
     request_response: RequestResponse<PeersExchangeCodec>,
     #[behaviour(ignore)]
@@ -79,16 +80,16 @@ pub struct PeersExchange {
     #[behaviour(ignore)]
     reserved_peers: Vec<PeerId>,
     #[behaviour(ignore)]
-    events: VecDeque<NetworkBehaviourAction<RequestProtocol<PeersExchangeCodec>, ()>>,
+    events: VecDeque<NetworkBehaviourAction<(), <Self as NetworkBehaviour>::ConnectionHandler>>,
     #[behaviour(ignore)]
     maintain_peers_interval: Interval,
     #[behaviour(ignore)]
-    netid_port: u16,
+    network_info: NetworkInfo,
 }
 
 #[allow(clippy::new_without_default)]
 impl PeersExchange {
-    pub fn new(netid_port: u16) -> Self {
+    pub fn new(network_info: NetworkInfo) -> Self {
         let codec = Codec::default();
         let protocol = iter::once((PeersExchangeProtocol::Version1, ProtocolSupport::Full));
         let config = RequestResponseConfig::default();
@@ -102,7 +103,7 @@ impl PeersExchange {
                 Instant::now() + Duration::from_secs(REQUEST_PEERS_INITIAL_DELAY),
                 Duration::from_secs(REQUEST_PEERS_INTERVAL),
             ),
-            netid_port,
+            network_info,
         }
     }
 
@@ -131,7 +132,7 @@ impl PeersExchange {
 
     fn forget_peer_addresses(&mut self, peer: &PeerId) {
         for address in self.request_response.addresses_of_peer(peer) {
-            if !self.is_reserved_peer(&peer) {
+            if !self.is_reserved_peer(peer) {
                 self.request_response.remove_address(peer, &address);
             }
         }
@@ -140,6 +141,7 @@ impl PeersExchange {
     pub fn add_peer_addresses_to_known_peers(&mut self, peer: &PeerId, addresses: PeerAddresses) {
         for address in addresses.iter() {
             if !self.validate_global_multiaddr(address) {
+                warn!("Attempt adding a not valid address of the peer '{}': {}", peer, address);
                 return;
             }
         }
@@ -161,14 +163,14 @@ impl PeersExchange {
             }
         }
 
-        if !self.reserved_peers.contains(&peer) && !addresses.is_empty() {
+        if !self.reserved_peers.contains(peer) && !addresses.is_empty() {
             self.reserved_peers.push(*peer);
         }
 
         let already_reserved = self.request_response.addresses_of_peer(peer);
         for address in addresses {
             if !already_reserved.contains(&address) {
-                self.request_response.add_address(&peer, address);
+                self.request_response.add_address(peer, address);
             }
         }
     }
@@ -221,6 +223,11 @@ impl PeersExchange {
     }
 
     fn validate_global_multiaddr(&self, address: &Multiaddr) -> bool {
+        let network_ports = match self.network_info {
+            NetworkInfo::Distributed { network_ports } => network_ports,
+            NetworkInfo::InMemory => panic!("PeersExchange must not be used with in-memory network"),
+        };
+
         let mut components = address.iter();
         match components.next() {
             Some(Protocol::Ip4(addr)) => {
@@ -233,7 +240,8 @@ impl PeersExchange {
 
         match components.next() {
             Some(Protocol::Tcp(port)) => {
-                if port != self.netid_port {
+                // currently, `NetworkPorts::ws` is not supported by `PeersExchange`
+                if port != network_ports.tcp {
                     return false;
                 }
             },
@@ -259,6 +267,7 @@ impl PeersExchange {
 
             for address in addresses {
                 if !self.validate_global_multiaddr(address) {
+                    warn!("Received a not valid address: {}", address);
                     return false;
                 }
             }
@@ -270,7 +279,7 @@ impl PeersExchange {
         &mut self,
         cx: &mut Context,
         _params: &mut impl PollParameters,
-    ) -> Poll<NetworkBehaviourAction<RequestProtocol<PeersExchangeCodec>, ()>> {
+    ) -> Poll<NetworkBehaviourAction<(), <Self as NetworkBehaviour>::ConnectionHandler>> {
         while let Poll::Ready(Some(())) = self.maintain_peers_interval.poll_next_unpin(cx) {
             self.maintain_known_peers();
         }
@@ -339,8 +348,8 @@ impl NetworkBehaviourEventProcess<RequestResponseEvent<PeersExchangeRequest, Pee
 
 #[cfg(test)]
 mod tests {
-    use crate::peers_exchange::{PeerIdSerde, PeersExchange};
-    use crate::PeerId;
+    use super::{NetworkInfo, PeerIdSerde, PeersExchange};
+    use crate::{NetworkPorts, PeerId};
     use libp2p::core::Multiaddr;
     use std::collections::{HashMap, HashSet};
     use std::iter::FromIterator;
@@ -355,7 +364,10 @@ mod tests {
 
     #[test]
     fn test_validate_get_known_peers_response() {
-        let behaviour = PeersExchange::new(3000);
+        let network_info = NetworkInfo::Distributed {
+            network_ports: NetworkPorts { tcp: 3000, wss: 3010 },
+        };
+        let behaviour = PeersExchange::new(network_info);
         let response = HashMap::default();
         assert!(!behaviour.validate_get_known_peers_response(&response));
 
@@ -400,7 +412,7 @@ mod tests {
 
     #[test]
     fn test_get_random_known_peers() {
-        let mut behaviour = PeersExchange::new(3000);
+        let mut behaviour = PeersExchange::new(NetworkInfo::InMemory);
         let peer_id = PeerId::random();
         behaviour.add_known_peer(peer_id);
 
diff --git a/mm2src/mm2_libp2p/src/relay_address.rs b/mm2src/mm2_libp2p/src/relay_address.rs
new file mode 100644
index 0000000000..c1e6b6225a
--- /dev/null
+++ b/mm2src/mm2_libp2p/src/relay_address.rs
@@ -0,0 +1,186 @@
+use crate::{NetworkInfo, NetworkPorts};
+use derive_more::Display;
+use libp2p::Multiaddr;
+use serde::{de, Deserialize, Deserializer, Serialize};
+use std::str::FromStr;
+
+#[derive(Clone, Debug, Display, Serialize)]
+pub enum RelayAddressError {
+    #[display(
+        fmt = "Error parsing 'RelayAddress' from {}: address has unknown protocol, expected either IPv4 or DNS or Memory address",
+        found
+    )]
+    FromStrError { found: String },
+    #[display(
+        fmt = "Error converting '{:?}' to Multiaddr: unexpected IPv4/DNS address on a memory network",
+        self_str
+    )]
+    DistributedAddrOnMemoryNetwork { self_str: String },
+    #[display(
+        fmt = "Error converting '{:?}' to Multiaddr: unexpected memory address on a distributed network",
+        self_str
+    )]
+    MemoryAddrOnDistributedNetwork { self_str: String },
+}
+
+impl std::error::Error for RelayAddressError {}
+
+impl RelayAddressError {
+    fn distributed_addr_on_memory_network(addr: &RelayAddress) -> RelayAddressError {
+        RelayAddressError::DistributedAddrOnMemoryNetwork {
+            self_str: format!("{:?}", addr),
+        }
+    }
+
+    fn memory_addr_on_distributed_network(addr: &RelayAddress) -> RelayAddressError {
+        RelayAddressError::MemoryAddrOnDistributedNetwork {
+            self_str: format!("{:?}", addr),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum RelayAddress {
+    IPv4(String),
+    Dns(String),
+    Memory(u64),
+}
+
+impl FromStr for RelayAddress {
+    type Err = RelayAddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        // check if the string is IPv4
+        if std::net::Ipv4Addr::from_str(s).is_ok() {
+            return Ok(RelayAddress::IPv4(s.to_string()));
+        }
+        // check if the string is a domain name
+        if validate_domain_name(s) {
+            return Ok(RelayAddress::Dns(s.to_owned()));
+        }
+        // check if the string is a `/memory/<PORT>` address
+        if let Some(port_str) = s.strip_prefix("/memory/") {
+            if let Ok(port) = port_str.parse() {
+                return Ok(RelayAddress::Memory(port));
+            }
+        }
+        Err(RelayAddressError::FromStrError { found: s.to_owned() })
+    }
+}
+
+impl<'de> Deserialize<'de> for RelayAddress {
+    fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let addr_str = String::deserialize(deserializer)?;
+        RelayAddress::from_str(&addr_str).map_err(de::Error::custom)
+    }
+}
+
+impl RelayAddress {
+    /// Try to convert `RelayAddress` to `Multiaddr` using the given `network_info`.
+    pub fn try_to_multiaddr(&self, network_info: NetworkInfo) -> Result<Multiaddr, RelayAddressError> {
+        let network_ports = match network_info {
+            NetworkInfo::InMemory => match self {
+                RelayAddress::Memory(port) => return Ok(memory_multiaddr(*port)),
+                _ => return Err(RelayAddressError::distributed_addr_on_memory_network(self)),
+            },
+            NetworkInfo::Distributed { network_ports } => network_ports,
+        };
+
+        match self {
+            RelayAddress::IPv4(ipv4) => Ok(ipv4_multiaddr(ipv4, network_ports)),
+            RelayAddress::Dns(dns) => Ok(dns_multiaddr(dns, network_ports)),
+            RelayAddress::Memory(_) => Err(RelayAddressError::memory_addr_on_distributed_network(self)),
+        }
+    }
+}
+
+/// Use [this](https://regex101.com/r/94nCB5/1) regular expression to validate the domain name.
+/// See examples at the linked resource above.
+fn validate_domain_name(s: &str) -> bool {
+    use regex::Regex;
+
+    lazy_static! {
+        static ref DNS_REGEX: Regex = Regex::new(r#"^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$"#).unwrap();
+    }
+
+    DNS_REGEX.is_match(s)
+}
+
+fn memory_multiaddr(port: u64) -> Multiaddr { format!("/memory/{}", port).parse().unwrap() }
+
+#[cfg(target_arch = "wasm32")]
+fn ipv4_multiaddr(ipv4_addr: &str, ports: NetworkPorts) -> Multiaddr {
+    format!("/ip4/{}/tcp/{}/wss", ipv4_addr, ports.wss).parse().unwrap()
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn ipv4_multiaddr(ipv4_addr: &str, ports: NetworkPorts) -> Multiaddr {
+    format!("/ip4/{}/tcp/{}", ipv4_addr, ports.tcp).parse().unwrap()
+}
+
+#[cfg(target_arch = "wasm32")]
+fn dns_multiaddr(dns_addr: &str, ports: NetworkPorts) -> Multiaddr {
+    format!("/dns/{}/tcp/{}/wss", dns_addr, ports.wss).parse().unwrap()
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn dns_multiaddr(dns_addr: &str, ports: NetworkPorts) -> Multiaddr {
+    format!("/dns/{}/tcp/{}", dns_addr, ports.tcp).parse().unwrap()
+}
+
+#[test]
+fn test_relay_address_from_str() {
+    let valid_addresses = vec![
+        ("127.0.0.1", RelayAddress::IPv4("127.0.0.1".to_owned())),
+        ("255.255.255.255", RelayAddress::IPv4("255.255.255.255".to_owned())),
+        ("google.com", RelayAddress::Dns("google.com".to_owned())),
+        ("www.google.com", RelayAddress::Dns("www.google.com".to_owned())),
+        ("g.co", RelayAddress::Dns("g.co".to_owned())),
+        (
+            "stackoverflow.co.uk",
+            RelayAddress::Dns("stackoverflow.co.uk".to_owned()),
+        ),
+        ("1.2.3.4.com", RelayAddress::Dns("1.2.3.4.com".to_owned())),
+        ("/memory/123", RelayAddress::Memory(123)),
+        ("/memory/71428421981", RelayAddress::Memory(71428421981)),
+    ];
+    for (s, expected) in valid_addresses {
+        let actual = RelayAddress::from_str(s).expect(&format!("Error parsing '{}'", s));
+        assert_eq!(actual, expected);
+    }
+
+    let invalid_addresses = vec![
+        "127.0.0",
+        "127.0.0.0.2",
+        "google.c",
+        "http://google.com",
+        "https://google.com/",
+        "google.com/",
+        "/memory/",
+        "/memory/9999999999999999999999999999999",
+    ];
+    for s in invalid_addresses {
+        let _ = RelayAddress::from_str(s).expect_err("Expected an error");
+    }
+}
+
+#[test]
+fn test_deserialize_relay_address() {
+    #[derive(Deserialize, PartialEq)]
+    struct Config {
+        addresses: Vec<RelayAddress>,
+    }
+
+    let Config { addresses: actual } =
+        serde_json::from_str(r#"{"addresses": ["foo.bar.com", "127.0.0.2", "/memory/12345"]}"#)
+            .expect("Error deserializing a list of RelayAddress");
+    let expected = vec![
+        RelayAddress::Dns("foo.bar.com".to_owned()),
+        RelayAddress::IPv4("127.0.0.2".to_owned()),
+        RelayAddress::Memory(12345),
+    ];
+    assert_eq!(actual, expected);
+}
diff --git a/mm2src/mm2_libp2p/src/request_response.rs b/mm2src/mm2_libp2p/src/request_response.rs
index 18e40aa9bd..25b87e46de 100644
--- a/mm2src/mm2_libp2p/src/request_response.rs
+++ b/mm2src/mm2_libp2p/src/request_response.rs
@@ -6,10 +6,9 @@ use futures::io::{AsyncRead, AsyncWrite};
 use futures::task::{Context, Poll};
 use futures::StreamExt;
 use libp2p::core::upgrade::{read_length_prefixed, write_length_prefixed};
-use libp2p::request_response::handler::RequestProtocol;
 use libp2p::request_response::{ProtocolName, ProtocolSupport, RequestId, RequestResponse, RequestResponseCodec,
                                RequestResponseConfig, RequestResponseEvent, RequestResponseMessage, ResponseChannel};
-use libp2p::swarm::{NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters};
+use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, NetworkBehaviourEventProcess, PollParameters};
 use libp2p::NetworkBehaviour;
 use libp2p::PeerId;
 use log::{debug, error, warn};
@@ -24,7 +23,6 @@ const MAX_BUFFER_SIZE: usize = 1024 * 1024 - 100;
 
 pub type RequestResponseReceiver = mpsc::UnboundedReceiver<(PeerId, PeerRequest, oneshot::Sender<PeerResponse>)>;
 pub type RequestResponseSender = mpsc::UnboundedSender<(PeerId, PeerRequest, oneshot::Sender<PeerResponse>)>;
-type ReqResCodec = Codec<Protocol, PeerRequest, PeerResponse>;
 
 /// Build a request-response network behaviour.
 pub fn build_request_response_behaviour() -> RequestResponseBehaviour {
@@ -39,13 +37,13 @@ pub fn build_request_response_behaviour() -> RequestResponseBehaviour {
     let timeout_interval = Interval::new(Duration::from_secs(1));
 
     RequestResponseBehaviour {
+        inner,
         rx,
         tx,
         pending_requests,
         events,
         timeout,
         timeout_interval,
-        inner,
     }
 }
 
@@ -63,9 +61,11 @@ struct PendingRequest {
 }
 
 #[derive(NetworkBehaviour)]
-#[behaviour(out_event = "RequestResponseBehaviourEvent")]
+#[behaviour(out_event = "RequestResponseBehaviourEvent", event_process = true)]
 #[behaviour(poll_method = "poll_event")]
 pub struct RequestResponseBehaviour {
+    /// The inner RequestResponse network behaviour.
+    inner: RequestResponse<Codec<Protocol, PeerRequest, PeerResponse>>,
     #[behaviour(ignore)]
     rx: RequestResponseReceiver,
     #[behaviour(ignore)]
@@ -81,8 +81,6 @@ pub struct RequestResponseBehaviour {
     /// Interval for request timeout check
     #[behaviour(ignore)]
     timeout_interval: Interval,
-    /// The inner RequestResponse network behaviour.
-    inner: RequestResponse<Codec<Protocol, PeerRequest, PeerResponse>>,
 }
 
 impl RequestResponseBehaviour {
@@ -111,7 +109,8 @@ impl RequestResponseBehaviour {
         &mut self,
         cx: &mut Context,
         _params: &mut impl PollParameters,
-    ) -> Poll<NetworkBehaviourAction<RequestProtocol<ReqResCodec>, RequestResponseBehaviourEvent>> {
+    ) -> Poll<NetworkBehaviourAction<RequestResponseBehaviourEvent, <Self as NetworkBehaviour>::ConnectionHandler>>
+    {
         // poll the `rx`
         match self.rx.poll_next_unpin(cx) {
             // received a request, forward it through the network and put to the `pending_requests`
diff --git a/mm2src/mm2_main/Cargo.toml b/mm2src/mm2_main/Cargo.toml
new file mode 100644
index 0000000000..95d1842d6b
--- /dev/null
+++ b/mm2src/mm2_main/Cargo.toml
@@ -0,0 +1,140 @@
+# Support for split-debuginfo [should eventually](https://github.com/rust-lang/rust/issues/34651) land,
+# hopefully giving us an out-of-the-box way to separate the code from the debugging information.
+# We should use the "objcopy --only-keep-debug" and "add-symbol-file" meanwhile
+# and separating stack tracing into raw trace and symbolication parts.
+
+[package]
+name = "mm2_main"
+version = "0.1.0"
+edition = "2018"
+default-run = "mm2"
+
+# wasm-opt reduces the size from 17 Mb to 14. But it runs for few minutes, which is not good for CI.
+# For production builds, it's recommended to run wasm-opt separately.
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = false
+
+[features]
+# Deprecated
+native = []
+track-ctx-pointer = ["common/track-ctx-pointer"]
+custom-swap-locktime = [] # only for testing purposes, should never be activated on release builds.
+zhtlc-native-tests = ["coins/zhtlc-native-tests"]
+
+[[bin]]
+name = "mm2"
+path = "src/mm2_bin.rs"
+test = false
+doctest = false
+bench = false
+
+[[bin]]
+name = "docker_tests"
+path = "src/docker_tests.rs"
+
+[lib]
+name = "mm2"
+path = "src/mm2_lib.rs"
+crate-type = ["cdylib", "staticlib"]
+test = false
+doctest = false
+bench = false
+
+[dependencies]
+async-std = { version = "1.5", features = ["unstable"] }
+async-trait = "0.1"
+bitcrypto = { path = "../mm2_bitcoin/crypto" }
+blake2 = "0.10"
+bytes = "0.4"
+chain = { path = "../mm2_bitcoin/chain" }
+cfg-if = "1.0"
+coins = { path = "../coins" }
+coins_activation = { path = "../coins_activation" }
+common = { path = "../common" }
+crc32fast = { version = "1.3.2", features = ["std", "nightly"] }
+crossbeam = "0.7"
+crypto = { path = "../crypto" }
+db_common = { path = "../db_common" }
+derive_more = "0.99"
+either = "1.6"
+ethereum-types = { version = "0.4", default-features = false, features = ["std", "serialize"] }
+enum-primitive-derive = "0.2"
+futures01 = { version = "0.1", package = "futures" }
+futures-cpupool = "0.1"
+futures = { version = "0.3.1", package = "futures", features = ["compat", "async-await"] }
+gstuff = { version = "0.7", features = ["nightly"] }
+hash256-std-hasher = "0.15.2"
+hash-db = "0.15.2"
+hex = "0.4.2"
+http = "0.2"
+hw_common = { path = "../hw_common" }
+itertools = "0.10"
+keys = { path = "../mm2_bitcoin/keys" }
+lazy_static = "1.4"
+# ledger = { path = "../ledger" }
+libc = "0.2"
+metrics = "0.12"
+mm2_core = { path = "../mm2_core" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_io = { path = "../mm2_io" }
+mm2-libp2p = { path = "../mm2_libp2p" }
+mm2_net = { path = "../mm2_net" }
+mm2_number = { path = "../mm2_number" }
+mm2_rpc = { path = "../mm2_rpc" }
+num-traits = "0.2"
+parity-util-mem = "0.11"
+parking_lot = { version = "0.12.0", features = ["nightly"] }
+primitives = { path = "../mm2_bitcoin/primitives" }
+rand = { version = "0.7", features = ["std", "small_rng"] }
+rand6 = { version = "0.6", package = "rand" }
+# TODO: Reduce the size of regex by disabling the features we don't use.
+# cf. https://github.com/rust-lang/regex/issues/583
+regex = "1"
+rmp-serde = "0.14.3"
+rpc = { path = "../mm2_bitcoin/rpc" }
+rpc_task = { path = "../rpc_task" }
+script = { path = "../mm2_bitcoin/script" }
+secp256k1 = { version = "0.20", features = ["rand"] }
+serde = "1.0"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_derive = "1.0"
+ser_error = { path = "../derives/ser_error" }
+ser_error_derive = { path = "../derives/ser_error_derive" }
+serialization = { path = "../mm2_bitcoin/serialization" }
+serialization_derive = { path = "../mm2_bitcoin/serialization_derive" }
+spv_validation = { path = "../mm2_bitcoin/spv_validation" }
+sp-runtime-interface = { version = "6.0.0", default-features = false, features = ["disable_target_static_assertions"] }
+sp-trie = { version = "6.0", default-features = false }
+trie-db = { version = "0.23.1", default-features = false }
+trie-root = "0.16.0"
+uuid = { version = "0.7", features = ["serde", "v4"] }
+wasm-timer = "0.2.4"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+instant = { version = "0.1.12", features = ["wasm-bindgen"] }
+js-sys = { version = "0.3.27" }
+mm2_db = { path = "../mm2_db" }
+mm2_test_helpers = { path = "../mm2_test_helpers" }
+wasm-bindgen = { version = "=0.2.78", features = ["nightly"] }
+wasm-bindgen-futures = { version = "0.4.1" }
+wasm-bindgen-test = { version = "0.3.1" }
+web-sys = { version = "0.3.55", features = ["console"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+dirs = { version = "1" }
+futures-rustls = { version = "0.21.1" }
+hyper = { version = "0.14.11", features = ["client", "http2", "server", "tcp"] }
+tokio = { version = "1.7", features = ["io-util", "rt-multi-thread", "net"] }
+
+[target.'cfg(windows)'.dependencies]
+winapi = "0.3"
+
+[dev-dependencies]
+mm2_test_helpers = { path = "../mm2_test_helpers" }
+mocktopus = "0.7.0"
+testcontainers = { git = "https://github.com/artemii235/testcontainers-rs.git" }
+
+[build-dependencies]
+chrono = "0.4"
+gstuff = { version = "0.7", features = ["nightly"] }
+regex = "1"
diff --git a/mm2src/README.md b/mm2src/mm2_main/README.md
similarity index 100%
rename from mm2src/README.md
rename to mm2src/mm2_main/README.md
diff --git a/build.rs b/mm2src/mm2_main/build.rs
similarity index 88%
rename from build.rs
rename to mm2src/mm2_main/build.rs
index 38d74532ca..3c071ecb58 100644
--- a/build.rs
+++ b/mm2src/mm2_main/build.rs
@@ -13,7 +13,7 @@ fn path2s(path: PathBuf) -> String {
         .into()
 }
 
-/// SuperNET's root.
+/// AtomicDEX's root.
 fn root() -> PathBuf {
     let super_net = Path::new(env!("CARGO_MANIFEST_DIR"));
     let super_net = match super_net.canonicalize() {
@@ -63,7 +63,7 @@ fn mm_version() -> String {
         }
     }
 
-    let mm_version_p = root().join("MM_VERSION");
+    let mm_version_p = root().join("../../MM_VERSION");
     let v_file = String::from_utf8(slurp(&mm_version_p)).unwrap();
     let v_file = v_file.trim().to_string();
     // if there is no MM_VERSION file there is no need to create it
@@ -92,7 +92,7 @@ fn mm_version() -> String {
         }
     }
 
-    let mm_datetime_p = root().join("MM_DATETIME");
+    let mm_datetime_p = root().join("../../MM_DATETIME");
     let dt_file = String::from_utf8(slurp(&mm_datetime_p)).unwrap();
     let mut dt_file = dt_file.trim().to_string();
     if let Some(ref dt_git) = dt_git {
@@ -110,7 +110,12 @@ fn mm_version() -> String {
 }
 
 fn main() {
-    // This allows build script to run even if no source code files change as rerun-if-changed checks for a file that doesn't exist
-    println!("cargo:rerun-if-changed=NON_EXISTING_FILE");
+    println!("cargo:rerun-if-env-changed=MANUAL_MM_VERSION");
+    println!("cargo:rerun-if-changed=MM_VERSION");
+    println!("cargo:rerun-if-changed=MM_DATETIME");
+    if std::env::var("MANUAL_MM_VERSION").is_err() {
+        // This allows build script to run even if no source code files change as rerun-if-changed checks for a file that doesn't exist
+        println!("cargo:rerun-if-changed=NON_EXISTING_FILE");
+    }
     mm_version();
 }
diff --git a/mm2src/database.rs b/mm2src/mm2_main/src/database.rs
similarity index 53%
rename from mm2src/database.rs
rename to mm2src/mm2_main/src/database.rs
index 4269058395..fcb6704b67 100644
--- a/mm2src/database.rs
+++ b/mm2src/mm2_main/src/database.rs
@@ -1,52 +1,57 @@
 /// The module responsible to work with SQLite database
 ///
-#[path = "database/database_common.rs"]
-pub mod database_common;
-#[path = "database/my_orders.rs"] pub mod my_orders;
+#[path = "database/my_orders.rs"]
+pub mod my_orders;
 #[path = "database/my_swaps.rs"] pub mod my_swaps;
 #[path = "database/stats_nodes.rs"] pub mod stats_nodes;
 #[path = "database/stats_swaps.rs"] pub mod stats_swaps;
 
 use crate::CREATE_MY_SWAPS_TABLE;
-use common::{log::{debug, error, info},
-             mm_ctx::MmArc,
-             rusqlite::{Connection, Result as SqlResult, NO_PARAMS}};
+use common::log::{debug, error, info};
+use db_common::sqlite::run_optimization_pragmas;
+use db_common::sqlite::rusqlite::{Result as SqlResult, NO_PARAMS};
+use mm2_core::mm_ctx::MmArc;
 
 use my_swaps::fill_my_swaps_from_json_statements;
 use stats_swaps::create_and_fill_stats_swaps_from_json_statements;
 
 const SELECT_MIGRATION: &str = "SELECT * FROM migration ORDER BY current_migration DESC LIMIT 1;";
 
-fn get_current_migration(conn: &Connection) -> SqlResult<i64> {
+fn get_current_migration(ctx: &MmArc) -> SqlResult<i64> {
+    let conn = ctx.sqlite_connection();
     conn.query_row(SELECT_MIGRATION, NO_PARAMS, |row| row.get(0))
 }
 
-pub fn init_and_migrate_db(ctx: &MmArc, conn: &Connection) -> SqlResult<()> {
+pub async fn init_and_migrate_db(ctx: &MmArc) -> SqlResult<()> {
     info!("Checking the current SQLite migration");
-    match get_current_migration(conn) {
+    match get_current_migration(ctx) {
         Ok(current_migration) => {
             if current_migration >= 1 {
                 info!(
                     "Current migration is {}, skipping the init, trying to migrate",
                     current_migration
                 );
-                migrate_sqlite_database(ctx, conn, current_migration)?;
+                migrate_sqlite_database(ctx, current_migration).await?;
                 return Ok(());
             }
         },
         Err(e) => {
-            debug!("Error {} on getting current migration. The database is either empty or corrupted, trying to clean it first", e);
-            if let Err(e) = conn.execute_batch(
-                "DROP TABLE migration;
-                    DROP TABLE my_swaps;",
-            ) {
-                error!("Error {} on SQLite database cleanup", e);
-            }
+            debug!("Error '{}' on getting current migration. The database is either empty or corrupted, trying to clean it first", e);
+            clean_db(ctx);
         },
     };
 
     info!("Trying to initialize the SQLite database");
 
+    init_db(ctx)?;
+    migrate_sqlite_database(ctx, 1).await?;
+    info!("SQLite database initialization is successful");
+    Ok(())
+}
+
+fn init_db(ctx: &MmArc) -> SqlResult<()> {
+    let conn = ctx.sqlite_connection();
+    run_optimization_pragmas(&conn)?;
     let init_batch = concat!(
         "BEGIN;
         CREATE TABLE IF NOT EXISTS migration (current_migration INTEGER NOT_NULL UNIQUE);
@@ -54,21 +59,30 @@ pub fn init_and_migrate_db(ctx: &MmArc, conn: &Connection) -> SqlResult<()> {
         CREATE_MY_SWAPS_TABLE!(),
         "COMMIT;"
     );
-    conn.execute_batch(init_batch)?;
-    migrate_sqlite_database(ctx, conn, 1)?;
-    info!("SQLite database initialization is successful");
-    Ok(())
+    conn.execute_batch(init_batch)
 }
 
-fn migration_1(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> { fill_my_swaps_from_json_statements(ctx) }
+fn clean_db(ctx: &MmArc) {
+    let conn = ctx.sqlite_connection();
+    if let Err(e) = conn.execute_batch(
+        "DROP TABLE migration;
+                    DROP TABLE my_swaps;",
+    ) {
+        error!("Error {} on SQLite database cleanup", e);
+    }
+}
+
+async fn migration_1(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> { fill_my_swaps_from_json_statements(ctx).await }
 
-fn migration_2(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> {
-    create_and_fill_stats_swaps_from_json_statements(ctx)
+async fn migration_2(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> {
+    create_and_fill_stats_swaps_from_json_statements(ctx).await
 }
 
 fn migration_3() -> Vec<(&'static str, Vec<String>)> { vec![(stats_swaps::ADD_STARTED_AT_INDEX, vec![])] }
 
-fn migration_4() -> Vec<(&'static str, Vec<String>)> { stats_swaps::add_and_split_tickers() }
+fn migration_4() -> Vec<(&'static str, Vec<String>)> {
+    db_common::sqlite::execute_batch(stats_swaps::ADD_SPLIT_TICKERS)
+}
 
 fn migration_5() -> Vec<(&'static str, Vec<String>)> { vec![(my_orders::CREATE_MY_ORDERS_TABLE, vec![])] }
 
@@ -79,22 +93,30 @@ fn migration_6() -> Vec<(&'static str, Vec<String>)> {
     ]
 }
 
-fn statements_for_migration(ctx: &MmArc, current_migration: i64) -> Option<Vec<(&'static str, Vec<String>)>> {
+fn migration_7() -> Vec<(&'static str, Vec<String>)> {
+    db_common::sqlite::execute_batch(stats_swaps::ADD_COINS_PRICE_INFOMATION)
+}
+
+async fn statements_for_migration(ctx: &MmArc, current_migration: i64) -> Option<Vec<(&'static str, Vec<String>)>> {
     match current_migration {
-        1 => Some(migration_1(ctx)),
-        2 => Some(migration_2(ctx)),
+        1 => Some(migration_1(ctx).await),
+        2 => Some(migration_2(ctx).await),
         3 => Some(migration_3()),
         4 => Some(migration_4()),
         5 => Some(migration_5()),
         6 => Some(migration_6()),
+        7 => Some(migration_7()),
         _ => None,
     }
 }
 
-pub fn migrate_sqlite_database(ctx: &MmArc, conn: &Connection, mut current_migration: i64) -> SqlResult<()> {
+pub async fn migrate_sqlite_database(ctx: &MmArc, mut current_migration: i64) -> SqlResult<()> {
     info!("migrate_sqlite_database, current migration {}", current_migration);
-    let transaction = conn.unchecked_transaction()?;
-    while let Some(statements_with_params) = statements_for_migration(ctx, current_migration) {
+    while let Some(statements_with_params) = statements_for_migration(ctx, current_migration).await {
+        // `statements_for_migration` locks the [`MmCtx::sqlite_connection`] mutex,
+        // so we can't create a transaction outside of this loop.
+        let conn = ctx.sqlite_connection();
+        let transaction = conn.unchecked_transaction()?;
         for (statement, params) in statements_with_params {
             debug!("Executing SQL statement {:?} with params {:?}", statement, params);
             transaction.execute(statement, params)?;
@@ -103,8 +125,8 @@ pub fn migrate_sqlite_database(ctx: &MmArc, conn: &Connection, mut current_migra
         transaction.execute("INSERT INTO migration (current_migration) VALUES (?1);", &[
             current_migration,
         ])?;
+        transaction.commit()?;
     }
-    transaction.commit()?;
     info!("migrate_sqlite_database complete, migrated to {}", current_migration);
     Ok(())
 }
diff --git a/mm2src/database/my_orders.rs b/mm2src/mm2_main/src/database/my_orders.rs
similarity index 89%
rename from mm2src/database/my_orders.rs
rename to mm2src/mm2_main/src/database/my_orders.rs
index 4e1289dff4..9a2ed6a278 100644
--- a/mm2src/database/my_orders.rs
+++ b/mm2src/mm2_main/src/database/my_orders.rs
@@ -1,16 +1,15 @@
+use crate::mm2::lp_ordermatch::{FilteringOrder, MakerOrder, MyOrdersFilter, RecentOrdersSelectResult, TakerAction,
+                                TakerOrder};
 /// This module contains code to work with my_orders table in MM2 SQLite DB
-use crate::mm2::lp_ordermatch::MyOrdersFilter;
-use crate::mm2::lp_ordermatch::{MakerOrder, TakerAction, TakerOrder};
 use common::log::debug;
-use common::mm_ctx::MmArc;
-use common::now_ms;
-use common::rusqlite::{Connection, Error as SqlError, Result as SqlResult, ToSql};
-use sql_builder::SqlBuilder;
+use common::{now_ms, PagingOptions};
+use db_common::sqlite::offset_by_uuid;
+use db_common::sqlite::rusqlite::{Connection, Error as SqlError, Result as SqlResult, ToSql};
+use db_common::sqlite::sql_builder::SqlBuilder;
+use mm2_core::mm_ctx::MmArc;
 use std::convert::TryInto;
 use uuid::Uuid;
 
-use super::database_common::{offset_by_uuid, PagingOptions};
-
 const MY_ORDERS_TABLE: &str = "my_orders";
 
 pub const CREATE_MY_ORDERS_TABLE: &str = "CREATE TABLE IF NOT EXISTS my_orders (
@@ -176,29 +175,6 @@ fn apply_my_orders_filter(builder: &mut SqlBuilder, params: &mut Vec<(&str, Stri
         params.push((":status", status.clone()));
     }
 }
-#[derive(Debug, Default)]
-pub struct RecentOrdersSelectSqlResult {
-    /// Orders matching the query
-    pub result: Vec<OrderSqlRow>,
-    /// Total count of orders matching the query
-    pub total_count: usize,
-    /// The number of skipped orders
-    pub skipped: usize,
-}
-#[derive(Debug, Serialize)]
-pub struct OrderSqlRow {
-    pub uuid: String,
-    pub order_type: String,
-    initial_action: String,
-    base: String,
-    rel: String,
-    price: f64,
-    volume: f64,
-    created_at: i64,
-    last_updated: i64,
-    was_taker: i8,
-    status: String,
-}
 
 #[derive(Debug)]
 pub enum SelectRecentOrdersUuidsErr {
@@ -222,7 +198,7 @@ pub fn select_orders_by_filter(
     conn: &Connection,
     filter: &MyOrdersFilter,
     paging_options: Option<&PagingOptions>,
-) -> SqlResult<RecentOrdersSelectSqlResult, SelectRecentOrdersUuidsErr> {
+) -> SqlResult<RecentOrdersSelectResult, SelectRecentOrdersUuidsErr> {
     let mut query_builder = SqlBuilder::select_from(MY_ORDERS_TABLE);
     let mut params = vec![];
     apply_my_orders_filter(&mut query_builder, &mut params, filter);
@@ -238,7 +214,7 @@ pub fn select_orders_by_filter(
     let total_count: isize = conn.query_row_named(&count_query, params_as_trait.as_slice(), |row| row.get(0))?;
     let total_count = total_count.try_into().expect("COUNT should always be >= 0");
     if total_count == 0 {
-        return Ok(RecentOrdersSelectSqlResult::default());
+        return Ok(RecentOrdersSelectResult::default());
     }
 
     // query the orders finally
@@ -273,9 +249,9 @@ pub fn select_orders_by_filter(
     let uuids_query = query_builder.sql().expect("SQL query builder should never fail here");
     debug!("Trying to execute SQL query {} with params {:?}", uuids_query, params);
     let mut stmt = conn.prepare(&uuids_query)?;
-    let result = stmt
+    let orders = stmt
         .query_map_named(params_as_trait.as_slice(), |row| {
-            Ok(OrderSqlRow {
+            Ok(FilteringOrder {
                 uuid: row.get(0)?,
                 order_type: row.get(1)?,
                 initial_action: row.get(2)?,
@@ -289,10 +265,10 @@ pub fn select_orders_by_filter(
                 status: row.get(10)?,
             })
         })?
-        .collect::<SqlResult<Vec<OrderSqlRow>>>()?;
+        .collect::<SqlResult<Vec<FilteringOrder>>>()?;
 
-    Ok(RecentOrdersSelectSqlResult {
-        result,
+    Ok(RecentOrdersSelectResult {
+        orders,
         total_count,
         skipped,
     })
diff --git a/mm2src/database/my_swaps.rs b/mm2src/mm2_main/src/database/my_swaps.rs
similarity index 76%
rename from mm2src/database/my_swaps.rs
rename to mm2src/mm2_main/src/database/my_swaps.rs
index 788f76d89e..e8d4f6b9bb 100644
--- a/mm2src/database/my_swaps.rs
+++ b/mm2src/mm2_main/src/database/my_swaps.rs
@@ -1,15 +1,12 @@
 /// This module contains code to work with my_swaps table in MM2 SQLite DB
-use crate::mm2::lp_swap::{my_swaps_dir, MySwapsFilter, SavedSwap};
-use common::log::{debug, error};
-use common::mm_ctx::MmArc;
-use common::rusqlite::{Connection, Error as SqlError, Result as SqlResult, ToSql};
-use common::{read_dir, slurp};
-use serde_json::{self as json};
-use sql_builder::SqlBuilder;
+use crate::mm2::lp_swap::{MyRecentSwapsUuids, MySwapsFilter, SavedSwap, SavedSwapIo};
+use common::log::debug;
+use common::PagingOptions;
+use db_common::sqlite::offset_by_uuid;
+use db_common::sqlite::rusqlite::{Connection, Error as SqlError, Result as SqlResult, ToSql};
+use db_common::sqlite::sql_builder::SqlBuilder;
+use mm2_core::mm_ctx::MmArc;
 use std::convert::TryInto;
-use uuid::Uuid;
-
-use super::database_common::{offset_by_uuid, PagingOptions};
 
 const MY_SWAPS_TABLE: &str = "my_swaps";
 
@@ -37,26 +34,9 @@ pub fn insert_new_swap(ctx: &MmArc, my_coin: &str, other_coin: &str, uuid: &str,
 }
 
 /// Returns SQL statements to initially fill my_swaps table using existing DB with JSON files
-pub fn fill_my_swaps_from_json_statements(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> {
-    let swap_files = read_dir(&my_swaps_dir(ctx)).expect("Reading swaps dir should not fail at this point");
-    let mut result = vec![];
-    for (_, file) in swap_files {
-        let content = slurp(&file).expect("slurp should not fail at this point");
-        match json::from_slice::<SavedSwap>(&content) {
-            Ok(swap) => {
-                if let Some(sql_with_params) = insert_saved_swap_sql(swap) {
-                    result.push(sql_with_params);
-                }
-            },
-            Err(e) => error!(
-                "Error {} on file {} content {:?} deserialization to SavedSwap",
-                e,
-                file.display(),
-                content
-            ),
-        }
-    }
-    result
+pub async fn fill_my_swaps_from_json_statements(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> {
+    let swaps = SavedSwap::load_all_my_swaps_from_db(ctx).await.unwrap_or_default();
+    swaps.into_iter().filter_map(insert_saved_swap_sql).collect()
 }
 
 fn insert_saved_swap_sql(swap: SavedSwap) -> Option<(&'static str, Vec<String>)> {
@@ -92,16 +72,6 @@ impl From<uuid::parser::ParseError> for SelectRecentSwapsUuidsErr {
     fn from(err: uuid::parser::ParseError) -> Self { SelectRecentSwapsUuidsErr::Parse(err) }
 }
 
-#[derive(Debug, Default)]
-pub struct RecentSwapsSelectSqlResult {
-    /// UUIDs of swaps matching the query
-    pub uuids: Vec<Uuid>,
-    /// Total count of swaps matching the query
-    pub total_count: usize,
-    /// The number of skipped UUIDs
-    pub skipped: usize,
-}
-
 /// Adds where clauses determined by MySwapsFilter
 fn apply_my_swaps_filter(builder: &mut SqlBuilder, params: &mut Vec<(&str, String)>, filter: &MySwapsFilter) {
     if let Some(my_coin) = &filter.my_coin {
@@ -129,7 +99,7 @@ pub fn select_uuids_by_my_swaps_filter(
     conn: &Connection,
     filter: &MySwapsFilter,
     paging_options: Option<&PagingOptions>,
-) -> SqlResult<RecentSwapsSelectSqlResult, SelectRecentSwapsUuidsErr> {
+) -> SqlResult<MyRecentSwapsUuids, SelectRecentSwapsUuidsErr> {
     let mut query_builder = SqlBuilder::select_from(MY_SWAPS_TABLE);
     let mut params = vec![];
     apply_my_swaps_filter(&mut query_builder, &mut params, filter);
@@ -145,7 +115,7 @@ pub fn select_uuids_by_my_swaps_filter(
     let total_count: isize = conn.query_row_named(&count_query, params_as_trait.as_slice(), |row| row.get(0))?;
     let total_count = total_count.try_into().expect("COUNT should always be >= 0");
     if total_count == 0 {
-        return Ok(RecentSwapsSelectSqlResult::default());
+        return Ok(MyRecentSwapsUuids::default());
     }
 
     // query the uuids finally
@@ -175,7 +145,7 @@ pub fn select_uuids_by_my_swaps_filter(
     let uuids: SqlResult<Vec<_>, _> = uuids.into_iter().map(|uuid| uuid.parse()).collect();
     let uuids = uuids?;
 
-    Ok(RecentSwapsSelectSqlResult {
+    Ok(MyRecentSwapsUuids {
         uuids,
         total_count,
         skipped,
diff --git a/mm2src/database/stats_nodes.rs b/mm2src/mm2_main/src/database/stats_nodes.rs
similarity index 96%
rename from mm2src/database/stats_nodes.rs
rename to mm2src/mm2_main/src/database/stats_nodes.rs
index 5240806aea..b4f896015f 100644
--- a/mm2src/database/stats_nodes.rs
+++ b/mm2src/mm2_main/src/database/stats_nodes.rs
@@ -1,8 +1,8 @@
 /// This module contains code to work with nodes table for stats collection in MM2 SQLite DB
 use crate::mm2::lp_stats::{NodeInfo, NodeVersionStat};
 use common::log::debug;
-use common::mm_ctx::MmArc;
-use common::rusqlite::{Error as SqlError, Result as SqlResult, NO_PARAMS};
+use db_common::sqlite::rusqlite::{Error as SqlError, Result as SqlResult, NO_PARAMS};
+use mm2_core::mm_ctx::MmArc;
 use std::collections::hash_map::HashMap;
 
 pub const CREATE_NODES_TABLE: &str = "CREATE TABLE IF NOT EXISTS nodes (
diff --git a/mm2src/database/stats_swaps.rs b/mm2src/mm2_main/src/database/stats_swaps.rs
similarity index 66%
rename from mm2src/database/stats_swaps.rs
rename to mm2src/mm2_main/src/database/stats_swaps.rs
index 6e72698d89..1a125dccc0 100644
--- a/mm2src/database/stats_swaps.rs
+++ b/mm2src/mm2_main/src/database/stats_swaps.rs
@@ -1,12 +1,10 @@
-use crate::mm2::lp_swap::{stats_maker_swap_dir, stats_taker_swap_dir, MakerSavedSwap, SavedSwap, TakerSavedSwap};
-use common::{log::{debug, error, warn},
-             mm_ctx::MmArc,
-             read_dir,
-             rusqlite::{Connection, OptionalExtension},
-             slurp};
-use serde_json::{self as json};
+use crate::mm2::lp_swap::{MakerSavedSwap, SavedSwap, SavedSwapIo, TakerSavedSwap};
+use common::log::{debug, error};
+use db_common::{owned_named_params,
+                sqlite::{rusqlite::{types::Value, Connection, OptionalExtension},
+                         AsSqlNamedParams, OwnedSqlNamedParams}};
+use mm2_core::mm_ctx::MmArc;
 use std::collections::HashSet;
-use uuid::Uuid;
 
 const CREATE_STATS_SWAPS_TABLE: &str = "CREATE TABLE IF NOT EXISTS stats_swaps (
     id INTEGER NOT NULL PRIMARY KEY,
@@ -43,10 +41,17 @@ const INSERT_STATS_SWAP: &str = "INSERT INTO stats_swaps (
     finished_at,
     maker_amount,
     taker_amount,
-    is_success
-) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)";
+    is_success,
+    maker_coin_usd_price,
+    taker_coin_usd_price
+) VALUES (:maker_coin, :maker_coin_ticker, :maker_coin_platform, :taker_coin, :taker_coin_ticker, :taker_coin_platform, :uuid, :started_at, :finished_at, :maker_amount, :taker_amount, :is_success, :maker_coin_usd_price, :taker_coin_usd_price)";
+
+pub const ADD_COINS_PRICE_INFOMATION: &[&str] = &[
+    "ALTER TABLE stats_swaps ADD COLUMN maker_coin_usd_price DECIMAL;",
+    "ALTER TABLE stats_swaps ADD COLUMN taker_coin_usd_price DECIMAL;",
+];
 
-const ADD_SPLIT_TICKERS: &[&str] = &[
+pub const ADD_SPLIT_TICKERS: &[&str] = &[
     "ALTER TABLE stats_swaps ADD COLUMN maker_coin_ticker VARCHAR(255) NOT NULL DEFAULT '';",
     "ALTER TABLE stats_swaps ADD COLUMN maker_coin_platform VARCHAR(255) NOT NULL DEFAULT '';",
     "ALTER TABLE stats_swaps ADD COLUMN taker_coin_ticker VARCHAR(255) NOT NULL DEFAULT '';",
@@ -71,74 +76,28 @@ const ADD_SPLIT_TICKERS: &[&str] = &[
 
 pub const ADD_STARTED_AT_INDEX: &str = "CREATE INDEX timestamp_index ON stats_swaps (started_at);";
 
-const SELECT_ID_BY_UUID: &str = "SELECT id FROM stats_swaps WHERE uuid = ?1";
+pub const SELECT_ID_BY_UUID: &str = "SELECT id FROM stats_swaps WHERE uuid = ?1";
 
 /// Returns SQL statements to initially fill stats_swaps table using existing DB with JSON files
-pub fn create_and_fill_stats_swaps_from_json_statements(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> {
-    let maker_swap_files =
-        read_dir(&stats_maker_swap_dir(ctx)).expect("Reading swaps dir should not fail at this point");
+pub async fn create_and_fill_stats_swaps_from_json_statements(ctx: &MmArc) -> Vec<(&'static str, Vec<String>)> {
+    let maker_swaps = SavedSwap::load_all_from_maker_stats_db(ctx).await.unwrap_or_default();
+    let taker_swaps = SavedSwap::load_all_from_taker_stats_db(ctx).await.unwrap_or_default();
+
     let mut result = vec![(CREATE_STATS_SWAPS_TABLE, vec![])];
-    let mut inserted_maker_uuids = HashSet::with_capacity(maker_swap_files.len());
-    for (_, file) in maker_swap_files {
-        let content = slurp(&file).expect("slurp should not fail at this point");
-        match json::from_slice(&content) {
-            Ok(swap) => {
-                if let Some(sql_with_params) = insert_stats_maker_swap_sql_init(&swap) {
-                    inserted_maker_uuids.insert(swap.uuid);
-                    result.push(sql_with_params);
-                }
-            },
-            Err(e) => error!(
-                "Error {} on file {} content {:?} deserialization to MakerSavedSwap",
-                e,
-                file.display(),
-                content
-            ),
+    let mut inserted_maker_uuids = HashSet::with_capacity(maker_swaps.len());
+
+    for maker_swap in maker_swaps {
+        if let Some(sql_with_params) = insert_stats_maker_swap_sql_init(&maker_swap) {
+            inserted_maker_uuids.insert(maker_swap.uuid);
+            result.push(sql_with_params);
         }
     }
-
-    let taker_swap_files =
-        read_dir(&stats_taker_swap_dir(ctx)).expect("Reading swaps dir should not fail at this point");
-    for (_, file) in taker_swap_files {
-        let os_file_name = match file.file_stem() {
-            Some(name) => name,
-            None => {
-                warn!("File {} does not have file_stem", file.display());
-                continue;
-            },
-        };
-        let file_name = match os_file_name.to_str() {
-            Some(name) => name,
-            None => {
-                warn!("{:?} is not a valid unicode", os_file_name);
-                continue;
-            },
-        };
-        let uuid: Uuid = match file_name.parse() {
-            Ok(u) => u,
-            Err(e) => {
-                warn!("Error {} while parsing uuid from {}", e, file_name);
-                continue;
-            },
-        };
-
-        if inserted_maker_uuids.contains(&uuid) {
+    for taker_swap in taker_swaps {
+        if inserted_maker_uuids.contains(&taker_swap.uuid) {
             continue;
         }
-
-        let content = slurp(&file).expect("slurp should not fail at this point");
-        match json::from_slice(&content) {
-            Ok(swap) => {
-                if let Some(sql_with_params) = insert_stats_taker_swap_sql_init(&swap) {
-                    result.push(sql_with_params);
-                }
-            },
-            Err(e) => error!(
-                "Error {} on file {} content {:?} deserialization to TakerSavedSwap",
-                e,
-                file.display(),
-                content
-            ),
+        if let Some(sql_with_params) = insert_stats_taker_swap_sql_init(&taker_swap) {
+            result.push(sql_with_params);
         }
     }
     result
@@ -151,7 +110,7 @@ fn split_coin(coin: &str) -> (String, String) {
     (ticker, platform)
 }
 
-fn insert_stats_maker_swap_sql(swap: &MakerSavedSwap) -> Option<(&'static str, Vec<String>)> {
+fn insert_stats_maker_swap_sql(swap: &MakerSavedSwap) -> Option<(&'static str, OwnedSqlNamedParams)> {
     let swap_data = match swap.swap_data() {
         Ok(d) => d,
         Err(e) => {
@@ -173,20 +132,22 @@ fn insert_stats_maker_swap_sql(swap: &MakerSavedSwap) -> Option<(&'static str, V
     let (maker_coin_ticker, maker_coin_platform) = split_coin(&swap_data.maker_coin);
     let (taker_coin_ticker, taker_coin_platform) = split_coin(&swap_data.taker_coin);
 
-    let params = vec![
-        swap_data.maker_coin.clone(),
-        maker_coin_ticker,
-        maker_coin_platform,
-        swap_data.taker_coin.clone(),
-        taker_coin_ticker,
-        taker_coin_platform,
-        swap.uuid.to_string(),
-        swap_data.started_at.to_string(),
-        finished_at,
-        swap_data.maker_amount.to_string(),
-        swap_data.taker_amount.to_string(),
-        (is_success as u32).to_string(),
-    ];
+    let params = owned_named_params! {
+        ":maker_coin": swap_data.maker_coin.clone(),
+        ":maker_coin_ticker": maker_coin_ticker,
+        ":maker_coin_platform": maker_coin_platform,
+        ":taker_coin": swap_data.taker_coin.clone(),
+        ":taker_coin_ticker": taker_coin_ticker,
+        ":taker_coin_platform": taker_coin_platform,
+        ":uuid": swap.uuid.to_string(),
+        ":started_at": swap_data.started_at.to_string(),
+        ":finished_at": finished_at,
+        ":maker_amount": swap_data.maker_amount.to_string(),
+        ":taker_amount": swap_data.taker_amount.to_string(),
+        ":is_success": (is_success as u32).to_string(),
+        ":maker_coin_usd_price": swap.maker_coin_usd_price.as_ref().map(|p| p.to_string()),
+        ":taker_coin_usd_price": swap.taker_coin_usd_price.as_ref().map(|p| p.to_string()),
+    };
     Some((INSERT_STATS_SWAP, params))
 }
 
@@ -222,7 +183,7 @@ fn insert_stats_maker_swap_sql_init(swap: &MakerSavedSwap) -> Option<(&'static s
     Some((INSERT_STATS_SWAP_ON_INIT, params))
 }
 
-fn insert_stats_taker_swap_sql(swap: &TakerSavedSwap) -> Option<(&'static str, Vec<String>)> {
+fn insert_stats_taker_swap_sql(swap: &TakerSavedSwap) -> Option<(&'static str, OwnedSqlNamedParams)> {
     let swap_data = match swap.swap_data() {
         Ok(d) => d,
         Err(e) => {
@@ -244,20 +205,22 @@ fn insert_stats_taker_swap_sql(swap: &TakerSavedSwap) -> Option<(&'static str, V
     let (maker_coin_ticker, maker_coin_platform) = split_coin(&swap_data.maker_coin);
     let (taker_coin_ticker, taker_coin_platform) = split_coin(&swap_data.taker_coin);
 
-    let params = vec![
-        swap_data.maker_coin.clone(),
-        maker_coin_ticker,
-        maker_coin_platform,
-        swap_data.taker_coin.clone(),
-        taker_coin_ticker,
-        taker_coin_platform,
-        swap.uuid.to_string(),
-        swap_data.started_at.to_string(),
-        finished_at,
-        swap_data.maker_amount.to_string(),
-        swap_data.taker_amount.to_string(),
-        (is_success as u32).to_string(),
-    ];
+    let params = owned_named_params! {
+        ":maker_coin": swap_data.maker_coin.clone(),
+        ":maker_coin_ticker": maker_coin_ticker,
+        ":maker_coin_platform": maker_coin_platform,
+        ":taker_coin": swap_data.taker_coin.clone(),
+        ":taker_coin_ticker": taker_coin_ticker,
+        ":taker_coin_platform": taker_coin_platform,
+        ":uuid": swap.uuid.to_string(),
+        ":started_at": swap_data.started_at.to_string(),
+        ":finished_at": finished_at,
+        ":maker_amount": swap_data.maker_amount.to_string(),
+        ":taker_amount": swap_data.taker_amount.to_string(),
+        ":is_success": (is_success as u32).to_string(),
+        ":maker_coin_usd_price": swap.maker_coin_usd_price.as_ref().map(|p| p.to_string()),
+        ":taker_coin_usd_price": swap.taker_coin_usd_price.as_ref().map(|p| p.to_string()),
+    };
     Some((INSERT_STATS_SWAP, params))
 }
 
@@ -318,15 +281,11 @@ pub fn add_swap_to_index(conn: &Connection, swap: &SavedSwap) {
     };
 
     debug!("Executing query {} with params {:?}", sql, params);
-    if let Err(e) = conn.execute(sql, &params) {
+    if let Err(e) = conn.execute_named(sql, &params.as_sql_named_params()) {
         error!("Error {} on query {} with params {:?}", e, sql, params);
     };
 }
 
-pub fn add_and_split_tickers() -> Vec<(&'static str, Vec<String>)> {
-    ADD_SPLIT_TICKERS.iter().map(|sql| (*sql, vec![])).collect()
-}
-
 #[test]
 fn test_split_coin() {
     let input = "";
diff --git a/mm2src/docker_tests.rs b/mm2src/mm2_main/src/docker_tests.rs
similarity index 82%
rename from mm2src/docker_tests.rs
rename to mm2src/mm2_main/src/docker_tests.rs
index 95730fca7e..a55e4233b4 100644
--- a/mm2src/docker_tests.rs
+++ b/mm2src/mm2_main/src/docker_tests.rs
@@ -8,14 +8,12 @@
 #![recursion_limit = "512"]
 
 #[cfg(test)] use docker_tests::docker_tests_runner;
+
 #[cfg(test)]
 #[macro_use]
 extern crate common;
 #[cfg(test)]
 #[macro_use]
-extern crate fomat_macros;
-#[cfg(test)]
-#[macro_use]
 extern crate gstuff;
 #[cfg(all(test, not(target_arch = "wasm32")))]
 #[macro_use]
@@ -87,36 +85,42 @@ mod docker_tests {
     #[rustfmt::skip]
     mod docker_ordermatch_tests;
     #[rustfmt::skip]
+    mod docker_tests_common;
+    #[rustfmt::skip]
     mod qrc20_tests;
     #[rustfmt::skip]
     mod slp_tests;
     #[rustfmt::skip]
+    mod solana_tests;
+    #[rustfmt::skip]
     mod swaps_confs_settings_sync_tests;
     #[rustfmt::skip]
     mod swaps_file_lock_tests;
 
-    use crate::mm2::lp_swap::dex_fee_amount;
-    use crate::mm2::mm2_tests::structs::*;
-    use bigdecimal::BigDecimal;
+    use docker_tests_common::*;
+
     use bitcrypto::ChecksumType;
-    use chain::OutPoint;
+    use chain::{OutPoint, TransactionOutput};
     use coins::eth::{eth_coin_from_conf_and_request, EthCoin};
-    use coins::utxo::rpc_clients::{UnspentInfo, UtxoRpcClientEnum, UtxoRpcClientOps};
-    use coins::utxo::utxo_standard::{utxo_standard_coin_from_conf_and_request, UtxoStandardCoin};
-    use coins::utxo::{coin_daemon_data_dir, dhash160, zcash_params_path, UtxoCoinFields, UtxoCommonOps};
-    use coins::{CoinProtocol, FoundSwapTxSpend, MarketCoinOps, MmCoin, SwapOps, TransactionEnum, WithdrawRequest};
-    use common::for_tests::{check_my_swap_status_amounts, enable_electrum};
-    use common::mm_number::MmNumber;
-    use common::privkey::key_pair_from_seed;
+    use coins::utxo::bch::{bch_coin_from_conf_and_params, BchActivationRequest, BchCoin};
+    use coins::utxo::rpc_clients::{UnspentInfo, UtxoRpcClientEnum};
+    use coins::utxo::slp::SlpToken;
+    use coins::utxo::slp::{slp_genesis_output, SlpOutput};
+    use coins::utxo::utxo_common::send_outputs_from_my_address;
+    use coins::utxo::utxo_standard::{utxo_standard_coin_with_priv_key, UtxoStandardCoin};
+    use coins::utxo::{dhash160, GetUtxoListOps, UtxoActivationParams, UtxoCommonOps};
+    use coins::{CoinProtocol, FoundSwapTxSpend, MarketCoinOps, MmCoin, SearchForSwapTxSpendInput, SwapOps,
+                Transaction, TransactionEnum, WithdrawRequest};
     use common::{block_on, now_ms};
-    use common::{file_lock::FileLock,
-                 for_tests::{enable_native, mm_dump, new_mm2_temp_folder_path, MarketMakerIt},
-                 mm_ctx::{MmArc, MmCtxBuilder}};
+    use crypto::privkey::{key_pair_from_secret, key_pair_from_seed};
     use futures01::Future;
-    use keys::{KeyPair, Private};
-    use primitives::hash::H160;
+    use keys::{Address, KeyPair, NetworkPrefix as CashAddrPrefix, Private};
+    use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
+    use mm2_number::{BigDecimal, MmNumber};
+    use mm2_test_helpers::for_tests::{check_my_swap_status_amounts, enable_electrum};
     use qrc20_tests::{qtum_docker_node, QtumDockerOps, QTUM_REGTEST_DOCKER_IMAGE};
-    use secp256k1::{PublicKey, Secp256k1, SecretKey};
+    use script::Builder;
+    use secp256k1::SecretKey;
     use serde_json::{self as json, Value as Json};
     use std::collections::HashMap;
     use std::env;
@@ -127,16 +131,6 @@ mod docker_tests {
     use std::time::Duration;
     use test::{test_main, StaticBenchFn, StaticTestFn, TestDescAndFn};
     use testcontainers::clients::Cli;
-    use testcontainers::images::generic::{GenericImage, WaitFor};
-    use testcontainers::{Container, Docker, Image};
-
-    fn rmd160_from_priv(privkey: [u8; 32]) -> H160 {
-        let secret = SecretKey::from_slice(&privkey).unwrap();
-        let public = PublicKey::from_secret_key(&Secp256k1::new(), &secret);
-        dhash160(&public.serialize())
-    }
-
-    const UTXO_ASSET_DOCKER_IMAGE: &str = "artempikulin/testblockchain";
 
     // AP: custom test runner is intended to initialize the required environment (e.g. coin daemons in the docker containers)
     // and then gracefully clear it by dropping the RAII docker container handlers
@@ -160,19 +154,24 @@ mod docker_tests {
             let utxo_node = utxo_asset_docker_node(&docker, "MYCOIN", 7000);
             let utxo_node1 = utxo_asset_docker_node(&docker, "MYCOIN1", 8000);
             let qtum_node = qtum_docker_node(&docker, 9000);
+            let for_slp_node = utxo_asset_docker_node(&docker, "FORSLP", 10000);
 
             let utxo_ops = UtxoAssetDockerOps::from_ticker("MYCOIN");
             let utxo_ops1 = UtxoAssetDockerOps::from_ticker("MYCOIN1");
             let qtum_ops = QtumDockerOps::new();
+            let for_slp_ops = BchDockerOps::from_ticker("FORSLP");
 
-            utxo_ops.wait_ready();
-            utxo_ops1.wait_ready();
-            qtum_ops.wait_ready();
+            utxo_ops.wait_ready(4);
+            utxo_ops1.wait_ready(4);
+            qtum_ops.wait_ready(2);
             qtum_ops.initialize_contracts();
+            for_slp_ops.wait_ready(4);
+            for_slp_ops.initialize_slp();
 
             containers.push(utxo_node);
             containers.push(utxo_node1);
             containers.push(qtum_node);
+            containers.push(for_slp_node);
         }
         // detect if docker is installed
         // skip the tests that use docker if not installed
@@ -223,26 +222,6 @@ mod docker_tests {
         }
     }
 
-    trait CoinDockerOps {
-        fn rpc_client(&self) -> &UtxoRpcClientEnum;
-
-        fn wait_ready(&self) {
-            let timeout = now_ms() + 30000;
-            loop {
-                match self.rpc_client().get_block_count().wait() {
-                    Ok(n) => {
-                        if n > 1 {
-                            break;
-                        }
-                    },
-                    Err(e) => log!([e]),
-                }
-                assert!(now_ms() < timeout, "Test timed out");
-                thread::sleep(Duration::from_secs(1));
-            }
-        }
-    }
-
     struct UtxoAssetDockerOps {
         #[allow(dead_code)]
         ctx: MmArc,
@@ -259,66 +238,20 @@ mod docker_tests {
             let req = json!({"method":"enable"});
             let priv_key = hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap();
             let ctx = MmCtxBuilder::new().into_mm_arc();
-            let coin = block_on(utxo_standard_coin_from_conf_and_request(
-                &ctx, ticker, &conf, &req, &priv_key,
+            let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+
+            let coin = block_on(utxo_standard_coin_with_priv_key(
+                &ctx, ticker, &conf, &params, &priv_key,
             ))
             .unwrap();
             UtxoAssetDockerOps { ctx, coin }
         }
     }
 
-    pub struct UtxoDockerNode<'a> {
+    struct BchDockerOps {
         #[allow(dead_code)]
-        container: Container<'a, Cli, GenericImage>,
-        #[allow(dead_code)]
-        ticker: String,
-        #[allow(dead_code)]
-        port: u16,
-    }
-
-    fn utxo_asset_docker_node<'a>(docker: &'a Cli, ticker: &'static str, port: u16) -> UtxoDockerNode<'a> {
-        let args = vec![
-            "-v".into(),
-            format!("{}:/data/.zcash-params", zcash_params_path().display()),
-            "-p".into(),
-            format!("127.0.0.1:{}:{}", port, port),
-        ];
-        let image = GenericImage::new(UTXO_ASSET_DOCKER_IMAGE)
-            .with_args(args)
-            .with_env_var("CLIENTS", "2")
-            .with_env_var("CHAIN", ticker)
-            .with_env_var("TEST_ADDY", "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF")
-            .with_env_var("TEST_WIF", "UqqW7f766rADem9heD8vSBvvrdfJb3zg5r8du9rJxPtccjWf7RG9")
-            .with_env_var(
-                "TEST_PUBKEY",
-                "021607076d7a2cb148d542fb9644c04ffc22d2cca752f80755a0402a24c567b17a",
-            )
-            .with_env_var("DAEMON_URL", "http://test:test@127.0.0.1:7000")
-            .with_env_var("COIN", "Komodo")
-            .with_env_var("COIN_RPC_PORT", port.to_string())
-            .with_wait_for(WaitFor::message_on_stdout("config is ready"));
-        let container = docker.run(image);
-        let mut conf_path = coin_daemon_data_dir(ticker, true);
-        std::fs::create_dir_all(&conf_path).unwrap();
-        conf_path.push(format!("{}.conf", ticker));
-        Command::new("docker")
-            .arg("cp")
-            .arg(format!("{}:/data/node_0/{}.conf", container.id(), ticker))
-            .arg(&conf_path)
-            .status()
-            .expect("Failed to execute docker command");
-        let timeout = now_ms() + 3000;
-        loop {
-            if conf_path.exists() {
-                break;
-            };
-            assert!(now_ms() < timeout, "Test timed out");
-        }
-        UtxoDockerNode {
-            container,
-            ticker: ticker.into(),
-            port,
-        }
+        ctx: MmArc,
+        coin: BchCoin,
     }
 
     // builds the EthCoin using the external dev Parity/OpenEthereum node
@@ -360,82 +293,124 @@ mod docker_tests {
         static ref MM_CTX: MmArc = MmCtxBuilder::new().into_mm_arc();
     }
 
-    /// Build asset `UtxoStandardCoin` from ticker and privkey without filling the balance.
-    fn utxo_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, UtxoStandardCoin) {
-        let ctx = MmCtxBuilder::new().into_mm_arc();
-        let conf = json!({"asset":ticker,"txversion":4,"overwintered":1,"txfee":1000,"network":"regtest"});
-        let req = json!({"method":"enable"});
-        let coin = block_on(utxo_standard_coin_from_conf_and_request(
-            &ctx, ticker, &conf, &req, priv_key,
-        ))
-        .unwrap();
-        import_address(&coin);
-        (ctx, coin)
+    impl BchDockerOps {
+        fn from_ticker(ticker: &str) -> BchDockerOps {
+            let conf = json!({"asset": ticker,"txfee":1000,"network": "regtest","txversion":4,"overwintered":1});
+            let req = json!({"method":"enable", "bchd_urls": [], "allow_slp_unsafe_conf": true});
+            let priv_key = hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap();
+            let ctx = MmCtxBuilder::new().into_mm_arc();
+            let params = BchActivationRequest::from_legacy_req(&req).unwrap();
+
+            let coin = block_on(bch_coin_from_conf_and_params(
+                &ctx,
+                ticker,
+                &conf,
+                params,
+                CashAddrPrefix::SlpTest,
+                &priv_key,
+            ))
+            .unwrap();
+            BchDockerOps { ctx, coin }
+        }
+
+        fn initialize_slp(&self) {
+            fill_address(&self.coin, &self.coin.my_address().unwrap(), 100000.into(), 30);
+            let mut slp_privkeys = vec![];
+
+            let slp_genesis_op_ret = slp_genesis_output("ADEXSLP", "ADEXSLP", None, None, 8, None, 1000000_00000000);
+            let slp_genesis = TransactionOutput {
+                value: self.coin.as_ref().dust_amount,
+                script_pubkey: Builder::build_p2pkh(&self.coin.my_public_key().unwrap().address_hash().into())
+                    .to_bytes(),
+            };
+
+            let mut bch_outputs = vec![slp_genesis_op_ret, slp_genesis];
+            let mut slp_outputs = vec![];
+
+            for _ in 0..18 {
+                let priv_key = SecretKey::new(&mut rand6::thread_rng());
+                let key_pair = key_pair_from_secret(priv_key.as_ref()).unwrap();
+                let address_hash = key_pair.public().address_hash();
+                let address = Address {
+                    prefix: self.coin.as_ref().conf.pub_addr_prefix,
+                    t_addr_prefix: self.coin.as_ref().conf.pub_t_addr_prefix,
+                    hrp: None,
+                    hash: address_hash.into(),
+                    checksum_type: Default::default(),
+                    addr_format: Default::default(),
+                };
+
+                self.native_client()
+                    .import_address(&address.to_string(), &address.to_string(), false)
+                    .wait()
+                    .unwrap();
+
+                let script_pubkey = Builder::build_p2pkh(&address_hash.into());
+
+                bch_outputs.push(TransactionOutput {
+                    value: 1000_00000000,
+                    script_pubkey: script_pubkey.to_bytes(),
+                });
+
+                slp_outputs.push(SlpOutput {
+                    amount: 1000_00000000,
+                    script_pubkey: script_pubkey.to_bytes(),
+                });
+                slp_privkeys.push(*priv_key.as_ref());
+            }
+
+            let slp_genesis_tx = send_outputs_from_my_address(self.coin.clone(), bch_outputs)
+                .wait()
+                .unwrap();
+            self.coin
+                .wait_for_confirmations(&slp_genesis_tx.tx_hex(), 1, false, now_ms() / 1000 + 30, 1)
+                .wait()
+                .unwrap();
+
+            let adex_slp = SlpToken::new(
+                8,
+                "ADEXSLP".into(),
+                slp_genesis_tx.tx_hash().as_slice().into(),
+                self.coin.clone(),
+                1,
+            );
+
+            let tx = block_on(adex_slp.send_slp_outputs(slp_outputs)).unwrap();
+            self.coin
+                .wait_for_confirmations(&tx.tx_hex(), 1, false, now_ms() / 1000 + 30, 1)
+                .wait()
+                .unwrap();
+            *SLP_TOKEN_OWNERS.lock().unwrap() = slp_privkeys;
+            *SLP_TOKEN_ID.lock().unwrap() = slp_genesis_tx.tx_hash().as_slice().into();
+        }
+    }
+
+    impl CoinDockerOps for BchDockerOps {
+        fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.coin.as_ref().rpc_client }
     }
 
-    /// Generate random privkey, create a coin and fill it's address with the specified balance.
-    fn generate_coin_with_random_privkey(ticker: &str, balance: BigDecimal) -> (MmArc, UtxoStandardCoin, [u8; 32]) {
+    /// Generate random privkey, create a UTXO coin and fill it's address with the specified balance.
+    fn generate_utxo_coin_with_random_privkey(
+        ticker: &str,
+        balance: BigDecimal,
+    ) -> (MmArc, UtxoStandardCoin, [u8; 32]) {
         let priv_key = SecretKey::new(&mut rand6::thread_rng());
-        let (ctx, coin) = utxo_coin_from_privkey(ticker, &priv_key[..]);
+        let (ctx, coin) = utxo_coin_from_privkey(ticker, priv_key.as_ref());
         let timeout = 30; // timeout if test takes more than 30 seconds to run
         let my_address = coin.my_address().expect("!my_address");
         fill_address(&coin, &my_address, balance, timeout);
         (ctx, coin, *priv_key.as_ref())
     }
 
-    fn import_address<T>(coin: &T)
-    where
-        T: MarketCoinOps + AsRef<UtxoCoinFields>,
-    {
-        match coin.as_ref().rpc_client {
-            UtxoRpcClientEnum::Native(ref native) => {
-                let my_address = coin.my_address().unwrap();
-                native.import_address(&my_address, &my_address, false).wait().unwrap()
-            },
-            UtxoRpcClientEnum::Electrum(_) => panic!("Expected NativeClient"),
-        }
-    }
-
-    fn fill_address<T>(coin: &T, address: &str, amount: BigDecimal, timeout: u64)
-    where
-        T: MarketCoinOps + AsRef<UtxoCoinFields>,
-    {
-        // prevent concurrent fill since daemon RPC returns errors if send_to_address
-        // is called concurrently (insufficient funds) and it also may return other errors
-        // if previous transaction is not confirmed yet
-        let _lock = COINS_LOCK.lock().unwrap();
-        let timeout = now_ms() / 1000 + timeout;
-
-        if let UtxoRpcClientEnum::Native(client) = &coin.as_ref().rpc_client {
-            client.import_address(address, address, false).wait().unwrap();
-            let hash = client.send_to_address(address, &amount).wait().unwrap();
-            let tx_bytes = client.get_transaction_bytes(hash).wait().unwrap();
-            coin.wait_for_confirmations(&tx_bytes, 1, false, timeout, 1)
-                .wait()
-                .unwrap();
-            log!({ "{:02x}", tx_bytes });
-            loop {
-                let unspents = client
-                    .list_unspent_impl(0, std::i32::MAX, vec![address.to_string()])
-                    .wait()
-                    .unwrap();
-                if !unspents.is_empty() {
-                    break;
-                }
-                assert!(now_ms() / 1000 < timeout, "Test timed out");
-                thread::sleep(Duration::from_secs(1));
-            }
-        };
-    }
-
     #[test]
     fn test_search_for_swap_tx_spend_native_was_refunded_taker() {
         let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
-        let (_ctx, coin, _) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
+        let my_public_key = coin.my_public_key().unwrap();
 
         let time_lock = (now_ms() / 1000) as u32 - 3600;
         let tx = coin
-            .send_taker_payment(time_lock, &*coin.my_public_key(), &[0; 20], 1.into(), &None)
+            .send_taker_payment(time_lock, my_public_key, &[0; 20], 1u64.into(), &None, &[])
             .wait()
             .unwrap();
 
@@ -444,7 +419,7 @@ mod docker_tests {
             .unwrap();
 
         let refund_tx = coin
-            .send_taker_refunds_payment(&tx.tx_hex(), time_lock, &*coin.my_public_key(), &[0; 20], &None)
+            .send_taker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
             .wait()
             .unwrap();
 
@@ -452,8 +427,16 @@ mod docker_tests {
             .wait()
             .unwrap();
 
-        let found = coin
-            .search_for_swap_tx_spend_my(time_lock, &*coin.my_public_key(), &[0; 20], &tx.tx_hex(), 0, &None)
+        let search_input = SearchForSwapTxSpendInput {
+            time_lock,
+            other_pub: &*coin.my_public_key().unwrap(),
+            secret_hash: &[0; 20],
+            tx: &tx.tx_hex(),
+            search_from_block: 0,
+            swap_contract_address: &None,
+            swap_unique_data: &[],
+        };
+        let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
             .unwrap()
             .unwrap();
         assert_eq!(FoundSwapTxSpend::Refunded(refund_tx), found);
@@ -462,11 +445,12 @@ mod docker_tests {
     #[test]
     fn test_search_for_swap_tx_spend_native_was_refunded_maker() {
         let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
-        let (_ctx, coin, _) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
+        let my_public_key = coin.my_public_key().unwrap();
 
         let time_lock = (now_ms() / 1000) as u32 - 3600;
         let tx = coin
-            .send_maker_payment(time_lock, &*coin.my_public_key(), &[0; 20], 1.into(), &None)
+            .send_maker_payment(time_lock, my_public_key, &[0; 20], 1u64.into(), &None, &[])
             .wait()
             .unwrap();
 
@@ -475,7 +459,7 @@ mod docker_tests {
             .unwrap();
 
         let refund_tx = coin
-            .send_maker_refunds_payment(&tx.tx_hex(), time_lock, &*coin.my_public_key(), &[0; 20], &None)
+            .send_maker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
             .wait()
             .unwrap();
 
@@ -483,8 +467,16 @@ mod docker_tests {
             .wait()
             .unwrap();
 
-        let found = coin
-            .search_for_swap_tx_spend_my(time_lock, &*coin.my_public_key(), &[0; 20], &tx.tx_hex(), 0, &None)
+        let search_input = SearchForSwapTxSpendInput {
+            time_lock,
+            other_pub: &*coin.my_public_key().unwrap(),
+            secret_hash: &[0; 20],
+            tx: &tx.tx_hex(),
+            search_from_block: 0,
+            swap_contract_address: &None,
+            swap_unique_data: &[],
+        };
+        let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
             .unwrap()
             .unwrap();
         assert_eq!(FoundSwapTxSpend::Refunded(refund_tx), found);
@@ -493,12 +485,13 @@ mod docker_tests {
     #[test]
     fn test_search_for_taker_swap_tx_spend_native_was_spent_by_maker() {
         let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
-        let (_ctx, coin, _) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
         let secret = [0; 32];
+        let my_pubkey = coin.my_public_key().unwrap();
 
         let time_lock = (now_ms() / 1000) as u32 - 3600;
         let tx = coin
-            .send_taker_payment(time_lock, &*coin.my_public_key(), &*dhash160(&secret), 1.into(), &None)
+            .send_taker_payment(time_lock, my_pubkey, &*dhash160(&secret), 1u64.into(), &None, &[])
             .wait()
             .unwrap();
 
@@ -507,7 +500,7 @@ mod docker_tests {
             .unwrap();
 
         let spend_tx = coin
-            .send_maker_spends_taker_payment(&tx.tx_hex(), time_lock, &*coin.my_public_key(), &secret, &None)
+            .send_maker_spends_taker_payment(&tx.tx_hex(), time_lock, my_pubkey, &secret, &None, &[])
             .wait()
             .unwrap();
 
@@ -515,15 +508,16 @@ mod docker_tests {
             .wait()
             .unwrap();
 
-        let found = coin
-            .search_for_swap_tx_spend_my(
-                time_lock,
-                &*coin.my_public_key(),
-                &*dhash160(&secret),
-                &tx.tx_hex(),
-                0,
-                &None,
-            )
+        let search_input = SearchForSwapTxSpendInput {
+            time_lock,
+            other_pub: &*coin.my_public_key().unwrap(),
+            secret_hash: &*dhash160(&secret),
+            tx: &tx.tx_hex(),
+            search_from_block: 0,
+            swap_contract_address: &None,
+            swap_unique_data: &[],
+        };
+        let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
             .unwrap()
             .unwrap();
         assert_eq!(FoundSwapTxSpend::Spent(spend_tx), found);
@@ -532,12 +526,13 @@ mod docker_tests {
     #[test]
     fn test_search_for_maker_swap_tx_spend_native_was_spent_by_taker() {
         let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
-        let (_ctx, coin, _) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
         let secret = [0; 32];
+        let my_pubkey = coin.my_public_key().unwrap();
 
         let time_lock = (now_ms() / 1000) as u32 - 3600;
         let tx = coin
-            .send_maker_payment(time_lock, &*coin.my_public_key(), &*dhash160(&secret), 1.into(), &None)
+            .send_maker_payment(time_lock, my_pubkey, &*dhash160(&secret), 1u64.into(), &None, &[])
             .wait()
             .unwrap();
 
@@ -546,7 +541,7 @@ mod docker_tests {
             .unwrap();
 
         let spend_tx = coin
-            .send_taker_spends_maker_payment(&tx.tx_hex(), time_lock, &*coin.my_public_key(), &secret, &None)
+            .send_taker_spends_maker_payment(&tx.tx_hex(), time_lock, my_pubkey, &secret, &None, &[])
             .wait()
             .unwrap();
 
@@ -554,15 +549,16 @@ mod docker_tests {
             .wait()
             .unwrap();
 
-        let found = coin
-            .search_for_swap_tx_spend_my(
-                time_lock,
-                &*coin.my_public_key(),
-                &*dhash160(&secret),
-                &tx.tx_hex(),
-                0,
-                &None,
-            )
+        let search_input = SearchForSwapTxSpendInput {
+            time_lock,
+            other_pub: &*coin.my_public_key().unwrap(),
+            secret_hash: &*dhash160(&secret),
+            tx: &tx.tx_hex(),
+            search_from_block: 0,
+            swap_contract_address: &None,
+            swap_unique_data: &[],
+        };
+        let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
             .unwrap()
             .unwrap();
         assert_eq!(FoundSwapTxSpend::Spent(spend_tx), found);
@@ -571,9 +567,10 @@ mod docker_tests {
     #[test]
     fn test_one_hundred_maker_payments_in_a_row_native() {
         let timeout = 30; // timeout if test takes more than 30 seconds to run
-        let (_ctx, coin, _) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
         let secret = [0; 32];
+        let my_pubkey = coin.my_public_key().unwrap();
 
         let time_lock = (now_ms() / 1000) as u32 - 3600;
         let mut unspents = vec![];
@@ -582,10 +579,11 @@ mod docker_tests {
             let tx = coin
                 .send_maker_payment(
                     time_lock + i,
-                    &*coin.my_public_key(),
+                    my_pubkey,
                     &*dhash160(&secret),
                     1.into(),
                     &coin.swap_contract_address(),
+                    &[],
                 )
                 .wait()
                 .unwrap();
@@ -604,15 +602,11 @@ mod docker_tests {
 
         let recently_sent = block_on(coin.as_ref().recently_spent_outpoints.lock());
 
-        let before = now_ms();
         unspents = recently_sent
             .replace_spent_outputs_with_cache(unspents.into_iter().collect())
             .into_iter()
             .collect();
 
-        let after = now_ms();
-        log!("Took "(after - before));
-
         let last_tx = sent_tx.last().unwrap();
         let expected_unspent = UnspentInfo {
             outpoint: OutPoint {
@@ -628,7 +622,7 @@ mod docker_tests {
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/554
     #[test]
     fn order_should_be_cancelled_when_entire_balance_is_withdrawn() {
-        let (_ctx, _, priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -651,9 +645,9 @@ mod docker_tests {
         )
         .unwrap();
         let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -667,7 +661,7 @@ mod docker_tests {
         let bob_uuid = json["result"]["uuid"].as_str().unwrap().to_owned();
 
         log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -677,11 +671,11 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "[bob_orderbook]);
+        log!("orderbook {:?}", bob_orderbook);
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
-        let withdraw = block_on(mm_bob.rpc(json! ({
+        let withdraw = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "withdraw",
             "coin": "MYCOIN",
@@ -693,7 +687,7 @@ mod docker_tests {
 
         let withdraw: Json = json::from_str(&withdraw.1).unwrap();
 
-        let send_raw = block_on(mm_bob.rpc(json! ({
+        let send_raw = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "send_raw_transaction",
             "coin": "MYCOIN",
@@ -702,10 +696,10 @@ mod docker_tests {
         .unwrap();
         assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
 
-        thread::sleep(Duration::from_secs(12));
+        thread::sleep(Duration::from_secs(32));
 
         log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -715,19 +709,19 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&bob_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&bob_orderbook).unwrap());
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 0, "MYCOIN/MYCOIN1 orderbook must have exactly 0 asks");
 
         log!("Get my orders");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "my_orders",
         })))
         .unwrap();
         assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
         let orders: Json = json::from_str(&rc.1).unwrap();
-        log!("my_orders "(json::to_string(&orders).unwrap()));
+        log!("my_orders {}", json::to_string(&orders).unwrap());
         assert!(
             orders["result"]["maker_orders"].as_object().unwrap().is_empty(),
             "maker_orders must be empty"
@@ -739,14 +733,14 @@ mod docker_tests {
             hex::encode(rmd160.take()),
             bob_uuid,
         ));
-        log!("Order path "(order_path.display()));
+        log!("Order path {}", order_path.display());
         assert!(!order_path.exists());
         block_on(mm_bob.stop()).unwrap();
     }
 
     #[test]
     fn order_should_be_updated_when_balance_is_decreased_alice_subscribes_after_update() {
-        let (_ctx, _, priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -786,12 +780,12 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -803,7 +797,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
         log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -813,11 +807,11 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "[bob_orderbook]);
+        log!("orderbook {:?}", bob_orderbook);
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
-        let withdraw = block_on(mm_bob.rpc(json! ({
+        let withdraw = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "withdraw",
             "coin": "MYCOIN",
@@ -829,7 +823,7 @@ mod docker_tests {
 
         let withdraw: Json = json::from_str(&withdraw.1).unwrap();
 
-        let send_raw = block_on(mm_bob.rpc(json! ({
+        let send_raw = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "send_raw_transaction",
             "coin": "MYCOIN",
@@ -838,10 +832,10 @@ mod docker_tests {
         .unwrap();
         assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
 
-        thread::sleep(Duration::from_secs(12));
+        thread::sleep(Duration::from_secs(32));
 
         log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -851,7 +845,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&bob_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&bob_orderbook).unwrap());
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
@@ -859,7 +853,7 @@ mod docker_tests {
         assert_eq!("500", order_volume);
 
         log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -869,7 +863,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&alice_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&alice_orderbook).unwrap());
         let asks = alice_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Alice MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
@@ -882,7 +876,7 @@ mod docker_tests {
 
     #[test]
     fn order_should_be_updated_when_balance_is_decreased_alice_subscribes_before_update() {
-        let (_ctx, _, priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -922,12 +916,12 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -939,7 +933,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
         log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -949,13 +943,13 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "[bob_orderbook]);
+        log!("orderbook {:?}", bob_orderbook);
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
         thread::sleep(Duration::from_secs(2));
         log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -965,11 +959,11 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&alice_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&alice_orderbook).unwrap());
         let asks = alice_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Alice MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
-        let withdraw = block_on(mm_bob.rpc(json! ({
+        let withdraw = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "withdraw",
             "coin": "MYCOIN",
@@ -981,7 +975,7 @@ mod docker_tests {
 
         let withdraw: Json = json::from_str(&withdraw.1).unwrap();
 
-        let send_raw = block_on(mm_bob.rpc(json! ({
+        let send_raw = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "send_raw_transaction",
             "coin": "MYCOIN",
@@ -990,10 +984,10 @@ mod docker_tests {
         .unwrap();
         assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
 
-        thread::sleep(Duration::from_secs(12));
+        thread::sleep(Duration::from_secs(32));
 
         log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -1003,7 +997,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&bob_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&bob_orderbook).unwrap());
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
@@ -1011,7 +1005,7 @@ mod docker_tests {
         assert_eq!("500", order_volume);
 
         log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -1021,7 +1015,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&alice_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&alice_orderbook).unwrap());
         let asks = alice_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Alice MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
@@ -1034,8 +1028,8 @@ mod docker_tests {
 
     #[test]
     fn test_order_should_be_updated_when_matched_partially() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 2000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 2000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -1072,12 +1066,12 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -1088,7 +1082,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -1104,7 +1098,7 @@ mod docker_tests {
             .unwrap();
 
         log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -1114,7 +1108,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&bob_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&bob_orderbook).unwrap());
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
@@ -1122,7 +1116,7 @@ mod docker_tests {
         assert_eq!("500", order_volume);
 
         log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -1132,7 +1126,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "(json::to_string(&alice_orderbook).unwrap()));
+        log!("orderbook {}", json::to_string(&alice_orderbook).unwrap());
         let asks = alice_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Alice MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
 
@@ -1143,8 +1137,8 @@ mod docker_tests {
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/471
     #[test]
     fn test_match_and_trade_setprice_max() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -1181,11 +1175,11 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -1199,7 +1193,7 @@ mod docker_tests {
         let bob_uuid = json["result"]["uuid"].as_str().unwrap().to_owned();
 
         log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -1209,12 +1203,12 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("orderbook "[bob_orderbook]);
+        log!("orderbook {:?}", bob_orderbook);
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
         assert_eq!(asks[0]["maxvolume"], Json::from("999.99999"));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -1237,7 +1231,7 @@ mod docker_tests {
             hex::encode(rmd160.take()),
             bob_uuid,
         ));
-        log!("Order path "(order_path.display()));
+        log!("Order path {}", order_path.display());
         assert!(!order_path.exists());
         block_on(mm_bob.stop()).unwrap();
         block_on(mm_alice.stop()).unwrap();
@@ -1246,13 +1240,13 @@ mod docker_tests {
     #[test]
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/888
     fn test_max_taker_vol_swap() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 50.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 50.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
         ]);
-        let mut mm_bob = MarketMakerIt::start_with_envs(
+        let mut mm_bob = block_on(MarketMakerIt::start_with_envs(
             json! ({
                 "gui": "nogui",
                 "netid": 9000,
@@ -1265,12 +1259,12 @@ mod docker_tests {
             "pass".to_string(),
             None,
             &[("MYCOIN_FEE_DISCOUNT", "")],
-        )
+        ))
         .unwrap();
         let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
         block_on(mm_bob.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
-        let mut mm_alice = MarketMakerIt::start_with_envs(
+        let mut mm_alice = block_on(MarketMakerIt::start_with_envs(
             json! ({
                 "gui": "nogui",
                 "netid": 9000,
@@ -1283,17 +1277,17 @@ mod docker_tests {
             "pass".to_string(),
             None,
             &[("MYCOIN_FEE_DISCOUNT", "")],
-        )
+        ))
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
         block_on(mm_alice.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
         let price = MmNumber::from((100, 1620));
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -1304,7 +1298,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN1",
@@ -1312,10 +1306,10 @@ mod docker_tests {
         })))
         .unwrap();
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-        log!((rc.1));
+        log!("{}", rc.1);
         thread::sleep(Duration::from_secs(3));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "max_taker_vol",
             "coin": "MYCOIN1",
@@ -1329,7 +1323,7 @@ mod docker_tests {
         let actual_vol = MmNumber::from(vol.result.clone());
         assert_eq!(expected_vol, actual_vol);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "MYCOIN1",
@@ -1347,7 +1341,7 @@ mod docker_tests {
 
         thread::sleep(Duration::from_secs(3));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "my_swap_status",
             "params": {
@@ -1367,8 +1361,8 @@ mod docker_tests {
 
     #[test]
     fn test_buy_when_coins_locked_by_other_swap() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -1405,11 +1399,11 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -1420,7 +1414,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -1440,9 +1434,9 @@ mod docker_tests {
             .unwrap();
         // TODO when buy call is made immediately swap might be not put into swap ctx yet so locked
         // amount returns 0
-        thread::sleep(Duration::from_secs(3));
+        thread::sleep(Duration::from_secs(6));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -1464,8 +1458,8 @@ mod docker_tests {
 
     #[test]
     fn test_sell_when_coins_locked_by_other_swap() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -1502,11 +1496,11 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -1517,7 +1511,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "MYCOIN1",
@@ -1537,9 +1531,9 @@ mod docker_tests {
             .unwrap();
         // TODO when sell call is made immediately swap might be not put into swap ctx yet so locked
         // amount returns 0
-        thread::sleep(Duration::from_secs(3));
+        thread::sleep(Duration::from_secs(6));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "MYCOIN1",
@@ -1561,7 +1555,7 @@ mod docker_tests {
 
     #[test]
     fn test_buy_max() {
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 1.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -1582,9 +1576,9 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_alice.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -1599,7 +1593,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!buy: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -1649,10 +1643,10 @@ mod docker_tests {
         .unwrap();
         let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
 
-        log!([block_on(enable_native(&mm, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1686,7 +1680,7 @@ mod docker_tests {
         actual.result.sort_total_fees();
         assert_eq!(expected, actual.result);
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1721,7 +1715,7 @@ mod docker_tests {
         actual.result.sort_total_fees();
         assert_eq!(expected, actual.result);
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1789,11 +1783,11 @@ mod docker_tests {
         .unwrap();
         let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
 
-        log!([block_on(enable_native(&mm, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
         // `max` field is not supported for `buy/sell` swap methods
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1816,7 +1810,7 @@ mod docker_tests {
         };
         assert_eq!(actual.error_data, Some(expected));
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1851,7 +1845,7 @@ mod docker_tests {
         });
         assert_eq!(expected, actual.result);
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1933,12 +1927,12 @@ mod docker_tests {
         .unwrap();
         let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
 
-        log!([block_on(enable_native(&mm, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
         fill_balance_functor(MmNumber::from("0.000015").to_decimal());
         // Try sell the max amount with the zero balance.
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1957,7 +1951,7 @@ mod docker_tests {
         let required = MmNumber::from("0.00002").to_decimal();
         expect_not_sufficient_balance(&rc.1, available, required, None);
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1976,7 +1970,7 @@ mod docker_tests {
         let required = MmNumber::from("0.10001").to_decimal();
         expect_not_sufficient_balance(&rc.1, available, required, None);
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -1997,7 +1991,7 @@ mod docker_tests {
         expect_not_sufficient_balance(&rc.1, available, required, None);
 
         fill_balance_functor(MmNumber::from("7.770085").to_decimal());
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -2054,11 +2048,11 @@ mod docker_tests {
         .unwrap();
         let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
 
-        log!([block_on(enable_native(&mm, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
         // Price is too low
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -2085,7 +2079,7 @@ mod docker_tests {
         // volume 0.00001 is too low, min trading volume 0.0001
         let low_volume = BigDecimal::from(1) / BigDecimal::from(100_000);
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -2110,7 +2104,7 @@ mod docker_tests {
         };
         assert_eq!(actual.error_data, Some(expected));
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -2141,7 +2135,7 @@ mod docker_tests {
         let low_price = BigDecimal::from(1) / BigDecimal::from(10);
         // Min MYCOIN1 trading volume is 0.0001, but the actual volume is 0.00001
         let low_rel_volume = &volume * &low_price;
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "mmrpc": "2.0",
             "method": "trade_preimage",
@@ -2197,10 +2191,10 @@ mod docker_tests {
         .unwrap();
         let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
 
-        log!([block_on(enable_native(&mm, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "method": "trade_preimage",
             "base": "MYCOIN",
@@ -2215,7 +2209,7 @@ mod docker_tests {
 
         // vvv test a taker method vvv
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "method": "trade_preimage",
             "base": "MYCOIN",
@@ -2231,7 +2225,7 @@ mod docker_tests {
         // vvv test the error response vvv
 
         // `max` field is not supported for `buy/sell` swap methods
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "method": "trade_preimage",
             "base": "MYCOIN",
@@ -2249,7 +2243,7 @@ mod docker_tests {
 
     #[test]
     fn test_get_max_taker_vol() {
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 1.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -2270,9 +2264,9 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        let rc = block_on(mm_alice.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "max_taker_vol",
             "coin": "MYCOIN1",
@@ -2287,7 +2281,7 @@ mod docker_tests {
         assert_eq!(json.result, expected);
         assert_eq!(json.coin, "MYCOIN1");
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "MYCOIN1",
@@ -2304,7 +2298,8 @@ mod docker_tests {
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/733
     #[test]
     fn test_get_max_taker_vol_dex_fee_threshold() {
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", "0.05328455".parse().unwrap());
+        let (_ctx, _, alice_priv_key) =
+            generate_utxo_coin_with_random_privkey("MYCOIN1", "0.05328455".parse().unwrap());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"}},
@@ -2325,9 +2320,9 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        let rc = block_on(mm_alice.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "max_taker_vol",
             "coin": "MYCOIN1",
@@ -2339,7 +2334,7 @@ mod docker_tests {
         assert_eq!(json["result"]["numer"], Json::from("1059691"));
         assert_eq!(json["result"]["denom"], Json::from("20000000"));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "MYCOIN1",
@@ -2365,7 +2360,7 @@ mod docker_tests {
     #[test]
     fn test_get_max_taker_vol_dust_threshold() {
         // first, try to test with the balance slightly less than required
-        let (_ctx, coin, priv_key) = generate_coin_with_random_privkey("MYCOIN1", "0.001656".parse().unwrap());
+        let (_ctx, coin, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", "0.001656".parse().unwrap());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"},"dust":72800},
@@ -2386,10 +2381,10 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm.log_path);
 
-        log!([block_on(enable_native(&mm, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
-        let rc = block_on(mm.rpc(json!({
+        let rc = block_on(mm.rpc(&json!({
             "userpass": mm.userpass,
             "method": "max_taker_vol",
             "coin": "MYCOIN1",
@@ -2402,7 +2397,7 @@ mod docker_tests {
 
         fill_address(&coin, &coin.my_address().unwrap(), "0.00001".parse().unwrap(), 30);
 
-        let rc = block_on(mm.rpc(json! ({
+        let rc = block_on(mm.rpc(&json! ({
             "userpass": mm.userpass,
             "method": "max_taker_vol",
             "coin": "MYCOIN1",
@@ -2419,7 +2414,7 @@ mod docker_tests {
 
     #[test]
     fn test_get_max_taker_vol_with_kmd() {
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 1.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"}},
@@ -2441,14 +2436,15 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_electrum(&mm_alice, "KMD", false, &[
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        let electrum = block_on(enable_electrum(&mm_alice, "KMD", false, &[
             "electrum1.cipig.net:10001",
             "electrum2.cipig.net:10001",
-            "electrum3.cipig.net:10001"
-        ]))]);
-        let rc = block_on(mm_alice.rpc(json! ({
+            "electrum3.cipig.net:10001",
+        ]));
+        log!("{:?}", electrum);
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "max_taker_vol",
             "coin": "MYCOIN1",
@@ -2461,7 +2457,7 @@ mod docker_tests {
         assert_eq!(json["result"]["numer"], Json::from("1294741"));
         assert_eq!(json["result"]["denom"], Json::from("1296500"));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "MYCOIN1",
@@ -2480,7 +2476,7 @@ mod docker_tests {
 
     #[test]
     fn test_set_price_max() {
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -2501,9 +2497,9 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_alice.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -2518,7 +2514,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -2537,8 +2533,8 @@ mod docker_tests {
 
     #[test]
     fn swaps_should_stop_on_stop_rpc() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -2575,11 +2571,11 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -2592,7 +2588,7 @@ mod docker_tests {
         let mut uuids = Vec::with_capacity(3);
 
         for _ in 0..3 {
-            let rc = block_on(mm_alice.rpc(json! ({
+            let rc = block_on(mm_alice.rpc(&json! ({
                 "userpass": mm_alice.userpass,
                 "method": "buy",
                 "base": "MYCOIN",
@@ -2634,7 +2630,7 @@ mod docker_tests {
 
     #[test]
     fn test_maker_order_should_kick_start_and_appear_in_orderbook_on_restart() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -2651,9 +2647,9 @@ mod docker_tests {
         let mm_bob = MarketMakerIt::start(bob_conf.clone(), "pass".to_string(), None).unwrap();
         let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -2671,13 +2667,13 @@ mod docker_tests {
 
         let mm_bob_dup = MarketMakerIt::start(bob_conf, "pass".to_string(), None).unwrap();
         let (_bob_dup_dump_log, _bob_dup_dump_dashboard) = mm_dump(&mm_bob_dup.log_path);
-        log!([block_on(enable_native(&mm_bob_dup, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[])));
 
         thread::sleep(Duration::from_secs(2));
 
         log!("Get RICK/MORTY orderbook on Bob side");
-        let rc = block_on(mm_bob_dup.rpc(json! ({
+        let rc = block_on(mm_bob_dup.rpc(&json! ({
             "userpass": mm_bob_dup.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -2687,14 +2683,14 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("Bob orderbook "[bob_orderbook]);
+        log!("Bob orderbook {:?}", bob_orderbook);
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 asks");
     }
 
     #[test]
     fn test_maker_order_should_not_kick_start_and_appear_in_orderbook_if_balance_is_withdrawn() {
-        let (_ctx, coin, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -2711,9 +2707,9 @@ mod docker_tests {
         let mm_bob = MarketMakerIt::start(bob_conf.clone(), "pass".to_string(), None).unwrap();
         let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -2745,13 +2741,13 @@ mod docker_tests {
 
         let mm_bob_dup = MarketMakerIt::start(bob_conf, "pass".to_string(), None).unwrap();
         let (_bob_dup_dump_log, _bob_dup_dump_dashboard) = mm_dump(&mm_bob_dup.log_path);
-        log!([block_on(enable_native(&mm_bob_dup, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[])));
 
         thread::sleep(Duration::from_secs(2));
 
         log!("Get RICK/MORTY orderbook on Bob side");
-        let rc = block_on(mm_bob_dup.rpc(json! ({
+        let rc = block_on(mm_bob_dup.rpc(&json! ({
             "userpass": mm_bob_dup.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -2761,11 +2757,11 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("Bob orderbook "[bob_orderbook]);
+        log!("Bob orderbook {:?}", bob_orderbook);
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert!(asks.is_empty(), "Bob MYCOIN/MYCOIN1 orderbook must not have asks");
 
-        let rc = block_on(mm_bob_dup.rpc(json! ({
+        let rc = block_on(mm_bob_dup.rpc(&json! ({
             "userpass": mm_bob_dup.userpass,
             "method": "my_orders",
         })))
@@ -2787,8 +2783,8 @@ mod docker_tests {
 
     #[test]
     fn test_maker_order_kick_start_should_trigger_subscription_and_match() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 1000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -2835,12 +2831,12 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -2858,13 +2854,13 @@ mod docker_tests {
 
         let mut mm_bob_dup = MarketMakerIt::start(bob_conf, "pass".to_string(), None).unwrap();
         let (_bob_dup_dump_log, _bob_dup_dump_dashboard) = mm_dump(&mm_bob_dup.log_path);
-        log!([block_on(enable_native(&mm_bob_dup, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[])));
 
         log!("Give restarted Bob 2 seconds to kickstart the order");
         thread::sleep(Duration::from_secs(2));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -2883,8 +2879,8 @@ mod docker_tests {
 
     #[test]
     fn test_orders_should_match_on_both_nodes_with_same_priv() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -2937,14 +2933,14 @@ mod docker_tests {
         .unwrap();
         let (_alice_2_dump_log, _alice_2_dump_dashboard) = mm_dump(&mm_alice_2.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice_1, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice_1, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice_2, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice_2, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice_1, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice_1, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice_2, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice_2, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -2955,7 +2951,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice_1.rpc(json! ({
+        let rc = block_on(mm_alice_1.rpc(&json! ({
             "userpass": mm_alice_1.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -2969,7 +2965,7 @@ mod docker_tests {
         block_on(mm_alice_1.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
             .unwrap();
 
-        let rc = block_on(mm_alice_2.rpc(json! ({
+        let rc = block_on(mm_alice_2.rpc(&json! ({
             "userpass": mm_alice_2.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -2990,8 +2986,8 @@ mod docker_tests {
 
     #[test]
     fn test_maker_and_taker_order_created_with_same_priv_should_not_match() {
-        let (_ctx, coin, priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, coin1, _) = generate_coin_with_random_privkey("MYCOIN1", 1000.into());
+        let (_ctx, coin, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin1, _) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1000.into());
         fill_address(&coin1, &coin.my_address().unwrap(), 1000.into(), 30);
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -3029,12 +3025,12 @@ mod docker_tests {
         .unwrap();
         let (_alice_1_dump_log, _alice_1_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -3045,7 +3041,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -3067,8 +3063,8 @@ mod docker_tests {
 
     #[test]
     fn test_taker_order_converted_to_maker_should_cancel_properly_when_matched() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -3105,11 +3101,11 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        let rc = block_on(mm_bob.rpc(json! ({
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "sell",
             "base": "MYCOIN",
@@ -3124,7 +3120,7 @@ mod docker_tests {
         log!("Give Bob 4 seconds to convert order to maker");
         thread::sleep(Duration::from_secs(4));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -3142,7 +3138,7 @@ mod docker_tests {
         log!("Give Bob 2 seconds to cancel the order");
         thread::sleep(Duration::from_secs(2));
         log!("Get my_orders on Bob side");
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "my_orders",
         })))
@@ -3153,7 +3149,7 @@ mod docker_tests {
             json::from_value(my_orders_json["result"]["maker_orders"].clone()).unwrap();
         assert!(maker_orders.is_empty());
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -3163,12 +3159,12 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("Bob orderbook "[bob_orderbook]);
+        log!("Bob orderbook {:?}", bob_orderbook);
         let asks = bob_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 0, "Bob MYCOIN/MYCOIN1 orderbook must be empty");
 
         log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -3178,7 +3174,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-        log!("Alice orderbook "[alice_orderbook]);
+        log!("Alice orderbook {:?}", alice_orderbook);
         let asks = alice_orderbook["asks"].as_array().unwrap();
         assert_eq!(asks.len(), 0, "Alice MYCOIN/MYCOIN1 orderbook must be empty");
 
@@ -3189,7 +3185,7 @@ mod docker_tests {
     #[test]
     fn test_utxo_merge() {
         let timeout = 30; // timeout if test takes more than 30 seconds to run
-        let (_ctx, coin, privkey) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, privkey) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         // fill several times to have more UTXOs on address
         fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
         fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
@@ -3216,7 +3212,7 @@ mod docker_tests {
         .unwrap();
         let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
 
-        let native = block_on(mm_bob.rpc(json! ({
+        let native = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "enable",
             "coin": "MYCOIN",
@@ -3228,7 +3224,7 @@ mod docker_tests {
         })))
         .unwrap();
         assert!(native.0.is_success(), "'enable' failed: {}", native.1);
-        log!("Enable result "(native.1));
+        log!("Enable result {}", native.1);
 
         block_on(mm_bob.wait_for_log(4., |log| log.contains("Starting UTXO merge loop for coin MYCOIN"))).unwrap();
 
@@ -3238,14 +3234,15 @@ mod docker_tests {
             .unwrap();
 
         thread::sleep(Duration::from_secs(2));
-        let (unspents, _) = block_on(coin.list_unspent_ordered(&coin.as_ref().my_address)).unwrap();
+        let (unspents, _) =
+            block_on(coin.get_unspent_ordered_list(&coin.as_ref().derivation_method.unwrap_iguana())).unwrap();
         assert_eq!(unspents.len(), 1);
     }
 
     #[test]
     fn test_utxo_merge_max_merge_at_once() {
         let timeout = 30; // timeout if test takes more than 30 seconds to run
-        let (_ctx, coin, privkey) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, coin, privkey) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         // fill several times to have more UTXOs on address
         fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
         fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
@@ -3272,7 +3269,7 @@ mod docker_tests {
         .unwrap();
         let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
 
-        let native = block_on(mm_bob.rpc(json! ({
+        let native = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "enable",
             "coin": "MYCOIN",
@@ -3285,7 +3282,7 @@ mod docker_tests {
         })))
         .unwrap();
         assert!(native.0.is_success(), "'enable' failed: {}", native.1);
-        log!("Enable result "(native.1));
+        log!("Enable result {}", native.1);
 
         block_on(mm_bob.wait_for_log(4., |log| log.contains("Starting UTXO merge loop for coin MYCOIN"))).unwrap();
 
@@ -3295,7 +3292,8 @@ mod docker_tests {
             .unwrap();
 
         thread::sleep(Duration::from_secs(2));
-        let (unspents, _) = block_on(coin.list_unspent_ordered(&coin.as_ref().my_address)).unwrap();
+        let (unspents, _) =
+            block_on(coin.get_unspent_ordered_list(&coin.as_ref().derivation_method.unwrap_iguana())).unwrap();
         // 4 utxos are merged of 5 so the resulting unspents len must be 2
         assert_eq!(unspents.len(), 2);
     }
@@ -3322,11 +3320,11 @@ mod docker_tests {
         )
         .unwrap();
         let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm.log_path);
-        log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
         // balance = 0, but amount = 1
         let amount = BigDecimal::from(1);
-        let withdraw = block_on(mm.rpc(json! ({
+        let withdraw = block_on(mm.rpc(&json! ({
             "mmrpc": "2.0",
             "userpass": mm.userpass,
             "method": "withdraw",
@@ -3340,7 +3338,7 @@ mod docker_tests {
         .unwrap();
 
         assert!(withdraw.0.is_client_error(), "RICK withdraw: {}", withdraw.1);
-        log!("error: "[withdraw.1]);
+        log!("error: {:?}", withdraw.1);
         let error: RpcErrorResponse<withdraw_error::NotSufficientBalance> =
             json::from_str(&withdraw.1).expect("Expected 'RpcErrorResponse<NotSufficientBalance>'");
         let expected_error = withdraw_error::NotSufficientBalance {
@@ -3359,7 +3357,7 @@ mod docker_tests {
         // txfee = 0.00001, amount = 0.5 => required = 0.50001
         // but balance = 0.5
         let txfee = BigDecimal::from(1) / BigDecimal::from(100000);
-        let withdraw = block_on(mm.rpc(json! ({
+        let withdraw = block_on(mm.rpc(&json! ({
             "mmrpc": "2.0",
             "userpass": mm.userpass,
             "method": "withdraw",
@@ -3373,7 +3371,7 @@ mod docker_tests {
         .unwrap();
 
         assert!(withdraw.0.is_client_error(), "RICK withdraw: {}", withdraw.1);
-        log!("error: "[withdraw.1]);
+        log!("error: {:?}", withdraw.1);
         let error: RpcErrorResponse<withdraw_error::NotSufficientBalance> =
             json::from_str(&withdraw.1).expect("Expected 'RpcErrorResponse<NotSufficientBalance>'");
         let expected_error = withdraw_error::NotSufficientBalance {
@@ -3388,9 +3386,9 @@ mod docker_tests {
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/1053
     #[test]
     fn test_taker_should_match_with_best_price_buy() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 2000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 4000.into());
-        let (_ctx, _, eve_priv_key) = generate_coin_with_random_privkey("MYCOIN", 2000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 2000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 4000.into());
+        let (_ctx, _, eve_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 2000.into());
 
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -3444,14 +3442,14 @@ mod docker_tests {
         .unwrap();
         let (_eve_dump_log, _eve_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_eve, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_eve, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_eve, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_eve, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -3462,7 +3460,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_eve.rpc(json! ({
+        let rc = block_on(mm_eve.rpc(&json! ({
             "userpass": mm_eve.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -3474,7 +3472,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
         // subscribe alice to the orderbook topic to not miss eve's message
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -3482,11 +3480,11 @@ mod docker_tests {
         })))
         .unwrap();
         assert!(rc.0.is_success(), "!alice orderbook: {}", rc.1);
-        log!("alice orderbook "(rc.1));
+        log!("alice orderbook {}", rc.1);
 
         thread::sleep(Duration::from_secs(1));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
@@ -3525,9 +3523,9 @@ mod docker_tests {
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/1053
     #[test]
     fn test_taker_should_match_with_best_price_sell() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 2000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 4000.into());
-        let (_ctx, _, eve_priv_key) = generate_coin_with_random_privkey("MYCOIN", 2000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 2000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 4000.into());
+        let (_ctx, _, eve_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 2000.into());
 
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -3581,14 +3579,14 @@ mod docker_tests {
         .unwrap();
         let (_eve_dump_log, _eve_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-        log!([block_on(enable_native(&mm_eve, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_eve, "MYCOIN1", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+        log!("{:?}", block_on(enable_native(&mm_eve, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_eve, "MYCOIN1", &[])));
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -3599,7 +3597,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_eve.rpc(json! ({
+        let rc = block_on(mm_eve.rpc(&json! ({
             "userpass": mm_eve.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -3611,7 +3609,7 @@ mod docker_tests {
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
         // subscribe alice to the orderbook topic to not miss eve's message
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "orderbook",
             "base": "MYCOIN",
@@ -3619,11 +3617,11 @@ mod docker_tests {
         })))
         .unwrap();
         assert!(rc.0.is_success(), "!alice orderbook: {}", rc.1);
-        log!("alice orderbook "(rc.1));
+        log!("alice orderbook {}", rc.1);
 
         thread::sleep(Duration::from_secs(1));
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "MYCOIN1",
@@ -3662,8 +3660,8 @@ mod docker_tests {
     #[test]
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/1074
     fn test_match_utxo_with_eth_taker_sell() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
@@ -3700,8 +3698,8 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
         let eth_bob = block_on(enable_native(&mm_bob, "ETH", &["http://195.201.0.6:8565"]));
         let eth_bob: EnableElectrumResponse = json::from_value(eth_bob).unwrap();
         // pass without 0x
@@ -3712,7 +3710,7 @@ mod docker_tests {
         // pass without 0x
         fill_eth(&eth_alice.address[2..]);
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -3722,7 +3720,7 @@ mod docker_tests {
         })))
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "sell",
             "base": "ETH",
@@ -3743,8 +3741,8 @@ mod docker_tests {
     #[test]
     // https://github.com/KomodoPlatform/atomicDEX-API/issues/1074
     fn test_match_utxo_with_eth_taker_buy() {
-        let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-        let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+        let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
         let coins = json! ([
             {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
             {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
@@ -3781,8 +3779,8 @@ mod docker_tests {
         .unwrap();
         let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-        log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-        log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
+        log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+        log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
         let eth_bob = block_on(enable_native(&mm_bob, "ETH", &["http://195.201.0.6:8565"]));
         let eth_bob: EnableElectrumResponse = json::from_value(eth_bob).unwrap();
         // pass without 0x
@@ -3793,7 +3791,7 @@ mod docker_tests {
         // pass without 0x
         fill_eth(&eth_alice.address[2..]);
 
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": "MYCOIN",
@@ -3804,7 +3802,7 @@ mod docker_tests {
         .unwrap();
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-        let rc = block_on(mm_alice.rpc(json! ({
+        let rc = block_on(mm_alice.rpc(&json! ({
             "userpass": mm_alice.userpass,
             "method": "buy",
             "base": "MYCOIN",
diff --git a/mm2src/docker_tests/docker_ordermatch_tests.rs b/mm2src/mm2_main/src/docker_tests/docker_ordermatch_tests.rs
similarity index 75%
rename from mm2src/docker_tests/docker_ordermatch_tests.rs
rename to mm2src/mm2_main/src/docker_tests/docker_ordermatch_tests.rs
index 97eb96bdad..e7e45f9bad 100644
--- a/mm2src/docker_tests/docker_ordermatch_tests.rs
+++ b/mm2src/mm2_main/src/docker_tests/docker_ordermatch_tests.rs
@@ -1,10 +1,10 @@
 use super::*;
 use common::block_on;
-use common::for_tests::{mm_dump, MarketMakerIt};
+use mm2_test_helpers::for_tests::{mm_dump, MarketMakerIt};
 
 fn check_asks_num(mm: &MarketMakerIt, base: &str, rel: &str, expected: usize) {
-    log!({"Get {}/{} orderbook", base, rel});
-    let rc = block_on(mm.rpc(json! ({
+    log!("Get {}/{} orderbook", base, rel);
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": base,
@@ -13,7 +13,7 @@ fn check_asks_num(mm: &MarketMakerIt, base: &str, rel: &str, expected: usize) {
     .unwrap();
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
     let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
+    log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.asks.len(),
         expected,
@@ -25,8 +25,8 @@ fn check_asks_num(mm: &MarketMakerIt, base: &str, rel: &str, expected: usize) {
 }
 
 fn check_bids_num(mm: &MarketMakerIt, base: &str, rel: &str, expected: usize) {
-    log!({"Get {}/{} orderbook", base, rel});
-    let rc = block_on(mm.rpc(json! ({
+    log!("Get {}/{} orderbook", base, rel);
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": base,
@@ -35,7 +35,7 @@ fn check_bids_num(mm: &MarketMakerIt, base: &str, rel: &str, expected: usize) {
     .unwrap();
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
     let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
+    log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.bids.len(),
         expected,
@@ -47,8 +47,8 @@ fn check_bids_num(mm: &MarketMakerIt, base: &str, rel: &str, expected: usize) {
 }
 
 fn check_orderbook_depth(mm: &MarketMakerIt, pairs: &[(&str, &str)], expected: &[(usize, usize)]) {
-    log!({"Get {:?} orderbook depth", pairs});
-    let rc = block_on(mm.rpc(json! ({
+    log!("Get {:?} orderbook depth", pairs);
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "orderbook_depth",
         "pairs": pairs,
@@ -56,7 +56,7 @@ fn check_orderbook_depth(mm: &MarketMakerIt, pairs: &[(&str, &str)], expected: &
     .unwrap();
     assert!(rc.0.is_success(), "!orderbook_depth: {}", rc.1);
     let orderbook_depth: OrderbookDepthResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook depth "[orderbook_depth]);
+    log!("orderbook depth {:?}", orderbook_depth);
     for (pair, expected_depth) in pairs.iter().zip(expected) {
         let actual_depth = orderbook_depth
             .result
@@ -84,8 +84,8 @@ fn check_best_orders(
     ticker_in_response: &str,
     expected_num_orders: usize,
 ) {
-    log!({"Get best orders for {}", for_coin});
-    let rc = block_on(mm.rpc(json! ({
+    log!("Get best orders for {}", for_coin);
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "best_orders",
         "coin": for_coin,
@@ -103,10 +103,74 @@ fn check_best_orders(
     assert_eq!(orders.len(), expected_num_orders);
 }
 
+fn check_best_orders_v2_by_number(
+    mm: &MarketMakerIt,
+    action: &str,
+    for_coin: &str,
+    ticker_in_response: &str,
+    expected_num_orders: usize,
+) {
+    log!("Get best orders for {}", for_coin);
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": for_coin,
+            "action": action,
+            "request_by": {
+                "type": "number",
+                "value": 1
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let best_orders: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let orders = best_orders
+        .result
+        .orders
+        .get(ticker_in_response)
+        .unwrap_or_else(|| panic!("No orders for ticker {}", ticker_in_response));
+    assert_eq!(orders.len(), expected_num_orders);
+}
+
+fn check_best_orders_v2_by_volume(
+    mm: &MarketMakerIt,
+    action: &str,
+    for_coin: &str,
+    ticker_in_response: &str,
+    expected_num_orders: usize,
+) {
+    log!("Get best orders for {}", for_coin);
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": for_coin,
+            "action": action,
+            "request_by": {
+                "type": "volume",
+                "value": 1
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let best_orders: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let orders = best_orders
+        .result
+        .orders
+        .get(ticker_in_response)
+        .unwrap_or_else(|| panic!("No orders for ticker {}", ticker_in_response));
+    assert_eq!(orders.len(), expected_num_orders);
+}
+
 #[test]
 fn test_ordermatch_custom_orderbook_ticker_both_on_maker() {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
     let coins = json! ([
         {"coin":"MYCOIN", "asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
         {"coin":"MYCOIN1", "asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -145,11 +209,11 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_maker() {
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-    log!([block_on(enable_native(&mm_bob, "MYCOIN-Custom", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1-Custom", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN-Custom", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1-Custom", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MYCOIN-Custom",
@@ -178,6 +242,16 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_maker() {
     check_best_orders(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
     check_best_orders(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
 
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
     check_orderbook_depth(
         &mm_alice,
         &[
@@ -206,7 +280,7 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_maker() {
         &[(1, 0); 4],
     );
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "MYCOIN",
@@ -229,8 +303,8 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_maker() {
 
 #[test]
 fn test_ordermatch_custom_orderbook_ticker_both_on_taker() {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
 
     let coins = json! ([
         {"coin":"MYCOIN", "asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -270,11 +344,11 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_taker() {
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN-Custom", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1-Custom", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN-Custom", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1-Custom", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MYCOIN",
@@ -297,6 +371,16 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_taker() {
     check_best_orders(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
     check_best_orders(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
 
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
     check_orderbook_depth(
         &mm_alice,
         &[
@@ -324,7 +408,7 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_taker() {
         &[(1, 0); 4],
     );
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "MYCOIN-Custom",
@@ -352,8 +436,8 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_taker() {
 
 #[test]
 fn test_ordermatch_custom_orderbook_ticker_mixed_case_one() {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
 
     let coins = json! ([
         {"coin":"MYCOIN", "asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -393,11 +477,11 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_one() {
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-    log!([block_on(enable_native(&mm_bob, "MYCOIN-Custom", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1-Custom", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN-Custom", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1-Custom", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MYCOIN-Custom",
@@ -425,6 +509,16 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_one() {
     check_best_orders(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
     check_best_orders(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
 
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
     check_orderbook_depth(
         &mm_alice,
         &[
@@ -452,7 +546,7 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_one() {
         &[(1, 0); 4],
     );
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "MYCOIN",
@@ -483,8 +577,8 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_one() {
 
 #[test]
 fn test_ordermatch_custom_orderbook_ticker_mixed_case_two() {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
 
     let coins = json! ([
         {"coin":"MYCOIN", "asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -524,11 +618,11 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_two() {
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1-Custom", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN-Custom", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1-Custom", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN-Custom", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MYCOIN",
@@ -556,6 +650,16 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_two() {
     check_best_orders(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
     check_best_orders(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
 
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_volume(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "sell", "MYCOIN1-Custom", "MYCOIN", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN", "MYCOIN1", 1);
+    check_best_orders_v2_by_number(&mm_alice, "buy", "MYCOIN-Custom", "MYCOIN1", 1);
+
     check_orderbook_depth(
         &mm_alice,
         &[
@@ -583,7 +687,7 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_two() {
         &[(1, 0); 4],
     );
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "MYCOIN-Custom",
@@ -631,7 +735,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     });
     let mm_seed = MarketMakerIt::start(seed_conf, "pass".to_string(), None).unwrap();
 
-    let (_ctx, _, priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
     let mut conf = json! ({
         "gui": "nogui",
         "netid": 9000,
@@ -646,10 +750,10 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     let mm_maker = MarketMakerIt::start(conf.clone(), "pass".to_string(), None).unwrap();
     let (_dump_log, _dump_dashboard) = mm_dump(&mm_maker.log_path);
 
-    log!([block_on(enable_native(&mm_maker, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_maker, "MYCOIN1", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm_maker, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_maker, "MYCOIN1", &[])));
 
-    let rc = block_on(mm_maker.rpc(json! ({
+    let rc = block_on(mm_maker.rpc(&json! ({
         "userpass": mm_maker.userpass,
         "method": "setprice",
         "base": "MYCOIN",
@@ -663,7 +767,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
 
     println!("set_price_res {:?}", set_price_res);
 
-    let withdraw = block_on(mm_maker.rpc(json! ({
+    let withdraw = block_on(mm_maker.rpc(&json! ({
         "userpass": mm_maker.userpass,
         "method": "withdraw",
         "coin": "MYCOIN",
@@ -675,7 +779,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
 
     let withdraw: Json = json::from_str(&withdraw.1).unwrap();
 
-    let send_raw = block_on(mm_maker.rpc(json! ({
+    let send_raw = block_on(mm_maker.rpc(&json! ({
         "userpass": mm_maker.userpass,
         "method": "send_raw_transaction",
         "coin": "MYCOIN",
@@ -686,10 +790,10 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
 
     let new_expected_vol: BigDecimal = "499.99998".parse().unwrap();
 
-    thread::sleep(Duration::from_secs(12));
+    thread::sleep(Duration::from_secs(32));
 
     log!("Get MYCOIN/MYCOIN1 orderbook");
-    let rc = block_on(mm_maker.rpc(json! ({
+    let rc = block_on(mm_maker.rpc(&json! ({
         "userpass": mm_maker.userpass,
         "method": "orderbook",
         "base": "MYCOIN",
@@ -699,7 +803,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
+    log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.asks.len(),
         1,
@@ -708,7 +812,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     assert_eq!(orderbook.asks[0].max_volume, new_expected_vol);
 
     log!("Get my orders");
-    let rc = block_on(mm_maker.rpc(json! ({
+    let rc = block_on(mm_maker.rpc(&json! ({
         "userpass": mm_maker.userpass,
         "method": "my_orders",
     })))
@@ -729,7 +833,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
 
     // we should ignore our state submitted by another node to us
     log!("Get MYCOIN/MYCOIN1 orderbook");
-    let rc = block_on(mm_maker_dup.rpc(json! ({
+    let rc = block_on(mm_maker_dup.rpc(&json! ({
         "userpass": mm_maker_dup.userpass,
         "method": "orderbook",
         "base": "MYCOIN",
@@ -739,20 +843,20 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
+    log!("orderbook {:?}", orderbook);
     assert!(
         orderbook.asks.is_empty(),
         "MYCOIN/MYCOIN1 orderbook must have empty asks"
     );
 
     // activate coins to kickstart our order
-    log!([block_on(enable_native(&mm_maker_dup, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_maker_dup, "MYCOIN1", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm_maker_dup, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_maker_dup, "MYCOIN1", &[])));
 
     thread::sleep(Duration::from_secs(5));
 
     log!("Get MYCOIN/MYCOIN1 orderbook");
-    let rc = block_on(mm_maker_dup.rpc(json! ({
+    let rc = block_on(mm_maker_dup.rpc(&json! ({
         "userpass": mm_maker_dup.userpass,
         "method": "orderbook",
         "base": "MYCOIN",
@@ -762,7 +866,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
+    log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.asks.len(),
         1,
@@ -771,7 +875,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     assert_eq!(orderbook.asks[0].max_volume, new_expected_vol);
 
     log!("Get my orders");
-    let rc = block_on(mm_maker_dup.rpc(json! ({
+    let rc = block_on(mm_maker_dup.rpc(&json! ({
         "userpass": mm_maker_dup.userpass,
         "method": "my_orders",
     })))
diff --git a/mm2src/mm2_main/src/docker_tests/docker_tests_common.rs b/mm2src/mm2_main/src/docker_tests/docker_tests_common.rs
new file mode 100644
index 0000000000..f17b0db32b
--- /dev/null
+++ b/mm2src/mm2_main/src/docker_tests/docker_tests_common.rs
@@ -0,0 +1,782 @@
+// re-export the most common imports
+pub use crate::mm2::mm2_tests::structs::*;
+pub use common::{block_on, now_ms};
+pub use mm2_number::MmNumber;
+pub use mm2_test_helpers::for_tests::{check_my_swap_status, check_recent_swaps, check_stats_swap_status,
+                                      enable_native, enable_native_bch, mm_dump, MarketMakerIt, MAKER_ERROR_EVENTS,
+                                      MAKER_SUCCESS_EVENTS, TAKER_ERROR_EVENTS, TAKER_SUCCESS_EVENTS};
+pub use secp256k1::{PublicKey, SecretKey};
+pub use std::env;
+pub use std::thread;
+
+use bitcrypto::{dhash160, ChecksumType};
+use coins::qrc20::rpc_clients::for_tests::Qrc20NativeWalletOps;
+use coins::qrc20::{qrc20_coin_from_conf_and_params, Qrc20ActivationParams, Qrc20Coin};
+use coins::utxo::qtum::{qtum_coin_with_priv_key, QtumBasedCoin, QtumCoin};
+use coins::utxo::rpc_clients::{NativeClient, UtxoRpcClientEnum, UtxoRpcClientOps};
+use coins::utxo::utxo_standard::{utxo_standard_coin_with_priv_key, UtxoStandardCoin};
+use coins::utxo::{coin_daemon_data_dir, sat_from_big_decimal, zcash_params_path, UtxoActivationParams,
+                  UtxoAddressFormat, UtxoCoinFields};
+use coins::MarketCoinOps;
+use ethereum_types::H160 as H160Eth;
+use futures01::Future;
+use http::StatusCode;
+use keys::{Address, AddressHashEnum};
+use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
+use mm2_number::BigDecimal;
+use primitives::hash::{H160, H256};
+use secp256k1::Secp256k1;
+use serde_json::{self as json, Value as Json};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Mutex;
+use std::time::Duration;
+use testcontainers::clients::Cli;
+use testcontainers::images::generic::{GenericImage, WaitFor};
+use testcontainers::{Container, Docker, Image};
+
+lazy_static! {
+    static ref COINS_LOCK: Mutex<()> = Mutex::new(());
+    pub static ref SLP_TOKEN_ID: Mutex<H256> = Mutex::new(H256::default());
+    // Private keys supplied with 1000 SLP tokens on tests initialization.
+    // Due to the SLP protocol limitations only 19 outputs (18 + change) can be sent in one transaction, which is sufficient for now though.
+    // Supply more privkeys when 18 will be not enough.
+    pub static ref SLP_TOKEN_OWNERS: Mutex<Vec<[u8; 32]>> = Mutex::new(Vec::with_capacity(18));
+}
+
+pub static mut QICK_TOKEN_ADDRESS: Option<H160Eth> = None;
+pub static mut QORTY_TOKEN_ADDRESS: Option<H160Eth> = None;
+pub static mut QRC20_SWAP_CONTRACT_ADDRESS: Option<H160Eth> = None;
+pub static mut QTUM_CONF_PATH: Option<PathBuf> = None;
+
+pub const UTXO_ASSET_DOCKER_IMAGE: &str = "docker.io/artempikulin/testblockchain:multiarch";
+
+pub const QTUM_ADDRESS_LABEL: &str = "MM2_ADDRESS_LABEL";
+
+pub trait CoinDockerOps {
+    fn rpc_client(&self) -> &UtxoRpcClientEnum;
+
+    fn native_client(&self) -> &NativeClient {
+        match self.rpc_client() {
+            UtxoRpcClientEnum::Native(native) => native,
+            _ => panic!("UtxoRpcClientEnum::Native is expected"),
+        }
+    }
+
+    fn wait_ready(&self, expected_tx_version: i32) {
+        let timeout = now_ms() + 120000;
+        loop {
+            match self.rpc_client().get_block_count().wait() {
+                Ok(n) => {
+                    if n > 1 {
+                        if let UtxoRpcClientEnum::Native(client) = self.rpc_client() {
+                            let hash = client.get_block_hash(n).wait().unwrap();
+                            let block = client.get_block(hash).wait().unwrap();
+                            let coinbase = client.get_verbose_transaction(&block.tx[0]).wait().unwrap();
+                            println!("Coinbase tx {:?} in block {}", coinbase, n);
+                            if coinbase.version == expected_tx_version {
+                                break;
+                            }
+                        }
+                    }
+                },
+                Err(e) => log!("{:?}", e),
+            }
+            assert!(now_ms() < timeout, "Test timed out");
+            thread::sleep(Duration::from_secs(1));
+        }
+    }
+}
+
+pub struct UtxoDockerNode<'a> {
+    #[allow(dead_code)]
+    pub container: Container<'a, Cli, GenericImage>,
+    #[allow(dead_code)]
+    pub ticker: String,
+    #[allow(dead_code)]
+    pub port: u16,
+}
+
+pub fn utxo_asset_docker_node<'a>(docker: &'a Cli, ticker: &'static str, port: u16) -> UtxoDockerNode<'a> {
+    let args = vec![
+        "-v".into(),
+        format!("{}:/root/.zcash-params", zcash_params_path().display()),
+        "-p".into(),
+        format!("{}:{}", port, port).into(),
+    ];
+    let image = GenericImage::new(UTXO_ASSET_DOCKER_IMAGE)
+        .with_args(args)
+        .with_env_var("CLIENTS", "2")
+        .with_env_var("CHAIN", ticker)
+        .with_env_var("TEST_ADDY", "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF")
+        .with_env_var("TEST_WIF", "UqqW7f766rADem9heD8vSBvvrdfJb3zg5r8du9rJxPtccjWf7RG9")
+        .with_env_var(
+            "TEST_PUBKEY",
+            "021607076d7a2cb148d542fb9644c04ffc22d2cca752f80755a0402a24c567b17a",
+        )
+        .with_env_var("DAEMON_URL", "http://test:test@127.0.0.1:7000")
+        .with_env_var("COIN", "Komodo")
+        .with_env_var("COIN_RPC_PORT", port.to_string())
+        .with_wait_for(WaitFor::message_on_stdout("config is ready"));
+    let container = docker.run(image);
+    let mut conf_path = coin_daemon_data_dir(ticker, true);
+    std::fs::create_dir_all(&conf_path).unwrap();
+    conf_path.push(format!("{}.conf", ticker));
+    Command::new("docker")
+        .arg("cp")
+        .arg(format!("{}:/data/node_0/{}.conf", container.id(), ticker))
+        .arg(&conf_path)
+        .status()
+        .expect("Failed to execute docker command");
+    let timeout = now_ms() + 3000;
+    loop {
+        if conf_path.exists() {
+            break;
+        };
+        assert!(now_ms() < timeout, "Test timed out");
+    }
+    UtxoDockerNode {
+        container,
+        ticker: ticker.into(),
+        port,
+    }
+}
+
+pub fn rmd160_from_priv(privkey: [u8; 32]) -> H160 {
+    let secret = SecretKey::from_slice(&privkey).unwrap();
+    let public = PublicKey::from_secret_key(&Secp256k1::new(), &secret);
+    dhash160(&public.serialize())
+}
+
+pub fn get_prefilled_slp_privkey() -> [u8; 32] { SLP_TOKEN_OWNERS.lock().unwrap().remove(0) }
+
+pub fn get_slp_token_id() -> String { hex::encode(SLP_TOKEN_ID.lock().unwrap().as_slice()) }
+
+pub fn import_address<T>(coin: &T)
+where
+    T: MarketCoinOps + AsRef<UtxoCoinFields>,
+{
+    match coin.as_ref().rpc_client {
+        UtxoRpcClientEnum::Native(ref native) => {
+            let my_address = coin.my_address().unwrap();
+            native.import_address(&my_address, &my_address, false).wait().unwrap()
+        },
+        UtxoRpcClientEnum::Electrum(_) => panic!("Expected NativeClient"),
+    }
+}
+
+/// Build `Qrc20Coin` from ticker and privkey without filling the balance.
+pub fn qrc20_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, Qrc20Coin) {
+    let (contract_address, swap_contract_address) = unsafe {
+        let contract_address = match ticker {
+            "QICK" => QICK_TOKEN_ADDRESS
+                .expect("QICK_TOKEN_ADDRESS must be set already")
+                .clone(),
+            "QORTY" => QORTY_TOKEN_ADDRESS
+                .expect("QORTY_TOKEN_ADDRESS must be set already")
+                .clone(),
+            _ => panic!("Expected QICK or QORTY ticker"),
+        };
+        (
+            contract_address,
+            QRC20_SWAP_CONTRACT_ADDRESS
+                .expect("QRC20_SWAP_CONTRACT_ADDRESS must be set already")
+                .clone(),
+        )
+    };
+    let platform = "QTUM";
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
+    let conf = json!({
+        "coin":ticker,
+        "decimals": 8,
+        "required_confirmations":0,
+        "pubtype":120,
+        "p2shtype":110,
+        "wiftype":128,
+        "mm2":1,
+        "mature_confirmations":500,
+        "network":"regtest",
+        "confpath": confpath,
+        "dust": 72800,
+    });
+    let req = json!({
+        "method": "enable",
+        "swap_contract_address": format!("{:#02x}", swap_contract_address),
+    });
+    let params = Qrc20ActivationParams::from_legacy_req(&req).unwrap();
+
+    let coin = block_on(qrc20_coin_from_conf_and_params(
+        &ctx,
+        ticker,
+        platform,
+        &conf,
+        &params,
+        &priv_key,
+        contract_address,
+    ))
+    .unwrap();
+
+    import_address(&coin);
+    (ctx, coin)
+}
+
+fn qrc20_coin_conf_item(ticker: &str) -> Json {
+    let contract_address = unsafe {
+        match ticker {
+            "QICK" => QICK_TOKEN_ADDRESS
+                .expect("QICK_TOKEN_ADDRESS must be set already")
+                .clone(),
+            "QORTY" => QORTY_TOKEN_ADDRESS
+                .expect("QORTY_TOKEN_ADDRESS must be set already")
+                .clone(),
+            _ => panic!("Expected either QICK or QORTY ticker, found {}", ticker),
+        }
+    };
+    let contract_address = format!("{:#02x}", contract_address);
+
+    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
+    json!({
+        "coin":ticker,
+        "required_confirmations":1,
+        "pubtype":120,
+        "p2shtype":110,
+        "wiftype":128,
+        "mature_confirmations":500,
+        "confpath":confpath,
+        "network":"regtest",
+        "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":contract_address}}})
+}
+
+/// Build asset `UtxoStandardCoin` from ticker and privkey without filling the balance.
+pub fn utxo_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, UtxoStandardCoin) {
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let conf = json!({"asset":ticker,"txversion":4,"overwintered":1,"txfee":1000,"network":"regtest"});
+    let req = json!({"method":"enable"});
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, ticker, &conf, &params, priv_key)).unwrap();
+    import_address(&coin);
+    (ctx, coin)
+}
+
+/// Get only one address assigned the specified label.
+pub fn get_address_by_label<T>(coin: T, label: &str) -> String
+where
+    T: AsRef<UtxoCoinFields>,
+{
+    let native = match coin.as_ref().rpc_client {
+        UtxoRpcClientEnum::Native(ref native) => native,
+        UtxoRpcClientEnum::Electrum(_) => panic!("NativeClient expected"),
+    };
+    let mut addresses = native
+        .get_addresses_by_label(label)
+        .wait()
+        .expect("!getaddressesbylabel")
+        .into_iter();
+    match addresses.next() {
+        Some((addr, _purpose)) if addresses.next().is_none() => addr,
+        Some(_) => panic!("Expected only one address by {:?}", label),
+        None => panic!("Expected one address by {:?}", label),
+    }
+}
+
+pub fn fill_qrc20_address(coin: &Qrc20Coin, amount: BigDecimal, timeout: u64) {
+    // prevent concurrent fill since daemon RPC returns errors if send_to_address
+    // is called concurrently (insufficient funds) and it also may return other errors
+    // if previous transaction is not confirmed yet
+    let _lock = COINS_LOCK.lock().unwrap();
+    let timeout = now_ms() / 1000 + timeout;
+    let client = match coin.as_ref().rpc_client {
+        UtxoRpcClientEnum::Native(ref client) => client,
+        UtxoRpcClientEnum::Electrum(_) => panic!("Expected NativeClient"),
+    };
+
+    let from_addr = get_address_by_label(coin, QTUM_ADDRESS_LABEL);
+    let to_addr = coin.my_addr_as_contract_addr().unwrap();
+    let satoshis = sat_from_big_decimal(&amount, coin.as_ref().decimals).expect("!sat_from_big_decimal");
+
+    let hash = client
+        .transfer_tokens(
+            &coin.contract_address,
+            &from_addr,
+            to_addr,
+            satoshis.into(),
+            coin.as_ref().decimals,
+        )
+        .wait()
+        .expect("!transfer_tokens")
+        .txid;
+
+    let tx_bytes = client.get_transaction_bytes(&hash).wait().unwrap();
+    log!("{:02x}", tx_bytes);
+    coin.wait_for_confirmations(&tx_bytes, 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+}
+
+/// Generate random privkey, create a QRC20 coin and fill it's address with the specified balance.
+pub fn generate_qrc20_coin_with_random_privkey(
+    ticker: &str,
+    qtum_balance: BigDecimal,
+    qrc20_balance: BigDecimal,
+) -> (MmArc, Qrc20Coin, [u8; 32]) {
+    let priv_key = SecretKey::new(&mut rand6::thread_rng());
+    let (ctx, coin) = qrc20_coin_from_privkey(ticker, priv_key.as_ref());
+
+    let timeout = 30; // timeout if test takes more than 30 seconds to run
+    let my_address = coin.my_address().expect("!my_address");
+    fill_address(&coin, &my_address, qtum_balance, timeout);
+    fill_qrc20_address(&coin, qrc20_balance, timeout);
+    (ctx, coin, *priv_key.as_ref())
+}
+
+pub fn generate_qtum_coin_with_random_privkey(
+    ticker: &str,
+    balance: BigDecimal,
+    txfee: Option<u64>,
+) -> (MmArc, QtumCoin, [u8; 32]) {
+    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
+    let conf = json!({
+        "coin":ticker,
+        "decimals":8,
+        "required_confirmations":0,
+        "pubtype":120,
+        "p2shtype": 110,
+        "wiftype":128,
+        "txfee": txfee,
+        "txfee_volatility_percent":0.1,
+        "mm2":1,
+        "mature_confirmations":500,
+        "network":"regtest",
+        "confpath": confpath,
+        "dust": 72800,
+    });
+    let req = json!({"method": "enable"});
+    let priv_key = SecretKey::new(&mut rand6::thread_rng());
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key.as_ref())).unwrap();
+
+    let timeout = 30; // timeout if test takes more than 30 seconds to run
+    let my_address = coin.my_address().expect("!my_address");
+    fill_address(&coin, &my_address, balance, timeout);
+    (ctx, coin, *priv_key.as_ref())
+}
+
+pub fn generate_segwit_qtum_coin_with_random_privkey(
+    ticker: &str,
+    balance: BigDecimal,
+    txfee: Option<u64>,
+) -> (MmArc, QtumCoin, [u8; 32]) {
+    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
+    let conf = json!({
+        "coin":ticker,
+        "decimals":8,
+        "required_confirmations":0,
+        "pubtype":120,
+        "p2shtype": 110,
+        "wiftype":128,
+        "segwit":true,
+        "txfee": txfee,
+        "txfee_volatility_percent":0.1,
+        "mm2":1,
+        "mature_confirmations":500,
+        "network":"regtest",
+        "confpath": confpath,
+        "dust": 72800,
+        "bech32_hrp":"qcrt",
+        "address_format": {
+            "format": "segwit",
+        },
+    });
+    let req = json!({"method": "enable"});
+    let priv_key = SecretKey::new(&mut rand6::thread_rng());
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key.as_ref())).unwrap();
+
+    let timeout = 30; // timeout if test takes more than 30 seconds to run
+    let my_address = coin.my_address().expect("!my_address");
+    fill_address(&coin, &my_address, balance, timeout);
+    (ctx, coin, *priv_key.as_ref())
+}
+
+pub fn fill_address<T>(coin: &T, address: &str, amount: BigDecimal, timeout: u64)
+where
+    T: MarketCoinOps + AsRef<UtxoCoinFields>,
+{
+    // prevent concurrent fill since daemon RPC returns errors if send_to_address
+    // is called concurrently (insufficient funds) and it also may return other errors
+    // if previous transaction is not confirmed yet
+    let _lock = COINS_LOCK.lock().unwrap();
+    let timeout = now_ms() / 1000 + timeout;
+
+    if let UtxoRpcClientEnum::Native(client) = &coin.as_ref().rpc_client {
+        client.import_address(address, address, false).wait().unwrap();
+        let hash = client.send_to_address(address, &amount).wait().unwrap();
+        let tx_bytes = client.get_transaction_bytes(&hash).wait().unwrap();
+        coin.wait_for_confirmations(&tx_bytes, 1, false, timeout, 1)
+            .wait()
+            .unwrap();
+        log!("{:02x}", tx_bytes);
+        loop {
+            let unspents = client
+                .list_unspent_impl(0, std::i32::MAX, vec![address.to_string()])
+                .wait()
+                .unwrap();
+            if !unspents.is_empty() {
+                break;
+            }
+            assert!(now_ms() / 1000 < timeout, "Test timed out");
+            thread::sleep(Duration::from_secs(1));
+        }
+    };
+}
+
+/// Wait for the `estimatesmartfee` returns no errors.
+pub fn wait_for_estimate_smart_fee(timeout: u64) -> Result<(), String> {
+    enum EstimateSmartFeeState {
+        Idle,
+        Ok,
+        NotAvailable,
+    }
+    lazy_static! {
+        static ref LOCK: Mutex<EstimateSmartFeeState> = Mutex::new(EstimateSmartFeeState::Idle);
+    }
+
+    let state = &mut *LOCK.lock().unwrap();
+    match state {
+        EstimateSmartFeeState::Ok => return Ok(()),
+        EstimateSmartFeeState::NotAvailable => return ERR!("estimatesmartfee not available"),
+        EstimateSmartFeeState::Idle => log!("Start wait_for_estimate_smart_fee"),
+    }
+
+    let priv_key = SecretKey::new(&mut rand6::thread_rng());
+    let (_ctx, coin) = qrc20_coin_from_privkey("QICK", priv_key.as_ref());
+    let timeout = now_ms() / 1000 + timeout;
+    let client = match coin.as_ref().rpc_client {
+        UtxoRpcClientEnum::Native(ref client) => client,
+        UtxoRpcClientEnum::Electrum(_) => panic!("Expected NativeClient"),
+    };
+    while now_ms() / 1000 < timeout {
+        if let Ok(res) = client.estimate_smart_fee(&None, 1).wait() {
+            if res.errors.is_empty() {
+                *state = EstimateSmartFeeState::Ok;
+                return Ok(());
+            }
+        }
+        thread::sleep(Duration::from_secs(1));
+    }
+
+    *state = EstimateSmartFeeState::NotAvailable;
+    ERR!("Waited too long for estimate_smart_fee to work")
+}
+
+pub async fn enable_qrc20_native(mm: &MarketMakerIt, coin: &str) -> Json {
+    let swap_contract_address = unsafe {
+        QRC20_SWAP_CONTRACT_ADDRESS
+            .expect("QRC20_SWAP_CONTRACT_ADDRESS must be set already")
+            .clone()
+    };
+
+    let native = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "enable",
+            "coin": coin,
+            "swap_contract_address": format!("{:#02x}", swap_contract_address),
+            "mm2": 1,
+        }))
+        .await
+        .unwrap();
+    assert_eq!(native.0, StatusCode::OK, "'enable' failed: {}", native.1);
+    json::from_str(&native.1).unwrap()
+}
+
+pub fn trade_base_rel((base, rel): (&str, &str)) {
+    /// Generate a wallet with the random private key and fill the wallet with Qtum (required by gas_fee) and specified in `ticker` coin.
+    fn generate_and_fill_priv_key(ticker: &str) -> [u8; 32] {
+        let timeout = 30; // timeout if test takes more than 30 seconds to run
+
+        match ticker {
+            "QTUM" => {
+                //Segwit QTUM
+                wait_for_estimate_smart_fee(timeout).expect("!wait_for_estimate_smart_fee");
+                let (_ctx, _coin, priv_key) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 10.into(), Some(0));
+
+                priv_key
+            },
+            "QICK" | "QORTY" => {
+                let priv_key = SecretKey::new(&mut rand6::thread_rng());
+                let (_ctx, coin) = qrc20_coin_from_privkey(ticker, priv_key.as_ref());
+                let my_address = coin.my_address().expect("!my_address");
+                fill_address(&coin, &my_address, 10.into(), timeout);
+                fill_qrc20_address(&coin, 10.into(), timeout);
+
+                *priv_key.as_ref()
+            },
+            "MYCOIN" | "MYCOIN1" => {
+                let priv_key = SecretKey::new(&mut rand6::thread_rng());
+                let (_ctx, coin) = utxo_coin_from_privkey(ticker, priv_key.as_ref());
+                let my_address = coin.my_address().expect("!my_address");
+                fill_address(&coin, &my_address, 10.into(), timeout);
+                // also fill the Qtum
+                let (_ctx, coin) = qrc20_coin_from_privkey("QICK", priv_key.as_ref());
+                let my_address = coin.my_address().expect("!my_address");
+                fill_address(&coin, &my_address, 10.into(), timeout);
+
+                *priv_key.as_ref()
+            },
+            "ADEXSLP" => get_prefilled_slp_privkey(),
+            "FORSLP" => get_prefilled_slp_privkey(),
+            _ => panic!("Expected either QICK or QORTY or MYCOIN or MYCOIN1, found {}", ticker),
+        }
+    }
+
+    let bob_priv_key = generate_and_fill_priv_key(base);
+    let alice_priv_key = generate_and_fill_priv_key(rel);
+
+    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
+    let coins = json! ([
+        qrc20_coin_conf_item("QICK"),
+        qrc20_coin_conf_item("QORTY"),
+        {"coin":"MYCOIN","asset":"MYCOIN","required_confirmations":0,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
+        {"coin":"MYCOIN1","asset":"MYCOIN1","required_confirmations":0,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
+        {"coin":"QTUM","asset":"QTUM","required_confirmations":0,"decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"segwit":true,"txfee":0,"txfee_volatility_percent":0.1,
+        "mm2":1,"network":"regtest","confpath":confpath,"protocol":{"type":"UTXO"},"bech32_hrp":"qcrt","address_format":{"format":"segwit"}},
+        {"coin":"FORSLP","asset":"FORSLP","required_confirmations":0,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"BCH","protocol_data":{"slp_prefix":"slptest"}}},
+        {"coin":"ADEXSLP","protocol":{"type":"SLPTOKEN","protocol_data":{"decimals":8,"token_id":get_slp_token_id(),"platform":"FORSLP"}}}
+    ]);
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(bob_priv_key)),
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
+    block_on(mm_bob.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
+
+    let mut mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(alice_priv_key)),
+            "coins": coins,
+            "rpc_password": "pass",
+            "seednodes": vec![format!("{}", mm_bob.ip)],
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
+    block_on(mm_alice.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
+
+    log!("{:?}", block_on(enable_qrc20_native(&mm_bob, "QICK")));
+    log!("{:?}", block_on(enable_qrc20_native(&mm_bob, "QORTY")));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "QTUM", &[])));
+    log!("{:?}", block_on(enable_native_bch(&mm_bob, "FORSLP", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "ADEXSLP", &[])));
+
+    log!("{:?}", block_on(enable_qrc20_native(&mm_alice, "QICK")));
+    log!("{:?}", block_on(enable_qrc20_native(&mm_alice, "QORTY")));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "QTUM", &[])));
+    log!("{:?}", block_on(enable_native_bch(&mm_alice, "FORSLP", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "ADEXSLP", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": base,
+        "rel": rel,
+        "price": 1,
+        "volume": "3",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    thread::sleep(Duration::from_secs(1));
+
+    log!("Issue alice {}/{} buy request", base, rel);
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": base,
+        "rel": rel,
+        "price": 1,
+        "volume": "2",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+    let buy_json: Json = serde_json::from_str(&rc.1).unwrap();
+    let uuid = buy_json["result"]["uuid"].as_str().unwrap().to_owned();
+
+    // ensure the swaps are started
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains(&format!("Entering the maker_swap_loop {}/{}", base, rel))
+    }))
+    .unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| {
+        log.contains(&format!("Entering the taker_swap_loop {}/{}", base, rel))
+    }))
+    .unwrap();
+
+    // ensure the swaps are finished
+    block_on(mm_bob.wait_for_log(600., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))).unwrap();
+    block_on(mm_alice.wait_for_log(600., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))).unwrap();
+
+    log!("Checking alice/taker status..");
+    block_on(check_my_swap_status(
+        &mm_alice,
+        &uuid,
+        &TAKER_SUCCESS_EVENTS,
+        &TAKER_ERROR_EVENTS,
+        "2".parse().unwrap(),
+        "2".parse().unwrap(),
+    ));
+
+    log!("Checking bob/maker status..");
+    block_on(check_my_swap_status(
+        &mm_bob,
+        &uuid,
+        &MAKER_SUCCESS_EVENTS,
+        &MAKER_ERROR_EVENTS,
+        "2".parse().unwrap(),
+        "2".parse().unwrap(),
+    ));
+
+    log!("Waiting 3 seconds for nodes to broadcast their swaps data..");
+    thread::sleep(Duration::from_secs(3));
+
+    log!("Checking alice status..");
+    block_on(check_stats_swap_status(
+        &mm_alice,
+        &uuid,
+        &MAKER_SUCCESS_EVENTS,
+        &TAKER_SUCCESS_EVENTS,
+    ));
+
+    log!("Checking bob status..");
+    block_on(check_stats_swap_status(
+        &mm_bob,
+        &uuid,
+        &MAKER_SUCCESS_EVENTS,
+        &TAKER_SUCCESS_EVENTS,
+    ));
+
+    log!("Checking alice recent swaps..");
+    block_on(check_recent_swaps(&mm_alice, 1));
+    log!("Checking bob recent swaps..");
+    block_on(check_recent_swaps(&mm_bob, 1));
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+pub fn slp_supplied_node() -> MarketMakerIt {
+    let coins = json! ([
+        {"coin":"FORSLP","asset":"FORSLP","required_confirmations":0,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"BCH","protocol_data":{"slp_prefix":"slptest"}}},
+        {"coin":"ADEXSLP","protocol":{"type":"SLPTOKEN","protocol_data":{"decimals":8,"token_id":get_slp_token_id(),"platform":"FORSLP"}}}
+    ]);
+
+    let priv_key = get_prefilled_slp_privkey();
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(priv_key)),
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .unwrap();
+
+    mm
+}
+
+pub fn solana_supplied_node() -> MarketMakerIt {
+    let coins = json! ([
+        {"coin": "SOL-DEVNET","name": "solana","fname": "Solana","rpcport": 80,"mm2": 1,"required_confirmations": 1,"avg_blocktime": 0.25,"protocol": {"type": "SOLANA"}},
+        {"coin":"USDC-SOL-DEVNET","protocol":{"type":"SPLTOKEN","protocol_data":{"decimals":6,"token_contract_address":"4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU","platform":"SOL-DEVNET"}},"mm2": 1},
+        {"coin":"ADEX-SOL-DEVNET","protocol":{"type":"SPLTOKEN","protocol_data":{"decimals":9,"token_contract_address":"5tSm6PqMosy1rz1AqV3kD28yYT5XqZW3QYmZommuFiPJ","platform":"SOL-DEVNET"}},"mm2": 1},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .unwrap();
+
+    mm
+}
+
+pub fn get_balance(mm: &MarketMakerIt, coin: &str) -> MyBalanceResponse {
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "my_balance",
+        "coin": coin,
+    })))
+    .unwrap();
+    assert_eq!(rc.0, StatusCode::OK, "my_balance request failed {}", rc.1);
+    json::from_str(&rc.1).unwrap()
+}
+
+pub fn utxo_burn_address() -> Address {
+    Address {
+        prefix: 60,
+        hash: AddressHashEnum::default_address_hash(),
+        t_addr_prefix: 0,
+        checksum_type: ChecksumType::DSHA256,
+        hrp: None,
+        addr_format: UtxoAddressFormat::Standard,
+    }
+}
+
+pub fn withdraw_max_and_send_v1(mm: &MarketMakerIt, coin: &str, to: &str) -> TransactionDetails {
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "withdraw",
+        "coin": coin,
+        "max": true,
+        "to": to,
+    })))
+    .unwrap();
+    assert_eq!(rc.0, StatusCode::OK, "withdraw request failed {}", rc.1);
+    let tx_details: TransactionDetails = json::from_str(&rc.1).unwrap();
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "send_raw_transaction",
+        "tx_hex": tx_details.tx_hex,
+        "coin": coin,
+    })))
+    .unwrap();
+    assert_eq!(rc.0, StatusCode::OK, "send_raw_transaction request failed {}", rc.1);
+
+    tx_details
+}
diff --git a/mm2src/docker_tests/qrc20_tests.rs b/mm2src/mm2_main/src/docker_tests/qrc20_tests.rs
similarity index 73%
rename from mm2src/docker_tests/qrc20_tests.rs
rename to mm2src/mm2_main/src/docker_tests/qrc20_tests.rs
index 4986127518..4d2e22f0ec 100644
--- a/mm2src/docker_tests/qrc20_tests.rs
+++ b/mm2src/mm2_main/src/docker_tests/qrc20_tests.rs
@@ -1,34 +1,34 @@
-use super::*;
-use crate::mm2::lp_swap::max_taker_vol_from_available;
-use bigdecimal::BigDecimal;
+use crate::docker_tests::docker_tests_common::*;
+use crate::mm2::lp_swap::{dex_fee_amount, max_taker_vol_from_available};
+use bitcrypto::dhash160;
 use coins::qrc20::rpc_clients::for_tests::Qrc20NativeWalletOps;
-use coins::qrc20::{qrc20_coin_from_conf_and_request, Qrc20Coin};
-use coins::utxo::qtum::QtumBasedCoin;
-use coins::utxo::qtum::{qtum_coin_from_conf_and_request, QtumCoin};
-use coins::utxo::sat_from_big_decimal;
+use coins::utxo::qtum::{qtum_coin_with_priv_key, QtumCoin};
+use coins::utxo::rpc_clients::UtxoRpcClientEnum;
 use coins::utxo::utxo_common::big_decimal_from_sat;
-use coins::{FeeApproxStage, MarketCoinOps, MmCoin, TradePreimageValue, TransactionEnum};
-use common::for_tests::{check_my_swap_status, check_recent_swaps, check_stats_swap_status, MAKER_ERROR_EVENTS,
-                        MAKER_SUCCESS_EVENTS, TAKER_ERROR_EVENTS, TAKER_SUCCESS_EVENTS};
+use coins::utxo::{UtxoActivationParams, UtxoCommonOps};
+use coins::{FeeApproxStage, FoundSwapTxSpend, MarketCoinOps, MmCoin, SearchForSwapTxSpendInput, SwapOps,
+            TradePreimageValue, TransactionEnum, ValidatePaymentInput};
 use common::log::debug;
-use common::mm_ctx::MmArc;
 use common::{temp_dir, DEX_FEE_ADDR_RAW_PUBKEY};
 use ethereum_types::H160;
+use futures01::Future;
 use http::StatusCode;
+use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
+use mm2_number::BigDecimal;
 use rand6::Rng;
-use std::path::PathBuf;
+use serde_json::{self as json, Value as Json};
+use std::convert::TryFrom;
+use std::process::Command;
 use std::str::FromStr;
+use std::time::Duration;
+use testcontainers::clients::Cli;
+use testcontainers::images::generic::{GenericImage, WaitFor};
+use testcontainers::{Docker, Image};
 
-pub const QTUM_REGTEST_DOCKER_IMAGE: &str = "sergeyboyko/qtumregtest";
+pub const QTUM_REGTEST_DOCKER_IMAGE: &str = "docker.io/sergeyboyko/qtumregtest";
 
 const QRC20_TOKEN_BYTES: &str = "6080604052600860ff16600a0a633b9aca000260005534801561002157600080fd5b50600054600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610c69806100776000396000f3006080604052600436106100a4576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100a9578063095ea7b31461013957806318160ddd1461019e57806323b872dd146101c9578063313ce5671461024e5780635a3b7e421461027f57806370a082311461030f57806395d89b4114610366578063a9059cbb146103f6578063dd62ed3e1461045b575b600080fd5b3480156100b557600080fd5b506100be6104d2565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100fe5780820151818401526020810190506100e3565b50505050905090810190601f16801561012b5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561014557600080fd5b50610184600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061050b565b604051808215151515815260200191505060405180910390f35b3480156101aa57600080fd5b506101b36106bb565b6040518082815260200191505060405180910390f35b3480156101d557600080fd5b50610234600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506106c1565b604051808215151515815260200191505060405180910390f35b34801561025a57600080fd5b506102636109a1565b604051808260ff1660ff16815260200191505060405180910390f35b34801561028b57600080fd5b506102946109a6565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156102d45780820151818401526020810190506102b9565b50505050905090810190601f1680156103015780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561031b57600080fd5b50610350600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506109df565b6040518082815260200191505060405180910390f35b34801561037257600080fd5b5061037b6109f7565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156103bb5780820151818401526020810190506103a0565b50505050905090810190601f1680156103e85780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561040257600080fd5b50610441600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610a30565b604051808215151515815260200191505060405180910390f35b34801561046757600080fd5b506104bc600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610be1565b6040518082815260200191505060405180910390f35b6040805190810160405280600881526020017f515243205445535400000000000000000000000000000000000000000000000081525081565b60008260008173ffffffffffffffffffffffffffffffffffffffff161415151561053457600080fd5b60008314806105bf57506000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054145b15156105ca57600080fd5b82600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925856040518082815260200191505060405180910390a3600191505092915050565b60005481565b60008360008173ffffffffffffffffffffffffffffffffffffffff16141515156106ea57600080fd5b8360008173ffffffffffffffffffffffffffffffffffffffff161415151561071157600080fd5b610797600260008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205485610c06565b600260008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610860600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205485610c06565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108ec600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205485610c1f565b600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508473ffffffffffffffffffffffffffffffffffffffff168673ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef866040518082815260200191505060405180910390a36001925050509392505050565b600881565b6040805190810160405280600981526020017f546f6b656e20302e31000000000000000000000000000000000000000000000081525081565b60016020528060005260406000206000915090505481565b6040805190810160405280600381526020017f515443000000000000000000000000000000000000000000000000000000000081525081565b60008260008173ffffffffffffffffffffffffffffffffffffffff1614151515610a5957600080fd5b610aa2600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205484610c06565b600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610b2e600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205484610c1f565b600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef856040518082815260200191505060405180910390a3600191505092915050565b6002602052816000526040600020602052806000526040600020600091509150505481565b6000818310151515610c1457fe5b818303905092915050565b6000808284019050838110151515610c3357fe5b80915050929150505600a165627a7a723058207f2e5248b61b80365ea08a0f6d11ac0b47374c4dfd538de76bc2f19591bbbba40029";
 const QRC20_SWAP_CONTRACT_BYTES: &str = "608060405234801561001057600080fd5b50611437806100206000396000f3fe60806040526004361061004a5760003560e01c806302ed292b1461004f5780630716326d146100de578063152cf3af1461017b57806346fc0294146101f65780639b415b2a14610294575b600080fd5b34801561005b57600080fd5b506100dc600480360360a081101561007257600080fd5b81019080803590602001909291908035906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610339565b005b3480156100ea57600080fd5b506101176004803603602081101561010157600080fd5b8101908080359060200190929190505050610867565b60405180846bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526020018367ffffffffffffffff1667ffffffffffffffff16815260200182600381111561016557fe5b60ff168152602001935050505060405180910390f35b6101f46004803603608081101561019157600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff19169060200190929190803567ffffffffffffffff1690602001909291905050506108bf565b005b34801561020257600080fd5b50610292600480360360a081101561021957600080fd5b81019080803590602001909291908035906020019092919080356bffffffffffffffffffffffff19169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610bd9565b005b610337600480360360c08110156102aa57600080fd5b810190808035906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080356bffffffffffffffffffffffff19169060200190929190803567ffffffffffffffff169060200190929190505050610fe2565b005b6001600381111561034657fe5b600080878152602001908152602001600020600001601c9054906101000a900460ff16600381111561037457fe5b1461037e57600080fd5b6000600333836003600288604051602001808281526020019150506040516020818303038152906040526040518082805190602001908083835b602083106103db57805182526020820191506020810190506020830392506103b8565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa15801561041d573d6000803e3d6000fd5b5050506040513d602081101561043257600080fd5b8101908080519060200190929190505050604051602001808281526020019150506040516020818303038152906040526040518082805190602001908083835b602083106104955780518252602082019150602081019050602083039250610472565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa1580156104d7573d6000803e3d6000fd5b5050506040515160601b8689604051602001808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b81526014018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401846bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401828152602001955050505050506040516020818303038152906040526040518082805190602001908083835b602083106105fc57805182526020820191506020810190506020830392506105d9565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa15801561063e573d6000803e3d6000fd5b5050506040515160601b905060008087815260200190815260200160002060000160009054906101000a900460601b6bffffffffffffffffffffffff1916816bffffffffffffffffffffffff19161461069657600080fd5b6002600080888152602001908152602001600020600001601c6101000a81548160ff021916908360038111156106c857fe5b0217905550600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561074e573373ffffffffffffffffffffffffffffffffffffffff166108fc869081150290604051600060405180830381858888f19350505050158015610748573d6000803e3d6000fd5b50610820565b60008390508073ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33886040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156107da57600080fd5b505af11580156107ee573d6000803e3d6000fd5b505050506040513d602081101561080457600080fd5b810190808051906020019092919050505061081e57600080fd5b505b7f36c177bcb01c6d568244f05261e2946c8c977fa50822f3fa098c470770ee1f3e8685604051808381526020018281526020019250505060405180910390a1505050505050565b60006020528060005260406000206000915090508060000160009054906101000a900460601b908060000160149054906101000a900467ffffffffffffffff169080600001601c9054906101000a900460ff16905083565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141580156108fc5750600034115b801561094057506000600381111561091057fe5b600080868152602001908152602001600020600001601c9054906101000a900460ff16600381111561093e57fe5b145b61094957600080fd5b60006003843385600034604051602001808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b81526014018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401846bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401828152602001955050505050506040516020818303038152906040526040518082805190602001908083835b60208310610a6c5780518252602082019150602081019050602083039250610a49565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610aae573d6000803e3d6000fd5b5050506040515160601b90506040518060600160405280826bffffffffffffffffffffffff191681526020018367ffffffffffffffff16815260200160016003811115610af757fe5b81525060008087815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908360601c021790555060208201518160000160146101000a81548167ffffffffffffffff021916908367ffffffffffffffff160217905550604082015181600001601c6101000a81548160ff02191690836003811115610b9357fe5b02179055509050507fccc9c05183599bd3135da606eaaf535daffe256e9de33c048014cffcccd4ad57856040518082815260200191505060405180910390a15050505050565b60016003811115610be657fe5b600080878152602001908152602001600020600001601c9054906101000a900460ff166003811115610c1457fe5b14610c1e57600080fd5b600060038233868689604051602001808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b81526014018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401846bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401828152602001955050505050506040516020818303038152906040526040518082805190602001908083835b60208310610d405780518252602082019150602081019050602083039250610d1d565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa158015610d82573d6000803e3d6000fd5b5050506040515160601b905060008087815260200190815260200160002060000160009054906101000a900460601b6bffffffffffffffffffffffff1916816bffffffffffffffffffffffff1916148015610e10575060008087815260200190815260200160002060000160149054906101000a900467ffffffffffffffff1667ffffffffffffffff164210155b610e1957600080fd5b6003600080888152602001908152602001600020600001601c6101000a81548160ff02191690836003811115610e4b57fe5b0217905550600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610ed1573373ffffffffffffffffffffffffffffffffffffffff166108fc869081150290604051600060405180830381858888f19350505050158015610ecb573d6000803e3d6000fd5b50610fa3565b60008390508073ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33886040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610f5d57600080fd5b505af1158015610f71573d6000803e3d6000fd5b505050506040513d6020811015610f8757600080fd5b8101908080519060200190929190505050610fa157600080fd5b505b7f1797d500133f8e427eb9da9523aa4a25cb40f50ebc7dbda3c7c81778973f35ba866040518082815260200191505060405180910390a1505050505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415801561101f5750600085115b801561106357506000600381111561103357fe5b600080888152602001908152602001600020600001601c9054906101000a900460ff16600381111561106157fe5b145b61106c57600080fd5b60006003843385888a604051602001808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b81526014018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401846bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1660601b8152601401828152602001955050505050506040516020818303038152906040526040518082805190602001908083835b6020831061118e578051825260208201915060208101905060208303925061116b565b6001836020036101000a038019825116818451168082178552505050505050905001915050602060405180830381855afa1580156111d0573d6000803e3d6000fd5b5050506040515160601b90506040518060600160405280826bffffffffffffffffffffffff191681526020018367ffffffffffffffff1681526020016001600381111561121957fe5b81525060008089815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908360601c021790555060208201518160000160146101000a81548167ffffffffffffffff021916908367ffffffffffffffff160217905550604082015181600001601c6101000a81548160ff021916908360038111156112b557fe5b021790555090505060008590508073ffffffffffffffffffffffffffffffffffffffff166323b872dd33308a6040518463ffffffff1660e01b8152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b15801561137d57600080fd5b505af1158015611391573d6000803e3d6000fd5b505050506040513d60208110156113a757600080fd5b81019080805190602001909291905050506113c157600080fd5b7fccc9c05183599bd3135da606eaaf535daffe256e9de33c048014cffcccd4ad57886040518082815260200191505060405180910390a1505050505050505056fea265627a7a723158208c83db436905afce0b7be1012be64818c49323c12d451fe2ab6bce76ff6421c964736f6c63430005110032";
-const QTUM_ADDRESS_LABEL: &str = "MM2_ADDRESS_LABEL";
-
-static mut QICK_TOKEN_ADDRESS: Option<H160> = None;
-static mut QORTY_TOKEN_ADDRESS: Option<H160> = None;
-static mut QRC20_SWAP_CONTRACT_ADDRESS: Option<H160> = None;
-static mut QTUM_CONF_PATH: Option<PathBuf> = None;
 
 pub struct QtumDockerOps {
     #[allow(dead_code)]
@@ -49,7 +49,8 @@ impl QtumDockerOps {
             "method": "enable",
         });
         let priv_key = hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap();
-        let coin = block_on(qtum_coin_from_conf_and_request(&ctx, "QTUM", &conf, &req, &priv_key)).unwrap();
+        let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+        let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, &priv_key)).unwrap();
         QtumDockerOps { ctx, coin }
     }
 
@@ -117,477 +118,8 @@ pub fn qtum_docker_node(docker: &Cli, port: u16) -> UtxoDockerNode {
     }
 }
 
-/// Build `Qrc20Coin` from ticker and privkey without filling the balance.
-fn qrc20_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, Qrc20Coin) {
-    let (contract_address, swap_contract_address) = unsafe {
-        let contract_address = match ticker {
-            "QICK" => QICK_TOKEN_ADDRESS.expect("QICK_TOKEN_ADDRESS must be set already"),
-            "QORTY" => QORTY_TOKEN_ADDRESS.expect("QORTY_TOKEN_ADDRESS must be set already"),
-            _ => panic!("Expected QICK or QORTY ticker"),
-        };
-        (
-            contract_address,
-            QRC20_SWAP_CONTRACT_ADDRESS.expect("QRC20_SWAP_CONTRACT_ADDRESS must be set already"),
-        )
-    };
-    let platform = "QTUM";
-    let ctx = MmCtxBuilder::new().into_mm_arc();
-    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
-    let conf = json!({
-        "coin":ticker,
-        "decimals": 8,
-        "required_confirmations":0,
-        "pubtype":120,
-        "p2shtype":110,
-        "wiftype":128,
-        "segwit":true,
-        "mm2":1,
-        "mature_confirmations":500,
-        "network":"regtest",
-        "confpath": confpath,
-        "dust": 72800,
-    });
-    let req = json!({
-        "method": "enable",
-        "swap_contract_address": format!("{:#02x}", swap_contract_address),
-    });
-    let coin = block_on(qrc20_coin_from_conf_and_request(
-        &ctx,
-        ticker,
-        platform,
-        &conf,
-        &req,
-        priv_key,
-        contract_address,
-    ))
-    .unwrap();
-
-    import_address(&coin);
-    (ctx, coin)
-}
-
-/// Generate random privkey, create a QRC20 coin and fill it's address with the specified balance.
-fn generate_qrc20_coin_with_random_privkey(
-    ticker: &str,
-    qtum_balance: BigDecimal,
-    qrc20_balance: BigDecimal,
-) -> (MmArc, Qrc20Coin, [u8; 32]) {
-    let priv_key = SecretKey::new(&mut rand6::thread_rng());
-    let (ctx, coin) = qrc20_coin_from_privkey(ticker, priv_key.as_ref());
-
-    let timeout = 30; // timeout if test takes more than 30 seconds to run
-    let my_address = coin.my_address().expect("!my_address");
-    fill_address(&coin, &my_address, qtum_balance, timeout);
-    fill_qrc20_address(&coin, qrc20_balance, timeout);
-    (ctx, coin, *priv_key.as_ref())
-}
-
-fn generate_qtum_coin_with_random_privkey(
-    ticker: &str,
-    balance: BigDecimal,
-    txfee: Option<u64>,
-) -> (MmArc, QtumCoin, [u8; 32]) {
-    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
-    let conf = json!({
-        "coin":ticker,
-        "decimals":8,
-        "required_confirmations":0,
-        "pubtype":120,
-        "p2shtype": 110,
-        "wiftype":128,
-        "segwit":true,
-        "txfee": txfee,
-        "txfee_volatility_percent":0.1,
-        "mm2":1,
-        "mature_confirmations":500,
-        "network":"regtest",
-        "confpath": confpath,
-        "dust": 72800,
-    });
-    let req = json!({"method": "enable"});
-    let priv_key = SecretKey::new(&mut rand6::thread_rng());
-    let ctx = MmCtxBuilder::new().into_mm_arc();
-    let coin = block_on(qtum_coin_from_conf_and_request(
-        &ctx,
-        "QTUM",
-        &conf,
-        &req,
-        priv_key.as_ref(),
-    ))
-    .unwrap();
-
-    let timeout = 30; // timeout if test takes more than 30 seconds to run
-    let my_address = coin.my_address().expect("!my_address");
-    fill_address(&coin, &my_address, balance, timeout);
-    (ctx, coin, *priv_key.as_ref())
-}
-
-fn generate_segwit_qtum_coin_with_random_privkey(
-    ticker: &str,
-    balance: BigDecimal,
-    txfee: Option<u64>,
-) -> (MmArc, QtumCoin, [u8; 32]) {
-    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
-    let conf = json!({
-        "coin":ticker,
-        "decimals":8,
-        "required_confirmations":0,
-        "pubtype":120,
-        "p2shtype": 110,
-        "wiftype":128,
-        "segwit":true,
-        "txfee": txfee,
-        "txfee_volatility_percent":0.1,
-        "mm2":1,
-        "mature_confirmations":500,
-        "network":"regtest",
-        "confpath": confpath,
-        "dust": 72800,
-        "bech32_hrp":"qcrt",
-        "address_format": {
-            "format": "segwit",
-        },
-    });
-    let req = json!({"method": "enable"});
-    let priv_key = SecretKey::new(&mut rand6::thread_rng());
-    let ctx = MmCtxBuilder::new().into_mm_arc();
-    let coin = block_on(qtum_coin_from_conf_and_request(
-        &ctx,
-        "QTUM",
-        &conf,
-        &req,
-        priv_key.as_ref(),
-    ))
-    .unwrap();
-
-    let timeout = 30; // timeout if test takes more than 30 seconds to run
-    let my_address = coin.my_address().expect("!my_address");
-    fill_address(&coin, &my_address, balance, timeout);
-    (ctx, coin, *priv_key.as_ref())
-}
-
-/// Get only one address assigned the specified label.
-fn get_address_by_label<T>(coin: T, label: &str) -> String
-where
-    T: AsRef<UtxoCoinFields>,
-{
-    let native = match coin.as_ref().rpc_client {
-        UtxoRpcClientEnum::Native(ref native) => native,
-        UtxoRpcClientEnum::Electrum(_) => panic!("NativeClient expected"),
-    };
-    let mut addresses = native
-        .get_addresses_by_label(label)
-        .wait()
-        .expect("!getaddressesbylabel")
-        .into_iter();
-    match addresses.next() {
-        Some((addr, _purpose)) if addresses.next().is_none() => addr,
-        Some(_) => panic!("Expected only one address by {:?}", label),
-        None => panic!("Expected one address by {:?}", label),
-    }
-}
-
-fn fill_qrc20_address(coin: &Qrc20Coin, amount: BigDecimal, timeout: u64) {
-    // prevent concurrent fill since daemon RPC returns errors if send_to_address
-    // is called concurrently (insufficient funds) and it also may return other errors
-    // if previous transaction is not confirmed yet
-    let _lock = COINS_LOCK.lock().unwrap();
-    let timeout = now_ms() / 1000 + timeout;
-    let client = match coin.as_ref().rpc_client {
-        UtxoRpcClientEnum::Native(ref client) => client,
-        UtxoRpcClientEnum::Electrum(_) => panic!("Expected NativeClient"),
-    };
-
-    let from_addr = get_address_by_label(coin, QTUM_ADDRESS_LABEL);
-    let to_addr = coin.my_addr_as_contract_addr();
-    let satoshis = sat_from_big_decimal(&amount, coin.as_ref().decimals).expect("!sat_from_big_decimal");
-
-    let hash = client
-        .transfer_tokens(
-            &coin.contract_address,
-            &from_addr,
-            to_addr,
-            satoshis.into(),
-            coin.as_ref().decimals,
-        )
-        .wait()
-        .expect("!transfer_tokens")
-        .txid;
-
-    let tx_bytes = client.get_transaction_bytes(hash).wait().unwrap();
-    log!({ "{:02x}", tx_bytes });
-    coin.wait_for_confirmations(&tx_bytes, 1, false, timeout, 1)
-        .wait()
-        .unwrap();
-}
-
-pub async fn enable_qrc20_native(mm: &MarketMakerIt, coin: &str) -> Json {
-    let swap_contract_address =
-        unsafe { QRC20_SWAP_CONTRACT_ADDRESS.expect("QRC20_SWAP_CONTRACT_ADDRESS must be set already") };
-
-    let native = mm
-        .rpc(json! ({
-            "userpass": mm.userpass,
-            "method": "enable",
-            "coin": coin,
-            "swap_contract_address": format!("{:#02x}", swap_contract_address),
-            "mm2": 1,
-        }))
-        .await
-        .unwrap();
-    assert_eq!(native.0, StatusCode::OK, "'enable' failed: {}", native.1);
-    json::from_str(&native.1).unwrap()
-}
-
-/// Wait for the `estimatesmartfee` returns no errors.
-fn wait_for_estimate_smart_fee(timeout: u64) -> Result<(), String> {
-    enum EstimateSmartFeeState {
-        Idle,
-        Ok,
-        NotAvailable,
-    }
-    lazy_static! {
-        static ref LOCK: Mutex<EstimateSmartFeeState> = Mutex::new(EstimateSmartFeeState::Idle);
-    }
-
-    let state = &mut *LOCK.lock().unwrap();
-    match state {
-        EstimateSmartFeeState::Ok => return Ok(()),
-        EstimateSmartFeeState::NotAvailable => return ERR!("estimatesmartfee not available"),
-        EstimateSmartFeeState::Idle => log!("Start wait_for_estimate_smart_fee"),
-    }
-
-    let priv_key = SecretKey::new(&mut rand6::thread_rng());
-    let (_ctx, coin) = qrc20_coin_from_privkey("QICK", priv_key.as_ref());
-    let timeout = now_ms() / 1000 + timeout;
-    let client = match coin.as_ref().rpc_client {
-        UtxoRpcClientEnum::Native(ref client) => client,
-        UtxoRpcClientEnum::Electrum(_) => panic!("Expected NativeClient"),
-    };
-    while now_ms() / 1000 < timeout {
-        if let Ok(res) = client.estimate_smart_fee(&None, 1).wait() {
-            if res.errors.is_empty() {
-                *state = EstimateSmartFeeState::Ok;
-                return Ok(());
-            }
-        }
-        thread::sleep(Duration::from_secs(1));
-    }
-
-    *state = EstimateSmartFeeState::NotAvailable;
-    ERR!("Waited too long for estimate_smart_fee to work")
-}
-
-fn qrc20_coin_conf_item(ticker: &str) -> Json {
-    let contract_address = unsafe {
-        match ticker {
-            "QICK" => QICK_TOKEN_ADDRESS.expect("QICK_TOKEN_ADDRESS must be set already"),
-            "QORTY" => QORTY_TOKEN_ADDRESS.expect("QORTY_TOKEN_ADDRESS must be set already"),
-            _ => panic!("Expected either QICK or QORTY ticker, found {}", ticker),
-        }
-    };
-    let contract_address = format!("{:#02x}", contract_address);
-
-    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
-    json!({
-        "coin":ticker,
-        "required_confirmations":1,
-        "pubtype":120,
-        "p2shtype":110,
-        "wiftype":128,
-        "segwit":true,
-        "mature_confirmations":500,
-        "confpath":confpath,
-        "network":"regtest",
-        "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":contract_address}}})
-}
-
-fn trade_base_rel((base, rel): (&str, &str)) {
-    /// Generate a wallet with the random private key and fill the wallet with Qtum (required by gas_fee) and specified in `ticker` coin.
-    fn generate_and_fill_priv_key(ticker: &str) -> [u8; 32] {
-        let timeout = 30; // timeout if test takes more than 30 seconds to run
-
-        match ticker {
-            "QTUM" => {
-                //Segwit QTUM
-                wait_for_estimate_smart_fee(timeout).expect("!wait_for_estimate_smart_fee");
-                let (_ctx, _coin, priv_key) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 10.into(), Some(0));
-
-                priv_key
-            },
-            "QICK" | "QORTY" => {
-                let priv_key = SecretKey::new(&mut rand6::thread_rng());
-                let (_ctx, coin) = qrc20_coin_from_privkey(ticker, priv_key.as_ref());
-                let my_address = coin.my_address().expect("!my_address");
-                fill_address(&coin, &my_address, 10.into(), timeout);
-                fill_qrc20_address(&coin, 10.into(), timeout);
-
-                *priv_key.as_ref()
-            },
-            "MYCOIN" | "MYCOIN1" => {
-                let priv_key = SecretKey::new(&mut rand6::thread_rng());
-                let (_ctx, coin) = utxo_coin_from_privkey(ticker, priv_key.as_ref());
-                let my_address = coin.my_address().expect("!my_address");
-                fill_address(&coin, &my_address, 10.into(), timeout);
-                // also fill the Qtum
-                let (_ctx, coin) = qrc20_coin_from_privkey("QICK", priv_key.as_ref());
-                let my_address = coin.my_address().expect("!my_address");
-                fill_address(&coin, &my_address, 10.into(), timeout);
-
-                *priv_key.as_ref()
-            },
-            _ => panic!("Expected either QICK or QORTY or MYCOIN or MYCOIN1, found {}", ticker),
-        }
-    }
-
-    let bob_priv_key = generate_and_fill_priv_key(base);
-    let alice_priv_key = generate_and_fill_priv_key(rel);
-
-    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
-    let coins = json! ([
-        qrc20_coin_conf_item("QICK"),
-        qrc20_coin_conf_item("QORTY"),
-        {"coin":"MYCOIN","asset":"MYCOIN","required_confirmations":0,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"MYCOIN1","asset":"MYCOIN1","required_confirmations":0,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"QTUM","asset":"QTUM","required_confirmations":0,"decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"segwit":true,"txfee":0,"txfee_volatility_percent":0.1,
-        "mm2":1,"network":"regtest","confpath":confpath,"protocol":{"type":"UTXO"},"bech32_hrp":"qcrt","address_format":{"format":"segwit"}},
-    ]);
-    let mut mm_bob = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9000,
-            "dht": "on",  // Enable DHT without delay.
-            "passphrase": format!("0x{}", hex::encode(bob_priv_key)),
-            "coins": coins,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".to_string(),
-        None,
-    )
-    .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
-    block_on(mm_bob.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
-
-    let mut mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9000,
-            "dht": "on",  // Enable DHT without delay.
-            "passphrase": format!("0x{}", hex::encode(alice_priv_key)),
-            "coins": coins,
-            "rpc_password": "pass",
-            "seednodes": vec![format!("{}", mm_bob.ip)],
-        }),
-        "pass".to_string(),
-        None,
-    )
-    .unwrap();
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
-    block_on(mm_alice.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
-
-    log!([block_on(enable_qrc20_native(&mm_bob, "QICK"))]);
-    log!([block_on(enable_qrc20_native(&mm_bob, "QORTY"))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "QTUM", &[]))]);
-
-    log!([block_on(enable_qrc20_native(&mm_alice, "QICK"))]);
-    log!([block_on(enable_qrc20_native(&mm_alice, "QORTY"))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "QTUM", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "setprice",
-        "base": base,
-        "rel": rel,
-        "price": 1,
-        "volume": "3",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-    thread::sleep(Duration::from_secs(12));
-
-    log!("Issue alice " (base) "/" (rel) " buy request");
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "buy",
-        "base": base,
-        "rel": rel,
-        "price": 1,
-        "volume": "2",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!buy: {}", rc.1);
-    let buy_json: Json = serde_json::from_str(&rc.1).unwrap();
-    let uuid = buy_json["result"]["uuid"].as_str().unwrap().to_owned();
-
-    // ensure the swaps are started
-    block_on(mm_bob.wait_for_log(22., |log| {
-        log.contains(&format!("Entering the maker_swap_loop {}/{}", base, rel))
-    }))
-    .unwrap();
-    block_on(mm_alice.wait_for_log(22., |log| {
-        log.contains(&format!("Entering the taker_swap_loop {}/{}", base, rel))
-    }))
-    .unwrap();
-
-    // ensure the swaps are finished
-    block_on(mm_bob.wait_for_log(600., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))).unwrap();
-    block_on(mm_alice.wait_for_log(600., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))).unwrap();
-
-    log!("Checking alice/taker status..");
-    block_on(check_my_swap_status(
-        &mm_alice,
-        &uuid,
-        &TAKER_SUCCESS_EVENTS,
-        &TAKER_ERROR_EVENTS,
-        "2".parse().unwrap(),
-        "2".parse().unwrap(),
-    ));
-
-    log!("Checking bob/maker status..");
-    block_on(check_my_swap_status(
-        &mm_bob,
-        &uuid,
-        &MAKER_SUCCESS_EVENTS,
-        &MAKER_ERROR_EVENTS,
-        "2".parse().unwrap(),
-        "2".parse().unwrap(),
-    ));
-
-    log!("Waiting 3 seconds for nodes to broadcast their swaps data..");
-    thread::sleep(Duration::from_secs(3));
-
-    log!("Checking alice status..");
-    block_on(check_stats_swap_status(
-        &mm_alice,
-        &uuid,
-        &MAKER_SUCCESS_EVENTS,
-        &TAKER_SUCCESS_EVENTS,
-    ));
-
-    log!("Checking bob status..");
-    block_on(check_stats_swap_status(
-        &mm_bob,
-        &uuid,
-        &MAKER_SUCCESS_EVENTS,
-        &TAKER_SUCCESS_EVENTS,
-    ));
-
-    log!("Checking alice recent swaps..");
-    block_on(check_recent_swaps(&mm_alice, 1));
-    log!("Checking bob recent swaps..");
-    block_on(check_recent_swaps(&mm_bob, 1));
-
-    block_on(mm_bob.stop()).unwrap();
-    block_on(mm_alice.stop()).unwrap();
-}
-
 fn withdraw_and_send(mm: &MarketMakerIt, coin: &str, to: &str, amount: f64) {
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "mmrpc": "2.0",
         "userpass": mm.userpass,
         "method": "withdraw",
@@ -605,12 +137,12 @@ fn withdraw_and_send(mm: &MarketMakerIt, coin: &str, to: &str, amount: f64) {
         json::from_str(&withdraw.1).expect("Expected 'RpcSuccessResponse<TransactionDetails>'");
     let tx_details = res.result;
 
-    log!("Balance Change: "[tx_details.my_balance_change]);
+    log!("Balance Change: {:?}", tx_details.my_balance_change);
 
     assert_eq!(tx_details.to, vec![to.to_owned()]);
-    assert!(BigDecimal::from(amount) + tx_details.my_balance_change < 0.into());
+    assert!(BigDecimal::try_from(amount).unwrap() + tx_details.my_balance_change < 0.into());
 
-    let send = block_on(mm.rpc(json! ({
+    let send = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "send_raw_transaction",
         "coin": coin,
@@ -638,25 +170,26 @@ fn test_taker_spends_maker_payment() {
     assert_eq!(taker_old_balance, BigDecimal::from(1));
 
     let timelock = (now_ms() / 1000) as u32 - 200;
-    let maker_pub = &*maker_coin.my_public_key();
-    let taker_pub = &*taker_coin.my_public_key();
+    let maker_pub = maker_coin.my_public_key().unwrap().to_vec();
+    let taker_pub = taker_coin.my_public_key().unwrap().to_vec();
     let secret = &[1; 32];
-    let secret_hash = &*dhash160(secret);
-    let amount = BigDecimal::from(0.2);
+    let secret_hash = dhash160(secret).to_vec();
+    let amount = BigDecimal::try_from(0.2).unwrap();
 
     let payment = maker_coin
         .send_maker_payment(
             timelock,
-            taker_pub,
-            secret_hash,
+            &taker_pub,
+            &secret_hash,
             amount.clone(),
             &maker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Maker payment: "[payment_tx_hash]);
+    log!("Maker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -667,31 +200,33 @@ fn test_taker_spends_maker_payment() {
         .wait()
         .unwrap();
 
-    taker_coin
-        .validate_maker_payment(
-            &payment_tx_hex,
-            timelock,
-            maker_pub,
-            secret_hash,
-            amount.clone(),
-            &taker_coin.swap_contract_address(),
-        )
-        .wait()
-        .unwrap();
+    let input = ValidatePaymentInput {
+        payment_tx: payment_tx_hex.clone(),
+        time_lock: timelock,
+        other_pub: maker_pub.clone(),
+        secret_hash,
+        amount: amount.clone(),
+        swap_contract_address: taker_coin.swap_contract_address(),
+        try_spv_proof_until: wait_until + 30,
+        confirmations,
+        unique_swap_data: Vec::new(),
+    };
+    taker_coin.validate_maker_payment(input).wait().unwrap();
 
     let spend = taker_coin
         .send_taker_spends_maker_payment(
             &payment_tx_hex,
             timelock,
-            maker_pub,
+            &maker_pub,
             secret,
             &taker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let spend_tx_hash = spend.tx_hash();
     let spend_tx_hex = spend.tx_hex();
-    log!("Taker spends tx: "[spend_tx_hash]);
+    log!("Taker spends tx: {:?}", spend_tx_hash);
 
     let wait_until = (now_ms() / 1000) + 40; // timeout if test takes more than 40 seconds to run
     taker_coin
@@ -727,25 +262,26 @@ fn test_maker_spends_taker_payment() {
     assert_eq!(taker_old_balance, BigDecimal::from(10));
 
     let timelock = (now_ms() / 1000) as u32 - 200;
-    let maker_pub = &*maker_coin.my_public_key();
-    let taker_pub = &*taker_coin.my_public_key();
+    let maker_pub = maker_coin.my_public_key().unwrap().to_vec();
+    let taker_pub = taker_coin.my_public_key().unwrap().to_vec();
     let secret = &[1; 32];
-    let secret_hash = &*dhash160(secret);
-    let amount = BigDecimal::from(0.2);
+    let secret_hash = dhash160(secret).to_vec();
+    let amount = BigDecimal::try_from(0.2).unwrap();
 
     let payment = taker_coin
         .send_taker_payment(
             timelock,
-            maker_pub,
-            secret_hash,
+            &maker_pub,
+            &secret_hash,
             amount.clone(),
             &taker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Taker payment: "[payment_tx_hash]);
+    log!("Taker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -756,31 +292,33 @@ fn test_maker_spends_taker_payment() {
         .wait()
         .unwrap();
 
-    maker_coin
-        .validate_taker_payment(
-            &payment_tx_hex,
-            timelock,
-            taker_pub,
-            secret_hash,
-            amount.clone(),
-            &maker_coin.swap_contract_address(),
-        )
-        .wait()
-        .unwrap();
+    let input = ValidatePaymentInput {
+        payment_tx: payment_tx_hex.clone(),
+        time_lock: timelock,
+        other_pub: taker_pub.clone(),
+        secret_hash: secret_hash.clone(),
+        amount: amount.clone(),
+        swap_contract_address: maker_coin.swap_contract_address(),
+        try_spv_proof_until: wait_until + 30,
+        confirmations,
+        unique_swap_data: Vec::new(),
+    };
+    maker_coin.validate_taker_payment(input).wait().unwrap();
 
     let spend = maker_coin
         .send_maker_spends_taker_payment(
             &payment_tx_hex,
             timelock,
-            taker_pub,
+            &taker_pub,
             secret,
             &maker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let spend_tx_hash = spend.tx_hash();
     let spend_tx_hex = spend.tx_hex();
-    log!("Maker spends tx: "[spend_tx_hash]);
+    log!("Maker spends tx: {:?}", spend_tx_hash);
 
     let wait_until = (now_ms() / 1000) + 40; // timeout if test takes more than 40 seconds to run
     maker_coin
@@ -818,12 +356,13 @@ fn test_maker_refunds_payment() {
             secret_hash,
             amount.clone(),
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Maker payment: "[payment_tx_hash]);
+    log!("Maker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -843,12 +382,13 @@ fn test_maker_refunds_payment() {
             &taker_pub,
             secret_hash,
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let refund_tx_hash = refund.tx_hash();
     let refund_tx_hex = refund.tx_hex();
-    log!("Maker refunds payment: "[refund_tx_hash]);
+    log!("Maker refunds payment: {:?}", refund_tx_hash);
 
     let wait_until = (now_ms() / 1000) + 40; // timeout if test takes more than 40 seconds to run
     coin.wait_for_confirmations(&refund_tx_hex, confirmations, requires_nota, wait_until, check_every)
@@ -877,12 +417,13 @@ fn test_taker_refunds_payment() {
             secret_hash,
             amount.clone(),
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Taker payment: "[payment_tx_hash]);
+    log!("Taker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -902,12 +443,13 @@ fn test_taker_refunds_payment() {
             &maker_pub,
             secret_hash,
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let refund_tx_hash = refund.tx_hash();
     let refund_tx_hex = refund.tx_hex();
-    log!("Taker refunds payment: "[refund_tx_hash]);
+    log!("Taker refunds payment: {:?}", refund_tx_hash);
 
     let wait_until = (now_ms() / 1000) + 40; // timeout if test takes more than 40 seconds to run
     coin.wait_for_confirmations(&refund_tx_hex, confirmations, requires_nota, wait_until, check_every)
@@ -927,12 +469,19 @@ fn test_check_if_my_payment_sent() {
     let amount = BigDecimal::from_str("0.2").unwrap();
 
     let payment = coin
-        .send_maker_payment(timelock, &taker_pub, secret_hash, amount, &coin.swap_contract_address())
+        .send_maker_payment(
+            timelock,
+            &taker_pub,
+            secret_hash,
+            amount,
+            &coin.swap_contract_address(),
+            &[],
+        )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Maker payment: "[payment_tx_hash]);
+    log!("Maker payment: {:?}", payment_tx_hash);
 
     let confirmations = 2;
     let requires_nota = false;
@@ -950,6 +499,7 @@ fn test_check_if_my_payment_sent() {
             secret_hash,
             search_from_block,
             &coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
@@ -963,11 +513,11 @@ fn test_search_for_swap_tx_spend_taker_spent() {
     let search_from_block = maker_coin.current_block().wait().expect("!current_block");
 
     let timelock = (now_ms() / 1000) as u32 - 200;
-    let maker_pub = &*maker_coin.my_public_key();
-    let taker_pub = &*taker_coin.my_public_key();
+    let maker_pub = maker_coin.my_public_key().unwrap();
+    let taker_pub = taker_coin.my_public_key().unwrap();
     let secret = &[1; 32];
     let secret_hash = &*dhash160(secret);
-    let amount = BigDecimal::from(0.2);
+    let amount = BigDecimal::try_from(0.2).unwrap();
 
     let payment = maker_coin
         .send_maker_payment(
@@ -976,12 +526,13 @@ fn test_search_for_swap_tx_spend_taker_spent() {
             secret_hash,
             amount,
             &maker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Maker payment: "[payment_tx_hash]);
+    log!("Maker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -999,12 +550,13 @@ fn test_search_for_swap_tx_spend_taker_spent() {
             maker_pub,
             secret,
             &taker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let spend_tx_hash = spend.tx_hash();
     let spend_tx_hex = spend.tx_hex();
-    log!("Taker spends tx: "[spend_tx_hash]);
+    log!("Taker spends tx: {:?}", spend_tx_hash);
 
     let wait_until = (now_ms() / 1000) + 40; // timeout if test takes more than 40 seconds to run
     taker_coin
@@ -1012,14 +564,16 @@ fn test_search_for_swap_tx_spend_taker_spent() {
         .wait()
         .unwrap();
 
-    let actual = maker_coin.search_for_swap_tx_spend_my(
-        timelock,
-        taker_pub,
+    let search_input = SearchForSwapTxSpendInput {
+        time_lock: timelock,
+        other_pub: taker_pub,
         secret_hash,
-        &payment_tx_hex,
+        tx: &payment_tx_hex,
         search_from_block,
-        &maker_coin.swap_contract_address(),
-    );
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
+    let actual = block_on(maker_coin.search_for_swap_tx_spend_my(search_input));
     let expected = Ok(Some(FoundSwapTxSpend::Spent(spend)));
     assert_eq!(actual, expected);
 }
@@ -1033,7 +587,7 @@ fn test_search_for_swap_tx_spend_maker_refunded() {
     let taker_pub = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
     let secret = &[1; 32];
     let secret_hash = &*dhash160(secret);
-    let amount = BigDecimal::from(0.2);
+    let amount = BigDecimal::try_from(0.2).unwrap();
 
     let payment = maker_coin
         .send_maker_payment(
@@ -1042,12 +596,13 @@ fn test_search_for_swap_tx_spend_maker_refunded() {
             secret_hash,
             amount,
             &maker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Maker payment: "[payment_tx_hash]);
+    log!("Maker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -1065,12 +620,13 @@ fn test_search_for_swap_tx_spend_maker_refunded() {
             &taker_pub,
             secret_hash,
             &maker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let refund_tx_hash = refund.tx_hash();
     let refund_tx_hex = refund.tx_hex();
-    log!("Maker refunds tx: "[refund_tx_hash]);
+    log!("Maker refunds tx: {:?}", refund_tx_hash);
 
     let wait_until = (now_ms() / 1000) + 40; // timeout if test takes more than 40 seconds to run
     maker_coin
@@ -1078,14 +634,16 @@ fn test_search_for_swap_tx_spend_maker_refunded() {
         .wait()
         .unwrap();
 
-    let actual = maker_coin.search_for_swap_tx_spend_my(
-        timelock,
-        &taker_pub,
+    let search_input = SearchForSwapTxSpendInput {
+        time_lock: timelock,
+        other_pub: &taker_pub,
         secret_hash,
-        &payment_tx_hex,
+        tx: &payment_tx_hex,
         search_from_block,
-        &maker_coin.swap_contract_address(),
-    );
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
+    let actual = block_on(maker_coin.search_for_swap_tx_spend_my(search_input));
     let expected = Ok(Some(FoundSwapTxSpend::Refunded(refund)));
     assert_eq!(actual, expected);
 }
@@ -1099,7 +657,7 @@ fn test_search_for_swap_tx_spend_not_spent() {
     let taker_pub = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
     let secret = &[1; 32];
     let secret_hash = &*dhash160(secret);
-    let amount = BigDecimal::from(0.2);
+    let amount = BigDecimal::try_from(0.2).unwrap();
 
     let payment = maker_coin
         .send_maker_payment(
@@ -1108,12 +666,13 @@ fn test_search_for_swap_tx_spend_not_spent() {
             secret_hash,
             amount,
             &maker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Maker payment: "[payment_tx_hash]);
+    log!("Maker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -1124,14 +683,16 @@ fn test_search_for_swap_tx_spend_not_spent() {
         .wait()
         .unwrap();
 
-    let actual = maker_coin.search_for_swap_tx_spend_my(
-        timelock,
-        &taker_pub,
+    let search_input = SearchForSwapTxSpendInput {
+        time_lock: timelock,
+        other_pub: &taker_pub,
         secret_hash,
-        &payment_tx_hex,
+        tx: &payment_tx_hex,
         search_from_block,
-        &maker_coin.swap_contract_address(),
-    );
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
+    let actual = block_on(maker_coin.search_for_swap_tx_spend_my(search_input));
     // maker payment hasn't been spent or refunded yet
     assert_eq!(actual, Ok(None));
 }
@@ -1143,11 +704,11 @@ fn test_wait_for_tx_spend() {
     let from_block = maker_coin.current_block().wait().expect("!current_block");
 
     let timelock = (now_ms() / 1000) as u32 - 200;
-    let maker_pub = &*maker_coin.my_public_key();
-    let taker_pub = &*taker_coin.my_public_key();
+    let maker_pub = maker_coin.my_public_key().unwrap();
+    let taker_pub = taker_coin.my_public_key().unwrap();
     let secret = &[1; 32];
     let secret_hash = &*dhash160(secret);
-    let amount = BigDecimal::from(0.2);
+    let amount = BigDecimal::try_from(0.2).unwrap();
 
     let payment = maker_coin
         .send_maker_payment(
@@ -1156,12 +717,13 @@ fn test_wait_for_tx_spend() {
             secret_hash,
             amount,
             &maker_coin.swap_contract_address(),
+            &[],
         )
         .wait()
         .unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
-    log!("Maker payment: "[payment_tx_hash]);
+    log!("Maker payment: {:?}", payment_tx_hash);
 
     let confirmations = 1;
     let requires_nota = false;
@@ -1174,7 +736,7 @@ fn test_wait_for_tx_spend() {
 
     // first try to check if the wait_for_tx_spend() returns an error correctly
     let wait_until = (now_ms() / 1000) + 5;
-    let err = maker_coin
+    let tx_err = maker_coin
         .wait_for_tx_spend(
             &payment_tx_hex,
             wait_until,
@@ -1183,7 +745,9 @@ fn test_wait_for_tx_spend() {
         )
         .wait()
         .expect_err("Expected 'Waited too long' error");
-    log!("error: "[err]);
+
+    let err = tx_err.get_plain_text_format();
+    log!("error: {:?}", err);
     assert!(err.contains("Waited too long"));
 
     // also spends the maker payment and try to check if the wait_for_tx_spend() returns the correct tx
@@ -1201,6 +765,7 @@ fn test_wait_for_tx_spend() {
                 &maker_pub_c,
                 secret,
                 &taker_coin.swap_contract_address(),
+                &[],
             )
             .wait()
             .unwrap();
@@ -1230,7 +795,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
     // fill the Bob address by 0.05 Qtum
     let (_ctx, coin) = qrc20_coin_from_privkey("QICK", bob_priv_key.as_ref());
     let my_address = coin.my_address().expect("!my_address");
-    fill_address(&coin, &my_address, 0.05.into(), timeout);
+    fill_address(&coin, &my_address, BigDecimal::try_from(0.05).unwrap(), timeout);
     // fill the Bob address by 10 MYCOIN
     let (_ctx, coin) = utxo_coin_from_privkey("MYCOIN", bob_priv_key.as_ref());
     let my_address = coin.my_address().expect("!my_address");
@@ -1250,7 +815,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
     let qick_contract_address = format!("{:#02x}", unsafe { QICK_TOKEN_ADDRESS.expect("!QICK_TOKEN_ADDRESS") });
     let coins = json!([
         {"coin":"MYCOIN","asset":"MYCOIN","required_confirmations":0,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"QICK","required_confirmations":1,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"segwit": true,"mm2": 1,"mature_confirmations": 500,"confpath": confpath,"network":"regtest",
+        {"coin":"QICK","required_confirmations":1,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"mm2": 1,"mature_confirmations": 500,"confpath": confpath,"network":"regtest",
          "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":qick_contract_address}}},
     ]);
 
@@ -1271,7 +836,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm_dump(&mm_bob.log_path);
-    log!({"Log path: {}", mm_bob.log_path.display()});
+    log!("Log path: {}", mm_bob.log_path.display());
     block_on(mm_bob.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
     block_on(enable_native(&mm_bob, "MYCOIN", &[]));
     block_on(enable_qrc20_native(&mm_bob, "QICK"));
@@ -1286,7 +851,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
             "canbind": env::var ("BOB_TRADE_PORT") .ok().map(|s| s.parse::<i64>().unwrap()),
             "passphrase": format!("0x{}", hex::encode(alice_priv_key.as_ref())),
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
         }),
         "pass".into(),
@@ -1294,12 +859,12 @@ fn test_check_balance_on_order_post_base_coin_locked() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm_dump(&mm_alice.log_path);
-    log!({"Log path: {}", mm_alice.log_path.display()});
+    log!("Log path: {}", mm_alice.log_path.display());
     block_on(mm_alice.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
     block_on(enable_native(&mm_alice, "MYCOIN", &[]));
     block_on(enable_qrc20_native(&mm_alice, "QICK"));
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "setprice",
         "base": "QICK",
@@ -1314,7 +879,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
     thread::sleep(Duration::from_secs(2));
 
     // Buy QICK and thus lock ~ 0.05 Qtum
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "QICK",
@@ -1329,7 +894,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
     thread::sleep(Duration::from_secs(4));
 
     // QRC20 balance is sufficient, but most of the balance is locked
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "sell",
         "base": "MYCOIN",
@@ -1352,13 +917,13 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let coins = json! ([
         {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"QTUM","decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"segwit":true,"txfee":0,"txfee_volatility_percent":0.1,
+        {"coin":"QTUM","decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"txfee":0,"txfee_volatility_percent":0.1,
         "mm2":1,"mature_confirmations":500,"network":"regtest","confpath":confpath,"protocol":{"type":"UTXO"}},
     ]);
     let mut mm = MarketMakerIt::start(
         json! ({
             "gui": "nogui",
-            "netid": 9000,
+            "netid": 9000u32,
             "dht": "on",  // Enable DHT without delay.
             "passphrase": format!("0x{}", hex::encode(priv_key)),
             "coins": coins,
@@ -1372,8 +937,8 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm.log_path);
     block_on(mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
-    log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm, "QTUM", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm, "QTUM", &[])));
 
     let qtum_balance = coin.my_spendable_balance().wait().expect("!my_balance");
     let qtum_dex_fee_threshold = MmNumber::from("0.000728");
@@ -1382,13 +947,11 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
     // - `max_trade_fee = trade_fee(balance)`
     // Please note if we pass the exact value, the `get_sender_trade_fee` will fail with 'Not sufficient balance: Couldn't collect enough value from utxos'.
     // So we should deduct trade fee from the output.
-    let max_trade_fee = coin
-        .get_sender_trade_fee(
-            TradePreimageValue::UpperBound(qtum_balance.clone()),
-            FeeApproxStage::TradePreimage,
-        )
-        .wait()
-        .expect("!get_sender_trade_fee");
+    let max_trade_fee = block_on(coin.get_sender_trade_fee(
+        TradePreimageValue::UpperBound(qtum_balance.clone()),
+        FeeApproxStage::TradePreimage,
+    ))
+    .expect("!get_sender_trade_fee");
     let max_trade_fee = max_trade_fee.amount.to_decimal();
     debug!("max_trade_fee: {}", max_trade_fee);
 
@@ -1405,10 +968,9 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
 
     // - `max_fee_to_send_taker_fee = fee_to_send_taker_fee(max_dex_fee)`
     // `taker_fee` is sent using general withdraw, and the fee get be obtained from withdraw result
-    let max_fee_to_send_taker_fee = coin
-        .get_fee_to_send_taker_fee(max_dex_fee.to_decimal(), FeeApproxStage::TradePreimage)
-        .wait()
-        .expect("!get_fee_to_send_taker_fee");
+    let max_fee_to_send_taker_fee =
+        block_on(coin.get_fee_to_send_taker_fee(max_dex_fee.to_decimal(), FeeApproxStage::TradePreimage))
+            .expect("!get_fee_to_send_taker_fee");
     let max_fee_to_send_taker_fee = max_fee_to_send_taker_fee.amount.to_decimal();
     debug!("max_fee_to_send_taker_fee: {}", max_fee_to_send_taker_fee);
 
@@ -1424,7 +986,7 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
     debug!("real_max_dex_fee: {:?}", real_dex_fee.to_fraction());
 
     // check if the actual max_taker_vol equals to the expected
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "max_taker_vol",
         "coin": "QTUM",
@@ -1437,12 +999,12 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
         json::to_value(expected_max_taker_vol.to_fraction()).unwrap()
     );
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "sell",
         "base": "QTUM",
         "rel": "MYCOIN",
-        "price": 1,
+        "price": 1u64,
         "volume": expected_max_taker_vol.to_fraction(),
     })))
     .unwrap();
@@ -1455,7 +1017,7 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
 
     let dex_fee_amount = dex_fee_amount("QTUM", "MYCOIN", &expected_max_taker_vol, &qtum_dex_fee_threshold);
     let _taker_fee_tx = coin
-        .send_taker_fee(&DEX_FEE_ADDR_RAW_PUBKEY, dex_fee_amount.to_decimal())
+        .send_taker_fee(&DEX_FEE_ADDR_RAW_PUBKEY, dex_fee_amount.to_decimal(), &[])
         .wait()
         .expect("!send_taker_fee");
 
@@ -1466,6 +1028,7 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
             secret_hash,
             expected_max_taker_vol.to_decimal(),
             &None,
+            &[],
         )
         .wait()
         .expect("!send_taker_payment");
@@ -1473,7 +1036,7 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
     let my_balance = coin.my_spendable_balance().wait().expect("!my_balance");
     assert_eq!(
         my_balance,
-        0.into(),
+        BigDecimal::from(0u32),
         "NOT AN ERROR, but it would be better if the balance remained zero"
     );
 }
@@ -1495,7 +1058,7 @@ fn test_max_taker_vol_dynamic_trade_fee() {
         qtum_balance = &qtum_balance + &amount;
         fill_address(&coin, &my_address, amount, 30);
     }
-    log!("QTUM balance "(qtum_balance)" = "(qtum_balance_steps));
+    log!("QTUM balance {} = {}", qtum_balance, qtum_balance_steps);
 
     test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin, &priv_key);
 }
@@ -1522,6 +1085,67 @@ fn test_trade_preimage_fee_includes_change_output_anyway() {
 
     test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin, &priv_key);
 }
+#[test]
+fn test_trade_preimage_not_sufficient_base_coin_balance_for_ticker() {
+    wait_for_estimate_smart_fee(30).expect("!wait_for_estimate_smart_fee");
+    // generate QRC20 coin(QICK) fill the wallet with 10 QICK
+    // fill QTUM balance with 0.005 QTUM which is will be than expected transaction fee just to get our desired output for this test.
+    let qick_balance = MmNumber::from("10").to_decimal();
+    let qtum_balance = MmNumber::from("0.005").to_decimal();
+    let (_, _, priv_key) = generate_qrc20_coin_with_random_privkey("QICK", qtum_balance.clone(), qick_balance.clone());
+
+    let qick_contract_address = format!("{:#02x}", unsafe { QICK_TOKEN_ADDRESS.expect("!QICK_TOKEN_ADDRESS") });
+    let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
+    let coins = json! ([
+        {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
+        {"coin":"QICK","required_confirmations":1,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"mm2": 1,"mature_confirmations": 500,"confpath": confpath,"network":"regtest",
+         "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":qick_contract_address}}},
+    ]);
+    let mut mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(priv_key)),
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm.log_path);
+    block_on(mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
+
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm, "QICK", &[])));
+
+    // txfee > 0, amount = 0.005 => required = txfee + amount > 0.005,
+    // but balance = 0.005
+    // This RPC call should fail because [`QtumCoin::get_sender_trade_fee`] will try to generate a dummy transaction due to the dynamic tx fee,
+    // and this operation must fail with the [`TradePreimageError::NotSufficientBaseCoinBalance`].
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "QICK",
+            "rel": "MYCOIN",
+            "swap_method": "setprice",
+            "price": 10,
+            "volume": 1,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    let actual: RpcErrorResponse<trade_preimage_error::NotSufficientBalance> = json::from_str(&rc.1).unwrap();
+    assert_eq!(actual.error_type, "NotSufficientBaseCoinBalance");
+    let data = actual.error_data.expect("Expected 'error_data'");
+    assert_eq!(data.coin, "QTUM");
+    assert_eq!(data.available, qtum_balance);
+    assert!(data.required > qtum_balance);
+}
 
 #[test]
 fn test_trade_preimage_dynamic_fee_not_sufficient_balance() {
@@ -1533,7 +1157,7 @@ fn test_trade_preimage_dynamic_fee_not_sufficient_balance() {
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let coins = json! ([
         {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"QTUM","decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"segwit":true,"txfee":0,"txfee_volatility_percent":0.1,
+        {"coin":"QTUM","decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"txfee":0,"txfee_volatility_percent":0.1,
         "mm2":1,"mature_confirmations":500,"network":"regtest","confpath":confpath,"protocol":{"type":"UTXO"}},
     ]);
     let mut mm = MarketMakerIt::start(
@@ -1553,14 +1177,14 @@ fn test_trade_preimage_dynamic_fee_not_sufficient_balance() {
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm.log_path);
     block_on(mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
-    log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm, "QTUM", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm, "QTUM", &[])));
 
     // txfee > 0, amount = 0.5 => required = txfee + amount > 0.5,
     // but balance = 0.5
     // This RPC call should fail because [`QtumCoin::get_sender_trade_fee`] will try to generate a dummy transaction due to the dynamic tx fee,
     // and this operation must fail with the [`TradePreimageError::NotSufficientBalance`].
-    let rc = block_on(mm.rpc(json!({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "mmrpc": "2.0",
         "method": "trade_preimage",
@@ -1594,7 +1218,7 @@ fn test_trade_preimage_deduct_fee_from_output_failed() {
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let coins = json! ([
         {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"QTUM","decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"segwit":true,"txfee":0,"txfee_volatility_percent":0.1,
+        {"coin":"QTUM","decimals":8,"pubtype":120,"p2shtype":110,"wiftype":128,"txfee":0,"txfee_volatility_percent":0.1,
         "mm2":1,"mature_confirmations":500,"network":"regtest","confpath":confpath,"protocol":{"type":"UTXO"}},
     ]);
     let mut mm = MarketMakerIt::start(
@@ -1614,10 +1238,10 @@ fn test_trade_preimage_deduct_fee_from_output_failed() {
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm.log_path);
     block_on(mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
-    log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm, "QTUM", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm, "QTUM", &[])));
 
-    let rc = block_on(mm.rpc(json!({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "mmrpc": "2.0",
         "method": "trade_preimage",
@@ -1648,7 +1272,8 @@ fn test_trade_preimage_deduct_fee_from_output_failed() {
 fn test_segwit_native_balance() {
     wait_for_estimate_smart_fee(30).expect("!wait_for_estimate_smart_fee");
     // generate QTUM coin with the dynamic fee and fill the wallet by 0.5 Qtums
-    let (_ctx, _coin, priv_key) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 0.5.into(), Some(0));
+    let (_ctx, _coin, priv_key) =
+        generate_segwit_qtum_coin_with_random_privkey("QTUM", BigDecimal::try_from(0.5).unwrap(), Some(0));
 
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let coins = json! ([
@@ -1676,7 +1301,7 @@ fn test_segwit_native_balance() {
     let balance = enable_res["balance"].as_str().unwrap();
     assert_eq!(balance, "0.5");
 
-    let my_balance = block_on(mm.rpc(json!({
+    let my_balance = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "my_balance",
         "coin": "QTUM",
@@ -1692,8 +1317,9 @@ fn test_segwit_native_balance() {
 #[test]
 fn test_withdraw_and_send_from_segwit() {
     wait_for_estimate_smart_fee(30).expect("!wait_for_estimate_smart_fee");
-    // generate QTUM coin with the dynamic fee and fill the wallet by 0.5 Qtums
-    let (_ctx, _coin, priv_key) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 0.5.into(), Some(0));
+    // generate QTUM coin with the dynamic fee and fill the wallet by 0.7 Qtums
+    let (_ctx, _coin, priv_key) =
+        generate_segwit_qtum_coin_with_random_privkey("QTUM", BigDecimal::try_from(0.7).unwrap(), Some(0));
 
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let coins = json! ([
@@ -1717,7 +1343,7 @@ fn test_withdraw_and_send_from_segwit() {
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm.log_path);
     block_on(mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
-    log!([block_on(enable_native(&mm, "QTUM", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm, "QTUM", &[])));
 
     // Send from Segwit Address to Segwit Address
     withdraw_and_send(&mm, "QTUM", "qcrt1q6pwxl4na4a363mgmrw8tjyppdcwuyfmat836dd", 0.2);
@@ -1725,14 +1351,23 @@ fn test_withdraw_and_send_from_segwit() {
     // Send from Segwit Address to Legacy Address
     withdraw_and_send(&mm, "QTUM", "qVgbLqYPvKN5zH2eEJ6Jh8cjbUVx851yxV", 0.2);
 
+    // Send from Segwit Address to P2WSH Address
+    withdraw_and_send(
+        &mm,
+        "QTUM",
+        "qcrt1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q2uwvdw",
+        0.2,
+    );
+
     block_on(mm.stop()).unwrap();
 }
 
 #[test]
 fn test_withdraw_and_send_legacy_to_segwit() {
     wait_for_estimate_smart_fee(30).expect("!wait_for_estimate_smart_fee");
-    // generate QTUM coin with the dynamic fee and fill the wallet by 0.5 Qtums
-    let (_ctx, _coin, priv_key) = generate_qtum_coin_with_random_privkey("QTUM", 0.5.into(), Some(0));
+    // generate QTUM coin with the dynamic fee and fill the wallet by 0.7 Qtums
+    let (_ctx, _coin, priv_key) =
+        generate_qtum_coin_with_random_privkey("QTUM", BigDecimal::try_from(0.7).unwrap(), Some(0));
 
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let coins = json! ([
@@ -1756,11 +1391,19 @@ fn test_withdraw_and_send_legacy_to_segwit() {
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm.log_path);
     block_on(mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
-    log!([block_on(enable_native(&mm, "QTUM", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm, "QTUM", &[])));
 
     // Send from Legacy Address to Segwit Address
     withdraw_and_send(&mm, "QTUM", "qcrt1q6pwxl4na4a363mgmrw8tjyppdcwuyfmat836dd", 0.2);
 
+    // Send from Legacy Address to P2WSH Address
+    withdraw_and_send(
+        &mm,
+        "QTUM",
+        "qcrt1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q2uwvdw",
+        0.2,
+    );
+
     block_on(mm.stop()).unwrap();
 }
 
@@ -1768,11 +1411,12 @@ fn test_withdraw_and_send_legacy_to_segwit() {
 fn test_search_for_segwit_swap_tx_spend_native_was_refunded_maker() {
     wait_for_estimate_smart_fee(30).expect("!wait_for_estimate_smart_fee");
     let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
-    let (_ctx, coin, _priv_key) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 1000.into(), Some(0));
+    let (_ctx, coin, _) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 1000u64.into(), Some(0));
+    let my_public_key = coin.my_public_key().unwrap();
 
     let time_lock = (now_ms() / 1000) as u32 - 3600;
     let tx = coin
-        .send_maker_payment(time_lock, &*coin.my_public_key(), &[0; 20], 1.into(), &None)
+        .send_maker_payment(time_lock, my_public_key, &[0; 20], 1u64.into(), &None, &[])
         .wait()
         .unwrap();
 
@@ -1781,7 +1425,7 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_maker() {
         .unwrap();
 
     let refund_tx = coin
-        .send_maker_refunds_payment(&tx.tx_hex(), time_lock, &*coin.my_public_key(), &[0; 20], &None)
+        .send_maker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
         .wait()
         .unwrap();
 
@@ -1789,8 +1433,16 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_maker() {
         .wait()
         .unwrap();
 
-    let found = coin
-        .search_for_swap_tx_spend_my(time_lock, &*coin.my_public_key(), &[0; 20], &tx.tx_hex(), 0, &None)
+    let search_input = SearchForSwapTxSpendInput {
+        time_lock,
+        other_pub: &*coin.my_public_key().unwrap(),
+        secret_hash: &[0; 20],
+        tx: &tx.tx_hex(),
+        search_from_block: 0,
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
         .unwrap()
         .unwrap();
     assert_eq!(FoundSwapTxSpend::Refunded(refund_tx), found);
@@ -1800,11 +1452,12 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_maker() {
 fn test_search_for_segwit_swap_tx_spend_native_was_refunded_taker() {
     wait_for_estimate_smart_fee(30).expect("!wait_for_estimate_smart_fee");
     let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
-    let (_ctx, coin, _priv_key) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 1000.into(), Some(0));
+    let (_ctx, coin, _) = generate_segwit_qtum_coin_with_random_privkey("QTUM", 1000u64.into(), Some(0));
+    let my_public_key = coin.my_public_key().unwrap();
 
     let time_lock = (now_ms() / 1000) as u32 - 3600;
     let tx = coin
-        .send_taker_payment(time_lock, &*coin.my_public_key(), &[0; 20], 1.into(), &None)
+        .send_taker_payment(time_lock, my_public_key, &[0; 20], 1u64.into(), &None, &[])
         .wait()
         .unwrap();
 
@@ -1813,7 +1466,7 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_taker() {
         .unwrap();
 
     let refund_tx = coin
-        .send_taker_refunds_payment(&tx.tx_hex(), time_lock, &*coin.my_public_key(), &[0; 20], &None)
+        .send_taker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
         .wait()
         .unwrap();
 
@@ -1821,8 +1474,16 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_taker() {
         .wait()
         .unwrap();
 
-    let found = coin
-        .search_for_swap_tx_spend_my(time_lock, &*coin.my_public_key(), &[0; 20], &tx.tx_hex(), 0, &None)
+    let search_input = SearchForSwapTxSpendInput {
+        time_lock,
+        other_pub: &*coin.my_public_key().unwrap(),
+        secret_hash: &[0; 20],
+        tx: &tx.tx_hex(),
+        search_from_block: 0,
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let found = block_on(coin.search_for_swap_tx_spend_my(search_input))
         .unwrap()
         .unwrap();
     assert_eq!(FoundSwapTxSpend::Refunded(refund_tx), found);
@@ -1830,7 +1491,7 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_taker() {
 
 pub async fn enable_native_segwit(mm: &MarketMakerIt, coin: &str) -> Json {
     let native = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "userpass": mm.userpass,
             "method": "enable",
             "coin": coin,
@@ -1850,7 +1511,8 @@ pub async fn enable_native_segwit(mm: &MarketMakerIt, coin: &str) -> Json {
 fn segwit_address_in_the_orderbook() {
     wait_for_estimate_smart_fee(30).expect("!wait_for_estimate_smart_fee");
     // generate QTUM coin with the dynamic fee and fill the wallet by 0.5 Qtums
-    let (_ctx, coin, priv_key) = generate_qtum_coin_with_random_privkey("QTUM", 0.5.into(), Some(0));
+    let (_ctx, coin, priv_key) =
+        generate_qtum_coin_with_random_privkey("QTUM", BigDecimal::try_from(0.5).unwrap(), Some(0));
 
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let coins = json! ([
@@ -1881,9 +1543,9 @@ fn segwit_address_in_the_orderbook() {
 
     fill_address(&coin, &segwit_addr, 1000.into(), 30);
 
-    log!([block_on(enable_native(&mm, "MYCOIN", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": "QTUM",
@@ -1894,7 +1556,7 @@ fn segwit_address_in_the_orderbook() {
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-    let orderbook = block_on(mm.rpc(json! ({
+    let orderbook = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "QTUM",
diff --git a/mm2src/mm2_main/src/docker_tests/slp_tests.rs b/mm2src/mm2_main/src/docker_tests/slp_tests.rs
new file mode 100644
index 0000000000..478743d89f
--- /dev/null
+++ b/mm2src/mm2_main/src/docker_tests/slp_tests.rs
@@ -0,0 +1,148 @@
+use crate::docker_tests::docker_tests_common::*;
+use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::{enable_bch_with_tokens, enable_slp, UtxoRpcMode};
+use serde_json::{self as json};
+use std::time::Duration;
+
+#[test]
+fn trade_test_with_maker_slp() { trade_base_rel(("ADEXSLP", "FORSLP")); }
+
+#[test]
+fn trade_test_with_taker_slp() { trade_base_rel(("FORSLP", "ADEXSLP")); }
+
+#[test]
+fn test_bch_and_slp_balance() {
+    // MM2 should mark the SLP-related and other UTXOs as unspendable BCH balance
+    let mm = slp_supplied_node();
+
+    let enable_bch = block_on(enable_native_bch(&mm, "FORSLP", &[]));
+    let enable_bch: EnableElectrumResponse = json::from_value(enable_bch).unwrap();
+
+    let expected_spendable = BigDecimal::from(1000);
+    assert_eq!(expected_spendable, enable_bch.balance);
+
+    let expected_unspendable: BigDecimal = "0.00001".parse().unwrap();
+    assert_eq!(expected_unspendable, enable_bch.unspendable_balance);
+
+    let bch_balance = get_balance(&mm, "FORSLP");
+
+    assert_eq!(expected_spendable, bch_balance.balance);
+    assert_eq!(expected_unspendable, bch_balance.unspendable_balance);
+
+    let enable_slp = block_on(enable_native(&mm, "ADEXSLP", &[]));
+    let enable_slp: EnableElectrumResponse = json::from_value(enable_slp).unwrap();
+
+    let expected_spendable = BigDecimal::from(1000);
+    assert_eq!(expected_spendable, enable_slp.balance);
+
+    let expected_unspendable: BigDecimal = 0.into();
+    assert_eq!(expected_unspendable, enable_slp.unspendable_balance);
+
+    let slp_balance = get_balance(&mm, "ADEXSLP");
+
+    assert_eq!(expected_spendable, slp_balance.balance);
+    assert_eq!(expected_unspendable, slp_balance.unspendable_balance);
+}
+
+#[test]
+fn test_bch_and_slp_balance_enable_slp_v2() {
+    // MM2 should mark the SLP-related and other UTXOs as unspendable BCH balance
+    let mm = slp_supplied_node();
+
+    let enable_bch = block_on(enable_native_bch(&mm, "FORSLP", &[]));
+    let enable_bch: EnableElectrumResponse = json::from_value(enable_bch).unwrap();
+
+    let expected_spendable = BigDecimal::from(1000);
+    assert_eq!(expected_spendable, enable_bch.balance);
+
+    let expected_unspendable: BigDecimal = "0.00001".parse().unwrap();
+    assert_eq!(expected_unspendable, enable_bch.unspendable_balance);
+
+    let bch_balance = get_balance(&mm, "FORSLP");
+
+    assert_eq!(expected_spendable, bch_balance.balance);
+    assert_eq!(expected_unspendable, bch_balance.unspendable_balance);
+
+    let enable_slp = block_on(enable_slp(&mm, "ADEXSLP"));
+    let enable_slp: RpcV2Response<EnableSlpResponse> = json::from_value(enable_slp).unwrap();
+    assert_eq!(1, enable_slp.result.balances.len());
+
+    let (_, balance) = enable_slp.result.balances.into_iter().next().unwrap();
+
+    let expected_spendable = BigDecimal::from(1000);
+    assert_eq!(expected_spendable, balance.spendable);
+
+    let expected_unspendable: BigDecimal = 0.into();
+    assert_eq!(expected_unspendable, balance.unspendable);
+
+    let slp_balance = get_balance(&mm, "ADEXSLP");
+
+    assert_eq!(expected_spendable, slp_balance.balance);
+    assert_eq!(expected_unspendable, slp_balance.unspendable_balance);
+}
+
+#[test]
+fn test_bch_and_slp_balance_enable_bch_with_tokens_v2() {
+    let mm = slp_supplied_node();
+
+    let tx_history = false;
+    let enable_bch_with_tokens = block_on(enable_bch_with_tokens(
+        &mm,
+        "FORSLP",
+        &["ADEXSLP"],
+        UtxoRpcMode::Native,
+        tx_history,
+    ));
+    let enable_bch_with_tokens: RpcV2Response<EnableBchWithTokensResponse> =
+        json::from_value(enable_bch_with_tokens).unwrap();
+
+    let expected_bch_spendable = BigDecimal::from(1000);
+    let expected_bch_unspendable: BigDecimal = "0.00001".parse().unwrap();
+
+    let (_, bch_balance) = enable_bch_with_tokens
+        .result
+        .bch_addresses_infos
+        .into_iter()
+        .next()
+        .unwrap();
+
+    assert_eq!(expected_bch_spendable, bch_balance.balances.spendable);
+    assert_eq!(expected_bch_unspendable, bch_balance.balances.unspendable);
+
+    let (_, slp_balances) = enable_bch_with_tokens
+        .result
+        .slp_addresses_infos
+        .into_iter()
+        .next()
+        .unwrap();
+
+    let expected_slp_spendable = BigDecimal::from(1000);
+    let expected_slp_unspendable: BigDecimal = 0.into();
+
+    let actual_slp = slp_balances.balances.get("ADEXSLP").unwrap();
+    assert_eq!(expected_slp_spendable, actual_slp.spendable);
+    assert_eq!(expected_slp_unspendable, actual_slp.unspendable);
+}
+
+#[test]
+fn test_withdraw_bch_max_must_not_spend_slp() {
+    let mm = slp_supplied_node();
+
+    block_on(enable_native_bch(&mm, "FORSLP", &[]));
+    block_on(enable_native(&mm, "ADEXSLP", &[]));
+
+    withdraw_max_and_send_v1(&mm, "FORSLP", &utxo_burn_address().to_string());
+    thread::sleep(Duration::from_secs(1));
+
+    let bch_balance = get_balance(&mm, "FORSLP");
+    let expected_spendable = BigDecimal::from(0);
+    let expected_unspendable: BigDecimal = "0.00001".parse().unwrap();
+
+    assert_eq!(expected_spendable, bch_balance.balance);
+    assert_eq!(expected_unspendable, bch_balance.unspendable_balance);
+
+    let slp_balance = get_balance(&mm, "ADEXSLP");
+    let expected_spendable = BigDecimal::from(1000);
+
+    assert_eq!(expected_spendable, slp_balance.balance);
+}
diff --git a/mm2src/mm2_main/src/docker_tests/solana_tests.rs b/mm2src/mm2_main/src/docker_tests/solana_tests.rs
new file mode 100644
index 0000000000..a566123dbb
--- /dev/null
+++ b/mm2src/mm2_main/src/docker_tests/solana_tests.rs
@@ -0,0 +1,111 @@
+use crate::docker_tests::docker_tests_common::*;
+use mm2_test_helpers::for_tests::{enable_solana_with_tokens, enable_spl, sign_message, verify_message};
+use num_traits::Zero;
+use serde_json as json;
+
+#[test]
+fn test_solana_and_spl_balance_enable_spl_v2() {
+    let mm = solana_supplied_node();
+    let tx_history = false;
+    let enable_solana_with_tokens = block_on(enable_solana_with_tokens(
+        &mm,
+        "SOL-DEVNET",
+        &["USDC-SOL-DEVNET"],
+        "https://api.devnet.solana.com",
+        tx_history,
+    ));
+    let enable_solana_with_tokens: RpcV2Response<EnableSolanaWithTokensResponse> =
+        json::from_value(enable_solana_with_tokens).unwrap();
+
+    let (_, solana_balance) = enable_solana_with_tokens
+        .result
+        .solana_addresses_infos
+        .into_iter()
+        .next()
+        .unwrap();
+    assert!(solana_balance.balances.spendable > 0.into());
+
+    let (_, spl_balances) = enable_solana_with_tokens
+        .result
+        .spl_addresses_infos
+        .into_iter()
+        .next()
+        .unwrap();
+    let usdc_spl = spl_balances.balances.get("USDC-SOL-DEVNET").unwrap();
+    assert!(usdc_spl.spendable.is_zero());
+
+    let enable_spl = block_on(enable_spl(&mm, "ADEX-SOL-DEVNET"));
+    let enable_spl: RpcV2Response<EnableSplResponse> = json::from_value(enable_spl).unwrap();
+    assert_eq!(1, enable_spl.result.balances.len());
+
+    let (_, balance) = enable_spl.result.balances.into_iter().next().unwrap();
+    assert!(balance.spendable > 0.into());
+}
+
+#[test]
+fn test_sign_verify_message_solana() {
+    let mm = solana_supplied_node();
+    let tx_history = false;
+    block_on(enable_solana_with_tokens(
+        &mm,
+        "SOL-DEVNET",
+        &["USDC-SOL-DEVNET"],
+        "https://api.devnet.solana.com",
+        tx_history,
+    ));
+
+    let response = block_on(sign_message(&mm, "SOL-DEVNET"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert_eq!(
+        response.signature,
+        "3AoWCXHq3ACYHYEHUsCzPmRNiXn5c6kodXn9KDd1tz52e1da3dZKYXD5nrJW31XLtN6zzJiwHWtDta52w7Cd7qyE"
+    );
+
+    let response = block_on(verify_message(
+        &mm,
+        "SOL-DEVNET",
+        "3AoWCXHq3ACYHYEHUsCzPmRNiXn5c6kodXn9KDd1tz52e1da3dZKYXD5nrJW31XLtN6zzJiwHWtDta52w7Cd7qyE",
+        "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
+}
+
+#[test]
+fn test_sign_verify_message_spl() {
+    let mm = solana_supplied_node();
+    let tx_history = false;
+    block_on(enable_solana_with_tokens(
+        &mm,
+        "SOL-DEVNET",
+        &["USDC-SOL-DEVNET"],
+        "https://api.devnet.solana.com",
+        tx_history,
+    ));
+
+    block_on(enable_spl(&mm, "ADEX-SOL-DEVNET"));
+
+    let response = block_on(sign_message(&mm, "ADEX-SOL-DEVNET"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert_eq!(
+        response.signature,
+        "3AoWCXHq3ACYHYEHUsCzPmRNiXn5c6kodXn9KDd1tz52e1da3dZKYXD5nrJW31XLtN6zzJiwHWtDta52w7Cd7qyE"
+    );
+
+    let response = block_on(verify_message(
+        &mm,
+        "ADEX-SOL-DEVNET",
+        "3AoWCXHq3ACYHYEHUsCzPmRNiXn5c6kodXn9KDd1tz52e1da3dZKYXD5nrJW31XLtN6zzJiwHWtDta52w7Cd7qyE",
+        "FJktmyjV9aBHEShT4hfnLpr9ELywdwVtEL1w1rSWgbVf",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
+}
diff --git a/mm2src/docker_tests/swaps_confs_settings_sync_tests.rs b/mm2src/mm2_main/src/docker_tests/swaps_confs_settings_sync_tests.rs
similarity index 91%
rename from mm2src/docker_tests/swaps_confs_settings_sync_tests.rs
rename to mm2src/mm2_main/src/docker_tests/swaps_confs_settings_sync_tests.rs
index 014d5aa50b..948718069c 100644
--- a/mm2src/docker_tests/swaps_confs_settings_sync_tests.rs
+++ b/mm2src/mm2_main/src/docker_tests/swaps_confs_settings_sync_tests.rs
@@ -1,6 +1,6 @@
 use super::*;
 use crate::mm2::lp_ordermatch::OrderConfirmationsSettings;
-use crate::mm2::lp_swap::PAYMENT_LOCKTIME;
+use crate::mm2::lp_swap::get_payment_locktime;
 
 struct SwapConfirmationsSettings {
     maker_coin_confs: u64,
@@ -16,8 +16,8 @@ fn test_confirmation_settings_sync_correctly_on_buy(
     expected_taker: SwapConfirmationsSettings,
     expected_lock_duration: u64,
 ) {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
     let coins = json! ([
         {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
         {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -54,11 +54,11 @@ fn test_confirmation_settings_sync_correctly_on_buy(
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MYCOIN",
@@ -72,9 +72,9 @@ fn test_confirmation_settings_sync_correctly_on_buy(
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    log!("Maker order "(rc.1));
+    log!("Maker order {}", rc.1);
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "MYCOIN",
@@ -96,7 +96,7 @@ fn test_confirmation_settings_sync_correctly_on_buy(
     log!("Sleep for 3 seconds to allow Started event to be saved");
     thread::sleep(Duration::from_secs(3));
 
-    let maker_status = block_on(mm_bob.rpc(json! ({
+    let maker_status = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_swap_status",
         "params": {
@@ -133,7 +133,7 @@ fn test_confirmation_settings_sync_correctly_on_buy(
         Some(expected_lock_duration)
     );
 
-    let taker_status = block_on(mm_alice.rpc(json! ({
+    let taker_status = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "my_swap_status",
         "params": {
@@ -181,8 +181,8 @@ fn test_confirmation_settings_sync_correctly_on_sell(
     expected_taker: SwapConfirmationsSettings,
     expected_lock_duration: u64,
 ) {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
     let coins = json! ([
         {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
         {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -219,11 +219,11 @@ fn test_confirmation_settings_sync_correctly_on_sell(
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MYCOIN",
@@ -237,9 +237,9 @@ fn test_confirmation_settings_sync_correctly_on_sell(
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    log!("Maker order "(rc.1));
+    log!("Maker order {}", rc.1);
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "sell",
         "base": "MYCOIN1",
@@ -261,7 +261,7 @@ fn test_confirmation_settings_sync_correctly_on_sell(
     log!("Sleep for 3 seconds to allow Started event to be saved");
     thread::sleep(Duration::from_secs(3));
 
-    let maker_status = block_on(mm_bob.rpc(json! ({
+    let maker_status = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_swap_status",
         "params": {
@@ -298,7 +298,7 @@ fn test_confirmation_settings_sync_correctly_on_sell(
         Some(expected_lock_duration)
     );
 
-    let taker_status = block_on(mm_alice.rpc(json! ({
+    let taker_status = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "my_swap_status",
         "params": {
@@ -374,7 +374,7 @@ fn test_buy_maker_should_use_taker_confs_and_notas_for_maker_payment_if_taker_re
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -413,7 +413,7 @@ fn test_buy_maker_should_not_use_taker_confs_and_notas_for_maker_payment_if_take
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -452,7 +452,7 @@ fn test_buy_taker_should_use_maker_confs_and_notas_for_taker_payment_if_maker_re
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -491,7 +491,7 @@ fn test_buy_taker_should_not_use_maker_confs_and_notas_for_taker_payment_if_make
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -530,7 +530,7 @@ fn test_buy_nodes_should_properly_sync_locktime_if_conf_sync_ends_up_without_not
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME,
+        get_payment_locktime(),
     );
 }
 
@@ -569,7 +569,7 @@ fn test_sell_maker_should_use_taker_confs_and_notas_for_maker_payment_if_taker_r
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -608,7 +608,7 @@ fn test_sell_maker_should_not_use_taker_confs_and_notas_for_maker_payment_if_tak
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -647,7 +647,7 @@ fn test_sell_taker_should_use_maker_confs_and_notas_for_taker_payment_if_maker_r
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -686,7 +686,7 @@ fn test_sell_taker_should_not_use_maker_confs_and_notas_for_taker_payment_if_mak
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME * 4,
+        get_payment_locktime() * 4,
     );
 }
 
@@ -725,6 +725,6 @@ fn test_sell_nodes_should_properly_sync_locktime_if_conf_sync_ends_up_without_no
         taker_settings,
         expected_maker,
         expected_taker,
-        PAYMENT_LOCKTIME,
+        get_payment_locktime(),
     );
 }
diff --git a/mm2src/docker_tests/swaps_file_lock_tests.rs b/mm2src/mm2_main/src/docker_tests/swaps_file_lock_tests.rs
similarity index 95%
rename from mm2src/docker_tests/swaps_file_lock_tests.rs
rename to mm2src/mm2_main/src/docker_tests/swaps_file_lock_tests.rs
index c223e0a85f..f8115f82aa 100644
--- a/mm2src/docker_tests/swaps_file_lock_tests.rs
+++ b/mm2src/mm2_main/src/docker_tests/swaps_file_lock_tests.rs
@@ -1,4 +1,6 @@
 use super::*;
+use mm2_io::file_lock::FileLock;
+use mm2_test_helpers::for_tests::new_mm2_temp_folder_path;
 
 const UNFINISHED_MAKER_SWAP: &str = r#"{"type":"Maker","uuid":"5acb0e63-8b26-469e-81df-7dd9e4a9ad15","events":[{"timestamp":1588244036250,"event":{"type":"Started","data":{"taker_coin":"MYCOIN1","maker_coin":"MYCOIN","taker":"859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521","secret":"dedf3c8dcfff9ee2787b4bf211f960fd044fdab7fa8e922ef613a0115848a498","secret_hash":"9304bce3196f344b2a22dc99db406e95ab6f3107","my_persistent_pub":"02987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4d","lock_duration":7800,"maker_amount":"999.99999","taker_amount":"999.99999","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1588259636,"uuid":"5acb0e63-8b26-469e-81df-7dd9e4a9ad15","started_at":1588244036,"maker_coin_start_block":12,"taker_coin_start_block":11}}},{"timestamp":1588244038035,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1588251836,"taker_pubkey":"02859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521"}}}],"maker_amount":"999.99999","maker_coin":"MYCOIN","taker_amount":"999.99999","taker_coin":"MYCOIN1","gui":"nogui","mm_version":"UNKNOWN","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
 const FINISHED_MAKER_SWAP: &str = r#"{"type":"Maker","uuid":"5acb0e63-8b26-469e-81df-7dd9e4a9ad15","events":[{"timestamp":1588244036250,"event":{"type":"Started","data":{"taker_coin":"MYCOIN1","maker_coin":"MYCOIN","taker":"859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521","secret":"dedf3c8dcfff9ee2787b4bf211f960fd044fdab7fa8e922ef613a0115848a498","secret_hash":"9304bce3196f344b2a22dc99db406e95ab6f3107","my_persistent_pub":"02987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4d","lock_duration":7800,"maker_amount":"999.99999","taker_amount":"999.99999","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1588259636,"uuid":"5acb0e63-8b26-469e-81df-7dd9e4a9ad15","started_at":1588244036,"maker_coin_start_block":12,"taker_coin_start_block":11}}},{"timestamp":1588244038035,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1588251836,"taker_pubkey":"02859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521"}}},{"timestamp":1588244038463,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f8901bdde9bca02870787441f6068e4c2a869a3aac3d1d0925f6a6e27874343544d0a010000006a47304402206694a794693b55fbe8205cb1cbb992d92fa2a9a851763ad1bf1628c16deaf73e02203cfff465504bdd6c51e8fbd45dd2e1187142fdc29e82f36f577616d9d6097d7a012102859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521ffffffff02dfceab07000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac39fd41892e0000001976a914d24e799df360da3ca3158d63b89ffaff27722c1588ac46aeaa5e000000000000000000000000000000","tx_hash":"7118d7484d1cbfdd6126673a848a228856f8748d946f6a9a440c90f0d62e27c6","from":["RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC"],"to":["RThtXup6Zo7LZAi8kRWgjAyi1s4u6U9Cpf","RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC"],"total_amount":"2000","spent_by_me":"0","received_by_me":"0","my_balance_change":"0","block_height":13,"timestamp":1588244038,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN1","internal_id":"7118d7484d1cbfdd6126673a848a228856f8748d946f6a9a440c90f0d62e27c6"}}},{"timestamp":1588244038505,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f890163cc0aceb3b432f84c1407991a0389b74b7842f030aa261203aa0b4b9a9a15fd010000006b483045022100f3239794b7b0e1c75aae084a65535270f154231ce86a4739976ff69eeff1ebd402206c0aeb28b7b4b2e77e98b3c3efd9a20d85c2cd0627acc3f45d577c0e88c34fb4012102987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4dffffffff0118e476481700000017a914dc4ed4686174503b85374bfb0aefe07a9fb37bcf8746aeaa5e000000000000000000000000000000","tx_hash":"9a4c0b3f85ed0bb24dc9575ce7c2fd6bc50ad9d37c91c478946f9c33d15abfdf","from":["RAzSdYQhjCFdyhjrBz1AZQDVg3Hu8DrzYc"],"to":["bYp9ncp3V7FYsymipriVbdd3QL72hK9hio"],"total_amount":"1000","spent_by_me":"1000","received_by_me":"0","my_balance_change":"-1000","block_height":0,"timestamp":0,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN","internal_id":"9a4c0b3f85ed0bb24dc9575ce7c2fd6bc50ad9d37c91c478946f9c33d15abfdf"}}},{"timestamp":1588244053938,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8901c6272ed6f0900c449a6a6f948d74f85688228a843a672661ddbf1c4d48d71871010000006b483045022100c37627385c66b7bdf466b4dd4e7095b7551e6f5ea35f9bcc6344eb629f2edcb202203280eaba64b4d72010500166fab62cf34a687a516b2fe83d4eceaf8572cb37a7012102859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521ffffffff0218e476481700000017a91431ff75ed72cd135a7ce50d121e71efc37066b9f9873915cb40170000001976a914d24e799df360da3ca3158d63b89ffaff27722c1588ac55aeaa5e000000000000000000000000000000","tx_hash":"b4718ce94aa43f9073ab0b70c18ab4ea4b587338fb7110f20ff7d1bb452df08f","from":["RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC"],"to":["RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC","bHHdqM8XWDHee2oyzydwUJKEE2BjofEtZH"],"total_amount":"1998.71298873","spent_by_me":"0","received_by_me":"0","my_balance_change":"0","block_height":0,"timestamp":0,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN1","internal_id":"b4718ce94aa43f9073ab0b70c18ab4ea4b587338fb7110f20ff7d1bb452df08f"}}},{"timestamp":1588244053939,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1588244068951,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1588244068959,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"0400008085202f89018ff02d45bbd1f70ff21071fb3873584beab48ac1700bab73903fa44ae98c71b400000000d747304402204f0d641a3916e54d6788744c3229110a431eff18634c66fbd1741f9ca7dba99d02202315ee1d9317cc4d5d75d01f066f2c8a59876f790106d310144cdc03c25f985e0120dedf3c8dcfff9ee2787b4bf211f960fd044fdab7fa8e922ef613a0115848a498004c6b6304bcccaa5eb1752102859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521ac6782012088a9149304bce3196f344b2a22dc99db406e95ab6f3107882102987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4dac68ffffffff0130e07648170000001976a91412c553e8469363f2d30268c475af1e9186cc90af88ac54a0aa5e000000000000000000000000000000","tx_hash":"e7aed7a77e47b44dc9d12166589bbade70faea10b64888f73ed4be04bcc9f9a9","from":["bHHdqM8XWDHee2oyzydwUJKEE2BjofEtZH"],"to":["RAzSdYQhjCFdyhjrBz1AZQDVg3Hu8DrzYc"],"total_amount":"999.99999","spent_by_me":"0","received_by_me":"999.99998","my_balance_change":"999.99998","block_height":0,"timestamp":0,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN1","internal_id":"e7aed7a77e47b44dc9d12166589bbade70faea10b64888f73ed4be04bcc9f9a9"}}},{"timestamp":1588244068960,"event":{"type":"Finished"}}],"maker_amount":"999.99999","maker_coin":"MYCOIN","taker_amount":"999.99999","taker_coin":"MYCOIN1","gui":"nogui","mm_version":"UNKNOWN","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
@@ -7,7 +9,7 @@ const UNFINISHED_TAKER_SWAP: &str = r#"{"type":"Taker","uuid":"5acb0e63-8b26-469
 const FINISHED_TAKER_SWAP: &str = r#"{"type":"Taker","uuid":"5acb0e63-8b26-469e-81df-7dd9e4a9ad15","events":[{"timestamp":1588244036253,"event":{"type":"Started","data":{"taker_coin":"MYCOIN1","maker_coin":"MYCOIN","maker":"987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4d","my_persistent_pub":"02859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521","lock_duration":7800,"maker_amount":"999.99999","taker_amount":"999.99999","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"taker_payment_lock":1588251836,"uuid":"5acb0e63-8b26-469e-81df-7dd9e4a9ad15","started_at":1588244036,"maker_payment_wait":1588247156,"maker_coin_start_block":12,"taker_coin_start_block":11}}},{"timestamp":1588244038239,"event":{"type":"Negotiated","data":{"maker_payment_locktime":1588259636,"maker_pubkey":"02987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4d","secret_hash":"9304bce3196f344b2a22dc99db406e95ab6f3107"}}},{"timestamp":1588244038271,"event":{"type":"TakerFeeSent","data":{"tx_hex":"0400008085202f8901bdde9bca02870787441f6068e4c2a869a3aac3d1d0925f6a6e27874343544d0a010000006a47304402206694a794693b55fbe8205cb1cbb992d92fa2a9a851763ad1bf1628c16deaf73e02203cfff465504bdd6c51e8fbd45dd2e1187142fdc29e82f36f577616d9d6097d7a012102859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521ffffffff02dfceab07000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac39fd41892e0000001976a914d24e799df360da3ca3158d63b89ffaff27722c1588ac46aeaa5e000000000000000000000000000000","tx_hash":"7118d7484d1cbfdd6126673a848a228856f8748d946f6a9a440c90f0d62e27c6","from":["RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC"],"to":["RThtXup6Zo7LZAi8kRWgjAyi1s4u6U9Cpf","RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC"],"total_amount":"2000","spent_by_me":"2000","received_by_me":"1998.71298873","my_balance_change":"-1.28701127","block_height":0,"timestamp":0,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN1","internal_id":"7118d7484d1cbfdd6126673a848a228856f8748d946f6a9a440c90f0d62e27c6"}}},{"timestamp":1588244038698,"event":{"type":"MakerPaymentReceived","data":{"tx_hex":"0400008085202f890163cc0aceb3b432f84c1407991a0389b74b7842f030aa261203aa0b4b9a9a15fd010000006b483045022100f3239794b7b0e1c75aae084a65535270f154231ce86a4739976ff69eeff1ebd402206c0aeb28b7b4b2e77e98b3c3efd9a20d85c2cd0627acc3f45d577c0e88c34fb4012102987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4dffffffff0118e476481700000017a914dc4ed4686174503b85374bfb0aefe07a9fb37bcf8746aeaa5e000000000000000000000000000000","tx_hash":"9a4c0b3f85ed0bb24dc9575ce7c2fd6bc50ad9d37c91c478946f9c33d15abfdf","from":["RAzSdYQhjCFdyhjrBz1AZQDVg3Hu8DrzYc"],"to":["bYp9ncp3V7FYsymipriVbdd3QL72hK9hio"],"total_amount":"1000","spent_by_me":"0","received_by_me":"0","my_balance_change":"0","block_height":0,"timestamp":0,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN","internal_id":"9a4c0b3f85ed0bb24dc9575ce7c2fd6bc50ad9d37c91c478946f9c33d15abfdf"}}},{"timestamp":1588244038699,"event":{"type":"MakerPaymentWaitConfirmStarted"}},{"timestamp":1588244053712,"event":{"type":"MakerPaymentValidatedAndConfirmed"}},{"timestamp":1588244053745,"event":{"type":"TakerPaymentSent","data":{"tx_hex":"0400008085202f8901c6272ed6f0900c449a6a6f948d74f85688228a843a672661ddbf1c4d48d71871010000006b483045022100c37627385c66b7bdf466b4dd4e7095b7551e6f5ea35f9bcc6344eb629f2edcb202203280eaba64b4d72010500166fab62cf34a687a516b2fe83d4eceaf8572cb37a7012102859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521ffffffff0218e476481700000017a91431ff75ed72cd135a7ce50d121e71efc37066b9f9873915cb40170000001976a914d24e799df360da3ca3158d63b89ffaff27722c1588ac55aeaa5e000000000000000000000000000000","tx_hash":"b4718ce94aa43f9073ab0b70c18ab4ea4b587338fb7110f20ff7d1bb452df08f","from":["RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC"],"to":["RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC","bHHdqM8XWDHee2oyzydwUJKEE2BjofEtZH"],"total_amount":"1998.71298873","spent_by_me":"1998.71298873","received_by_me":"998.71298873","my_balance_change":"-1000","block_height":0,"timestamp":0,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN1","internal_id":"b4718ce94aa43f9073ab0b70c18ab4ea4b587338fb7110f20ff7d1bb452df08f"}}},{"timestamp":1588244078860,"event":{"type":"TakerPaymentSpent","data":{"transaction":{"tx_hex":"0400008085202f89018ff02d45bbd1f70ff21071fb3873584beab48ac1700bab73903fa44ae98c71b400000000d747304402204f0d641a3916e54d6788744c3229110a431eff18634c66fbd1741f9ca7dba99d02202315ee1d9317cc4d5d75d01f066f2c8a59876f790106d310144cdc03c25f985e0120dedf3c8dcfff9ee2787b4bf211f960fd044fdab7fa8e922ef613a0115848a498004c6b6304bcccaa5eb1752102859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521ac6782012088a9149304bce3196f344b2a22dc99db406e95ab6f3107882102987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4dac68ffffffff0130e07648170000001976a91412c553e8469363f2d30268c475af1e9186cc90af88ac54a0aa5e000000000000000000000000000000","tx_hash":"e7aed7a77e47b44dc9d12166589bbade70faea10b64888f73ed4be04bcc9f9a9","from":["bHHdqM8XWDHee2oyzydwUJKEE2BjofEtZH"],"to":["RAzSdYQhjCFdyhjrBz1AZQDVg3Hu8DrzYc"],"total_amount":"999.99999","spent_by_me":"0","received_by_me":"0","my_balance_change":"0","block_height":29,"timestamp":1588244070,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN1","internal_id":"e7aed7a77e47b44dc9d12166589bbade70faea10b64888f73ed4be04bcc9f9a9"},"secret":"dedf3c8dcfff9ee2787b4bf211f960fd044fdab7fa8e922ef613a0115848a498"}}},{"timestamp":1588244078870,"event":{"type":"MakerPaymentSpent","data":{"tx_hex":"0400008085202f8901dfbf5ad1339c6f9478c4917cd3d90ac56bfdc2e75c57c94db20bed853f0b4c9a00000000d848304502210092535c081325ba5261699d7cfd4c503fb6125dde86389b83f40f3e2c006039bb022063cfd72aa15558dee874cac08b22dbcf11d3f06c8e48b0ddaf75b86887d604410120dedf3c8dcfff9ee2787b4bf211f960fd044fdab7fa8e922ef613a0115848a498004c6b630434ebaa5eb1752102987d5f82205a55d789616f470ae9df48537f050ee050d501aa316651642a0a4dac6782012088a9149304bce3196f344b2a22dc99db406e95ab6f3107882102859a80b83941e4e8ff2f511080e3ea5021db4ba95caec30eb37864e71ae73521ac68ffffffff0130e07648170000001976a914d24e799df360da3ca3158d63b89ffaff27722c1588ac5ea0aa5e000000000000000000000000000000","tx_hash":"caea128b1c85a88abd5924e512780ee18952dadc217b0c06f4b2820eb71d03bc","from":["bYp9ncp3V7FYsymipriVbdd3QL72hK9hio"],"to":["RUTBzLtJNTn89Wkb6oZocbesKrjBDTRMrC"],"total_amount":"999.99999","spent_by_me":"0","received_by_me":"999.99998","my_balance_change":"999.99998","block_height":0,"timestamp":0,"fee_details":{"amount":"0.00001"},"coin":"MYCOIN","internal_id":"caea128b1c85a88abd5924e512780ee18952dadc217b0c06f4b2820eb71d03bc"}}},{"timestamp":1588244078871,"event":{"type":"Finished"}}],"maker_amount":"999.99999","maker_coin":"MYCOIN","taker_amount":"999.99999","taker_coin":"MYCOIN1","gui":"nogui","mm_version":"UNKNOWN","success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed"]}"#;
 
 fn swap_file_lock_prevents_double_swap_start_on_kick_start(swap_json: &str) {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
     let addr_hash = addr_hash_for_privkey(bob_priv_key);
     let db_folder = new_mm2_temp_folder_path(None).join("DB");
     let swaps_db_folder = db_folder.join(addr_hash).join("SWAPS").join("MY");
@@ -38,8 +40,8 @@ fn swap_file_lock_prevents_double_swap_start_on_kick_start(swap_json: &str) {
     });
     let mut mm_bob = MarketMakerIt::start(bob_conf, "pass".to_string(), None).unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
     block_on(mm_bob.wait_for_log(22., |log| {
         log.contains("Kick starting the swap 5acb0e63-8b26-469e-81df-7dd9e4a9ad15")
     }))
@@ -64,8 +66,8 @@ fn test_swap_file_lock_prevents_double_swap_start_on_kick_start_taker() {
 
 #[test]
 fn test_swaps_should_kick_start_if_process_was_killed() {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
-    let (_ctx, _, alice_priv_key) = generate_coin_with_random_privkey("MYCOIN1", 2000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 2000.into());
     let coins = json! ([
         {"coin":"MYCOIN","asset":"MYCOIN","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
         {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
@@ -94,11 +96,11 @@ fn test_swaps_should_kick_start_if_process_was_killed() {
     let mut mm_alice = MarketMakerIt::start(alice_conf.clone(), "pass".to_string(), None).unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
 
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_alice, "MYCOIN1", &[]))]);
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice, "MYCOIN1", &[])));
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MYCOIN",
@@ -108,7 +110,7 @@ fn test_swaps_should_kick_start_if_process_was_killed() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "MYCOIN",
@@ -143,8 +145,8 @@ fn test_swaps_should_kick_start_if_process_was_killed() {
     drop(mm_bob);
     let mut mm_bob_dup = MarketMakerIt::start(bob_conf, "pass".to_string(), None).unwrap();
     let (_bob_dup_dump_log, _bob_dup_dump_dashboard) = mm_dump(&mm_bob_dup.log_path);
-    log!([block_on(enable_native(&mm_bob_dup, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob_dup, "MYCOIN1", &[])));
 
     block_on(mm_bob_dup.wait_for_log(50., |log| log.contains(&format!("Swap {} kick started.", uuid)))).unwrap();
 
@@ -157,8 +159,8 @@ fn test_swaps_should_kick_start_if_process_was_killed() {
     alice_conf["skip_seednodes_check"] = true.into();
     let mut mm_alice_dup = MarketMakerIt::start(alice_conf, "pass".to_string(), None).unwrap();
     let (_alice_dup_dump_log, _alice_dup_dump_dashboard) = mm_dump(&mm_alice_dup.log_path);
-    log!([block_on(enable_native(&mm_alice_dup, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_alice_dup, "MYCOIN1", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm_alice_dup, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_alice_dup, "MYCOIN1", &[])));
 
     block_on(mm_alice_dup.wait_for_log(50., |log| log.contains(&format!("Swap {} kick started.", uuid)))).unwrap();
 }
@@ -178,7 +180,7 @@ fn swap_should_not_kick_start_if_finished_during_waiting_for_file_lock(
     unfinished_swap_json: &str,
     finished_swap_json: &str,
 ) {
-    let (_ctx, _, bob_priv_key) = generate_coin_with_random_privkey("MYCOIN", 1000.into());
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
     let addr_hash = addr_hash_for_privkey(bob_priv_key);
     let db_folder = new_mm2_temp_folder_path(None).join("DB");
     let swaps_db_folder = db_folder.join(addr_hash).join("SWAPS").join("MY");
@@ -204,8 +206,8 @@ fn swap_should_not_kick_start_if_finished_during_waiting_for_file_lock(
     });
     let mut mm_bob = MarketMakerIt::start(bob_conf, "pass".to_string(), None).unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN", &[]))]);
-    log!([block_on(enable_native(&mm_bob, "MYCOIN1", &[]))]);
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_bob, "MYCOIN1", &[])));
     block_on(mm_bob.wait_for_log(22., |log| {
         log.contains("Kick starting the swap 5acb0e63-8b26-469e-81df-7dd9e4a9ad15")
     }))
diff --git a/mm2src/mm2_main/src/for_tests/check_order_serde_payload.json b/mm2src/mm2_main/src/for_tests/check_order_serde_payload.json
new file mode 100644
index 0000000000..c3ebacb594
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/check_order_serde_payload.json
@@ -0,0 +1,20 @@
+{
+  "type": "Maker",
+  "order": {
+    "base": "BASE",
+    "base_orderbook_ticker": null,
+    "conf_settings": null,
+    "created_at": 1653473944616,
+    "matches": {},
+    "max_base_vol": [ [ 1, [ 10 ] ], [ 1, [ 1 ] ] ],
+    "min_base_vol": [ [ 0, [] ], [ 1, [ 1 ] ] ],
+    "p2p_privkey": null,
+    "price": [ [ 1, [ 1 ] ], [ 1, [ 1 ] ] ],
+    "rel": "REL",
+    "rel_orderbook_ticker": null,
+    "save_in_history": true,
+    "started_swaps": [],
+    "updated_at": 1653473944616,
+    "uuid": "c6e34a89-a2a8-4fc3-9f16-eb2ecaded3c4"
+  }
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/lp_dispatcher.rs b/mm2src/mm2_main/src/lp_dispatcher.rs
new file mode 100644
index 0000000000..74f7a9a18d
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_dispatcher.rs
@@ -0,0 +1,58 @@
+use crate::mm2::lp_ordermatch::TradingBotEvent;
+use crate::mm2::lp_swap::MakerSwapStatusChanged;
+use async_std::sync::RwLock;
+use mm2_core::{event_dispatcher::{Dispatcher, EventUniqueId},
+               mm_ctx::{from_ctx, MmArc}};
+use std::any::TypeId;
+use std::sync::Arc;
+
+#[derive(Clone)]
+pub struct StopCtxEvent;
+
+impl StopCtxEvent {
+    pub fn event_id() -> TypeId { TypeId::of::<StopCtxEvent>() }
+}
+
+#[derive(Clone)]
+pub enum LpEvents {
+    MakerSwapStatusChanged(MakerSwapStatusChanged),
+    StopCtxEvent(StopCtxEvent),
+    TradingBotEvent(TradingBotEvent),
+}
+
+impl From<TradingBotEvent> for LpEvents {
+    fn from(evt: TradingBotEvent) -> Self { LpEvents::TradingBotEvent(evt) }
+}
+
+impl From<StopCtxEvent> for LpEvents {
+    fn from(evt: StopCtxEvent) -> Self { LpEvents::StopCtxEvent(evt) }
+}
+
+impl EventUniqueId for LpEvents {
+    fn event_id(&self) -> TypeId {
+        match self {
+            LpEvents::MakerSwapStatusChanged(_) => MakerSwapStatusChanged::event_id(),
+            LpEvents::StopCtxEvent(_) => StopCtxEvent::event_id(),
+            LpEvents::TradingBotEvent(event) => event.event_id(),
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct DispatcherContext {
+    pub dispatcher: RwLock<Dispatcher<LpEvents>>,
+}
+
+impl DispatcherContext {
+    /// Obtains a reference to this crate context, creating it if necessary.
+    pub fn from_ctx(ctx: &MmArc) -> Result<Arc<DispatcherContext>, String> {
+        Ok(try_s!(from_ctx(&ctx.dispatcher_ctx, move || {
+            Ok(DispatcherContext::default())
+        })))
+    }
+}
+
+pub async fn dispatch_lp_event(ctx: MmArc, event: LpEvents) {
+    let dispatcher_ctx = DispatcherContext::from_ctx(&ctx).unwrap();
+    dispatcher_ctx.dispatcher.read().await.dispatch_async(ctx, event).await;
+}
diff --git a/mm2src/mm2_main/src/lp_init/init_context.rs b/mm2src/mm2_main/src/lp_init/init_context.rs
new file mode 100644
index 0000000000..32d8c24214
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_init/init_context.rs
@@ -0,0 +1,19 @@
+use crate::mm2::lp_native_dex::init_hw::InitHwTaskManagerShared;
+use mm2_core::mm_ctx::{from_ctx, MmArc};
+use rpc_task::RpcTaskManager;
+use std::sync::Arc;
+
+pub struct MmInitContext {
+    pub init_hw_task_manager: InitHwTaskManagerShared,
+}
+
+impl MmInitContext {
+    /// Obtains a reference to this crate context, creating it if necessary.
+    pub fn from_ctx(ctx: &MmArc) -> Result<Arc<MmInitContext>, String> {
+        from_ctx(&ctx.mm_init_ctx, move || {
+            Ok(MmInitContext {
+                init_hw_task_manager: RpcTaskManager::new_shared(),
+            })
+        })
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_init/init_hw.rs b/mm2src/mm2_main/src/lp_init/init_hw.rs
new file mode 100644
index 0000000000..e5970e6174
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_init/init_hw.rs
@@ -0,0 +1,176 @@
+use crate::mm2::lp_native_dex::init_context::MmInitContext;
+use async_trait::async_trait;
+use common::{HttpStatusCode, SuccessResponse};
+use crypto::hw_rpc_task::{HwConnectStatuses, HwRpcTaskAwaitingStatus, HwRpcTaskUserAction, HwRpcTaskUserActionRequest,
+                          TrezorRpcTaskConnectProcessor};
+use crypto::{CryptoCtx, CryptoInitError, HwCtxInitError, HwError, HwWalletType};
+use derive_more::Display;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{InitRpcTaskResponse, RpcTaskStatusError, RpcTaskStatusRequest, RpcTaskUserActionError};
+use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+use std::time::Duration;
+
+const TREZOR_CONNECT_TIMEOUT: Duration = Duration::from_secs(300);
+const TREZOR_PIN_TIMEOUT: Duration = Duration::from_secs(600);
+
+pub type InitHwAwaitingStatus = HwRpcTaskAwaitingStatus;
+pub type InitHwUserAction = HwRpcTaskUserAction;
+
+pub type InitHwTaskManagerShared = RpcTaskManagerShared<InitHwTask>;
+pub type InitHwStatus = RpcTaskStatus<SuccessResponse, InitHwError, InitHwInProgressStatus, InitHwAwaitingStatus>;
+type InitHwTaskHandle = RpcTaskHandle<InitHwTask>;
+
+#[derive(Clone, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum InitHwError {
+    /* ----------- Trezor device errors ----------- */
+    #[display(fmt = "Trezor internal error: {}", _0)]
+    TrezorInternal(String),
+    #[display(fmt = "No Trezor device available")]
+    NoTrezorDeviceAvailable,
+    /* ---------------- RPC error ----------------- */
+    #[display(fmt = "Hardware Wallet context is initializing already")]
+    HwContextInitializingAlready,
+    #[display(fmt = "Hardware Wallet context is initialized already")]
+    HwContextInitializedAlready,
+    #[display(fmt = "RPC timed out {:?}", _0)]
+    Timeout(Duration),
+    #[display(fmt = "Internal: {}", _0)]
+    Internal(String),
+}
+
+impl From<CryptoInitError> for InitHwError {
+    fn from(e: CryptoInitError) -> Self { InitHwError::Internal(e.to_string()) }
+}
+
+impl From<HwCtxInitError<RpcTaskError>> for InitHwError {
+    fn from(e: HwCtxInitError<RpcTaskError>) -> Self {
+        match e {
+            HwCtxInitError::InitializingAlready => InitHwError::HwContextInitializingAlready,
+            HwCtxInitError::InitializedAlready => InitHwError::HwContextInitializedAlready,
+            HwCtxInitError::HwError(hw_error) => InitHwError::from(hw_error),
+            HwCtxInitError::ProcessorError(rpc) => InitHwError::from(rpc),
+        }
+    }
+}
+
+impl From<HwError> for InitHwError {
+    fn from(e: HwError) -> Self {
+        match e {
+            HwError::NoTrezorDeviceAvailable => InitHwError::NoTrezorDeviceAvailable,
+            trezor => InitHwError::TrezorInternal(trezor.to_string()),
+        }
+    }
+}
+
+impl From<RpcTaskError> for InitHwError {
+    fn from(e: RpcTaskError) -> Self {
+        let error = e.to_string();
+        match e {
+            RpcTaskError::Canceled => InitHwError::Internal("Canceled".to_owned()),
+            RpcTaskError::Timeout(timeout) => InitHwError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => InitHwError::Internal(error),
+            RpcTaskError::Internal(internal) => InitHwError::Internal(internal),
+        }
+    }
+}
+
+impl HttpStatusCode for InitHwError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            InitHwError::HwContextInitializingAlready | InitHwError::HwContextInitializedAlready => {
+                StatusCode::BAD_REQUEST
+            },
+            InitHwError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
+            InitHwError::TrezorInternal(_) | InitHwError::NoTrezorDeviceAvailable | InitHwError::Internal(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
+
+#[derive(Clone, Deserialize, Serialize)]
+pub enum InitHwInProgressStatus {
+    Initializing,
+    WaitingForTrezorToConnect,
+    ReadPublicKeyFromTrezor,
+}
+
+pub struct InitHwTask {
+    ctx: MmArc,
+    hw_wallet_type: HwWalletType,
+}
+
+impl RpcTaskTypes for InitHwTask {
+    type Item = SuccessResponse;
+    type Error = InitHwError;
+    type InProgressStatus = InitHwInProgressStatus;
+    type AwaitingStatus = InitHwAwaitingStatus;
+    type UserAction = InitHwUserAction;
+}
+
+#[async_trait]
+impl RpcTask for InitHwTask {
+    fn initial_status(&self) -> Self::InProgressStatus { InitHwInProgressStatus::Initializing }
+
+    async fn run(self, task_handle: &InitHwTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
+        let crypto_ctx = CryptoCtx::from_ctx(&self.ctx)?;
+
+        match self.hw_wallet_type {
+            HwWalletType::Trezor => {
+                let trezor_connect_processor = TrezorRpcTaskConnectProcessor::new(task_handle, HwConnectStatuses {
+                    on_connect: InitHwInProgressStatus::WaitingForTrezorToConnect,
+                    on_connected: InitHwInProgressStatus::Initializing,
+                    on_connection_failed: InitHwInProgressStatus::Initializing,
+                    on_button_request: InitHwInProgressStatus::ReadPublicKeyFromTrezor,
+                    on_pin_request: InitHwAwaitingStatus::WaitForTrezorPin,
+                    on_ready: InitHwInProgressStatus::Initializing,
+                })
+                .with_connect_timeout(TREZOR_CONNECT_TIMEOUT)
+                .with_pin_timeout(TREZOR_PIN_TIMEOUT);
+
+                crypto_ctx.init_hw_ctx_with_trezor(&trezor_connect_processor).await?;
+            },
+        }
+        Ok(SuccessResponse::new())
+    }
+}
+
+#[derive(Deserialize)]
+pub struct InitTrezorRequest;
+
+pub async fn init_trezor(ctx: MmArc, _req: InitTrezorRequest) -> MmResult<InitRpcTaskResponse, InitHwError> {
+    let init_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(InitHwError::Internal)?;
+    let task = InitHwTask {
+        ctx,
+        hw_wallet_type: HwWalletType::Trezor,
+    };
+    let task_id = RpcTaskManager::spawn_rpc_task(&init_ctx.init_hw_task_manager, task)?;
+    Ok(InitRpcTaskResponse { task_id })
+}
+
+pub async fn init_trezor_status(ctx: MmArc, req: RpcTaskStatusRequest) -> MmResult<InitHwStatus, RpcTaskStatusError> {
+    let coins_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(RpcTaskStatusError::Internal)?;
+    let mut task_manager = coins_ctx
+        .init_hw_task_manager
+        .lock()
+        .map_to_mm(|e| RpcTaskStatusError::Internal(e.to_string()))?;
+    task_manager
+        .task_status(req.task_id, req.forget_if_finished)
+        .or_mm_err(|| RpcTaskStatusError::NoSuchTask(req.task_id))
+}
+
+pub async fn init_trezor_user_action(
+    ctx: MmArc,
+    req: HwRpcTaskUserActionRequest,
+) -> MmResult<SuccessResponse, RpcTaskUserActionError> {
+    let coins_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(RpcTaskUserActionError::Internal)?;
+    let mut task_manager = coins_ctx
+        .init_hw_task_manager
+        .lock()
+        .map_to_mm(|e| RpcTaskUserActionError::Internal(e.to_string()))?;
+    task_manager.on_user_action(req.task_id, req.user_action)?;
+    Ok(SuccessResponse::new())
+}
diff --git a/mm2src/mm2_main/src/lp_message_service.rs b/mm2src/mm2_main/src/lp_message_service.rs
new file mode 100644
index 0000000000..98a7b03a54
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_message_service.rs
@@ -0,0 +1,157 @@
+#[path = "notification/telegram/telegram.rs"] pub mod telegram;
+
+use crate::mm2::lp_message_service::telegram::{ChatIdRegistry, TelegramError, TgClient};
+use async_trait::async_trait;
+use derive_more::Display;
+use futures::lock::Mutex as AsyncMutex;
+use mm2_core::mm_ctx::from_ctx;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use serde_json::{self as json};
+use std::sync::Arc;
+
+pub type MessageResult<T> = Result<T, MmError<MessageError>>;
+pub const MAKER_BOT_ROOM_ID: &str = "maker_bot";
+pub const DEFAULT_ROOM_ID: &str = "default";
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum MessageError {
+    #[display(fmt = "{}", _0)]
+    TelegramError(TelegramError),
+}
+
+impl From<TelegramError> for MessageError {
+    fn from(e: TelegramError) -> Self { MessageError::TelegramError(e) }
+}
+
+#[async_trait]
+pub trait MessageServiceTraits {
+    async fn send_message(&self, message: String, room_id: &str, disable_notification: bool) -> MessageResult<bool>;
+}
+
+#[derive(Default)]
+pub struct MessageService {
+    services: Vec<Box<dyn MessageServiceTraits + Send + Sync>>,
+}
+
+impl MessageService {
+    pub async fn send_message(
+        &self,
+        message: String,
+        room_id: &str,
+        disable_notification: bool,
+    ) -> MessageResult<bool> {
+        for service in self.services.iter() {
+            service
+                .send_message(message.clone(), room_id, disable_notification)
+                .await?;
+        }
+        Ok(true)
+    }
+
+    pub fn attach_service(&mut self, service: Box<dyn MessageServiceTraits + Send + Sync>) -> &MessageService {
+        self.services.push(service);
+        self
+    }
+
+    #[cfg(all(test, not(target_arch = "wasm32")))]
+    pub fn nb_services(&self) -> usize { self.services.len() }
+
+    #[cfg(all(test, not(target_arch = "wasm32")))]
+    pub fn new() -> Self { Default::default() }
+}
+
+#[derive(Default)]
+pub struct MessageServiceContext {
+    pub message_service: AsyncMutex<MessageService>,
+}
+
+impl MessageServiceContext {
+    /// Obtains a reference to this crate context, creating it if necessary.
+    pub fn from_ctx(ctx: &MmArc) -> Result<Arc<MessageServiceContext>, String> {
+        Ok(try_s!(from_ctx(&ctx.message_service_ctx, move || {
+            Ok(MessageServiceContext::default())
+        })))
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct MessageServiceCfg {
+    telegram: Option<Telegram>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Telegram {
+    api_key: String,
+    chat_registry: ChatIdRegistry,
+}
+
+#[derive(Display)]
+pub enum InitMessageServiceError {
+    #[display(fmt = "Error deserializing '{}' config field: {}", field, error)]
+    ErrorDeserializingConfig { field: String, error: String },
+}
+
+pub async fn init_message_service(ctx: &MmArc) -> Result<(), MmError<InitMessageServiceError>> {
+    let maybe_cfg: Option<MessageServiceCfg> =
+        json::from_value(ctx.conf["message_service_cfg"].clone()).map_to_mm(|e| {
+            InitMessageServiceError::ErrorDeserializingConfig {
+                field: "message_service_cfg".to_owned(),
+                error: e.to_string(),
+            }
+        })?;
+    if let Some(message_service_cfg) = maybe_cfg {
+        let message_service_ctx = MessageServiceContext::from_ctx(ctx).unwrap();
+        let mut message_service = message_service_ctx.message_service.lock().await;
+        if let Some(telegram) = message_service_cfg.telegram {
+            let tg_client = TgClient::new(telegram.api_key, None, telegram.chat_registry);
+            message_service.attach_service(Box::new(tg_client));
+            let _ = message_service
+                .send_message(
+                    "message service successfully initialized".to_string(),
+                    DEFAULT_ROOM_ID,
+                    false,
+                )
+                .await;
+        }
+    }
+    Ok(())
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod message_service_tests {
+    use crate::mm2::lp_message_service::telegram::{ChatIdRegistry, TgClient};
+    use crate::mm2::lp_message_service::MessageService;
+    use common::block_on;
+    use std::collections::HashMap;
+    use std::env::var;
+
+    #[test]
+    fn test_attach_service() {
+        if let Ok(api_key) = var("TELEGRAM_API_KEY") {
+            let tg_client = TgClient::new(api_key, None, HashMap::new());
+            let nb_services = MessageService::new().attach_service(Box::new(tg_client)).nb_services();
+            assert_eq!(nb_services, 1);
+        }
+    }
+
+    #[test]
+    fn test_send_message_service() {
+        if let Ok(api_key) = var("TELEGRAM_API_KEY") {
+            let chat_registry: ChatIdRegistry = vec![("RustTestChatId".to_string(), "-645728650".to_string())]
+                .into_iter()
+                .collect();
+            let tg_client = TgClient::new(api_key, None, chat_registry);
+            let mut message_service = MessageService::new();
+            message_service.attach_service(Box::new(tg_client));
+            let res = block_on(message_service.send_message(
+                "Hey it's the message service, do you hear me?".to_string(),
+                "RustTestChatId",
+                true,
+            ));
+            assert!(!res.is_err());
+            assert!(res.unwrap());
+        }
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_native_dex.rs b/mm2src/mm2_main/src/lp_native_dex.rs
new file mode 100644
index 0000000000..967f5cd413
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_native_dex.rs
@@ -0,0 +1,643 @@
+/******************************************************************************
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
+ *                                                                            *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+//
+//  lp_native_dex.rs
+//  marketmaker
+//
+
+use bitcrypto::sha256;
+use coins::register_balance_update_handler;
+use common::executor::{spawn, spawn_boxed, Timer};
+use common::log::{info, warn};
+use crypto::{CryptoCtx, CryptoInitError, HwError, HwProcessingError};
+use derive_more::Display;
+use mm2_core::mm_ctx::{MmArc, MmCtx};
+use mm2_err_handle::prelude::*;
+use mm2_libp2p::{spawn_gossipsub, AdexBehaviourError, NodeType, RelayAddress, RelayAddressError, WssCerts};
+use rpc_task::RpcTaskError;
+use serde_json::{self as json};
+use std::fs;
+use std::io;
+use std::path::PathBuf;
+use std::str;
+use std::time::Duration;
+
+#[cfg(not(target_arch = "wasm32"))]
+use crate::mm2::database::init_and_migrate_db;
+use crate::mm2::lp_message_service::{init_message_service, InitMessageServiceError};
+use crate::mm2::lp_network::{lp_network_ports, p2p_event_process_loop, NetIdError, P2PContext};
+use crate::mm2::lp_ordermatch::{broadcast_maker_orders_keep_alive_loop, clean_memory_loop, init_ordermatch_context,
+                                lp_ordermatch_loop, orders_kick_start, BalanceUpdateOrdermatchHandler,
+                                OrdermatchInitError};
+use crate::mm2::lp_swap::{running_swaps_num, swap_kick_starts};
+use crate::mm2::rpc::spawn_rpc;
+use crate::mm2::{MM_DATETIME, MM_VERSION};
+
+cfg_native! {
+    use mm2_io::fs::{ensure_dir_is_writable, ensure_file_is_writable};
+    use mm2_net::ip_addr::myipaddr;
+    use db_common::sqlite::rusqlite::Error as SqlError;
+}
+
+#[path = "lp_init/init_context.rs"] mod init_context;
+#[path = "lp_init/init_hw.rs"] pub mod init_hw;
+
+const NETID_7777_SEEDNODES: [&str; 3] = ["seed1.defimania.live", "seed2.defimania.live", "seed3.defimania.live"];
+
+pub type P2PResult<T> = Result<T, MmError<P2PInitError>>;
+pub type MmInitResult<T> = Result<T, MmError<MmInitError>>;
+
+#[derive(Clone, Debug, Display, Serialize)]
+pub enum P2PInitError {
+    #[display(
+        fmt = "Invalid WSS key/cert at {:?}. The file must contain {}'",
+        path,
+        expected_format
+    )]
+    InvalidWssCert { path: PathBuf, expected_format: String },
+    #[display(fmt = "Error deserializing '{}' config field: {}", field, error)]
+    ErrorDeserializingConfig { field: String, error: String },
+    #[display(fmt = "The '{}' field not found in the config", field)]
+    FieldNotFoundInConfig { field: String },
+    #[display(fmt = "Error reading WSS key/cert file {:?}: {}", path, error)]
+    ErrorReadingCertFile { path: PathBuf, error: String },
+    #[display(fmt = "Error getting my IP address: '{}'", _0)]
+    ErrorGettingMyIpAddr(String),
+    #[display(fmt = "Invalid netid: '{}'", _0)]
+    InvalidNetId(NetIdError),
+    #[display(fmt = "Invalid relay address: '{}'", _0)]
+    InvalidRelayAddress(RelayAddressError),
+    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+    #[display(fmt = "WASM node can be a seed if only 'p2p_in_memory' is true")]
+    WasmNodeCannotBeSeed,
+    #[display(fmt = "Internal error: '{}'", _0)]
+    Internal(String),
+}
+
+impl From<NetIdError> for P2PInitError {
+    fn from(e: NetIdError) -> Self { P2PInitError::InvalidNetId(e) }
+}
+
+impl From<AdexBehaviourError> for P2PInitError {
+    fn from(e: AdexBehaviourError) -> Self {
+        match e {
+            AdexBehaviourError::ParsingRelayAddress(e) => P2PInitError::InvalidRelayAddress(e),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum MmInitError {
+    Canceled,
+    #[display(fmt = "Initialization timeout {:?}", _0)]
+    Timeout(Duration),
+    #[display(fmt = "Error deserializing '{}' config field: {}", field, error)]
+    ErrorDeserializingConfig {
+        field: String,
+        error: String,
+    },
+    #[display(fmt = "The '{}' field not found in the config", field)]
+    FieldNotFoundInConfig {
+        field: String,
+    },
+    #[display(fmt = "P2P initializing error: '{}'", _0)]
+    P2PError(P2PInitError),
+    #[display(fmt = "Error creating DB director '{:?}': {}", path, error)]
+    ErrorCreatingDbDir {
+        path: PathBuf,
+        error: String,
+    },
+    #[display(fmt = "{} db dir is not writable", path)]
+    DbDirectoryIsNotWritable {
+        path: String,
+    },
+    #[display(fmt = "{} db file is not writable", path)]
+    DbFileIsNotWritable {
+        path: String,
+    },
+    #[display(fmt = "sqlite initializing error: {}", _0)]
+    ErrorSqliteInitializing(String),
+    #[display(fmt = "DB migrating error: {}", _0)]
+    ErrorDbMigrating(String),
+    #[display(fmt = "Swap kick start error: {}", _0)]
+    SwapsKickStartError(String),
+    #[display(fmt = "Order kick start error: {}", _0)]
+    OrdersKickStartError(String),
+    NullStringPassphrase,
+    #[display(fmt = "Invalid passphrase: {}", _0)]
+    InvalidPassphrase(String),
+    #[display(fmt = "No Trezor device available")]
+    NoTrezorDeviceAvailable,
+    #[display(fmt = "Hardware Wallet error: {}", _0)]
+    HardwareWalletError(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<P2PInitError> for MmInitError {
+    fn from(e: P2PInitError) -> Self {
+        match e {
+            P2PInitError::ErrorDeserializingConfig { field, error } => {
+                MmInitError::ErrorDeserializingConfig { field, error }
+            },
+            P2PInitError::FieldNotFoundInConfig { field } => MmInitError::FieldNotFoundInConfig { field },
+            P2PInitError::Internal(e) => MmInitError::Internal(e),
+            other => MmInitError::P2PError(other),
+        }
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl From<SqlError> for MmInitError {
+    fn from(e: SqlError) -> Self { MmInitError::ErrorSqliteInitializing(e.to_string()) }
+}
+
+impl From<OrdermatchInitError> for MmInitError {
+    fn from(e: OrdermatchInitError) -> Self {
+        match e {
+            OrdermatchInitError::ErrorDeserializingConfig { field, error } => {
+                MmInitError::ErrorDeserializingConfig { field, error }
+            },
+            OrdermatchInitError::Internal(internal) => MmInitError::Internal(internal),
+        }
+    }
+}
+
+impl From<InitMessageServiceError> for MmInitError {
+    fn from(e: InitMessageServiceError) -> Self {
+        match e {
+            InitMessageServiceError::ErrorDeserializingConfig { field, error } => {
+                MmInitError::ErrorDeserializingConfig { field, error }
+            },
+        }
+    }
+}
+
+impl From<CryptoInitError> for MmInitError {
+    fn from(e: CryptoInitError) -> Self {
+        match e {
+            e @ CryptoInitError::InitializedAlready | e @ CryptoInitError::NotInitialized => {
+                MmInitError::Internal(e.to_string())
+            },
+            CryptoInitError::NullStringPassphrase => MmInitError::NullStringPassphrase,
+            CryptoInitError::InvalidPassphrase(pass) => MmInitError::InvalidPassphrase(pass.to_string()),
+            CryptoInitError::Internal(internal) => MmInitError::Internal(internal),
+        }
+    }
+}
+
+impl From<HwError> for MmInitError {
+    fn from(e: HwError) -> Self {
+        match e {
+            HwError::NoTrezorDeviceAvailable => MmInitError::NoTrezorDeviceAvailable,
+            HwError::Internal(internal) => MmInitError::Internal(internal),
+            hw => MmInitError::HardwareWalletError(hw.to_string()),
+        }
+    }
+}
+
+impl From<RpcTaskError> for MmInitError {
+    fn from(e: RpcTaskError) -> Self {
+        let error = e.to_string();
+        match e {
+            RpcTaskError::Canceled => MmInitError::Canceled,
+            RpcTaskError::Timeout(timeout) => MmInitError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => MmInitError::Internal(error),
+            RpcTaskError::Internal(internal) => MmInitError::Internal(internal),
+        }
+    }
+}
+
+impl From<HwProcessingError<RpcTaskError>> for MmInitError {
+    fn from(e: HwProcessingError<RpcTaskError>) -> Self {
+        match e {
+            HwProcessingError::HwError(hw) => MmInitError::from(hw),
+            HwProcessingError::ProcessorError(rpc_task) => MmInitError::from(rpc_task),
+        }
+    }
+}
+
+impl MmInitError {
+    pub fn db_directory_is_not_writable(path: &str) -> MmInitError {
+        MmInitError::DbDirectoryIsNotWritable { path: path.to_owned() }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+fn default_seednodes(netid: u16) -> Vec<RelayAddress> {
+    if netid == 7777 {
+        NETID_7777_SEEDNODES
+            .iter()
+            .map(|seed| RelayAddress::Dns(seed.to_string()))
+            .collect()
+    } else {
+        Vec::new()
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn default_seednodes(netid: u16) -> Vec<RelayAddress> {
+    use crate::mm2::lp_network::addr_to_ipv4_string;
+    if netid == 7777 {
+        NETID_7777_SEEDNODES
+            .iter()
+            .filter_map(|seed| addr_to_ipv4_string(*seed).ok())
+            .map(RelayAddress::IPv4)
+            .collect()
+    } else {
+        Vec::new()
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn fix_directories(ctx: &MmCtx) -> MmInitResult<()> {
+    let dbdir = ctx.dbdir();
+    std::fs::create_dir_all(&dbdir).map_to_mm(|e| MmInitError::ErrorCreatingDbDir {
+        path: dbdir.clone(),
+        error: e.to_string(),
+    })?;
+
+    if !ensure_dir_is_writable(&dbdir.join("SWAPS")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("SWAPS"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("MY")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("SWAPS/MY"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("STATS")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("SWAPS/STATS"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("STATS").join("MAKER")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("SWAPS/STATS/MAKER"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("SWAPS").join("STATS").join("TAKER")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("SWAPS/STATS/TAKER"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("TRANSACTIONS")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("TRANSACTIONS"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("GTC")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("GTC"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("PRICES")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("PRICES"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("UNSPENTS")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("UNSPENTS"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("ORDERS")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("ORDERS"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("ORDERS/MY"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY").join("MAKER")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("ORDERS/MY/MAKER"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY").join("TAKER")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("ORDERS/MY/TAKER"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("ORDERS").join("MY").join("HISTORY")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("ORDERS/MY/HISTORY"));
+    }
+    if !ensure_dir_is_writable(&dbdir.join("TX_CACHE")) {
+        return MmError::err(MmInitError::db_directory_is_not_writable("TX_CACHE"));
+    }
+    ensure_file_is_writable(&dbdir.join("GTC").join("orders")).map_to_mm(|_| MmInitError::DbFileIsNotWritable {
+        path: "GTC/orders".to_owned(),
+    })?;
+    Ok(())
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn migrate_db(ctx: &MmArc) -> MmInitResult<()> {
+    let migration_num_path = ctx.dbdir().join(".migration");
+    let mut current_migration = match std::fs::read(&migration_num_path) {
+        Ok(bytes) => {
+            let mut num_bytes = [0; 8];
+            if bytes.len() == 8 {
+                num_bytes.clone_from_slice(&bytes);
+                u64::from_le_bytes(num_bytes)
+            } else {
+                0
+            }
+        },
+        Err(_) => 0,
+    };
+
+    if current_migration < 1 {
+        migration_1(ctx);
+        current_migration = 1;
+    }
+    std::fs::write(&migration_num_path, &current_migration.to_le_bytes())
+        .map_to_mm(|e| MmInitError::ErrorDbMigrating(e.to_string()))?;
+    Ok(())
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn migration_1(_ctx: &MmArc) {}
+
+pub async fn lp_init_continue(ctx: MmArc) -> MmInitResult<()> {
+    init_ordermatch_context(&ctx)?;
+    init_p2p(ctx.clone()).await?;
+
+    if ctx.secp256k1_key_pair_as_option().is_none() {
+        return Ok(());
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        fix_directories(&ctx)?;
+        ctx.init_sqlite_connection()
+            .map_to_mm(MmInitError::ErrorSqliteInitializing)?;
+        init_and_migrate_db(&ctx).await?;
+        migrate_db(&ctx)?;
+    }
+
+    init_message_service(&ctx).await?;
+
+    let balance_update_ordermatch_handler = BalanceUpdateOrdermatchHandler::new(ctx.clone());
+    register_balance_update_handler(ctx.clone(), Box::new(balance_update_ordermatch_handler)).await;
+
+    ctx.initialized.pin(true).map_to_mm(MmInitError::Internal)?;
+
+    // launch kickstart threads before RPC is available, this will prevent the API user to place
+    // an order and start new swap that might get started 2 times because of kick-start
+    kick_start(ctx.clone()).await?;
+
+    spawn(lp_ordermatch_loop(ctx.clone()));
+
+    spawn(broadcast_maker_orders_keep_alive_loop(ctx.clone()));
+
+    spawn(clean_memory_loop(ctx.weak()));
+    Ok(())
+}
+
+#[cfg_attr(target_arch = "wasm32", allow(unused_variables))]
+/// * `ctx_cb` - callback used to share the `MmCtx` ID with the call site.
+pub async fn lp_init(ctx: MmArc) -> MmInitResult<()> {
+    info!("Version: {} DT {}", MM_VERSION, MM_DATETIME);
+
+    if !ctx.conf["passphrase"].is_null() {
+        let passphrase: String =
+            json::from_value(ctx.conf["passphrase"].clone()).map_to_mm(|e| MmInitError::ErrorDeserializingConfig {
+                field: "passphrase".to_owned(),
+                error: e.to_string(),
+            })?;
+        CryptoCtx::init_with_iguana_passphrase(ctx.clone(), &passphrase)?;
+    }
+
+    lp_init_continue(ctx.clone()).await?;
+
+    let ctx_id = ctx.ffi_handle().map_to_mm(MmInitError::Internal)?;
+
+    spawn_rpc(ctx_id);
+    let ctx_c = ctx.clone();
+    spawn(async move {
+        if let Err(err) = ctx_c.init_metrics() {
+            warn!("Couldn't initialize metrics system: {}", err);
+        }
+    });
+    // In the mobile version we might depend on `lp_init` staying around until the context stops.
+    loop {
+        if ctx.is_stopping() {
+            break;
+        };
+        Timer::sleep(0.2).await
+    }
+
+    // wait for swaps to stop
+    loop {
+        if running_swaps_num(&ctx) == 0 {
+            break;
+        };
+        Timer::sleep(0.2).await
+    }
+    Ok(())
+}
+
+async fn kick_start(ctx: MmArc) -> MmInitResult<()> {
+    let mut coins_needed_for_kick_start = swap_kick_starts(ctx.clone())
+        .await
+        .map_to_mm(MmInitError::SwapsKickStartError)?;
+    coins_needed_for_kick_start.extend(
+        orders_kick_start(&ctx)
+            .await
+            .map_to_mm(MmInitError::OrdersKickStartError)?,
+    );
+    let mut lock = ctx
+        .coins_needed_for_kick_start
+        .lock()
+        .map_to_mm(|poison| MmInitError::Internal(poison.to_string()))?;
+    *lock = coins_needed_for_kick_start;
+    Ok(())
+}
+
+async fn init_p2p(ctx: MmArc) -> P2PResult<()> {
+    let i_am_seed = ctx.conf["i_am_seed"].as_bool().unwrap_or(false);
+    let netid = ctx.netid();
+
+    let seednodes = seednodes(&ctx)?;
+
+    let ctx_on_poll = ctx.clone();
+    let force_p2p_key = if i_am_seed {
+        let key = sha256(&*ctx.secp256k1_key_pair().private().secret);
+        Some(key.take())
+    } else {
+        None
+    };
+
+    let node_type = if i_am_seed {
+        relay_node_type(&ctx).await?
+    } else {
+        light_node_type(&ctx)?
+    };
+
+    let spawn_result = spawn_gossipsub(netid, force_p2p_key, spawn_boxed, seednodes, node_type, move |swarm| {
+        let behaviour = swarm.behaviour();
+        mm_gauge!(
+            ctx_on_poll.metrics,
+            "p2p.connected_relays.len",
+            behaviour.connected_relays_len() as i64
+        );
+        mm_gauge!(
+            ctx_on_poll.metrics,
+            "p2p.relay_mesh.len",
+            behaviour.relay_mesh_len() as i64
+        );
+        let (period, received_msgs) = behaviour.received_messages_in_period();
+        mm_gauge!(
+            ctx_on_poll.metrics,
+            "p2p.received_messages.period_in_secs",
+            period.as_secs() as i64
+        );
+
+        mm_gauge!(ctx_on_poll.metrics, "p2p.received_messages.count", received_msgs as i64);
+
+        let connected_peers_count = behaviour.connected_peers_len();
+
+        mm_gauge!(
+            ctx_on_poll.metrics,
+            "p2p.connected_peers.count",
+            connected_peers_count as i64
+        );
+    })
+    .await;
+    let (cmd_tx, event_rx, peer_id, p2p_abort) = spawn_result?;
+    let mut p2p_abort = Some(p2p_abort);
+    ctx.on_stop(Box::new(move || {
+        if let Some(handle) = p2p_abort.take() {
+            handle.abort();
+        }
+        Ok(())
+    }));
+    ctx.peer_id.pin(peer_id.to_string()).map_to_mm(P2PInitError::Internal)?;
+    let p2p_context = P2PContext::new(cmd_tx);
+    p2p_context.store_to_mm_arc(&ctx);
+    spawn(p2p_event_process_loop(ctx.weak(), event_rx, i_am_seed));
+
+    Ok(())
+}
+
+fn seednodes(ctx: &MmArc) -> P2PResult<Vec<RelayAddress>> {
+    if ctx.conf["seednodes"].is_null() {
+        if ctx.p2p_in_memory() {
+            // If the network is in memory, there is no need to use default seednodes.
+            return Ok(Vec::new());
+        }
+        return Ok(default_seednodes(ctx.netid()));
+    }
+
+    json::from_value(ctx.conf["seednodes"].clone()).map_to_mm(|e| P2PInitError::ErrorDeserializingConfig {
+        field: "seednodes".to_owned(),
+        error: e.to_string(),
+    })
+}
+
+#[cfg(target_arch = "wasm32")]
+async fn relay_node_type(ctx: &MmArc) -> P2PResult<NodeType> {
+    if ctx.p2p_in_memory() {
+        return relay_in_memory_node_type(ctx);
+    }
+    MmError::err(P2PInitError::WasmNodeCannotBeSeed)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+async fn relay_node_type(ctx: &MmArc) -> P2PResult<NodeType> {
+    if ctx.p2p_in_memory() {
+        return relay_in_memory_node_type(ctx);
+    }
+
+    let netid = ctx.netid();
+    let ip = myipaddr(ctx.clone())
+        .await
+        .map_to_mm(P2PInitError::ErrorGettingMyIpAddr)?;
+    let network_ports = lp_network_ports(netid)?;
+    let wss_certs = wss_certs(ctx)?;
+    if wss_certs.is_none() {
+        const WARN_MSG: &str = r#"Please note TLS private key and certificate are not specified.
+To accept P2P WSS connections, please pass 'wss_certs' to the config.
+Example:    "wss_certs": { "server_priv_key": "/path/to/key.pem", "certificate": "/path/to/cert.pem" }"#;
+        warn!("{}", WARN_MSG);
+    }
+
+    Ok(NodeType::Relay {
+        ip,
+        network_ports,
+        wss_certs,
+    })
+}
+
+fn relay_in_memory_node_type(ctx: &MmArc) -> P2PResult<NodeType> {
+    let port = ctx
+        .p2p_in_memory_port()
+        .or_mm_err(|| P2PInitError::FieldNotFoundInConfig {
+            field: "p2p_in_memory_port".to_owned(),
+        })?;
+    Ok(NodeType::RelayInMemory { port })
+}
+
+fn light_node_type(ctx: &MmArc) -> P2PResult<NodeType> {
+    if ctx.p2p_in_memory() {
+        return Ok(NodeType::LightInMemory);
+    }
+
+    let netid = ctx.netid();
+    let network_ports = lp_network_ports(netid)?;
+    Ok(NodeType::Light { network_ports })
+}
+
+/// Returns non-empty vector of keys/certs or an error.
+#[cfg(not(target_arch = "wasm32"))]
+fn extract_cert_from_file<T, P>(path: PathBuf, parser: P, expected_format: String) -> P2PResult<Vec<T>>
+where
+    P: Fn(&mut dyn io::BufRead) -> Result<Vec<T>, ()>,
+{
+    let certfile = fs::File::open(path.as_path()).map_to_mm(|e| P2PInitError::ErrorReadingCertFile {
+        path: path.clone(),
+        error: e.to_string(),
+    })?;
+    let mut reader = io::BufReader::new(certfile);
+    match parser(&mut reader) {
+        Ok(certs) if certs.is_empty() => MmError::err(P2PInitError::InvalidWssCert { path, expected_format }),
+        Ok(certs) => Ok(certs),
+        Err(_) => MmError::err(P2PInitError::InvalidWssCert { path, expected_format }),
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn wss_certs(ctx: &MmArc) -> P2PResult<Option<WssCerts>> {
+    use futures_rustls::rustls;
+
+    #[derive(Deserialize)]
+    struct WssCertsInfo {
+        server_priv_key: PathBuf,
+        certificate: PathBuf,
+    }
+
+    if ctx.conf["wss_certs"].is_null() {
+        return Ok(None);
+    }
+    let certs: WssCertsInfo =
+        json::from_value(ctx.conf["wss_certs"].clone()).map_to_mm(|e| P2PInitError::ErrorDeserializingConfig {
+            field: "wss_certs".to_owned(),
+            error: e.to_string(),
+        })?;
+
+    // First, try to extract the all PKCS8 private keys
+    let mut server_priv_keys = extract_cert_from_file(
+        certs.server_priv_key.clone(),
+        rustls::internal::pemfile::pkcs8_private_keys,
+        "Private key, DER-encoded ASN.1 in either PKCS#8 or PKCS#1 format".to_owned(),
+    )
+    // or try to extract all PKCS1 private keys
+    .or_else(|_| {
+        extract_cert_from_file(
+            certs.server_priv_key.clone(),
+            rustls::internal::pemfile::rsa_private_keys,
+            "Private key, DER-encoded ASN.1 in either PKCS#8 or PKCS#1 format".to_owned(),
+        )
+    })?;
+    // `extract_cert_from_file` returns either non-empty vector or an error.
+    let server_priv_key = server_priv_keys.remove(0);
+
+    let certs = extract_cert_from_file(
+        certs.certificate,
+        rustls::internal::pemfile::certs,
+        "Certificate, DER-encoded X.509 format".to_owned(),
+    )?;
+    Ok(Some(WssCerts { server_priv_key, certs }))
+}
diff --git a/mm2src/lp_network.rs b/mm2src/mm2_main/src/lp_network.rs
similarity index 78%
rename from mm2src/lp_network.rs
rename to mm2src/mm2_main/src/lp_network.rs
index 67e60b3432..b5e81360b4 100644
--- a/mm2src/lp_network.rs
+++ b/mm2src/mm2_main/src/lp_network.rs
@@ -1,13 +1,15 @@
 /******************************************************************************
- * Copyright © 2014-2019 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -16,18 +18,22 @@
 //  lp_network.rs
 //  marketmaker
 //
+use coins::lp_coinfind;
 use common::executor::spawn;
-use common::log;
-use common::mm_ctx::{MmArc, MmWeak};
-use common::mm_error::prelude::*;
 use common::mm_metrics::{ClockOps, MetricsOps};
+use common::{log, Future01CompatExt};
 use derive_more::Display;
-use futures::{channel::oneshot, lock::Mutex as AsyncMutex, StreamExt};
+use futures::{channel::oneshot, StreamExt};
+use keys::KeyPair;
+use mm2_core::mm_ctx::{MmArc, MmWeak};
+use mm2_err_handle::prelude::*;
 use mm2_libp2p::atomicdex_behaviour::{AdexBehaviourCmd, AdexBehaviourEvent, AdexCmdTx, AdexEventRx, AdexResponse,
                                       AdexResponseChannel};
 use mm2_libp2p::peers_exchange::PeerAddresses;
-use mm2_libp2p::{decode_message, encode_message, GossipsubMessage, MessageId, PeerId, TOPIC_SEPARATOR};
+use mm2_libp2p::{decode_message, encode_message, DecodingError, GossipsubMessage, Libp2pPublic, Libp2pSecpPublic,
+                 MessageId, NetworkPorts, PeerId, TOPIC_SEPARATOR};
 #[cfg(test)] use mocktopus::macros::*;
+use parking_lot::Mutex as PaMutex;
 use serde::de;
 use std::net::ToSocketAddrs;
 use std::sync::Arc;
@@ -36,7 +42,17 @@ use crate::mm2::{lp_ordermatch, lp_stats, lp_swap};
 
 pub type P2PRequestResult<T> = Result<T, MmError<P2PRequestError>>;
 
+pub trait Libp2pPeerId {
+    fn libp2p_peer_id(&self) -> PeerId;
+}
+
+impl Libp2pPeerId for KeyPair {
+    #[inline(always)]
+    fn libp2p_peer_id(&self) -> PeerId { peer_id_from_secp_public(self.public_slice()).expect("valid public") }
+}
+
 #[derive(Debug, Display)]
+#[allow(clippy::enum_variant_names)]
 pub enum P2PRequestError {
     EncodeError(String),
     DecodeError(String),
@@ -62,14 +78,14 @@ pub enum P2PRequest {
 
 pub struct P2PContext {
     /// Using Mutex helps to prevent cloning which can actually result to channel being unbounded in case of using 1 tx clone per 1 message.
-    pub cmd_tx: AsyncMutex<AdexCmdTx>,
+    pub cmd_tx: PaMutex<AdexCmdTx>,
 }
 
 #[cfg_attr(test, mockable)]
 impl P2PContext {
     pub fn new(cmd_tx: AdexCmdTx) -> Self {
         P2PContext {
-            cmd_tx: AsyncMutex::new(cmd_tx),
+            cmd_tx: PaMutex::new(cmd_tx),
         }
     }
 
@@ -103,7 +119,7 @@ pub async fn p2p_event_process_loop(ctx: MmWeak, mut rx: AdexEventRx, i_am_relay
                 request,
                 response_channel,
             }) => {
-                if let Err(e) = process_p2p_request(ctx, peer_id, request, response_channel).await {
+                if let Err(e) = process_p2p_request(ctx, peer_id, request, response_channel) {
                     log::error!("Error on process P2P request: {:?}", e);
                 }
             },
@@ -132,9 +148,19 @@ async fn process_p2p_message(
                 }
             },
             Some(lp_swap::SWAP_PREFIX) => {
-                lp_swap::process_msg(ctx.clone(), split.next().unwrap_or_default(), &message.data);
+                lp_swap::process_msg(ctx.clone(), split.next().unwrap_or_default(), &message.data).await;
                 to_propagate = true;
             },
+            Some(lp_swap::TX_HELPER_PREFIX) => {
+                if let Some(pair) = split.next() {
+                    if let Ok(Some(coin)) = lp_coinfind(&ctx, pair).await {
+                        match coin.send_raw_tx_bytes(&message.data).compat().await {
+                            Ok(id) => log::debug!("Transaction broadcasted successfully: {:?} ", id),
+                            Err(e) => log::error!("Broadcast transaction failed. {}", e),
+                        }
+                    }
+                }
+            },
             None | Some(_) => (),
         }
     }
@@ -147,6 +173,7 @@ async fn process_p2p_message(
             &message.data,
             i_am_relay,
         );
+
         if process_fut.await {
             to_propagate = true;
         }
@@ -157,7 +184,7 @@ async fn process_p2p_message(
     }
 }
 
-async fn process_p2p_request(
+fn process_p2p_request(
     ctx: MmArc,
     _peer_id: PeerId,
     request: Vec<u8>,
@@ -165,8 +192,8 @@ async fn process_p2p_request(
 ) -> P2PRequestResult<()> {
     let request = decode_message::<P2PRequest>(&request)?;
     let result = match request {
-        P2PRequest::Ordermatch(req) => lp_ordermatch::process_peer_request(ctx.clone(), req).await,
-        P2PRequest::NetworkInfo(req) => lp_stats::process_info_request(ctx.clone(), req).await,
+        P2PRequest::Ordermatch(req) => lp_ordermatch::process_peer_request(ctx.clone(), req),
+        P2PRequest::NetworkInfo(req) => lp_stats::process_info_request(ctx.clone(), req),
     };
 
     let res = match result {
@@ -180,32 +207,32 @@ async fn process_p2p_request(
     p2p_ctx
         .cmd_tx
         .lock()
-        .await
         .try_send(cmd)
         .map_to_mm(|e| P2PRequestError::SendError(e.to_string()))?;
     Ok(())
 }
 
-pub fn broadcast_p2p_msg(ctx: &MmArc, topics: Vec<String>, msg: Vec<u8>) {
+pub fn broadcast_p2p_msg(ctx: &MmArc, topics: Vec<String>, msg: Vec<u8>, from: Option<PeerId>) {
     let ctx = ctx.clone();
-    spawn(async move {
-        let cmd = AdexBehaviourCmd::PublishMsg { topics, msg };
-        let p2p_ctx = P2PContext::fetch_from_mm_arc(&ctx);
-        if let Err(e) = p2p_ctx.cmd_tx.lock().await.try_send(cmd) {
-            log::error!("broadcast_p2p_msg cmd_tx.send error {:?}", e);
-        };
-    });
+    let cmd = match from {
+        Some(from) => AdexBehaviourCmd::PublishMsgFrom { topics, msg, from },
+        None => AdexBehaviourCmd::PublishMsg { topics, msg },
+    };
+    let p2p_ctx = P2PContext::fetch_from_mm_arc(&ctx);
+    if let Err(e) = p2p_ctx.cmd_tx.lock().try_send(cmd) {
+        log::error!("broadcast_p2p_msg cmd_tx.send error {:?}", e);
+    };
 }
 
 /// Subscribe to the given `topic`.
 ///
 /// # Safety
 ///
-/// The function locks the [`MmCtx::p2p_ctx`] mutext.
-pub async fn subscribe_to_topic(ctx: &MmArc, topic: String) {
+/// The function locks the [`MmCtx::p2p_ctx`] mutex.
+pub fn subscribe_to_topic(ctx: &MmArc, topic: String) {
     let p2p_ctx = P2PContext::fetch_from_mm_arc(ctx);
     let cmd = AdexBehaviourCmd::Subscribe { topic };
-    if let Err(e) = p2p_ctx.cmd_tx.lock().await.try_send(cmd) {
+    if let Err(e) = p2p_ctx.cmd_tx.lock().try_send(cmd) {
         log::error!("subscribe_to_topic cmd_tx.send error {:?}", e);
     };
 }
@@ -225,7 +252,6 @@ pub async fn request_any_relay<T: de::DeserializeOwned>(
     p2p_ctx
         .cmd_tx
         .lock()
-        .await
         .try_send(cmd)
         .map_to_mm(|e| P2PRequestError::SendError(e.to_string()))?;
     match response_rx
@@ -262,7 +288,6 @@ pub async fn request_relays<T: de::DeserializeOwned>(
     p2p_ctx
         .cmd_tx
         .lock()
-        .await
         .try_send(cmd)
         .map_to_mm(|e| P2PRequestError::SendError(e.to_string()))?;
     let responses = response_rx
@@ -288,7 +313,6 @@ pub async fn request_peers<T: de::DeserializeOwned>(
     p2p_ctx
         .cmd_tx
         .lock()
-        .await
         .try_send(cmd)
         .map_to_mm(|e| P2PRequestError::SendError(e.to_string()))?;
     let responses = response_rx
@@ -339,27 +363,23 @@ fn parse_peers_responses<T: de::DeserializeOwned>(
 
 pub fn propagate_message(ctx: &MmArc, message_id: MessageId, propagation_source: PeerId) {
     let ctx = ctx.clone();
-    spawn(async move {
-        let p2p_ctx = P2PContext::fetch_from_mm_arc(&ctx);
-        let cmd = AdexBehaviourCmd::PropagateMessage {
-            message_id,
-            propagation_source,
-        };
-        if let Err(e) = p2p_ctx.cmd_tx.lock().await.try_send(cmd) {
-            log::error!("propagate_message cmd_tx.send error {:?}", e);
-        };
-    });
+    let p2p_ctx = P2PContext::fetch_from_mm_arc(&ctx);
+    let cmd = AdexBehaviourCmd::PropagateMessage {
+        message_id,
+        propagation_source,
+    };
+    if let Err(e) = p2p_ctx.cmd_tx.lock().try_send(cmd) {
+        log::error!("propagate_message cmd_tx.send error {:?}", e);
+    };
 }
 
 pub fn add_reserved_peer_addresses(ctx: &MmArc, peer: PeerId, addresses: PeerAddresses) {
     let ctx = ctx.clone();
-    spawn(async move {
-        let p2p_ctx = P2PContext::fetch_from_mm_arc(&ctx);
-        let cmd = AdexBehaviourCmd::AddReservedPeer { peer, addresses };
-        if let Err(e) = p2p_ctx.cmd_tx.lock().await.try_send(cmd) {
-            log::error!("add_reserved_peer_addresses cmd_tx.send error {:?}", e);
-        };
-    });
+    let p2p_ctx = P2PContext::fetch_from_mm_arc(&ctx);
+    let cmd = AdexBehaviourCmd::AddReservedPeer { peer, addresses };
+    if let Err(e) = p2p_ctx.cmd_tx.lock().try_send(cmd) {
+        log::error!("add_reserved_peer_addresses cmd_tx.send error {:?}", e);
+    };
 }
 
 #[derive(Debug, Display)]
@@ -407,7 +427,7 @@ pub fn addr_to_ipv4_string(address: &str) -> Result<String, MmError<ParseAddress
     }
 }
 
-#[derive(Debug, Display)]
+#[derive(Clone, Debug, Display, Serialize)]
 pub enum NetIdError {
     #[display(fmt = "Netid {} is larger than max {}", netid, max_netid)]
     LargerThanMax { netid: u16, max_netid: u16 },
@@ -429,3 +449,16 @@ pub fn lp_ports(netid: u16) -> Result<(u16, u16, u16), MmError<NetIdError>> {
     };
     Ok((other_ports + 10, other_ports + 20, other_ports + 30))
 }
+
+pub fn lp_network_ports(netid: u16) -> Result<NetworkPorts, MmError<NetIdError>> {
+    let (_, network_port, network_wss_port) = lp_ports(netid)?;
+    Ok(NetworkPorts {
+        tcp: network_port,
+        wss: network_wss_port,
+    })
+}
+
+pub fn peer_id_from_secp_public(secp_public: &[u8]) -> Result<PeerId, MmError<DecodingError>> {
+    let public_key = Libp2pSecpPublic::decode(secp_public)?;
+    Ok(PeerId::from_public_key(&Libp2pPublic::Secp256k1(public_key)))
+}
diff --git a/mm2src/lp_ordermatch.rs b/mm2src/mm2_main/src/lp_ordermatch.rs
similarity index 73%
rename from mm2src/lp_ordermatch.rs
rename to mm2src/mm2_main/src/lp_ordermatch.rs
index b3ccd51352..7473e9f20f 100644
--- a/mm2src/lp_ordermatch.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch.rs
@@ -1,13 +1,15 @@
 /******************************************************************************
- * Copyright © 2014-2019 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -20,28 +22,30 @@
 
 use async_trait::async_trait;
 use best_orders::BestOrdersAction;
-use bigdecimal::BigDecimal;
 use blake2::digest::{Update, VariableOutput};
-use blake2::VarBlake2b;
-use coins::utxo::{compressed_pub_key_from_priv_raw, ChecksumType};
-use coins::{find_pair, lp_coinfind, BalanceTradeFeeUpdatedHandler, FeeApproxStage, MmCoinEnum};
+use blake2::Blake2bVar;
+use coins::utxo::{compressed_pub_key_from_priv_raw, ChecksumType, UtxoAddressFormat};
+use coins::{coin_conf, find_pair, lp_coinfind, BalanceTradeFeeUpdatedHandler, CoinProtocol, CoinsContext,
+            FeeApproxStage, MmCoinEnum};
 use common::executor::{spawn, Timer};
-use common::log::error;
-use common::mm_ctx::{from_ctx, MmArc, MmWeak};
-use common::mm_number::{Fraction, MmNumber};
+use common::log::{error, LogOnError};
 use common::time_cache::TimeCache;
-use common::{bits256, json_dir_entries, log, new_uuid, now_ms, remove_file, write};
+use common::{bits256, log, new_uuid, now_ms, spawn_abortable, AbortOnDropHandle};
+use crypto::privkey::SerializableSecp256k1Keypair;
+use crypto::CryptoCtx;
 use derive_more::Display;
-use futures::{compat::Future01CompatExt, lock::Mutex as AsyncMutex, StreamExt, TryFutureExt};
-use gstuff::slurp;
+use futures::{compat::Future01CompatExt, lock::Mutex as AsyncMutex, TryFutureExt};
 use hash256_std_hasher::Hash256StdHasher;
 use hash_db::Hasher;
 use http::Response;
-use keys::AddressFormat;
+use keys::{AddressFormat, KeyPair};
+use mm2_core::mm_ctx::{from_ctx, MmArc, MmWeak};
+use mm2_err_handle::prelude::*;
 use mm2_libp2p::{decode_signed, encode_and_sign, encode_message, pub_sub_topic, TopicPrefix, TOPIC_SEPARATOR};
+use mm2_number::{construct_detailed, BigDecimal, BigRational, Fraction, MmNumber, MmNumberMultiRepr};
 #[cfg(test)] use mocktopus::macros::*;
-use num_rational::BigRational;
 use num_traits::identities::Zero;
+use parking_lot::Mutex as PaMutex;
 use rpc::v1::types::H256 as H256Json;
 use serde_json::{self as json, Value as Json};
 use sp_trie::{delta_trie_root, MemoryDB, Trie, TrieConfiguration, TrieDB, TrieDBMut, TrieHash, TrieMut};
@@ -49,24 +53,40 @@ use std::collections::hash_map::{Entry, HashMap, RawEntryMut};
 use std::collections::{BTreeSet, HashSet};
 use std::convert::TryInto;
 use std::fmt;
-use std::fs::DirEntry;
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 use trie_db::NodeCodec as NodeCodecT;
 use uuid::Uuid;
 
-use crate::mm2::lp_network::{broadcast_p2p_msg, request_any_relay, request_one_peer, subscribe_to_topic, P2PRequest};
+use crate::mm2::lp_network::{broadcast_p2p_msg, request_any_relay, request_one_peer, subscribe_to_topic, Libp2pPeerId,
+                             P2PRequest};
 use crate::mm2::lp_swap::{calc_max_maker_vol, check_balance_for_maker_swap, check_balance_for_taker_swap,
                           check_other_coin_balance_for_swap, insert_new_swap_to_db, is_pubkey_banned,
                           lp_atomic_locktime, run_maker_swap, run_taker_swap, AtomicLocktimeVersion, MakerSwap,
                           RunMakerSwapInput, RunTakerSwapInput, SwapConfirmationsSettings, TakerSwap};
 
-pub use best_orders::best_orders_rpc;
+pub use best_orders::{best_orders_rpc, best_orders_rpc_v2};
+use my_orders_storage::{delete_my_maker_order, delete_my_taker_order, save_maker_order_on_update,
+                        save_my_new_maker_order, save_my_new_taker_order, MyActiveOrders, MyOrdersFilteringHistory,
+                        MyOrdersHistory, MyOrdersStorage};
 pub use orderbook_depth::orderbook_depth_rpc;
-pub use orderbook_rpc::orderbook_rpc;
+pub use orderbook_rpc::{orderbook_rpc, orderbook_rpc_v2};
+
+cfg_wasm32! {
+    use mm2_db::indexed_db::{ConstructibleDb, DbLocked};
+    use ordermatch_wasm_db::{InitDbResult, OrdermatchDb};
+
+    pub type OrdermatchDbLocked<'a> = DbLocked<'a, OrdermatchDb>;
+}
 
 #[path = "lp_ordermatch/best_orders.rs"] mod best_orders;
+#[path = "lp_ordermatch/lp_bot.rs"] mod lp_bot;
+pub use lp_bot::{start_simple_market_maker_bot, stop_simple_market_maker_bot, StartSimpleMakerBotRequest,
+                 TradingBotEvent, KMD_PRICE_ENDPOINT};
+
+#[path = "lp_ordermatch/my_orders_storage.rs"]
+mod my_orders_storage;
 #[path = "lp_ordermatch/new_protocol.rs"] mod new_protocol;
 #[path = "lp_ordermatch/order_requests_tracker.rs"]
 mod order_requests_tracker;
@@ -76,8 +96,16 @@ mod order_requests_tracker;
 #[path = "ordermatch_tests.rs"]
 pub mod ordermatch_tests;
 
+#[cfg(target_arch = "wasm32")]
+#[path = "lp_ordermatch/ordermatch_wasm_db.rs"]
+mod ordermatch_wasm_db;
+
 pub const ORDERBOOK_PREFIX: TopicPrefix = "orbk";
-const MIN_ORDER_KEEP_ALIVE_INTERVAL: u64 = 30;
+#[cfg(not(test))]
+pub const MIN_ORDER_KEEP_ALIVE_INTERVAL: u64 = 30;
+#[cfg(test)]
+pub const MIN_ORDER_KEEP_ALIVE_INTERVAL: u64 = 5;
+const BALANCE_REQUEST_INTERVAL: f64 = 30.;
 const MAKER_ORDER_TIMEOUT: u64 = MIN_ORDER_KEEP_ALIVE_INTERVAL * 3;
 const TAKER_ORDER_TIMEOUT: u64 = 30;
 const ORDER_MATCH_TIMEOUT: u64 = 30;
@@ -96,6 +124,30 @@ const TRIE_ORDER_HISTORY_TIMEOUT: u64 = 3;
 type AlbOrderedOrderbookPair = String;
 type PubkeyOrders = Vec<(Uuid, OrderbookP2PItem)>;
 
+pub type OrdermatchInitResult<T> = Result<T, MmError<OrdermatchInitError>>;
+
+#[derive(Debug, Deserialize, Display, Serialize)]
+pub enum OrdermatchInitError {
+    #[display(fmt = "Error deserializing '{}' config field: {}", field, error)]
+    ErrorDeserializingConfig {
+        field: String,
+        error: String,
+    },
+    Internal(String),
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CancelAllOrdersResponse {
+    cancelled: Vec<Uuid>,
+    currently_matching: Vec<Uuid>,
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum CancelAllOrdersError {
+    LegacyError(String),
+}
+
 impl From<(new_protocol::MakerOrderCreated, String)> for OrderbookItem {
     fn from(tuple: (new_protocol::MakerOrderCreated, String)) -> OrderbookItem {
         let (order, pubkey) = tuple;
@@ -111,6 +163,7 @@ impl From<(new_protocol::MakerOrderCreated, String)> for OrderbookItem {
             created_at: order.created_at,
             base_protocol_info: order.base_protocol_info,
             rel_protocol_info: order.rel_protocol_info,
+            conf_settings: Some(order.conf_settings),
         }
     }
 }
@@ -122,42 +175,47 @@ pub fn addr_format_from_protocol_info(protocol_info: &[u8]) -> AddressFormat {
     }
 }
 
+struct ProcessTrieParams<'a> {
+    pubkey: &'a str,
+    alb_pair: &'a str,
+    protocol_infos: &'a HashMap<Uuid, BaseRelProtocolInfo>,
+    conf_infos: &'a HashMap<Uuid, OrderConfirmationsSettings>,
+}
+
 fn process_pubkey_full_trie(
     orderbook: &mut Orderbook,
-    pubkey: &str,
-    alb_pair: &str,
     new_trie_orders: PubkeyOrders,
-    protocol_infos: &HashMap<Uuid, BaseRelProtocolInfo>,
+    params: ProcessTrieParams,
 ) -> H64 {
-    remove_pubkey_pair_orders(orderbook, pubkey, alb_pair);
+    remove_pubkey_pair_orders(orderbook, params.pubkey, params.alb_pair);
 
     for (uuid, order) in new_trie_orders {
-        orderbook.insert_or_update_order_update_trie(OrderbookItem::from_p2p_and_proto_info(
+        orderbook.insert_or_update_order_update_trie(OrderbookItem::from_p2p_and_info(
             order,
-            protocol_infos.get(&uuid).cloned().unwrap_or_default(),
+            params.protocol_infos.get(&uuid).cloned().unwrap_or_default(),
+            params.conf_infos.get(&uuid).cloned(),
         ));
     }
 
-    let new_root = pubkey_state_mut(&mut orderbook.pubkeys_state, pubkey)
+    let new_root = pubkey_state_mut(&mut orderbook.pubkeys_state, params.pubkey)
         .trie_roots
-        .get(alb_pair)
+        .get(params.alb_pair)
         .copied()
-        .unwrap_or_else(H64::default);
+        .unwrap_or_default();
     new_root
 }
 
 fn process_trie_delta(
     orderbook: &mut Orderbook,
-    pubkey: &str,
-    alb_pair: &str,
     delta_orders: HashMap<Uuid, Option<OrderbookP2PItem>>,
-    protocol_infos: &HashMap<Uuid, BaseRelProtocolInfo>,
+    params: ProcessTrieParams,
 ) -> H64 {
     for (uuid, order) in delta_orders {
         match order {
-            Some(order) => orderbook.insert_or_update_order_update_trie(OrderbookItem::from_p2p_and_proto_info(
+            Some(order) => orderbook.insert_or_update_order_update_trie(OrderbookItem::from_p2p_and_info(
                 order,
-                protocol_infos.get(&uuid).cloned().unwrap_or_default(),
+                params.protocol_infos.get(&uuid).cloned().unwrap_or_default(),
+                params.conf_infos.get(&uuid).cloned(),
             )),
             None => {
                 orderbook.remove_order_trie_update(uuid);
@@ -165,12 +223,12 @@ fn process_trie_delta(
         }
     }
 
-    let new_root = match orderbook.pubkeys_state.get(pubkey) {
+    let new_root = match orderbook.pubkeys_state.get(params.pubkey) {
         Some(pubkey_state) => pubkey_state
             .trie_roots
-            .get(alb_pair)
+            .get(params.alb_pair)
             .copied()
-            .unwrap_or_else(H64::default),
+            .unwrap_or_default(),
         None => H64::default(),
     };
     new_root
@@ -187,7 +245,6 @@ async fn process_orders_keep_alive(
     let to_request = ordermatch_ctx
         .orderbook
         .lock()
-        .await
         .process_keep_alive(&from_pubkey, keep_alive, i_am_relay);
 
     let req = match to_request {
@@ -205,28 +262,26 @@ async fn process_orders_keep_alive(
         _ => return false,
     };
 
-    let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
     for (pair, diff) in response.pair_orders_diff {
+        let params = ProcessTrieParams {
+            pubkey: &from_pubkey,
+            alb_pair: &pair,
+            protocol_infos: &response.protocol_infos,
+            conf_infos: &response.conf_infos,
+        };
         let _new_root = match diff {
-            DeltaOrFullTrie::Delta(delta) => {
-                process_trie_delta(&mut orderbook, &from_pubkey, &pair, delta, &response.protocol_infos)
-            },
-            DeltaOrFullTrie::FullTrie(values) => {
-                process_pubkey_full_trie(&mut orderbook, &from_pubkey, &pair, values, &response.protocol_infos)
-            },
+            DeltaOrFullTrie::Delta(delta) => process_trie_delta(&mut orderbook, delta, params),
+            DeltaOrFullTrie::FullTrie(values) => process_pubkey_full_trie(&mut orderbook, values, params),
         };
     }
     true
 }
 
-async fn process_maker_order_updated(
-    ctx: MmArc,
-    from_pubkey: String,
-    updated_msg: new_protocol::MakerOrderUpdated,
-) -> bool {
+fn process_maker_order_updated(ctx: MmArc, from_pubkey: String, updated_msg: new_protocol::MakerOrderUpdated) -> bool {
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).expect("from_ctx failed");
     let uuid = updated_msg.uuid();
-    let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
     match orderbook.find_order_by_uuid_and_pubkey(&uuid, &from_pubkey) {
         Some(mut order) => {
             order.apply_updated(&updated_msg);
@@ -271,21 +326,22 @@ async fn request_and_fill_orderbook(ctx: &MmArc, base: &str, rel: &str) -> Resul
     };
 
     let response = try_s!(request_any_relay::<GetOrderbookRes>(ctx.clone(), P2PRequest::Ordermatch(request)).await);
-    let (pubkey_orders, protocol_infos) = match response {
+    let (pubkey_orders, protocol_infos, conf_infos) = match response {
         Some((
             GetOrderbookRes {
                 pubkey_orders,
                 protocol_infos,
+                conf_infos,
             },
             _peer_id,
-        )) => (pubkey_orders, protocol_infos),
+        )) => (pubkey_orders, protocol_infos, conf_infos),
         None => return Ok(()),
     };
 
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
-    let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
 
-    let my_pubkey = ctx.secp256k1_key_pair().public();
+    let keypair = ctx.secp256k1_key_pair_as_option();
     let alb_pair = alb_ordered_pair(base, rel);
     for (pubkey, GetOrderbookPubkeyItem { orders, .. }) in pubkey_orders {
         let pubkey_bytes = match hex::decode(&pubkey) {
@@ -295,15 +351,23 @@ async fn request_and_fill_orderbook(ctx: &MmArc, base: &str, rel: &str) -> Resul
                 continue;
             },
         };
-        if pubkey_bytes.as_slice() == my_pubkey.as_ref() {
-            continue;
+        if let Some(keypair) = keypair {
+            if pubkey_bytes.as_slice() == keypair.public().as_ref() {
+                continue;
+            }
         }
 
         if is_pubkey_banned(ctx, &pubkey_bytes[1..].into()) {
             log::warn!("Pubkey {} is banned", pubkey);
             continue;
         }
-        let _new_root = process_pubkey_full_trie(&mut orderbook, &pubkey, &alb_pair, orders, &protocol_infos);
+        let params = ProcessTrieParams {
+            pubkey: &pubkey,
+            alb_pair: &alb_pair,
+            protocol_infos: &protocol_infos,
+            conf_infos: &conf_infos,
+        };
+        let _new_root = process_pubkey_full_trie(&mut orderbook, orders, params);
     }
 
     let topic = orderbook_topic_from_base_rel(base, rel);
@@ -316,16 +380,16 @@ async fn request_and_fill_orderbook(ctx: &MmArc, base: &str, rel: &str) -> Resul
 
 /// Insert or update an order `req`.
 /// Note this function locks the [`OrdermatchContext::orderbook`] async mutex.
-async fn insert_or_update_order(ctx: &MmArc, item: OrderbookItem) {
+fn insert_or_update_order(ctx: &MmArc, item: OrderbookItem) {
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).expect("from_ctx failed");
-    let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
     orderbook.insert_or_update_order_update_trie(item)
 }
 
-async fn delete_order(ctx: &MmArc, pubkey: &str, uuid: Uuid) {
+fn delete_order(ctx: &MmArc, pubkey: &str, uuid: Uuid) {
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).expect("from_ctx failed");
 
-    let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
     if let Some(order) = orderbook.order_set.get(&uuid) {
         if order.pubkey == pubkey {
             orderbook.remove_order_trie_update(uuid);
@@ -333,9 +397,9 @@ async fn delete_order(ctx: &MmArc, pubkey: &str, uuid: Uuid) {
     }
 }
 
-async fn delete_my_order(ctx: &MmArc, uuid: Uuid) {
+fn delete_my_order(ctx: &MmArc, uuid: Uuid) {
     let ordermatch_ctx: Arc<OrdermatchContext> = OrdermatchContext::from_ctx(ctx).expect("from_ctx failed");
-    let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
     orderbook.remove_order_trie_update(uuid);
 }
 
@@ -384,7 +448,7 @@ pub async fn process_msg(ctx: MmArc, _topics: Vec<String>, from_peer: String, ms
             match message {
                 new_protocol::OrdermatchMessage::MakerOrderCreated(created_msg) => {
                     let order: OrderbookItem = (created_msg, hex::encode(pubkey.to_bytes().as_slice())).into();
-                    insert_or_update_order(&ctx, order).await;
+                    insert_or_update_order(&ctx, order);
                     true
                 },
                 new_protocol::OrdermatchMessage::PubkeyKeepAlive(keep_alive) => {
@@ -410,11 +474,11 @@ pub async fn process_msg(ctx: MmArc, _topics: Vec<String>, from_peer: String, ms
                     true
                 },
                 new_protocol::OrdermatchMessage::MakerOrderCancelled(cancelled_msg) => {
-                    delete_order(&ctx, &pubkey.to_hex(), cancelled_msg.uuid.into()).await;
+                    delete_order(&ctx, &pubkey.to_hex(), cancelled_msg.uuid.into());
                     true
                 },
                 new_protocol::OrdermatchMessage::MakerOrderUpdated(updated_msg) => {
-                    process_maker_order_updated(ctx, pubkey.to_hex(), updated_msg).await
+                    process_maker_order_updated(ctx, pubkey.to_hex(), updated_msg)
                 },
             }
         },
@@ -443,6 +507,11 @@ pub enum OrdermatchRequest {
         action: BestOrdersAction,
         volume: BigRational,
     },
+    BestOrdersByNumber {
+        coin: String,
+        action: BestOrdersAction,
+        number: usize,
+    },
     OrderbookDepth {
         pairs: Vec<(String, String)>,
     },
@@ -485,26 +554,28 @@ impl TryFromBytes for Uuid {
     }
 }
 
-pub async fn process_peer_request(ctx: MmArc, request: OrdermatchRequest) -> Result<Option<Vec<u8>>, String> {
+pub fn process_peer_request(ctx: MmArc, request: OrdermatchRequest) -> Result<Option<Vec<u8>>, String> {
     log::debug!("Got ordermatch request {:?}", request);
     match request {
-        OrdermatchRequest::GetOrderbook { base, rel } => process_get_orderbook_request(ctx, base, rel).await,
+        OrdermatchRequest::GetOrderbook { base, rel } => process_get_orderbook_request(ctx, base, rel),
         OrdermatchRequest::SyncPubkeyOrderbookState { pubkey, trie_roots } => {
-            let response = process_sync_pubkey_orderbook_state(ctx, pubkey, trie_roots).await;
+            let response = process_sync_pubkey_orderbook_state(ctx, pubkey, trie_roots);
             response.map(|res| res.map(|r| encode_message(&r).expect("Serialization failed")))
         },
         OrdermatchRequest::BestOrders { coin, action, volume } => {
-            best_orders::process_best_orders_p2p_request(ctx, coin, action, volume).await
+            best_orders::process_best_orders_p2p_request(ctx, coin, action, volume)
         },
-        OrdermatchRequest::OrderbookDepth { pairs } => {
-            orderbook_depth::process_orderbook_depth_p2p_request(ctx, pairs).await
+        OrdermatchRequest::BestOrdersByNumber { coin, action, number } => {
+            best_orders::process_best_orders_p2p_request_by_number(ctx, coin, action, number)
         },
+        OrdermatchRequest::OrderbookDepth { pairs } => orderbook_depth::process_orderbook_depth_p2p_request(ctx, pairs),
     }
 }
 
 type TrieProof = Vec<Vec<u8>>;
 
 #[derive(Debug, Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq))]
 struct GetOrderbookPubkeyItem {
     /// Timestamp of the latest keep alive message received.
     last_keep_alive: u64,
@@ -516,6 +587,7 @@ struct GetOrderbookPubkeyItem {
 
 /// Do not change this struct as it will break backward compatibility
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq))]
 struct BaseRelProtocolInfo {
     base: Vec<u8>,
     rel: Vec<u8>,
@@ -527,25 +599,31 @@ struct GetOrderbookRes {
     pubkey_orders: HashMap<String, GetOrderbookPubkeyItem>,
     #[serde(default)]
     protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
+    #[serde(default)]
+    conf_infos: HashMap<Uuid, OrderConfirmationsSettings>,
 }
 
-fn get_pubkeys_orders(
-    orderbook: &Orderbook,
-    base: String,
-    rel: String,
-) -> (usize, HashMap<String, PubkeyOrders>, HashMap<Uuid, BaseRelProtocolInfo>) {
+struct GetPubkeysOrdersRes {
+    total_number_of_orders: usize,
+    uuids_by_pubkey: HashMap<String, PubkeyOrders>,
+    protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
+    conf_infos: HashMap<Uuid, OrderConfirmationsSettings>,
+}
+
+fn get_pubkeys_orders(orderbook: &Orderbook, base: String, rel: String) -> GetPubkeysOrdersRes {
     let asks = orderbook.unordered.get(&(base.clone(), rel.clone()));
     let bids = orderbook.unordered.get(&(rel, base));
 
     let asks_num = asks.map(|x| x.len()).unwrap_or(0);
     let bids_num = bids.map(|x| x.len()).unwrap_or(0);
-    let total_orders_number = asks_num + bids_num;
+    let total_number_of_orders = asks_num + bids_num;
 
     // flatten Option(asks) and Option(bids) to avoid cloning
     let orders = asks.iter().chain(bids.iter()).copied().flatten();
 
     let mut uuids_by_pubkey = HashMap::new();
     let mut protocol_infos = HashMap::new();
+    let mut conf_infos = HashMap::new();
     for uuid in orders {
         let order = orderbook
             .order_set
@@ -553,22 +631,31 @@ fn get_pubkeys_orders(
             .expect("Orderbook::ordered contains an uuid that is not in Orderbook::order_set");
         let uuids = uuids_by_pubkey.entry(order.pubkey.clone()).or_insert_with(Vec::new);
         protocol_infos.insert(order.uuid, order.base_rel_proto_info());
+        if let Some(info) = order.conf_settings {
+            conf_infos.insert(order.uuid, info);
+        }
         uuids.push((*uuid, order.clone().into()))
     }
 
-    (total_orders_number, uuids_by_pubkey, protocol_infos)
+    GetPubkeysOrdersRes {
+        total_number_of_orders,
+        uuids_by_pubkey,
+        protocol_infos,
+        conf_infos,
+    }
 }
 
-async fn process_get_orderbook_request(ctx: MmArc, base: String, rel: String) -> Result<Option<Vec<u8>>, String> {
+fn process_get_orderbook_request(ctx: MmArc, base: String, rel: String) -> Result<Option<Vec<u8>>, String> {
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let orderbook = ordermatch_ctx.orderbook.lock().await;
+    let orderbook = ordermatch_ctx.orderbook.lock();
 
-    let (total_orders_number, orders, protocol_infos) = get_pubkeys_orders(&orderbook, base, rel);
-    if total_orders_number > MAX_ORDERS_NUMBER_IN_ORDERBOOK_RESPONSE {
+    let pubkeys_orders = get_pubkeys_orders(&orderbook, base, rel);
+    if pubkeys_orders.total_number_of_orders > MAX_ORDERS_NUMBER_IN_ORDERBOOK_RESPONSE {
         return ERR!("Orderbook too large");
     }
 
-    let orders_to_send: Result<HashMap<_, _>, String> = orders
+    let orders_to_send = pubkeys_orders
+        .uuids_by_pubkey
         .into_iter()
         .map(|(pubkey, orders)| {
             let pubkey_state = orderbook.pubkeys_state.get(&pubkey).ok_or(ERRL!(
@@ -585,12 +672,12 @@ async fn process_get_orderbook_request(ctx: MmArc, base: String, rel: String) ->
 
             Ok((pubkey, item))
         })
-        .collect();
+        .collect::<Result<HashMap<_, _>, String>>()?;
 
-    let pubkey_orders = orders_to_send?;
     let response = GetOrderbookRes {
-        pubkey_orders,
-        protocol_infos,
+        pubkey_orders: orders_to_send,
+        protocol_infos: pubkeys_orders.protocol_infos,
+        conf_infos: pubkeys_orders.conf_infos,
     };
     let encoded = try_s!(encode_message(&response));
     Ok(Some(encoded))
@@ -703,15 +790,17 @@ struct SyncPubkeyOrderbookStateRes {
     pair_orders_diff: HashMap<AlbOrderedOrderbookPair, DeltaOrFullTrie<Uuid, OrderbookP2PItem>>,
     #[serde(default)]
     protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
+    #[serde(default)]
+    conf_infos: HashMap<Uuid, OrderConfirmationsSettings>,
 }
 
-async fn process_sync_pubkey_orderbook_state(
+fn process_sync_pubkey_orderbook_state(
     ctx: MmArc,
     pubkey: String,
     trie_roots: HashMap<AlbOrderedOrderbookPair, H64>,
 ) -> Result<Option<SyncPubkeyOrderbookStateRes>, String> {
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let orderbook = ordermatch_ctx.orderbook.lock().await;
+    let orderbook = ordermatch_ctx.orderbook.lock();
     let pubkey_state = match orderbook.pubkeys_state.get(&pubkey) {
         Some(s) => s,
         None => return Ok(None),
@@ -742,6 +831,7 @@ async fn process_sync_pubkey_orderbook_state(
 
     let pair_orders_diff = try_s!(pair_orders_diff);
     let mut protocol_infos = HashMap::new();
+    let mut conf_infos = HashMap::new();
     let pair_orders_diff = pair_orders_diff
         .into_iter()
         .map(|(pair, trie)| {
@@ -751,9 +841,13 @@ async fn process_sync_pubkey_orderbook_state(
                         base: o.base_protocol_info.clone(),
                         rel: o.rel_protocol_info.clone(),
                     });
+                    if let Some(info) = o.conf_settings {
+                        conf_infos.insert(o.uuid, info);
+                    }
                 },
                 None => {
                     protocol_infos.remove(uuid);
+                    conf_infos.remove(uuid);
                 },
             });
             (pair, new_trie)
@@ -764,6 +858,7 @@ async fn process_sync_pubkey_orderbook_state(
         last_signed_pubkey_payload,
         pair_orders_diff,
         protocol_infos,
+        conf_infos,
     };
     Ok(Some(result))
 }
@@ -819,7 +914,7 @@ fn test_parse_orderbook_pair_from_topic() {
     assert_eq!(None, parse_orderbook_pair_from_topic("orbk/BTC:"));
 }
 
-async fn maker_order_created_p2p_notify(
+fn maker_order_created_p2p_notify(
     ctx: MmArc,
     order: &MakerOrder,
     base_protocol_info: Vec<u8>,
@@ -841,17 +936,21 @@ async fn maker_order_created_p2p_notify(
         rel_protocol_info,
     };
 
-    let key_pair = ctx.secp256k1_key_pair.or(&&|| panic!());
     let to_broadcast = new_protocol::OrdermatchMessage::MakerOrderCreated(message.clone());
-    let encoded_msg = encode_and_sign(&to_broadcast, &*key_pair.private().secret).unwrap();
-    let order: OrderbookItem = (message, hex::encode(&**key_pair.public())).into();
-    insert_or_update_order(&ctx, order).await;
-    broadcast_p2p_msg(&ctx, vec![topic], encoded_msg);
+    let (key_pair, peer_id) = match order.p2p_keypair() {
+        Some(k) => (k, Some(k.libp2p_peer_id())),
+        None => (ctx.secp256k1_key_pair(), None),
+    };
+
+    let encoded_msg = encode_and_sign(&to_broadcast, key_pair.private_ref()).unwrap();
+    let order: OrderbookItem = (message, hex::encode(key_pair.public_slice())).into();
+    insert_or_update_order(&ctx, order);
+    broadcast_p2p_msg(&ctx, vec![topic], encoded_msg, peer_id);
 }
 
-async fn process_my_maker_order_updated(ctx: &MmArc, message: &new_protocol::MakerOrderUpdated) {
+fn process_my_maker_order_updated(ctx: &MmArc, message: &new_protocol::MakerOrderUpdated) {
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).expect("from_ctx failed");
-    let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
 
     let uuid = message.uuid();
     if let Some(mut order) = orderbook.find_order_by_uuid(&uuid) {
@@ -860,23 +959,31 @@ async fn process_my_maker_order_updated(ctx: &MmArc, message: &new_protocol::Mak
     }
 }
 
-async fn maker_order_updated_p2p_notify(ctx: MmArc, topic: String, message: new_protocol::MakerOrderUpdated) {
+fn maker_order_updated_p2p_notify(
+    ctx: MmArc,
+    topic: String,
+    message: new_protocol::MakerOrderUpdated,
+    p2p_privkey: Option<&KeyPair>,
+) {
     let msg: new_protocol::OrdermatchMessage = message.clone().into();
-    let key_pair = ctx.secp256k1_key_pair.or(&&|| panic!());
-    let encoded_msg = encode_and_sign(&msg, &*key_pair.private().secret).unwrap();
-    process_my_maker_order_updated(&ctx, &message).await;
-    broadcast_p2p_msg(&ctx, vec![topic], encoded_msg);
+    let (secret, peer_id) = match p2p_privkey {
+        Some(k) => (k.private_bytes(), Some(k.libp2p_peer_id())),
+        None => (ctx.secp256k1_key_pair().private_bytes(), None),
+    };
+    let encoded_msg = encode_and_sign(&msg, &secret).unwrap();
+    process_my_maker_order_updated(&ctx, &message);
+    broadcast_p2p_msg(&ctx, vec![topic], encoded_msg, peer_id);
 }
 
-async fn maker_order_cancelled_p2p_notify(ctx: MmArc, order: &MakerOrder) {
+fn maker_order_cancelled_p2p_notify(ctx: MmArc, order: &MakerOrder) {
     let message = new_protocol::OrdermatchMessage::MakerOrderCancelled(new_protocol::MakerOrderCancelled {
         uuid: order.uuid.into(),
         timestamp: now_ms() / 1000,
         pair_trie_root: H64::default(),
     });
-    delete_my_order(&ctx, order.uuid).await;
+    delete_my_order(&ctx, order.uuid);
     log::debug!("maker_order_cancelled_p2p_notify called, message {:?}", message);
-    broadcast_ordermatch_message(&ctx, vec![order.orderbook_topic()], message);
+    broadcast_ordermatch_message(&ctx, vec![order.orderbook_topic()], message, order.p2p_keypair());
 }
 
 pub struct BalanceUpdateOrdermatchHandler {
@@ -894,6 +1001,13 @@ impl BalanceTradeFeeUpdatedHandler for BalanceUpdateOrdermatchHandler {
             Some(ctx) => ctx,
             None => return,
         };
+        if coin.wallet_only(&ctx) {
+            log::warn!(
+                "coin: {} is wallet only, skip BalanceTradeFeeUpdatedHandler",
+                coin.ticker()
+            );
+            return;
+        }
         // Get the max maker available volume to check if the wallet balances are sufficient for the issued maker orders.
         // Note although the maker orders are issued already, but they are not matched yet, so pass the `OrderIssue` stage.
         let new_volume = match calc_max_maker_vol(&ctx, coin, new_balance, FeeApproxStage::OrderIssue).await {
@@ -904,37 +1018,45 @@ impl BalanceTradeFeeUpdatedHandler for BalanceUpdateOrdermatchHandler {
                 return;
             },
         };
+
         let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-        let mut maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-        *maker_orders = maker_orders
-            .drain()
-            .filter_map(|(uuid, mut order)| {
-                if order.base == coin.ticker() {
-                    if new_volume < order.min_base_vol {
-                        let ctx = ctx.clone();
-                        delete_my_maker_order(&ctx, &order, MakerOrderCancellationReason::InsufficientBalance);
-                        spawn(async move { maker_order_cancelled_p2p_notify(ctx, &order).await });
-                        None
-                    } else if new_volume < order.available_amount() {
-                        order.max_base_vol = &order.reserved_amount() + &new_volume;
-                        let mut update_msg = new_protocol::MakerOrderUpdated::new(order.uuid);
-                        update_msg.with_new_max_volume(order.available_amount().into());
-                        let topic = order.orderbook_topic();
-                        let ctx = ctx.clone();
-                        spawn(async move { maker_order_updated_p2p_notify(ctx, topic, update_msg).await });
-                        Some((uuid, order))
-                    } else {
-                        Some((uuid, order))
-                    }
-                } else {
-                    Some((uuid, order))
+        let my_maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+
+        for (uuid, order_mutex) in my_maker_orders {
+            let mut order = order_mutex.lock().await;
+            if order.base != coin.ticker() {
+                continue;
+            }
+
+            if new_volume < order.min_base_vol {
+                let removed_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().remove_order(&uuid);
+                // This checks that the order hasn't been removed by another process
+                if removed_order_mutex.is_some() {
+                    // cancel the order
+                    maker_order_cancelled_p2p_notify(ctx.clone(), &order);
+                    delete_my_maker_order(
+                        ctx.clone(),
+                        order.clone(),
+                        MakerOrderCancellationReason::InsufficientBalance,
+                    )
+                    .compat()
+                    .await
+                    .ok();
+                    continue;
                 }
-            })
-            .collect();
+            }
+
+            if new_volume < order.available_amount() {
+                order.max_base_vol = &order.reserved_amount() + &new_volume;
+                let mut update_msg = new_protocol::MakerOrderUpdated::new(order.uuid);
+                update_msg.with_new_max_volume(order.available_amount().into());
+                maker_order_updated_p2p_notify(ctx.clone(), order.orderbook_topic(), update_msg, order.p2p_keypair());
+            }
+        }
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub enum TakerAction {
     Buy,
     Sell,
@@ -960,7 +1082,7 @@ impl OrderConfirmationsSettings {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct TakerRequest {
     pub base: String,
     pub rel: String,
@@ -1262,6 +1384,17 @@ impl<'a> TakerOrderBuilder<'a> {
             });
         }
 
+        let my_coin = match &self.action {
+            TakerAction::Buy => &self.rel_coin,
+            TakerAction::Sell => &self.base_coin,
+        };
+
+        let p2p_privkey = if my_coin.is_privacy() {
+            Some(SerializableSecp256k1Keypair::random())
+        } else {
+            None
+        };
+
         Ok(TakerOrder {
             created_at: now_ms(),
             request: TakerRequest {
@@ -1285,6 +1418,7 @@ impl<'a> TakerOrderBuilder<'a> {
             save_in_history: self.save_in_history,
             base_orderbook_ticker: self.base_orderbook_ticker,
             rel_orderbook_ticker: self.rel_orderbook_ticker,
+            p2p_privkey,
         })
     }
 
@@ -1314,11 +1448,12 @@ impl<'a> TakerOrderBuilder<'a> {
             save_in_history: false,
             base_orderbook_ticker: None,
             rel_orderbook_ticker: None,
+            p2p_privkey: None,
         }
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(tag = "type", content = "data")]
 pub enum MatchBy {
     Any,
@@ -1341,7 +1476,7 @@ impl Default for OrderType {
     fn default() -> Self { OrderType::GoodTillCancelled }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct TakerOrder {
     pub created_at: u64,
     pub request: TakerRequest,
@@ -1355,6 +1490,9 @@ pub struct TakerOrder {
     base_orderbook_ticker: Option<String>,
     #[serde(default)]
     rel_orderbook_ticker: Option<String>,
+    /// A custom priv key for more privacy to prevent linking orders of the same node between each other
+    /// Commonly used with privacy coins (ARRR, ZCash, etc.)
+    p2p_privkey: Option<SerializableSecp256k1Keypair>,
 }
 
 /// Result of match_reserved function
@@ -1437,9 +1575,11 @@ impl TakerOrder {
     fn orderbook_topic(&self) -> String {
         orderbook_topic_from_base_rel(self.base_orderbook_ticker(), self.rel_orderbook_ticker())
     }
+
+    fn p2p_keypair(&self) -> Option<&KeyPair> { self.p2p_privkey.as_ref().map(|key| key.key_pair()) }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 /// Market maker order
 /// The "action" is missing here because it's easier to always consider maker order as "sell"
 /// So upon ordermatch with request we have only 2 combinations "sell":"sell" and "sell":"buy"
@@ -1456,6 +1596,7 @@ pub struct MakerOrder {
     started_swaps: Vec<Uuid>,
     uuid: Uuid,
     conf_settings: Option<OrderConfirmationsSettings>,
+    // Keeping this for now for backward compatibility when kickstarting maker orders
     #[serde(skip_serializing_if = "Option::is_none")]
     changes_history: Option<Vec<HistoricalOrder>>,
     #[serde(default = "get_true")]
@@ -1464,6 +1605,9 @@ pub struct MakerOrder {
     base_orderbook_ticker: Option<String>,
     #[serde(default)]
     rel_orderbook_ticker: Option<String>,
+    /// A custom priv key for more privacy to prevent linking orders of the same node between each other
+    /// Commonly used with privacy coins (ARRR, ZCash, etc.)
+    p2p_privkey: Option<SerializableSecp256k1Keypair>,
 }
 
 pub struct MakerOrderBuilder<'a> {
@@ -1690,11 +1834,19 @@ impl<'a> MakerOrderBuilder<'a> {
             self.price.clone(),
         )?;
 
+        let created_at = now_ms();
+
+        let p2p_privkey = if self.base_coin.is_privacy() {
+            Some(SerializableSecp256k1Keypair::random())
+        } else {
+            None
+        };
+
         Ok(MakerOrder {
             base: self.base_coin.ticker().to_owned(),
             rel: self.rel_coin.ticker().to_owned(),
-            created_at: now_ms(),
-            updated_at: Some(now_ms()),
+            created_at,
+            updated_at: Some(created_at),
             max_base_vol: self.max_base_vol,
             min_base_vol: actual_min_base_vol,
             price: self.price,
@@ -1706,16 +1858,18 @@ impl<'a> MakerOrderBuilder<'a> {
             save_in_history: self.save_in_history,
             base_orderbook_ticker: self.base_orderbook_ticker,
             rel_orderbook_ticker: self.rel_orderbook_ticker,
+            p2p_privkey,
         })
     }
 
     #[cfg(test)]
     fn build_unchecked(self) -> MakerOrder {
+        let created_at = now_ms();
         MakerOrder {
             base: self.base_coin.ticker().to_owned(),
             rel: self.rel_coin.ticker().to_owned(),
-            created_at: now_ms(),
-            updated_at: Some(now_ms()),
+            created_at,
+            updated_at: Some(created_at),
             max_base_vol: self.max_base_vol,
             min_base_vol: self.min_base_vol.unwrap_or(self.base_coin.min_trading_vol()),
             price: self.price,
@@ -1727,6 +1881,7 @@ impl<'a> MakerOrderBuilder<'a> {
             save_in_history: false,
             base_orderbook_ticker: None,
             rel_orderbook_ticker: None,
+            p2p_privkey: None,
         }
     }
 }
@@ -1830,17 +1985,22 @@ impl MakerOrder {
     fn orderbook_topic(&self) -> String {
         orderbook_topic_from_base_rel(self.base_orderbook_ticker(), self.rel_orderbook_ticker())
     }
+
+    fn was_updated(&self) -> bool { self.updated_at != Some(self.created_at) }
+
+    fn p2p_keypair(&self) -> Option<&KeyPair> { self.p2p_privkey.as_ref().map(|key| key.key_pair()) }
 }
 
 impl From<TakerOrder> for MakerOrder {
     fn from(taker_order: TakerOrder) -> Self {
+        let created_at = now_ms();
         match taker_order.request.action {
             TakerAction::Sell => MakerOrder {
                 price: (taker_order.request.get_rel_amount() / taker_order.request.get_base_amount()),
                 max_base_vol: taker_order.request.get_base_amount().clone(),
                 min_base_vol: taker_order.min_volume,
-                created_at: now_ms(),
-                updated_at: Some(now_ms()),
+                created_at,
+                updated_at: Some(created_at),
                 base: taker_order.request.base,
                 rel: taker_order.request.rel,
                 matches: HashMap::new(),
@@ -1851,6 +2011,7 @@ impl From<TakerOrder> for MakerOrder {
                 save_in_history: taker_order.save_in_history,
                 base_orderbook_ticker: taker_order.base_orderbook_ticker,
                 rel_orderbook_ticker: taker_order.rel_orderbook_ticker,
+                p2p_privkey: taker_order.p2p_privkey,
             },
             // The "buy" taker order is recreated with reversed pair as Maker order is always considered as "sell"
             TakerAction::Buy => {
@@ -1860,8 +2021,8 @@ impl From<TakerOrder> for MakerOrder {
                     price,
                     max_base_vol: taker_order.request.get_rel_amount().clone(),
                     min_base_vol,
-                    created_at: now_ms(),
-                    updated_at: Some(now_ms()),
+                    created_at,
+                    updated_at: Some(created_at),
                     base: taker_order.request.rel,
                     rel: taker_order.request.base,
                     matches: HashMap::new(),
@@ -1872,13 +2033,14 @@ impl From<TakerOrder> for MakerOrder {
                     save_in_history: taker_order.save_in_history,
                     base_orderbook_ticker: taker_order.rel_orderbook_ticker,
                     rel_orderbook_ticker: taker_order.base_orderbook_ticker,
+                    p2p_privkey: taker_order.p2p_privkey,
                 }
             },
         }
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct TakerConnect {
     taker_order_uuid: Uuid,
     maker_order_uuid: Uuid,
@@ -1906,7 +2068,7 @@ impl From<TakerConnect> for new_protocol::OrdermatchMessage {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[cfg_attr(test, derive(Default))]
 pub struct MakerReserved {
     base: String,
@@ -1971,7 +2133,7 @@ impl From<MakerReserved> for new_protocol::OrdermatchMessage {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct MakerConnected {
     taker_order_uuid: Uuid,
     maker_order_uuid: Uuid,
@@ -2001,33 +2163,55 @@ impl From<MakerConnected> for new_protocol::OrdermatchMessage {
     }
 }
 
+fn broadcast_keep_alive_for_pub(ctx: &MmArc, pubkey: &str, orderbook: &Orderbook, p2p_privkey: Option<&KeyPair>) {
+    let state = match orderbook.pubkeys_state.get(pubkey) {
+        Some(s) => s,
+        None => return,
+    };
+
+    let mut trie_roots = HashMap::new();
+    let mut topics = HashSet::new();
+    for (alb_pair, root) in state.trie_roots.iter() {
+        if *root == H64::default() && *root == hashed_null_node::<Layout>() {
+            continue;
+        }
+        topics.insert(orderbook_topic_from_ordered_pair(alb_pair));
+        trie_roots.insert(alb_pair.clone(), *root);
+    }
+
+    let message = new_protocol::PubkeyKeepAlive {
+        trie_roots,
+        timestamp: now_ms() / 1000,
+    };
+
+    broadcast_ordermatch_message(ctx, topics, message.into(), p2p_privkey);
+}
+
 pub async fn broadcast_maker_orders_keep_alive_loop(ctx: MmArc) {
-    let my_pubsecp = hex::encode(&**ctx.secp256k1_key_pair().public());
+    let persistent_pubsecp = CryptoCtx::from_ctx(&ctx)
+        .expect("CryptoCtx not available")
+        .secp256k1_pubkey_hex();
+
     while !ctx.is_stopping() {
         Timer::sleep(MIN_ORDER_KEEP_ALIVE_INTERVAL as f64).await;
         let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).expect("from_ctx failed");
-        let orderbook = ordermatch_ctx.orderbook.lock().await;
-        let state = match orderbook.pubkeys_state.get(&my_pubsecp) {
-            Some(s) => s,
-            None => continue,
-        };
-
-        let mut trie_roots = HashMap::new();
-        let mut topics = HashSet::new();
-        for (alb_pair, root) in state.trie_roots.iter() {
-            if *root == H64::default() && *root == hashed_null_node::<Layout>() {
-                continue;
+        let my_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+
+        for (_, order_mutex) in my_orders {
+            let order = order_mutex.lock().await;
+            if let Some(p2p_privkey) = order.p2p_privkey {
+                // Artem Vitae
+                // I tried if let Some(p2p_privkey) = order_mutex.lock().await.p2p_privkey
+                // but it seems to keep holding the guard
+                drop(order);
+                let pubsecp = hex::encode(p2p_privkey.public_slice());
+                let orderbook = ordermatch_ctx.orderbook.lock();
+                broadcast_keep_alive_for_pub(&ctx, &pubsecp, &orderbook, Some(p2p_privkey.key_pair()));
             }
-            topics.insert(orderbook_topic_from_ordered_pair(alb_pair));
-            trie_roots.insert(alb_pair.clone(), *root);
         }
 
-        let message = new_protocol::PubkeyKeepAlive {
-            trie_roots,
-            timestamp: now_ms() / 1000,
-        };
-
-        broadcast_ordermatch_message(&ctx, topics, message.into());
+        let orderbook = ordermatch_ctx.orderbook.lock();
+        broadcast_keep_alive_for_pub(&ctx, &persistent_pubsecp, &orderbook, None);
     }
 }
 
@@ -2035,10 +2219,14 @@ fn broadcast_ordermatch_message(
     ctx: &MmArc,
     topics: impl IntoIterator<Item = String>,
     msg: new_protocol::OrdermatchMessage,
+    p2p_privkey: Option<&KeyPair>,
 ) {
-    let key_pair = ctx.secp256k1_key_pair.or(&&|| panic!());
-    let encoded_msg = encode_and_sign(&msg, &*key_pair.private().secret).unwrap();
-    broadcast_p2p_msg(ctx, topics.into_iter().collect(), encoded_msg);
+    let (secret, peer_id) = match p2p_privkey {
+        Some(k) => (k.private_bytes(), Some(k.libp2p_peer_id())),
+        None => (ctx.secp256k1_key_pair().private_bytes(), None),
+    };
+    let encoded_msg = encode_and_sign(&msg, &secret).unwrap();
+    broadcast_p2p_msg(ctx, topics.into_iter().collect(), encoded_msg, peer_id);
 }
 
 /// The order is ordered by [`OrderbookItem::price`] and [`OrderbookItem::uuid`].
@@ -2430,12 +2618,11 @@ impl Orderbook {
     }
 }
 
-#[derive(Default)]
+#[cfg_attr(not(target_arch = "wasm32"), derive(Default))]
 struct OrdermatchContext {
-    pub my_maker_orders: AsyncMutex<HashMap<Uuid, MakerOrder>>,
+    pub maker_orders_ctx: PaMutex<MakerOrdersContext>,
     pub my_taker_orders: AsyncMutex<HashMap<Uuid, TakerOrder>>,
-    pub my_cancelled_orders: AsyncMutex<HashMap<Uuid, MakerOrder>>,
-    pub orderbook: AsyncMutex<Orderbook>,
+    pub orderbook: PaMutex<Orderbook>,
     /// The map from coin original ticker to the orderbook ticker
     /// It is used to share the same orderbooks for concurrently activated coins with different protocols
     /// E.g. BTC and BTC-Segwit
@@ -2445,9 +2632,11 @@ struct OrdermatchContext {
     /// Pending MakerReserved messages for a specific TakerOrder UUID
     /// Used to select a trade with the best price upon matching
     pending_maker_reserved: AsyncMutex<HashMap<Uuid, Vec<MakerReserved>>>,
+    #[cfg(target_arch = "wasm32")]
+    ordermatch_db: ConstructibleDb<OrdermatchDb>,
 }
 
-pub fn init_ordermatch_context(ctx: &MmArc) -> Result<(), String> {
+pub fn init_ordermatch_context(ctx: &MmArc) -> OrdermatchInitResult<()> {
     // Helper
     #[derive(Deserialize)]
     struct CoinConf {
@@ -2455,7 +2644,11 @@ pub fn init_ordermatch_context(ctx: &MmArc) -> Result<(), String> {
         orderbook_ticker: Option<String>,
     }
 
-    let coins: Vec<CoinConf> = try_s!(json::from_value(ctx.conf["coins"].clone()));
+    let coins: Vec<CoinConf> =
+        json::from_value(ctx.conf["coins"].clone()).map_to_mm(|e| OrdermatchInitError::ErrorDeserializingConfig {
+            field: "coins".to_owned(),
+            error: e.to_string(),
+        })?;
     let mut orderbook_tickers = HashMap::new();
     let mut original_tickers = HashMap::new();
     for coin in coins {
@@ -2469,23 +2662,47 @@ pub fn init_ordermatch_context(ctx: &MmArc) -> Result<(), String> {
     }
 
     let ordermatch_context = OrdermatchContext {
+        maker_orders_ctx: Default::default(),
+        my_taker_orders: Default::default(),
+        orderbook: Default::default(),
+        pending_maker_reserved: Default::default(),
         orderbook_tickers,
         original_tickers,
-        ..Default::default()
+        #[cfg(target_arch = "wasm32")]
+        ordermatch_db: ConstructibleDb::new(ctx),
     };
 
-    from_ctx(&ctx.ordermatch_ctx, move || Ok(ordermatch_context)).map(|_| ())
+    from_ctx(&ctx.ordermatch_ctx, move || Ok(ordermatch_context))
+        .map(|_| ())
+        .map_to_mm(OrdermatchInitError::Internal)
 }
 
-#[cfg_attr(test, mockable)]
+#[cfg_attr(all(test, not(target_arch = "wasm32")), mockable)]
 impl OrdermatchContext {
     /// Obtains a reference to this crate context, creating it if necessary.
+    #[cfg(not(target_arch = "wasm32"))]
     fn from_ctx(ctx: &MmArc) -> Result<Arc<OrdermatchContext>, String> {
         Ok(try_s!(from_ctx(&ctx.ordermatch_ctx, move || {
             Ok(OrdermatchContext::default())
         })))
     }
 
+    /// Obtains a reference to this crate context, creating it if necessary.
+    #[cfg(target_arch = "wasm32")]
+    fn from_ctx(ctx: &MmArc) -> Result<Arc<OrdermatchContext>, String> {
+        Ok(try_s!(from_ctx(&ctx.ordermatch_ctx, move || {
+            Ok(OrdermatchContext {
+                maker_orders_ctx: Default::default(),
+                my_taker_orders: Default::default(),
+                orderbook: Default::default(),
+                pending_maker_reserved: Default::default(),
+                orderbook_tickers: Default::default(),
+                original_tickers: Default::default(),
+                ordermatch_db: ConstructibleDb::new(ctx),
+            })
+        })))
+    }
+
     /// Obtains a reference to this crate context, creating it if necessary.
     #[allow(dead_code)]
     fn from_ctx_weak(ctx_weak: &MmWeak) -> Result<Arc<OrdermatchContext>, String> {
@@ -2505,6 +2722,67 @@ impl OrdermatchContext {
             self.orderbook_ticker(&pair.1).unwrap_or_else(|| pair.1.clone()),
         )
     }
+
+    #[cfg(target_arch = "wasm32")]
+    pub async fn ordermatch_db(&self) -> InitDbResult<OrdermatchDbLocked<'_>> {
+        Ok(self.ordermatch_db.get_or_initialize().await?)
+    }
+}
+
+#[derive(Default)]
+struct MakerOrdersContext {
+    orders: HashMap<Uuid, Arc<AsyncMutex<MakerOrder>>>,
+    order_tickers: HashMap<Uuid, String>,
+    count_by_tickers: HashMap<String, usize>,
+    balance_loops: HashMap<String, AbortOnDropHandle>,
+}
+
+impl MakerOrdersContext {
+    fn add_order(&mut self, ctx: MmWeak, order: MakerOrder, balance: Option<BigDecimal>) {
+        if !self.balance_loop_exists(&order.base) {
+            self.spawn_balance_loop(ctx, order.base.clone(), balance);
+        }
+
+        self.order_tickers.insert(order.uuid, order.base.clone());
+        *self.count_by_tickers.entry(order.base.clone()).or_insert(0) += 1;
+        self.orders.insert(order.uuid, Arc::new(AsyncMutex::new(order)));
+    }
+
+    fn get_order(&self, uuid: &Uuid) -> Option<&Arc<AsyncMutex<MakerOrder>>> { self.orders.get(uuid) }
+
+    fn remove_order(&mut self, uuid: &Uuid) -> Option<Arc<AsyncMutex<MakerOrder>>> {
+        let order = self.orders.remove(uuid)?;
+        let ticker = self.order_tickers.remove(uuid)?;
+        if let Some(count) = self.count_by_tickers.get_mut(&ticker) {
+            if *count > 0 {
+                *count -= 1;
+            }
+        }
+
+        if !self.coin_has_active_maker_orders(&ticker) {
+            self.stop_balance_loop(&ticker);
+        }
+
+        Some(order)
+    }
+
+    fn coin_has_active_maker_orders(&self, ticker: &str) -> bool {
+        self.count_by_tickers.get(ticker).copied() > Some(0)
+    }
+
+    fn add_balance_loop(&mut self, ticker: &str, handle: AbortOnDropHandle) {
+        self.balance_loops.insert(ticker.to_string(), handle);
+    }
+
+    fn spawn_balance_loop(&mut self, ctx: MmWeak, order_base: String, balance: Option<BigDecimal>) {
+        let ticker = order_base.clone();
+        let handle = spawn_abortable(async move { check_balance_update_loop(ctx, ticker, balance).await });
+        self.add_balance_loop(&order_base, handle);
+    }
+
+    fn stop_balance_loop(&mut self, ticker: &str) { self.balance_loops.remove(ticker); }
+
+    fn balance_loop_exists(&mut self, ticker: &str) -> bool { self.balance_loops.contains_key(ticker) }
 }
 
 #[cfg_attr(test, mockable)]
@@ -2559,21 +2837,17 @@ fn lp_connect_start_bob(ctx: MmArc, maker_match: MakerMatch, maker_order: MakerO
             None => AtomicLocktimeVersion::V1,
         };
         let lock_time = lp_atomic_locktime(maker_coin.ticker(), taker_coin.ticker(), atomic_locktime_v);
-        log::info!(
-            "Entering the maker_swap_loop {}/{} with uuid: {}",
+        log_tag!(
+            ctx,
+            "";
+            fmt = "Entering the maker_swap_loop {}/{} with uuid: {}",
             maker_coin.ticker(),
             taker_coin.ticker(),
             uuid
         );
 
         let now = now_ms() / 1000;
-        if let Err(e) = insert_new_swap_to_db(
-            &ctx,
-            maker_coin.ticker(),
-            taker_coin.ticker(),
-            &uuid.to_string(),
-            &now.to_string(),
-        ) {
+        if let Err(e) = insert_new_swap_to_db(ctx.clone(), maker_coin.ticker(), taker_coin.ticker(), uuid, now).await {
             error!("Error {} on new swap insertion", e);
         }
         let maker_swap = MakerSwap::new(
@@ -2588,6 +2862,8 @@ fn lp_connect_start_bob(ctx: MmArc, maker_match: MakerMatch, maker_order: MakerO
             maker_coin,
             taker_coin,
             lock_time,
+            maker_order.p2p_privkey.map(SerializableSecp256k1Keypair::into_inner),
+            MakerSwap::generate_secret().into(),
         );
         run_maker_swap(RunMakerSwapInput::StartNew(maker_swap), ctx).await;
     });
@@ -2648,20 +2924,17 @@ fn lp_connected_alice(ctx: MmArc, taker_order: TakerOrder, taker_match: TakerMat
             None => AtomicLocktimeVersion::V1,
         };
         let locktime = lp_atomic_locktime(maker_coin.ticker(), taker_coin.ticker(), atomic_locktime_v);
-        log::info!(
-            "Entering the taker_swap_loop {}/{} with uuid: {}",
+        log_tag!(
+            ctx,
+            "";
+            fmt = "Entering the taker_swap_loop {}/{} with uuid: {}",
             maker_coin.ticker(),
             taker_coin.ticker(),
             uuid
         );
+
         let now = now_ms() / 1000;
-        if let Err(e) = insert_new_swap_to_db(
-            &ctx,
-            taker_coin.ticker(),
-            maker_coin.ticker(),
-            &uuid.to_string(),
-            &now.to_string(),
-        ) {
+        if let Err(e) = insert_new_swap_to_db(ctx.clone(), taker_coin.ticker(), maker_coin.ticker(), uuid, now).await {
             error!("Error {} on new swap insertion", e);
         }
         let taker_swap = TakerSwap::new(
@@ -2676,97 +2949,31 @@ fn lp_connected_alice(ctx: MmArc, taker_order: TakerOrder, taker_match: TakerMat
             maker_coin,
             taker_coin,
             locktime,
+            taker_order.p2p_privkey.map(SerializableSecp256k1Keypair::into_inner),
         );
         run_taker_swap(RunTakerSwapInput::StartNew(taker_swap), ctx).await
     });
 }
 
 pub async fn lp_ordermatch_loop(ctx: MmArc) {
-    let my_pubsecp = hex::encode(&**ctx.secp256k1_key_pair().public());
+    let my_pubsecp = CryptoCtx::from_ctx(&ctx)
+        .expect("CryptoCtx not available")
+        .secp256k1_pubkey_hex();
+
     let maker_order_timeout = ctx.conf["maker_order_timeout"].as_u64().unwrap_or(MAKER_ORDER_TIMEOUT);
     loop {
         if ctx.is_stopping() {
             break;
         }
         let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-        {
-            let mut my_taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
-            let mut my_maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-            let _my_cancelled_orders = ordermatch_ctx.my_cancelled_orders.lock().await;
-            // transform the timed out and unmatched GTC taker orders to maker
-            *my_taker_orders = my_taker_orders
-                .drain()
-                .filter_map(|(uuid, order)| {
-                    if order.created_at + order.timeout * 1000 < now_ms() {
-                        if order.matches.is_empty() && order.order_type == OrderType::GoodTillCancelled {
-                            delete_my_taker_order(&ctx, &order, TakerOrderCancellationReason::ToMaker);
-                            let maker_order: MakerOrder = order.into();
-                            my_maker_orders.insert(uuid, maker_order.clone());
-                            save_my_maker_order(&ctx, &maker_order);
-                            if maker_order.save_in_history {
-                                if let Err(e) = update_was_taker_in_db(&ctx, uuid) {
-                                    error!("Error {} on order update", e);
-                                }
-                            }
-                            spawn({
-                                let ctx = ctx.clone();
-                                async move {
-                                    if let Ok(Some((base_coin, rel_coin))) =
-                                        find_pair(&ctx, &maker_order.base, &maker_order.rel).await
-                                    {
-                                        maker_order_created_p2p_notify(
-                                            ctx,
-                                            &maker_order,
-                                            base_coin.coin_protocol_info(),
-                                            rel_coin.coin_protocol_info(),
-                                        )
-                                        .await;
-                                    }
-                                }
-                            });
-                        } else {
-                            delete_my_taker_order(&ctx, &order, TakerOrderCancellationReason::TimedOut);
-                        }
-                        None
-                    } else {
-                        Some((uuid, order))
-                    }
-                })
-                .collect();
-            // remove timed out unfinished matches to unlock the reserved amount
-            my_maker_orders.iter_mut().for_each(|(_, order)| {
-                let old_len = order.matches.len();
-                order.matches.retain(|_, order_match| {
-                    order_match.last_updated + ORDER_MATCH_TIMEOUT * 1000 > now_ms() || order_match.connected.is_some()
-                });
-                if old_len != order.matches.len() {
-                    save_my_maker_order(&ctx, order);
-                }
-            });
-            *my_maker_orders = futures::stream::iter(my_maker_orders.drain())
-                .filter_map(|(uuid, order)| {
-                    let ctx = ctx.clone();
-                    async move {
-                        if order.available_amount() < order.min_base_vol && !order.has_ongoing_matches() {
-                            if order.matches.is_empty() {
-                                delete_my_maker_order(&ctx, &order, MakerOrderCancellationReason::InsufficientBalance);
-                            } else {
-                                delete_my_maker_order(&ctx, &order, MakerOrderCancellationReason::Fulfilled);
-                            }
-                            maker_order_cancelled_p2p_notify(ctx.clone(), &order).await;
-                            None
-                        } else {
-                            Some((uuid, order))
-                        }
-                    }
-                })
-                .collect()
-                .await;
-        }
+
+        handle_timed_out_taker_orders(ctx.clone(), &ordermatch_ctx).await;
+        handle_timed_out_maker_matches(ctx.clone(), &ordermatch_ctx).await;
+        check_balance_for_maker_orders(ctx.clone(), &ordermatch_ctx).await;
 
         {
             // remove "timed out" pubkeys states with their orders from orderbook
-            let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+            let mut orderbook = ordermatch_ctx.orderbook.lock();
             let mut uuids_to_remove = vec![];
             let mut pubkeys_to_remove = vec![];
             for (pubkey, state) in orderbook.pubkeys_state.iter() {
@@ -2790,70 +2997,82 @@ pub async fn lp_ordermatch_loop(ctx: MmArc) {
         }
 
         {
-            let mut my_maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-            let mut to_cancel = vec![];
-
-            for (uuid, order) in my_maker_orders.iter_mut() {
-                if !ordermatch_ctx.orderbook.lock().await.order_set.contains_key(uuid) {
-                    let (base, rel) = match find_pair(&ctx, &order.base, &order.rel).await {
-                        Ok(Some(coins)) => coins,
-                        _ => continue,
-                    };
-
-                    let current_balance = match base.my_spendable_balance().compat().await {
-                        Ok(b) => b,
-                        Err(e) => {
-                            log::info!("Error {} on balance check to kickstart order {}, cancelling", e, uuid);
-                            to_cancel.push(*uuid);
-                            continue;
-                        },
-                    };
-                    let max_vol =
-                        match calc_max_maker_vol(&ctx, &base, &current_balance, FeeApproxStage::OrderIssue).await {
-                            Ok(max) => max,
-                            Err(e) => {
-                                log::info!("Error {} on balance check to kickstart order {}, cancelling", e, uuid);
-                                to_cancel.push(*uuid);
-                                continue;
-                            },
-                        };
-                    if max_vol < order.available_amount() {
-                        order.max_base_vol = order.reserved_amount() + max_vol;
+            let mut missing_uuids = Vec::new();
+            let mut to_cancel = Vec::new();
+            {
+                let orderbook = ordermatch_ctx.orderbook.lock();
+                for (uuid, _) in ordermatch_ctx.maker_orders_ctx.lock().orders.iter() {
+                    if !orderbook.order_set.contains_key(uuid) {
+                        missing_uuids.push(*uuid);
                     }
-                    if order.available_amount() < order.min_base_vol {
-                        log::info!("Insufficient volume available for order {}, cancelling", uuid);
-                        to_cancel.push(*uuid);
+                }
+            }
+
+            for uuid in missing_uuids {
+                let order_mutex = match ordermatch_ctx.maker_orders_ctx.lock().get_order(&uuid) {
+                    Some(o) => o.clone(),
+                    None => continue,
+                };
+
+                let mut order = order_mutex.lock().await;
+                let (base, rel) = match find_pair(&ctx, &order.base, &order.rel).await {
+                    Ok(Some(pair)) => pair,
+                    _ => continue,
+                };
+                let current_balance = match base.my_spendable_balance().compat().await {
+                    Ok(b) => b,
+                    Err(e) => {
+                        log::info!("Error {} on balance check to kickstart order {}, cancelling", e, uuid);
+                        to_cancel.push(uuid);
                         continue;
-                    }
+                    },
+                };
+                let max_vol = match calc_max_maker_vol(&ctx, &base, &current_balance, FeeApproxStage::OrderIssue).await
+                {
+                    Ok(max) => max,
+                    Err(e) => {
+                        log::info!("Error {} on balance check to kickstart order {}, cancelling", e, uuid);
+                        to_cancel.push(uuid);
+                        continue;
+                    },
+                };
+                if max_vol < order.available_amount() {
+                    order.max_base_vol = order.reserved_amount() + max_vol;
+                }
+                if order.available_amount() < order.min_base_vol {
+                    log::info!("Insufficient volume available for order {}, cancelling", uuid);
+                    to_cancel.push(uuid);
+                    continue;
+                }
 
+                let maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+
+                // notify other nodes only if maker order is still there keeping maker_orders locked during the operation
+                if maker_orders.contains_key(&uuid) {
                     let topic = order.orderbook_topic();
-                    if !ordermatch_ctx.orderbook.lock().await.is_subscribed_to(&topic) {
-                        let request_orderbook = false;
-                        if let Err(e) = subscribe_to_orderbook_topic(
-                            &ctx,
-                            &order.base_orderbook_ticker(),
-                            &order.rel_orderbook_ticker(),
-                            request_orderbook,
-                        )
-                        .await
-                        {
-                            log::error!("Error {} on subscribing to orderbook topic {}", e, topic);
-                        }
-                    }
+                    subscribe_to_topic(&ctx, topic);
                     maker_order_created_p2p_notify(
                         ctx.clone(),
-                        order,
+                        &order,
                         base.coin_protocol_info(),
                         rel.coin_protocol_info(),
-                    )
-                    .await;
+                    );
                 }
             }
 
             for uuid in to_cancel {
-                if let Some(order) = my_maker_orders.remove(&uuid) {
-                    delete_my_maker_order(&ctx, &order, MakerOrderCancellationReason::InsufficientBalance);
-                    maker_order_cancelled_p2p_notify(ctx.clone(), &order).await;
+                let removed_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().remove_order(&uuid);
+                // This checks that the order hasn't been removed by another process
+                if let Some(order_mutex) = removed_order_mutex {
+                    let order = order_mutex.lock().await;
+                    delete_my_maker_order(
+                        ctx.clone(),
+                        order.clone(),
+                        MakerOrderCancellationReason::InsufficientBalance,
+                    )
+                    .compat()
+                    .await
+                    .ok();
                 }
             }
         }
@@ -2862,20 +3081,140 @@ pub async fn lp_ordermatch_loop(ctx: MmArc) {
     }
 }
 
-pub async fn clean_memory_loop(ctx: MmArc) {
+pub async fn clean_memory_loop(ctx_weak: MmWeak) {
     loop {
-        if ctx.is_stopping() {
-            break;
-        }
-        let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
         {
-            let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+            let ctx = match MmArc::from_weak(&ctx_weak) {
+                Some(ctx) => ctx,
+                None => return,
+            };
+            if ctx.is_stopping() {
+                break;
+            }
+
+            let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
+            let mut orderbook = ordermatch_ctx.orderbook.lock();
             orderbook.memory_db.purge();
         }
         Timer::sleep(600.).await;
     }
 }
 
+/// Transforms the timed out and unmatched GTC taker orders to maker.
+///
+/// # Safety
+///
+/// The function locks the [`OrdermatchContext::my_maker_orders`] and [`OrdermatchContext::my_taker_orders`] mutexes.
+async fn handle_timed_out_taker_orders(ctx: MmArc, ordermatch_ctx: &OrdermatchContext) {
+    let mut my_taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
+    let storage = MyOrdersStorage::new(ctx.clone());
+    let mut my_actual_taker_orders = HashMap::with_capacity(my_taker_orders.len());
+
+    for (uuid, order) in my_taker_orders.drain() {
+        if order.created_at + order.timeout * 1000 >= now_ms() {
+            my_actual_taker_orders.insert(uuid, order);
+            continue;
+        }
+
+        if !order.matches.is_empty() || order.order_type != OrderType::GoodTillCancelled {
+            delete_my_taker_order(ctx.clone(), order, TakerOrderCancellationReason::TimedOut)
+                .compat()
+                .await
+                .ok();
+            continue;
+        }
+
+        // transform the timed out taker order to maker
+
+        delete_my_taker_order(ctx.clone(), order.clone(), TakerOrderCancellationReason::ToMaker)
+            .compat()
+            .await
+            .ok();
+        let maker_order: MakerOrder = order.into();
+        ordermatch_ctx
+            .maker_orders_ctx
+            .lock()
+            .add_order(ctx.weak(), maker_order.clone(), None);
+
+        storage
+            .save_new_active_maker_order(&maker_order)
+            .await
+            .error_log_with_msg("!save_new_active_maker_order");
+        if maker_order.save_in_history {
+            storage
+                .update_was_taker_in_filtering_history(uuid)
+                .await
+                .error_log_with_msg("!update_was_taker_in_filtering_history");
+        }
+
+        // notify other peers
+        if let Ok(Some((base, rel))) = find_pair(&ctx, &maker_order.base, &maker_order.rel).await {
+            maker_order_created_p2p_notify(
+                ctx.clone(),
+                &maker_order,
+                base.coin_protocol_info(),
+                rel.coin_protocol_info(),
+            );
+        }
+    }
+
+    *my_taker_orders = my_actual_taker_orders;
+}
+
+/// # Safety
+///
+/// The function locks the [`OrdermatchContext::my_maker_orders`] mutex.
+async fn check_balance_for_maker_orders(ctx: MmArc, ordermatch_ctx: &OrdermatchContext) {
+    let my_maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+
+    for (uuid, order) in my_maker_orders {
+        let order = order.lock().await;
+        if order.available_amount() >= order.min_base_vol || order.has_ongoing_matches() {
+            continue;
+        }
+
+        let reason = if order.matches.is_empty() {
+            MakerOrderCancellationReason::InsufficientBalance
+        } else {
+            MakerOrderCancellationReason::Fulfilled
+        };
+        let removed_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().remove_order(&uuid);
+        // This checks that the order hasn't been removed by another process
+        if removed_order_mutex.is_some() {
+            maker_order_cancelled_p2p_notify(ctx.clone(), &order);
+            delete_my_maker_order(ctx.clone(), order.clone(), reason)
+                .compat()
+                .await
+                .ok();
+        }
+    }
+}
+
+/// Removes timed out unfinished matches to unlock the reserved amount.
+///
+/// # Safety
+///
+/// The function locks the [`OrdermatchContext::my_maker_orders`] mutex.
+async fn handle_timed_out_maker_matches(ctx: MmArc, ordermatch_ctx: &OrdermatchContext) {
+    let now = now_ms();
+    let storage = MyOrdersStorage::new(ctx.clone());
+    let my_maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+
+    for (_, order) in my_maker_orders.iter() {
+        let mut order = order.lock().await;
+        let old_len = order.matches.len();
+        order.matches.retain(|_, order_match| {
+            order_match.last_updated + ORDER_MATCH_TIMEOUT * 1000 > now || order_match.connected.is_some()
+        });
+        if old_len != order.matches.len() {
+            storage
+                .update_active_maker_order(&order)
+                .await
+                .error_log_with_msg("!update_active_maker_order");
+        }
+    }
+}
+
 async fn process_maker_reserved(ctx: MmArc, from_pubkey: H256Json, reserved_msg: MakerReserved) {
     log::debug!("Processing MakerReserved {:?}", reserved_msg);
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
@@ -2914,11 +3253,11 @@ async fn process_maker_reserved(ctx: MmArc, from_pubkey: H256Json, reserved_msg:
     };
 
     // our base and rel coins should match maker's side tickers for a proper is_coin_protocol_supported check
-    let (base_coin, rel_coin) =
-        match find_pair(&ctx, &my_order.maker_coin_ticker(), &my_order.taker_coin_ticker()).await {
-            Ok(Some(c)) => c,
-            _ => return, // attempt to match with deactivated coin
-        };
+    let (base_coin, rel_coin) = match find_pair(&ctx, my_order.maker_coin_ticker(), my_order.taker_coin_ticker()).await
+    {
+        Ok(Some(c)) => c,
+        _ => return, // attempt to match with deactivated coin
+    };
     let mut pending_map = ordermatch_ctx.pending_maker_reserved.lock().await;
     if let Some(mut reserved_messages) = pending_map.remove(&uuid) {
         reserved_messages.sort_unstable_by_key(|r| r.price());
@@ -2932,12 +3271,12 @@ async fn process_maker_reserved(ctx: MmArc, from_pubkey: H256Json, reserved_msg:
             {
                 let connect = TakerConnect {
                     sender_pubkey: H256Json::from(our_public_id.bytes),
-                    dest_pub_key: reserved_msg.sender_pubkey.clone(),
+                    dest_pub_key: reserved_msg.sender_pubkey,
                     taker_order_uuid: reserved_msg.taker_order_uuid,
                     maker_order_uuid: reserved_msg.maker_order_uuid,
                 };
                 let topic = my_order.orderbook_topic();
-                broadcast_ordermatch_message(&ctx, vec![topic], connect.clone().into());
+                broadcast_ordermatch_message(&ctx, vec![topic], connect.clone().into(), my_order.p2p_keypair());
                 let taker_match = TakerMatch {
                     reserved: reserved_msg,
                     connect,
@@ -2947,7 +3286,10 @@ async fn process_maker_reserved(ctx: MmArc, from_pubkey: H256Json, reserved_msg:
                 my_order
                     .matches
                     .insert(taker_match.reserved.maker_order_uuid, taker_match);
-                save_my_taker_order(&ctx, my_order);
+                MyOrdersStorage::new(ctx)
+                    .update_active_taker_order(my_order)
+                    .await
+                    .error_log_with_msg("!update_active_taker_order");
                 return;
             }
         }
@@ -2986,8 +3328,11 @@ async fn process_maker_connected(ctx: MmArc, from_pubkey: H256Json, connected: M
     // alice
     lp_connected_alice(ctx.clone(), my_order_entry.get().clone(), order_match.clone());
     // remove the matched order immediately
-    delete_my_taker_order(&ctx, my_order_entry.get(), TakerOrderCancellationReason::Fulfilled);
-    my_order_entry.remove();
+    let order = my_order_entry.remove();
+    delete_my_taker_order(ctx, order, TakerOrderCancellationReason::Fulfilled)
+        .compat()
+        .await
+        .ok();
 }
 
 async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request: TakerRequest) {
@@ -3003,12 +3348,14 @@ async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request:
     }
 
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let mut my_orders = ordermatch_ctx.my_maker_orders.lock().await;
+    let storage = MyOrdersStorage::new(ctx.clone());
+    let mut my_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
     let filtered = my_orders
         .iter_mut()
         .filter(|(uuid, _)| taker_request.can_match_with_uuid(uuid));
 
     for (uuid, order) in filtered {
+        let mut order = order.lock().await;
         if let OrderMatchResult::Matched((base_amount, rel_amount)) = order.match_with_request(&taker_request) {
             let (base_coin, rel_coin) = match find_pair(&ctx, &order.base, &order.rel).await {
                 Ok(Some(c)) => c,
@@ -3020,7 +3367,7 @@ async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request:
                 && rel_coin.is_coin_protocol_supported(taker_request.rel_protocol_info_for_maker())
             {
                 let reserved = MakerReserved {
-                    dest_pub_key: taker_request.sender_pubkey.clone(),
+                    dest_pub_key: taker_request.sender_pubkey,
                     sender_pubkey: our_public_id,
                     base: order.base_orderbook_ticker().to_owned(),
                     base_amount: base_amount.clone(),
@@ -3041,7 +3388,7 @@ async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request:
                 };
                 let topic = order.orderbook_topic();
                 log::debug!("Request matched sending reserved {:?}", reserved);
-                broadcast_ordermatch_message(&ctx, vec![topic], reserved.clone().into());
+                broadcast_ordermatch_message(&ctx, vec![topic], reserved.clone().into(), order.p2p_keypair());
                 let maker_match = MakerMatch {
                     request: taker_request,
                     reserved,
@@ -3050,7 +3397,10 @@ async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request:
                     last_updated: now_ms(),
                 };
                 order.matches.insert(maker_match.request.uuid, maker_match);
-                save_my_maker_order(&ctx, order);
+                storage
+                    .update_active_maker_order(&order)
+                    .await
+                    .error_log_with_msg("!update_active_maker_order");
             }
             return;
         }
@@ -3066,11 +3416,18 @@ async fn process_taker_connect(ctx: MmArc, sender_pubkey: H256Json, connect_msg:
         return;
     }
 
-    let mut maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-    let my_order = match maker_orders.get_mut(&connect_msg.maker_order_uuid) {
-        Some(o) => o,
-        None => return,
+    let order_mutex = {
+        match ordermatch_ctx
+            .maker_orders_ctx
+            .lock()
+            .orders
+            .get(&connect_msg.maker_order_uuid)
+        {
+            Some(o) => o.clone(),
+            None => return,
+        }
     };
+    let mut my_order = order_mutex.lock().await;
     let order_match = match my_order.matches.get_mut(&connect_msg.taker_order_uuid) {
         Some(o) => o,
         None => {
@@ -3089,25 +3446,29 @@ async fn process_taker_connect(ctx: MmArc, sender_pubkey: H256Json, connect_msg:
     if order_match.connected.is_none() && order_match.connect.is_none() {
         let connected = MakerConnected {
             sender_pubkey: our_public_id.bytes.into(),
-            dest_pub_key: connect_msg.sender_pubkey.clone(),
+            dest_pub_key: connect_msg.sender_pubkey,
             taker_order_uuid: connect_msg.taker_order_uuid,
             maker_order_uuid: connect_msg.maker_order_uuid,
             method: "connected".into(),
         };
         order_match.connect = Some(connect_msg);
         order_match.connected = Some(connected.clone());
+        let order_match = order_match.clone();
         my_order.started_swaps.push(order_match.request.uuid);
-        lp_connect_start_bob(ctx.clone(), order_match.clone(), my_order.clone());
+        lp_connect_start_bob(ctx.clone(), order_match, my_order.clone());
         let topic = my_order.orderbook_topic();
-        broadcast_ordermatch_message(&ctx, vec![topic.clone()], connected.into());
+        broadcast_ordermatch_message(&ctx, vec![topic.clone()], connected.into(), my_order.p2p_keypair());
 
         // If volume is less order will be cancelled a bit later
         if my_order.available_amount() >= my_order.min_base_vol {
             let mut updated_msg = new_protocol::MakerOrderUpdated::new(my_order.uuid);
             updated_msg.with_new_max_volume(my_order.available_amount().into());
-            maker_order_updated_p2p_notify(ctx.clone(), topic, updated_msg).await;
+            maker_order_updated_p2p_notify(ctx.clone(), topic, updated_msg, my_order.p2p_keypair());
         }
-        save_my_maker_order(&ctx, my_order);
+        MyOrdersStorage::new(ctx)
+            .update_active_maker_order(&my_order)
+            .await
+            .error_log_with_msg("!update_active_maker_order");
     }
 }
 
@@ -3119,12 +3480,15 @@ pub struct AutoBuyInput {
     volume: MmNumber,
     timeout: Option<u64>,
     /// Not used. Deprecated.
+    #[allow(dead_code)]
     duration: Option<u32>,
     // TODO: remove this field on API refactoring, method should be separated from params
     method: String,
+    #[allow(dead_code)]
     gui: Option<String>,
     #[serde(rename = "destpubkey")]
     #[serde(default)]
+    #[allow(dead_code)]
     dest_pub_key: H256Json,
     #[serde(default)]
     match_by: MatchBy,
@@ -3203,7 +3567,7 @@ pub async fn sell(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
 }
 
 /// Created when maker order is matched with taker request
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 struct MakerMatch {
     request: TakerRequest,
     reserved: MakerReserved,
@@ -3213,7 +3577,7 @@ struct MakerMatch {
 }
 
 /// Created upon taker request broadcast
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 struct TakerMatch {
     reserved: MakerReserved,
     connect: TakerConnect,
@@ -3271,6 +3635,7 @@ pub struct TakerRequestForRpc<'a> {
     conf_settings: &'a Option<OrderConfirmationsSettings>,
 }
 
+#[allow(clippy::needless_borrow)]
 pub async fn lp_auto_buy(
     ctx: &MmArc,
     base_coin: &MmCoinEnum,
@@ -3318,12 +3683,17 @@ pub async fn lp_auto_buy(
         subscribe_to_orderbook_topic(
             ctx,
             order.base_orderbook_ticker(),
-            &order.rel_orderbook_ticker(),
+            order.rel_orderbook_ticker(),
             request_orderbook
         )
         .await
     );
-    broadcast_ordermatch_message(ctx, vec![order.orderbook_topic()], order.clone().into());
+    broadcast_ordermatch_message(
+        ctx,
+        vec![order.orderbook_topic()],
+        order.clone().into(),
+        order.p2p_keypair(),
+    );
 
     let result = json!({ "result": LpautobuyResult {
         request: (&order.request).into(),
@@ -3332,7 +3702,10 @@ pub async fn lp_auto_buy(
         base_orderbook_ticker: &order.base_orderbook_ticker,
         rel_orderbook_ticker: &order.rel_orderbook_ticker,
     } });
-    save_my_new_taker_order(ctx, &order);
+
+    save_my_new_taker_order(ctx.clone(), &order)
+        .await
+        .map_err(|e| ERRL!("{}", e))?;
     my_taker_orders.insert(order.request.uuid, order);
     Ok(result.to_string())
 }
@@ -3352,7 +3725,12 @@ struct OrderbookP2PItem {
 }
 
 impl OrderbookP2PItem {
-    fn as_rpc_best_orders_buy(&self, address: String, is_mine: bool) -> RpcOrderbookEntry {
+    fn as_rpc_best_orders_buy(
+        &self,
+        address: String,
+        conf_settings: Option<&OrderConfirmationsSettings>,
+        is_mine: bool,
+    ) -> RpcOrderbookEntry {
         let price_mm = MmNumber::from(self.price.clone());
         let max_vol_mm = MmNumber::from(self.max_volume.clone());
         let min_vol_mm = MmNumber::from(self.min_volume.clone());
@@ -3383,10 +3761,41 @@ impl OrderbookP2PItem {
             base_min_volume,
             rel_max_volume,
             rel_min_volume,
+            conf_settings: conf_settings.cloned(),
+        }
+    }
+
+    fn as_rpc_best_orders_buy_v2(
+        &self,
+        address: OrderbookAddress,
+        conf_settings: Option<&OrderConfirmationsSettings>,
+        is_mine: bool,
+    ) -> RpcOrderbookEntryV2 {
+        let price_mm = MmNumber::from(self.price.clone());
+        let max_vol_mm = MmNumber::from(self.max_volume.clone());
+        let min_vol_mm = MmNumber::from(self.min_volume.clone());
+
+        RpcOrderbookEntryV2 {
+            coin: self.rel.clone(),
+            address,
+            rel_max_volume: (&max_vol_mm * &price_mm).into(),
+            rel_min_volume: (&min_vol_mm * &price_mm).into(),
+            price: price_mm.into(),
+            pubkey: self.pubkey.clone(),
+            uuid: self.uuid,
+            is_mine,
+            base_max_volume: max_vol_mm.into(),
+            base_min_volume: min_vol_mm.into(),
+            conf_settings: conf_settings.cloned(),
         }
     }
 
-    fn as_rpc_best_orders_sell(&self, address: String, is_mine: bool) -> RpcOrderbookEntry {
+    fn as_rpc_best_orders_sell(
+        &self,
+        address: String,
+        conf_settings: Option<&OrderConfirmationsSettings>,
+        is_mine: bool,
+    ) -> RpcOrderbookEntry {
         let price_mm = MmNumber::from(1i32) / self.price.clone().into();
         let max_vol_mm = MmNumber::from(self.max_volume.clone());
         let min_vol_mm = MmNumber::from(self.min_volume.clone());
@@ -3395,6 +3804,7 @@ impl OrderbookP2PItem {
         let base_min_volume = (&min_vol_mm / &price_mm).into();
         let rel_max_volume = max_vol_mm.clone().into();
         let rel_min_volume = min_vol_mm.clone().into();
+        let conf_settings = conf_settings.map(|conf| conf.reversed());
 
         RpcOrderbookEntry {
             coin: self.base.clone(),
@@ -3417,6 +3827,34 @@ impl OrderbookP2PItem {
             base_min_volume,
             rel_max_volume,
             rel_min_volume,
+            conf_settings,
+        }
+    }
+
+    fn as_rpc_best_orders_sell_v2(
+        &self,
+        address: OrderbookAddress,
+        conf_settings: Option<&OrderConfirmationsSettings>,
+        is_mine: bool,
+    ) -> RpcOrderbookEntryV2 {
+        let price_mm = MmNumber::from(1i32) / self.price.clone().into();
+        let max_vol_mm = MmNumber::from(self.max_volume.clone());
+        let min_vol_mm = MmNumber::from(self.min_volume.clone());
+
+        let conf_settings = conf_settings.map(|conf| conf.reversed());
+
+        RpcOrderbookEntryV2 {
+            coin: self.base.clone(),
+            address,
+            base_max_volume: (&max_vol_mm / &price_mm).into(),
+            base_min_volume: (&min_vol_mm / &price_mm).into(),
+            price: price_mm.into(),
+            pubkey: self.pubkey.clone(),
+            uuid: self.uuid,
+            is_mine,
+            rel_max_volume: max_vol_mm.into(),
+            rel_min_volume: min_vol_mm.into(),
+            conf_settings,
         }
     }
 }
@@ -3472,6 +3910,7 @@ struct OrderbookItem {
     created_at: u64,
     base_protocol_info: Vec<u8>,
     rel_protocol_info: Vec<u8>,
+    conf_settings: Option<OrderConfirmationsSettings>,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -3494,15 +3933,15 @@ impl Hasher for Blake2Hasher64 {
     const LENGTH: usize = 8;
 
     fn hash(x: &[u8]) -> Self::Out {
-        let mut hasher = VarBlake2b::new(8).expect("8 is valid VarBlake2b output_size");
+        let mut hasher = Blake2bVar::new(8).expect("8 is valid VarBlake2b output_size");
         hasher.update(x);
         let mut res: [u8; 8] = Default::default();
-        hasher.finalize_variable(|hash| res.copy_from_slice(hash));
+        hasher.finalize_variable(&mut res).expect("hashing to succeed");
         res
     }
 }
 
-type Layout = sp_trie::Layout<Blake2Hasher64>;
+type Layout = sp_trie::LayoutV0<Blake2Hasher64>;
 
 impl OrderbookItem {
     fn apply_updated(&mut self, msg: &new_protocol::MakerOrderUpdated) {
@@ -3550,6 +3989,7 @@ impl OrderbookItem {
             base_min_volume,
             rel_max_volume,
             rel_min_volume,
+            conf_settings: self.conf_settings,
         }
     }
 
@@ -3562,6 +4002,7 @@ impl OrderbookItem {
         let base_min_volume = (&min_vol_mm / &price_mm).into();
         let rel_max_volume = max_vol_mm.clone().into();
         let rel_min_volume = min_vol_mm.clone().into();
+        let conf_settings = self.conf_settings.map(|conf| conf.reversed());
 
         RpcOrderbookEntry {
             coin: self.base.clone(),
@@ -3584,10 +4025,57 @@ impl OrderbookItem {
             base_min_volume,
             rel_max_volume,
             rel_min_volume,
+            conf_settings,
+        }
+    }
+
+    fn as_rpc_v2_entry_ask(&self, address: OrderbookAddress, is_mine: bool) -> RpcOrderbookEntryV2 {
+        let price_mm = MmNumber::from(self.price.clone());
+        let max_vol_mm = MmNumber::from(self.max_volume.clone());
+        let min_vol_mm = MmNumber::from(self.min_volume.clone());
+
+        RpcOrderbookEntryV2 {
+            coin: self.base.clone(),
+            address,
+            rel_max_volume: (&max_vol_mm * &price_mm).into(),
+            rel_min_volume: (&min_vol_mm * &price_mm).into(),
+            price: price_mm.into(),
+            pubkey: self.pubkey.clone(),
+            uuid: self.uuid,
+            is_mine,
+            base_max_volume: max_vol_mm.into(),
+            base_min_volume: min_vol_mm.into(),
+            conf_settings: self.conf_settings,
+        }
+    }
+
+    fn as_rpc_v2_entry_bid(&self, address: OrderbookAddress, is_mine: bool) -> RpcOrderbookEntryV2 {
+        let price_mm = MmNumber::from(1i32) / self.price.clone().into();
+        let max_vol_mm = MmNumber::from(self.max_volume.clone());
+        let min_vol_mm = MmNumber::from(self.min_volume.clone());
+
+        let conf_settings = self.conf_settings.map(|conf| conf.reversed());
+
+        RpcOrderbookEntryV2 {
+            coin: self.base.clone(),
+            address,
+            base_max_volume: (&max_vol_mm / &price_mm).into(),
+            base_min_volume: (&min_vol_mm / &price_mm).into(),
+            price: price_mm.into(),
+            pubkey: self.pubkey.clone(),
+            uuid: self.uuid,
+            is_mine,
+            rel_max_volume: max_vol_mm.into(),
+            rel_min_volume: min_vol_mm.into(),
+            conf_settings,
         }
     }
 
-    fn from_p2p_and_proto_info(o: OrderbookP2PItem, info: BaseRelProtocolInfo) -> Self {
+    fn from_p2p_and_info(
+        o: OrderbookP2PItem,
+        proto_info: BaseRelProtocolInfo,
+        conf_info: Option<OrderConfirmationsSettings>,
+    ) -> Self {
         OrderbookItem {
             pubkey: o.pubkey,
             base: o.base,
@@ -3597,8 +4085,9 @@ impl OrderbookItem {
             min_volume: o.min_volume,
             uuid: o.uuid,
             created_at: o.created_at,
-            base_protocol_info: info.base,
-            rel_protocol_info: info.rel,
+            base_protocol_info: proto_info.base,
+            rel_protocol_info: proto_info.rel,
+            conf_settings: conf_info,
         }
     }
 
@@ -3642,7 +4131,7 @@ impl OrderbookItem {
 fn get_true() -> bool { true }
 
 #[derive(Deserialize)]
-struct SetPriceReq {
+pub struct SetPriceReq {
     base: String,
     rel: String,
     price: MmNumber,
@@ -3662,7 +4151,7 @@ struct SetPriceReq {
 }
 
 #[derive(Deserialize)]
-struct MakerOrderUpdateReq {
+pub struct MakerOrderUpdateReq {
     uuid: Uuid,
     new_price: Option<MmNumber>,
     max: Option<bool>,
@@ -3760,6 +4249,7 @@ struct MakerMatchForRpc<'a> {
     last_updated: u64,
 }
 
+#[allow(clippy::needless_borrow)]
 impl<'a> From<&'a MakerMatch> for MakerMatchForRpc<'a> {
     fn from(maker_match: &'a MakerMatch) -> MakerMatchForRpc {
         MakerMatchForRpc {
@@ -3827,34 +4317,17 @@ impl<'a> From<&'a MakerOrder> for MakerOrderForRpc<'a> {
 async fn cancel_orders_on_error<T, E>(ctx: &MmArc, req: &SetPriceReq, error: E) -> Result<T, E> {
     if req.cancel_previous {
         let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
-        let mut my_orders = ordermatch_ctx.my_maker_orders.lock().await;
-
-        let mut cancelled = vec![];
-        // remove the previous orders if there're some to allow multiple setprice call per pair
-        // it's common use case now as `autoprice` doesn't work with new ordermatching and
-        // MM2 users request the coins price from aggregators by their own scripts issuing
-        // repetitive setprice calls with new price
-        *my_orders = my_orders
-            .drain()
-            .filter_map(|(uuid, order)| {
-                let to_delete = order.base == req.base && order.rel == req.rel;
-                if to_delete {
-                    delete_my_maker_order(ctx, &order, MakerOrderCancellationReason::Cancelled);
-                    cancelled.push(order);
-                    None
-                } else {
-                    Some((uuid, order))
-                }
-            })
-            .collect();
-        for order in cancelled {
-            maker_order_cancelled_p2p_notify(ctx.clone(), &order).await;
-        }
+        cancel_previous_maker_orders(ctx, &ordermatch_ctx, &req.base, &req.rel).await;
     }
     Err(error)
 }
 
-async fn get_max_volume(ctx: &MmArc, my_coin: &MmCoinEnum, other_coin: &MmCoinEnum) -> Result<MmNumber, String> {
+struct CoinVolumeInfo {
+    volume: MmNumber,
+    balance: BigDecimal,
+}
+
+async fn get_max_volume(ctx: &MmArc, my_coin: &MmCoinEnum, other_coin: &MmCoinEnum) -> Result<CoinVolumeInfo, String> {
     let my_balance = try_s!(my_coin.my_spendable_balance().compat().await);
     // first check if `rel_coin` balance is sufficient
     let other_coin_trade_fee = try_s!(
@@ -3866,41 +4339,63 @@ async fn get_max_volume(ctx: &MmArc, my_coin: &MmCoinEnum, other_coin: &MmCoinEn
     try_s!(check_other_coin_balance_for_swap(ctx, other_coin, None, other_coin_trade_fee).await);
     // calculate max maker volume
     // note the `calc_max_maker_vol` returns [`CheckBalanceError::NotSufficientBalance`] error if the balance of `base_coin` is not sufficient
-    Ok(try_s!(
-        calc_max_maker_vol(ctx, my_coin, &my_balance, FeeApproxStage::OrderIssue).await
-    ))
+    Ok(CoinVolumeInfo {
+        volume: try_s!(calc_max_maker_vol(ctx, my_coin, &my_balance, FeeApproxStage::OrderIssue).await),
+        balance: my_balance,
+    })
 }
 
-pub async fn set_price(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
-    let req: SetPriceReq = try_s!(json::from_value(req));
+pub async fn check_balance_update_loop(ctx: MmWeak, ticker: String, balance: Option<BigDecimal>) {
+    let mut current_balance = balance;
+    loop {
+        Timer::sleep(BALANCE_REQUEST_INTERVAL).await;
+        let ctx = match MmArc::from_weak(&ctx) {
+            Some(ctx) => ctx,
+            None => return,
+        };
+
+        if let Ok(Some(coin)) = lp_coinfind(&ctx, &ticker).await {
+            let balance = match coin.my_spendable_balance().compat().await {
+                Ok(balance) => balance,
+                Err(_) => continue,
+            };
+            if Some(&balance) != current_balance.as_ref() {
+                let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+                coins_ctx.balance_updated(&coin, &balance).await;
+                current_balance = Some(balance);
+            }
+        }
+    }
+}
 
-    let base_coin: MmCoinEnum = match try_s!(lp_coinfind(&ctx, &req.base).await) {
+pub async fn create_maker_order(ctx: &MmArc, req: SetPriceReq) -> Result<MakerOrder, String> {
+    let base_coin: MmCoinEnum = match try_s!(lp_coinfind(ctx, &req.base).await) {
         Some(coin) => coin,
         None => return ERR!("Base coin {} is not found", req.base),
     };
 
-    let rel_coin: MmCoinEnum = match try_s!(lp_coinfind(&ctx, &req.rel).await) {
+    let rel_coin: MmCoinEnum = match try_s!(lp_coinfind(ctx, &req.rel).await) {
         Some(coin) => coin,
         None => return ERR!("Rel coin {} is not found", req.rel),
     };
 
-    if base_coin.wallet_only(&ctx) {
+    if base_coin.wallet_only(ctx) {
         return ERR!("Base coin {} is wallet only", req.base);
     }
-    if rel_coin.wallet_only(&ctx) {
+    if rel_coin.wallet_only(ctx) {
         return ERR!("Rel coin {} is wallet only", req.rel);
     }
 
-    let volume = if req.max {
+    let CoinVolumeInfo { volume, balance } = if req.max {
         try_s!(
-            get_max_volume(&ctx, &base_coin, &rel_coin)
-                .or_else(|e| cancel_orders_on_error(&ctx, &req, e))
+            get_max_volume(ctx, &base_coin, &rel_coin)
+                .or_else(|e| cancel_orders_on_error(ctx, &req, e))
                 .await
         )
     } else {
-        try_s!(
+        let balance = try_s!(
             check_balance_for_maker_swap(
-                &ctx,
+                ctx,
                 &base_coin,
                 &rel_coin,
                 req.volume.clone(),
@@ -3908,37 +4403,18 @@ pub async fn set_price(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, Strin
                 None,
                 FeeApproxStage::OrderIssue
             )
-            .or_else(|e| cancel_orders_on_error(&ctx, &req, e))
+            .or_else(|e| cancel_orders_on_error(ctx, &req, e))
             .await
         );
-        req.volume.clone()
+        CoinVolumeInfo {
+            volume: req.volume.clone(),
+            balance,
+        }
     };
 
-    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
-    let mut my_orders = ordermatch_ctx.my_maker_orders.lock().await;
-
+    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
     if req.cancel_previous {
-        let mut cancelled = vec![];
-        // remove the previous orders if there're some to allow multiple setprice call per pair
-        // it's common use case now as `autoprice` doesn't work with new ordermatching and
-        // MM2 users request the coins price from aggregators by their own scripts issuing
-        // repetitive setprice calls with new price
-        *my_orders = my_orders
-            .drain()
-            .filter_map(|(uuid, order)| {
-                let to_delete = order.base == req.base && order.rel == req.rel;
-                if to_delete {
-                    delete_my_maker_order(&ctx, &order, MakerOrderCancellationReason::Cancelled);
-                    cancelled.push(order);
-                    None
-                } else {
-                    Some((uuid, order))
-                }
-            })
-            .collect();
-        for order in cancelled {
-            maker_order_cancelled_p2p_notify(ctx.clone(), &order).await;
-        }
+        cancel_previous_maker_orders(ctx, &ordermatch_ctx, &req.base, &req.rel).await;
     }
 
     let conf_settings = OrderConfirmationsSettings {
@@ -3961,74 +4437,103 @@ pub async fn set_price(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, Strin
     let request_orderbook = false;
     try_s!(
         subscribe_to_orderbook_topic(
-            &ctx,
-            &new_order.base_orderbook_ticker(),
-            &new_order.rel_orderbook_ticker(),
+            ctx,
+            new_order.base_orderbook_ticker(),
+            new_order.rel_orderbook_ticker(),
             request_orderbook
         )
         .await
     );
-    save_my_new_maker_order(&ctx, &new_order);
+    save_my_new_maker_order(ctx.clone(), &new_order)
+        .await
+        .map_err(|e| ERRL!("{}", e))?;
     maker_order_created_p2p_notify(
         ctx.clone(),
         &new_order,
         base_coin.coin_protocol_info(),
         rel_coin.coin_protocol_info(),
-    )
-    .await;
-    let rpc_result = MakerOrderForRpc::from(&new_order);
+    );
+
+    ordermatch_ctx
+        .maker_orders_ctx
+        .lock()
+        .add_order(ctx.weak(), new_order.clone(), Some(balance));
+    Ok(new_order)
+}
+
+pub async fn set_price(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let req: SetPriceReq = try_s!(json::from_value(req));
+    let maker_order = create_maker_order(&ctx, req).await?;
+    let rpc_result = MakerOrderForRpc::from(&maker_order);
     let res = try_s!(json::to_vec(&json!({ "result": rpc_result })));
-    my_orders.insert(new_order.uuid, new_order);
     Ok(try_s!(Response::builder().body(res)))
 }
 
-pub async fn update_maker_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
-    let req: MakerOrderUpdateReq = try_s!(json::from_value(req));
-
-    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
-    let my_maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-
-    let (base_coin, rel_coin, original_price, original_volume, updated_conf_settings, matches, reserved_amount) =
-        match my_maker_orders.get(&req.uuid) {
-            Some(order) => {
-                if order.has_ongoing_matches() {
-                    return ERR!("Can't update an order that has ongoing matches");
-                }
-                let base = order.base.as_str();
-                let base_coin: MmCoinEnum = match try_s!(lp_coinfind(&ctx, base).await) {
-                    Some(coin) => coin,
-                    None => return ERR!("Base coin {} has been removed from config", base),
-                };
+/// Removes the previous orders if there're some to allow multiple setprice call per pair.
+/// It's common use case now as `autoprice` doesn't work with new ordermatching and
+/// MM2 users request the coins price from aggregators by their own scripts issuing
+/// repetitive setprice calls with new price
+///
+/// # Safety
+///
+/// The function locks the [`OrdermatchContext::my_maker_orders`] mutex.
+async fn cancel_previous_maker_orders(
+    ctx: &MmArc,
+    ordermatch_ctx: &OrdermatchContext,
+    base_to_delete: &str,
+    rel_to_delete: &str,
+) {
+    let my_maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+
+    for (uuid, order) in my_maker_orders {
+        let order = order.lock().await;
+        let to_delete = order.base == base_to_delete && order.rel == rel_to_delete;
+        if to_delete {
+            let removed_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().remove_order(&uuid);
+            // This checks that the uuid, &order.base hasn't been removed by another process
+            if removed_order_mutex.is_some() {
+                maker_order_cancelled_p2p_notify(ctx.clone(), &order);
+                delete_my_maker_order(ctx.clone(), order.clone(), MakerOrderCancellationReason::Cancelled)
+                    .compat()
+                    .await
+                    .ok();
+            }
+        }
+    }
+}
 
-                let rel = order.rel.as_str();
-                let rel_coin: MmCoinEnum = match try_s!(lp_coinfind(&ctx, rel).await) {
-                    Some(coin) => coin,
-                    None => return ERR!("Rel coin {} has been removed from config", rel),
-                };
+pub async fn update_maker_order(ctx: &MmArc, req: MakerOrderUpdateReq) -> Result<MakerOrder, String> {
+    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
+    let order_mutex = {
+        let maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
+        match maker_orders_ctx.get_order(&req.uuid) {
+            Some(order) => order.clone(),
+            None => return ERR!("There is no order with UUID {}", req.uuid),
+        }
+    };
 
-                let original_conf_settings = order.conf_settings.unwrap();
+    let order_before_update = order_mutex.lock().await.clone();
+    if order_before_update.has_ongoing_matches() {
+        return ERR!("Can't update an order that has ongoing matches");
+    }
 
-                let updated_conf_settings = OrderConfirmationsSettings {
-                    base_confs: req.base_confs.unwrap_or(original_conf_settings.base_confs),
-                    base_nota: req.base_nota.unwrap_or(original_conf_settings.base_nota),
-                    rel_confs: req.rel_confs.unwrap_or(original_conf_settings.rel_confs),
-                    rel_nota: req.rel_nota.unwrap_or(original_conf_settings.rel_nota),
-                };
+    let base = order_before_update.base.as_str();
+    let rel = order_before_update.rel.as_str();
+    let (base_coin, rel_coin) = match find_pair(ctx, base, rel).await {
+        Ok(Some(c)) => c,
+        _ => return ERR!("Base coin {} and/or rel coin {} are not activated", base, rel),
+    };
 
-                (
-                    base_coin,
-                    rel_coin,
-                    order.price.clone(),
-                    order.max_base_vol.clone(),
-                    updated_conf_settings,
-                    order.matches.clone(),
-                    order.reserved_amount(),
-                )
-            },
-            None => return ERR!("There is no order with UUID {}", req.uuid),
-        };
+    let original_conf_settings = order_before_update.conf_settings.unwrap();
+    let updated_conf_settings = OrderConfirmationsSettings {
+        base_confs: req.base_confs.unwrap_or(original_conf_settings.base_confs),
+        base_nota: req.base_nota.unwrap_or(original_conf_settings.base_nota),
+        rel_confs: req.rel_confs.unwrap_or(original_conf_settings.rel_confs),
+        rel_nota: req.rel_nota.unwrap_or(original_conf_settings.rel_nota),
+    };
 
-    drop(my_maker_orders);
+    let original_volume = order_before_update.max_base_vol.clone();
+    let reserved_amount = order_before_update.reserved_amount();
 
     let mut update_msg = new_protocol::MakerOrderUpdated::new(req.uuid);
     update_msg.with_new_conf_settings(updated_conf_settings);
@@ -4040,7 +4545,7 @@ pub async fn update_maker_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8
             update_msg.with_new_price(new_price.clone().into());
             new_price
         },
-        None => original_price,
+        None => order_before_update.price.clone(),
     };
 
     let min_base_amount = base_coin.min_trading_vol();
@@ -4048,7 +4553,7 @@ pub async fn update_maker_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8
 
     // Add min_volume to update_msg if min_volume is found in the request
     if let Some(min_volume) = req.min_volume.clone() {
-        // Validate and Ca lculate Minimum Volume
+        // Validate and Calculate Minimum Volume
         let actual_min_vol = try_s!(validate_and_get_min_vol(
             min_base_amount.clone(),
             min_rel_amount.clone(),
@@ -4060,7 +4565,7 @@ pub async fn update_maker_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8
 
     // Calculate order volume and add to update_msg if new_volume is found in the request
     let new_volume = if req.max.unwrap_or(false) {
-        let max_volume = try_s!(get_max_volume(&ctx, &base_coin, &rel_coin).await) + reserved_amount.clone();
+        let max_volume = try_s!(get_max_volume(ctx, &base_coin, &rel_coin).await).volume + reserved_amount.clone();
         update_msg.with_new_max_volume(max_volume.clone().into());
         max_volume
     } else if Option::is_some(&req.volume_delta) {
@@ -4070,7 +4575,7 @@ pub async fn update_maker_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8
         }
         try_s!(
             check_balance_for_maker_swap(
-                &ctx,
+                ctx,
                 &base_coin,
                 &rel_coin,
                 volume.clone(),
@@ -4103,24 +4608,33 @@ pub async fn update_maker_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8
         new_price
     ));
 
-    let mut my_maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-    let (rpc_result, topic) = match my_maker_orders.get_mut(&req.uuid) {
-        None => return ERR!("Order with UUID: {} has been deleted", req.uuid),
-        Some(order) => {
-            if order.matches.len() != matches.len() || !order.matches.keys().all(|k| matches.contains_key(k)) {
-                return ERR!("Order {} is being matched now, can't update", req.uuid);
-            }
-
-            let new_change = HistoricalOrder::build(&update_msg, order);
-            order.apply_updated(&update_msg);
-            order.changes_history.get_or_insert(Vec::new()).push(new_change);
-            save_maker_order_on_update(&ctx, order);
-            update_msg.with_new_max_volume((new_volume - reserved_amount).into());
-            (MakerOrderForRpc::from(&*order), order.orderbook_topic())
-        },
+    let order_mutex = {
+        let maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
+        match maker_orders_ctx.get_order(&req.uuid) {
+            Some(order) => order.clone(),
+            None => return ERR!("Order with UUID: {} has been deleted", req.uuid),
+        }
     };
+
+    let mut order = order_mutex.lock().await;
+    if *order != order_before_update {
+        return ERR!("Order state has changed after price/volume/balance checks. Please try to update the order again if it's still needed.");
+    }
+    order.apply_updated(&update_msg);
+    if let Err(e) = save_maker_order_on_update(ctx.clone(), &order).await {
+        *order = order_before_update;
+        return ERR!("Error on saving updated order state to database:{}", e);
+    }
+    update_msg.with_new_max_volume((new_volume - reserved_amount).into());
+    maker_order_updated_p2p_notify(ctx.clone(), order.orderbook_topic(), update_msg, order.p2p_keypair());
+    Ok(order.clone())
+}
+
+pub async fn update_maker_order_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let req: MakerOrderUpdateReq = try_s!(json::from_value(req));
+    let order = try_s!(update_maker_order(&ctx, req).await);
+    let rpc_result = MakerOrderForRpc::from(&order);
     let res = try_s!(json::to_vec(&json!({ "result": rpc_result })));
-    maker_order_updated_p2p_notify(ctx.clone(), topic, update_msg).await;
 
     Ok(try_s!(Response::builder().body(res)))
 }
@@ -4146,29 +4660,18 @@ struct OrderForRpcWithCancellationReason<'a> {
     cancellation_reason: &'a str,
 }
 
-#[cfg(target_arch = "wasm32")]
-pub async fn order_status(_ctx: MmArc, _req: Json) -> Result<Response<Vec<u8>>, String> {
-    let res = json!({
-        "error": format!("'order_status' is only supported in native mode"),
-    });
-    Response::builder()
-        .status(404)
-        .body(json::to_vec(&res).expect("Serialization failed"))
-        .map_err(|e| ERRL!("{}", e))
-}
-
-#[cfg(not(target_arch = "wasm32"))]
 pub async fn order_status(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
-    use crate::mm2::database::my_orders::select_status_by_uuid;
-
     let req: OrderStatusReq = try_s!(json::from_value(req));
 
     let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
-    let maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-    if let Some(order) = maker_orders.get(&req.uuid) {
+    let storage = MyOrdersStorage::new(ctx.clone());
+
+    let maybe_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().get_order(&req.uuid).cloned();
+    if let Some(order_mutex) = maybe_order_mutex {
+        let order = order_mutex.lock().await.clone();
         let res = json!({
             "type": "Maker",
-            "order": MakerOrderForMyOrdersRpc::from(order),
+            "order": MakerOrderForMyOrdersRpc::from(&order),
         });
         return Response::builder()
             .body(json::to_vec(&res).expect("Serialization failed"))
@@ -4186,37 +4689,27 @@ pub async fn order_status(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, St
             .map_err(|e| ERRL!("{}", e));
     }
 
-    let order_path = my_orders_history_dir(&ctx).join(req.uuid.to_string() + ".json");
+    let order = try_s!(storage.load_order_from_history(req.uuid).await);
+    let cancellation_reason = &try_s!(storage.select_order_status(req.uuid).await);
 
-    if let Ok(order) = json::from_slice::<Order>(&slurp(&order_path)) {
-        let cancellation_reason = &try_s!(select_status_by_uuid(&ctx.sqlite_connection(), &req.uuid));
-        let res = json!(OrderForRpcWithCancellationReason {
-            order: OrderForRpc::from(&order),
-            cancellation_reason,
-        });
-        return Response::builder()
-            .body(json::to_vec(&res).expect("Serialization failed"))
-            .map_err(|e| ERRL!("{}", e));
-    }
-
-    let res = json!({
-        "error": format!("Order with uuid {} is not found", req.uuid),
+    let res = json!(OrderForRpcWithCancellationReason {
+        order: OrderForRpc::from(&order),
+        cancellation_reason,
     });
     Response::builder()
-        .status(404)
         .body(json::to_vec(&res).expect("Serialization failed"))
         .map_err(|e| ERRL!("{}", e))
 }
 
 #[derive(Display)]
-enum MakerOrderCancellationReason {
+pub enum MakerOrderCancellationReason {
     Fulfilled,
     InsufficientBalance,
     Cancelled,
 }
 
 #[derive(Display)]
-enum TakerOrderCancellationReason {
+pub enum TakerOrderCancellationReason {
     Fulfilled,
     ToMaker,
     TimedOut,
@@ -4241,9 +4734,9 @@ pub struct MyOrdersFilter {
     pub include_details: bool,
 }
 
-#[derive(Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(tag = "type", content = "order")]
-enum Order {
+pub enum Order {
     Maker(MakerOrder),
     Taker(TakerOrder),
 }
@@ -4257,35 +4750,57 @@ impl<'a> From<&'a Order> for OrderForRpc<'a> {
     }
 }
 
+impl Order {
+    pub fn uuid(&self) -> Uuid {
+        match self {
+            Order::Maker(maker) => maker.uuid,
+            Order::Taker(taker) => taker.request.uuid,
+        }
+    }
+}
+
 #[derive(Serialize)]
 struct UuidParseError {
     uuid: String,
     warning: String,
 }
 
-#[cfg(target_arch = "wasm32")]
-pub async fn orders_history_by_filter(_ctx: MmArc, _req: Json) -> Result<Response<Vec<u8>>, String> {
-    let res = json!({
-        "error": format!("'orders_history_by_filter' is only supported in native mode yet"),
-    });
-    Response::builder()
-        .status(404)
-        .body(json::to_vec(&res).expect("Serialization failed"))
-        .map_err(|e| ERRL!("{}", e))
+#[derive(Debug, Default)]
+pub struct RecentOrdersSelectResult {
+    /// Orders matching the query
+    pub orders: Vec<FilteringOrder>,
+    /// Total count of orders matching the query
+    pub total_count: usize,
+    /// The number of skipped orders
+    pub skipped: usize,
+}
+
+#[derive(Debug, Serialize)]
+pub struct FilteringOrder {
+    pub uuid: String,
+    pub order_type: String,
+    pub initial_action: String,
+    pub base: String,
+    pub rel: String,
+    pub price: f64,
+    pub volume: f64,
+    pub created_at: i64,
+    pub last_updated: i64,
+    pub was_taker: i8,
+    pub status: String,
 }
 
 /// Returns *all* uuids of swaps, which match the selected filter.
-#[cfg(not(target_arch = "wasm32"))]
 pub async fn orders_history_by_filter(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
-    use crate::mm2::database::my_orders::select_orders_by_filter;
+    let storage = MyOrdersStorage::new(ctx.clone());
 
     let filter: MyOrdersFilter = try_s!(json::from_value(req));
-    let db_result = try_s!(select_orders_by_filter(&ctx.sqlite_connection(), &filter, None));
-    let mut warnings = vec![];
+    let db_result = try_s!(storage.select_orders_by_filter(&filter, None).await);
 
+    let mut warnings = vec![];
     let rpc_orders = if filter.include_details {
-        let mut vec = Vec::with_capacity(db_result.result.len());
-        for order in db_result.result.iter() {
+        let mut vec = Vec::with_capacity(db_result.orders.len());
+        for order in db_result.orders.iter() {
             let uuid = match Uuid::parse_str(order.uuid.as_str()) {
                 Ok(uuid) => uuid,
                 Err(e) => {
@@ -4301,18 +4816,18 @@ pub async fn orders_history_by_filter(ctx: MmArc, req: Json) -> Result<Response<
                     continue;
                 },
             };
-            let order_path = my_orders_history_dir(&ctx).join(order.uuid.clone() + ".json");
-            let content = slurp(&order_path);
-            if let Ok(order) = json::from_slice::<Order>(&content) {
+
+            if let Ok(order) = storage.load_order_from_history(uuid).await {
                 vec.push(order);
                 continue;
             }
 
             let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
-            if order.order_type == *"Maker" {
-                let maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-                if let Some(maker_order) = maker_orders.get(&uuid) {
-                    vec.push(Order::Maker(maker_order.to_owned()));
+            if order.order_type == "Maker" {
+                let maybe_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().get_order(&uuid).cloned();
+                if let Some(maker_order_mutex) = maybe_order_mutex {
+                    let maker_order = maker_order_mutex.lock().await.clone();
+                    vec.push(Order::Maker(maker_order));
                 }
                 continue;
             }
@@ -4331,7 +4846,7 @@ pub async fn orders_history_by_filter(ctx: MmArc, req: Json) -> Result<Response<
 
     let json = json!({
     "result": {
-        "orders": db_result.result,
+        "orders": db_result.orders,
         "details": details,
         "found_records": db_result.total_count,
         "warnings": warnings,
@@ -4343,33 +4858,98 @@ pub async fn orders_history_by_filter(ctx: MmArc, req: Json) -> Result<Response<
 }
 
 #[derive(Deserialize)]
-struct CancelOrderReq {
+pub struct CancelOrderReq {
     uuid: Uuid,
 }
 
-pub async fn cancel_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
-    let req: CancelOrderReq = try_s!(json::from_value(req));
+#[derive(Debug, Deserialize, Serialize, SerializeErrorType, Display)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum CancelOrderError {
+    #[display(fmt = "Cannot retrieve order match context.")]
+    CannotRetrieveOrderMatchContext,
+    #[display(fmt = "Order {} is being matched now, can't cancel", uuid)]
+    OrderBeingMatched { uuid: Uuid },
+    #[display(fmt = "Order {} not found", uuid)]
+    UUIDNotFound { uuid: Uuid },
+}
 
-    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
-    let mut maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-    match maker_orders.entry(req.uuid) {
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CancelOrderResponse {
+    result: String,
+}
+
+pub async fn cancel_order(ctx: MmArc, req: CancelOrderReq) -> Result<CancelOrderResponse, MmError<CancelOrderError>> {
+    let ordermatch_ctx = match OrdermatchContext::from_ctx(&ctx) {
+        Ok(x) => x,
+        Err(_) => return MmError::err(CancelOrderError::CannotRetrieveOrderMatchContext),
+    };
+    let maybe_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().get_order(&req.uuid).cloned();
+    if let Some(order_mutex) = maybe_order_mutex {
+        let order = order_mutex.lock().await;
+        if !order.is_cancellable() {
+            return MmError::err(CancelOrderError::OrderBeingMatched { uuid: req.uuid });
+        }
+        let removed_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().remove_order(&order.uuid);
+        // This checks that the order hasn't been removed by another process
+        if removed_order_mutex.is_some() {
+            maker_order_cancelled_p2p_notify(ctx.clone(), &order);
+            delete_my_maker_order(ctx, order.clone(), MakerOrderCancellationReason::Cancelled)
+                .compat()
+                .await
+                .ok();
+        }
+        return Ok(CancelOrderResponse {
+            result: "success".to_string(),
+        });
+    }
+
+    let mut taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
+    match taker_orders.entry(req.uuid) {
         Entry::Occupied(order) => {
             if !order.get().is_cancellable() {
-                return ERR!("Order {} is being matched now, can't cancel", req.uuid);
+                return MmError::err(CancelOrderError::UUIDNotFound { uuid: req.uuid });
             }
             let order = order.remove();
-            delete_my_maker_order(&ctx, &order, MakerOrderCancellationReason::Cancelled);
-            maker_order_cancelled_p2p_notify(ctx, &order).await;
-            let res = json!({
-                "result": "success"
+            delete_my_taker_order(ctx, order, TakerOrderCancellationReason::Cancelled)
+                .compat()
+                .await
+                .ok();
+            return Ok(CancelOrderResponse {
+                result: "success".to_string(),
             });
-            return Response::builder()
-                .body(json::to_vec(&res).expect("Serialization failed"))
-                .map_err(|e| ERRL!("{}", e));
         },
-        // look for taker order with provided uuid
+        // error is returned
         Entry::Vacant(_) => (),
     }
+    MmError::err(CancelOrderError::UUIDNotFound { uuid: req.uuid })
+}
+
+pub async fn cancel_order_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let req: CancelOrderReq = try_s!(json::from_value(req));
+
+    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
+    let maybe_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().get_order(&req.uuid).cloned();
+    if let Some(order_mutex) = maybe_order_mutex {
+        let order = order_mutex.lock().await;
+        if !order.is_cancellable() {
+            return ERR!("Order {} is being matched now, can't cancel", req.uuid);
+        }
+        let removed_order_mutex = ordermatch_ctx.maker_orders_ctx.lock().remove_order(&order.uuid);
+        // This checks that the order hasn't been removed by another process
+        if removed_order_mutex.is_some() {
+            maker_order_cancelled_p2p_notify(ctx.clone(), &order);
+            delete_my_maker_order(ctx, order.clone(), MakerOrderCancellationReason::Cancelled)
+                .compat()
+                .await
+                .ok();
+        }
+        let res = json!({
+            "result": "success"
+        });
+        return Response::builder()
+            .body(json::to_vec(&res).expect("Serialization failed"))
+            .map_err(|e| ERRL!("{}", e));
+    }
 
     let mut taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
     match taker_orders.entry(req.uuid) {
@@ -4378,7 +4958,10 @@ pub async fn cancel_order(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, St
                 return ERR!("Order {} is being matched now, can't cancel", req.uuid);
             }
             let order = order.remove();
-            delete_my_taker_order(&ctx, &order, TakerOrderCancellationReason::Cancelled);
+            delete_my_taker_order(ctx, order, TakerOrderCancellationReason::Cancelled)
+                .compat()
+                .await
+                .ok();
             let res = json!({
                 "result": "success"
             });
@@ -4425,6 +5008,7 @@ struct TakerMatchForRpc<'a> {
     last_updated: u64,
 }
 
+#[allow(clippy::needless_borrow)]
 impl<'a> From<&'a TakerMatch> for TakerMatchForRpc<'a> {
     fn from(taker_match: &'a TakerMatch) -> TakerMatchForRpc {
         TakerMatchForRpc {
@@ -4447,6 +5031,7 @@ struct TakerOrderForRpc<'a> {
     rel_orderbook_ticker: &'a Option<String>,
 }
 
+#[allow(clippy::needless_borrow)]
 impl<'a> From<&'a TakerOrder> for TakerOrderForRpc<'a> {
     fn from(order: &'a TakerOrder) -> TakerOrderForRpc {
         TakerOrderForRpc {
@@ -4474,12 +5059,18 @@ enum OrderForRpc<'a> {
 
 pub async fn my_orders(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
     let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
-    let maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-    let taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
-    let maker_orders_for_rpc: HashMap<_, _> = maker_orders
+    let my_maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+    let mut maker_orders_map = HashMap::with_capacity(my_maker_orders.len());
+    for (uuid, order_mutex) in my_maker_orders.iter() {
+        let order = order_mutex.lock().await.clone();
+        maker_orders_map.insert(uuid, order);
+    }
+    let maker_orders_for_rpc: HashMap<_, _> = maker_orders_map
         .iter()
         .map(|(uuid, order)| (uuid, MakerOrderForMyOrdersRpc::from(order)))
         .collect();
+
+    let taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
     let taker_orders_for_rpc: HashMap<_, _> = taker_orders
         .iter()
         .map(|(uuid, order)| (uuid, TakerOrderForRpc::from(order)))
@@ -4495,46 +5086,6 @@ pub async fn my_orders(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
         .map_err(|e| ERRL!("{}", e))
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-fn insert_maker_order_to_db(ctx: &MmArc, uuid: Uuid, order: &MakerOrder) -> Result<(), String> {
-    crate::mm2::database::my_orders::insert_maker_order(ctx, uuid, order).map_err(|e| ERRL!("{}", e))
-}
-
-#[cfg(target_arch = "wasm32")]
-fn insert_maker_order_to_db(_ctx: &MmArc, _uuid: Uuid, _order: &MakerOrder) -> Result<(), String> { Ok(()) }
-
-#[cfg(not(target_arch = "wasm32"))]
-fn insert_taker_order_to_db(ctx: &MmArc, uuid: Uuid, order: &TakerOrder) -> Result<(), String> {
-    crate::mm2::database::my_orders::insert_taker_order(ctx, uuid, order).map_err(|e| ERRL!("{}", e))
-}
-
-#[cfg(target_arch = "wasm32")]
-fn insert_taker_order_to_db(_ctx: &MmArc, _uuid: Uuid, _order: &TakerOrder) -> Result<(), String> { Ok(()) }
-
-#[cfg(not(target_arch = "wasm32"))]
-fn update_maker_order_in_db(ctx: &MmArc, uuid: Uuid, order: &MakerOrder) -> Result<(), String> {
-    crate::mm2::database::my_orders::update_maker_order(ctx, uuid, order).map_err(|e| ERRL!("{}", e))
-}
-
-#[cfg(target_arch = "wasm32")]
-fn update_maker_order_in_db(_ctx: &MmArc, _uuid: Uuid, _order: &MakerOrder) -> Result<(), String> { Ok(()) }
-
-#[cfg(not(target_arch = "wasm32"))]
-fn update_was_taker_in_db(ctx: &MmArc, uuid: Uuid) -> Result<(), String> {
-    crate::mm2::database::my_orders::update_was_taker(ctx, uuid).map_err(|e| ERRL!("{}", e))
-}
-
-#[cfg(target_arch = "wasm32")]
-fn update_was_taker_in_db(_ctx: &MmArc, _uuid: Uuid) -> Result<(), String> { Ok(()) }
-
-#[cfg(not(target_arch = "wasm32"))]
-fn update_order_status_in_db(ctx: &MmArc, uuid: Uuid, status: String) -> Result<(), String> {
-    crate::mm2::database::my_orders::update_order_status(ctx, uuid, status).map_err(|e| ERRL!("{}", e))
-}
-
-#[cfg(target_arch = "wasm32")]
-fn update_order_status_in_db(_ctx: &MmArc, _uuid: Uuid, _status: String) -> Result<(), String> { Ok(()) }
-
 pub fn my_maker_orders_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("ORDERS").join("MY").join("MAKER") }
 
 fn my_taker_orders_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("ORDERS").join("MY").join("TAKER") }
@@ -4553,8 +5104,8 @@ fn my_order_history_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     my_orders_history_dir(ctx).join(format!("{}.json", uuid))
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-struct HistoricalOrder {
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct HistoricalOrder {
     #[serde(skip_serializing_if = "Option::is_none")]
     max_base_vol: Option<MmNumber>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -4567,154 +5118,29 @@ struct HistoricalOrder {
     conf_settings: Option<OrderConfirmationsSettings>,
 }
 
-impl HistoricalOrder {
-    fn build(new_order: &new_protocol::MakerOrderUpdated, old_order: &MakerOrder) -> HistoricalOrder {
-        HistoricalOrder {
-            max_base_vol: if new_order.new_max_volume().is_some() {
-                Some(old_order.max_base_vol.clone())
-            } else {
-                None
-            },
-            min_base_vol: if new_order.new_min_volume().is_some() {
-                Some(old_order.min_base_vol.clone())
-            } else {
-                None
-            },
-            price: if new_order.new_price().is_some() {
-                Some(old_order.price.clone())
-            } else {
-                None
-            },
-            updated_at: old_order.updated_at,
-            conf_settings: if let Some(settings) = new_order.new_conf_settings() {
-                if Some(settings) == old_order.conf_settings {
-                    None
-                } else {
-                    old_order.conf_settings
-                }
-            } else {
-                None
-            },
-        }
-    }
-}
-
-fn save_my_maker_order(ctx: &MmArc, order: &MakerOrder) {
-    let path = my_maker_order_file_path(ctx, &order.uuid);
-    let content = json::to_vec(order).unwrap();
-    write(&path, &content).unwrap();
-}
-
-fn save_my_new_maker_order(ctx: &MmArc, order: &MakerOrder) {
-    save_my_maker_order(ctx, order);
-
-    if order.save_in_history {
-        if let Err(e) = insert_maker_order_to_db(ctx, order.uuid, order) {
-            error!("Error {} on new order insertion", e);
-        }
-    }
-}
-
-fn save_maker_order_on_update(ctx: &MmArc, order: &MakerOrder) {
-    save_my_maker_order(ctx, order);
-
-    if order.save_in_history {
-        if let Err(e) = update_maker_order_in_db(ctx, order.uuid, order) {
-            error!("Error {} on order update", e);
-        }
-    }
-}
-
-fn save_my_taker_order(ctx: &MmArc, order: &TakerOrder) {
-    let path = my_taker_order_file_path(ctx, &order.request.uuid);
-    let content = json::to_vec(order).unwrap();
-    write(&path, &content).unwrap();
-}
-
-fn save_my_new_taker_order(ctx: &MmArc, order: &TakerOrder) {
-    save_my_taker_order(ctx, order);
-
-    if order.save_in_history {
-        if let Err(e) = insert_taker_order_to_db(ctx, order.request.uuid, order) {
-            error!("Error {} on new order insertion", e);
-        }
-    }
-}
-
-fn save_my_order_in_history(ctx: &MmArc, order: &Order) {
-    let path = match order {
-        Order::Maker(o) => my_order_history_file_path(ctx, &o.uuid),
-        Order::Taker(o) => my_order_history_file_path(ctx, &o.request.uuid),
-    };
-    let content = json::to_vec(order).unwrap();
-    write(&path, &content).unwrap();
-}
-
-#[cfg_attr(test, mockable)]
-fn delete_my_maker_order(ctx: &MmArc, order: &MakerOrder, reason: MakerOrderCancellationReason) {
-    let path = my_maker_order_file_path(ctx, &order.uuid);
-    match remove_file(&path) {
-        Ok(_) => (),
-        Err(e) => log::warn!("Could not remove order file {}, error {}", path.display(), e),
-    }
-
-    if order.save_in_history {
-        save_my_order_in_history(ctx, &Order::Maker(order.clone()));
-
-        if let Err(e) = update_order_status_in_db(ctx, order.uuid, reason.to_string()) {
-            error!("Error {} on order update", e);
-        }
-    }
-}
-
-#[cfg_attr(test, mockable)]
-fn delete_my_taker_order(ctx: &MmArc, order: &TakerOrder, reason: TakerOrderCancellationReason) {
-    let path = my_taker_order_file_path(ctx, &order.request.uuid);
-    match remove_file(&path) {
-        Ok(_) => (),
-        Err(e) => log::warn!("Could not remove order file {}, error {}", path.display(), e),
-    }
-
-    match reason {
-        TakerOrderCancellationReason::ToMaker => (),
-        _ => {
-            if order.save_in_history {
-                save_my_order_in_history(ctx, &Order::Taker(order.clone()));
-            }
-        },
-    }
-
-    if order.save_in_history {
-        if let Err(e) = update_order_status_in_db(ctx, order.request.uuid, reason.to_string()) {
-            error!("Error {} on order update", e);
-        }
-    }
-}
-
 pub async fn orders_kick_start(ctx: &MmArc) -> Result<HashSet<String>, String> {
     let mut coins = HashSet::new();
     let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
-    let mut maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
-    let maker_entries = try_s!(json_dir_entries(&my_maker_orders_dir(ctx)));
 
-    maker_entries.iter().for_each(|entry| {
-        if let Ok(order) = json::from_slice::<MakerOrder>(&slurp(&entry.path())) {
+    let storage = MyOrdersStorage::new(ctx.clone());
+    let saved_maker_orders = try_s!(storage.load_active_maker_orders().await);
+    let saved_taker_orders = try_s!(storage.load_active_taker_orders().await);
+
+    {
+        let mut maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
+        for order in saved_maker_orders {
             coins.insert(order.base.clone());
             coins.insert(order.rel.clone());
-            maker_orders.insert(order.uuid, order);
+            maker_orders_ctx.add_order(ctx.weak(), order.clone(), None);
         }
-    });
+    }
 
     let mut taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
-    let taker_entries: Vec<DirEntry> = try_s!(json_dir_entries(&my_taker_orders_dir(ctx)));
-
-    taker_entries.iter().for_each(|entry| {
-        if let Ok(order) = json::from_slice::<TakerOrder>(&slurp(&entry.path())) {
-            coins.insert(order.request.base.clone());
-            coins.insert(order.request.rel.clone());
-            taker_orders.insert(order.request.uuid, order);
-        }
-    });
+    for order in saved_taker_orders {
+        coins.insert(order.request.base.clone());
+        coins.insert(order.request.rel.clone());
+        taker_orders.insert(order.request.uuid, order);
+    }
     Ok(coins)
 }
 
@@ -4732,26 +5158,26 @@ pub enum CancelBy {
 pub async fn cancel_orders_by(ctx: &MmArc, cancel_by: CancelBy) -> Result<(Vec<Uuid>, Vec<Uuid>), String> {
     let mut cancelled = vec![];
     let mut cancelled_maker_orders = vec![];
+    let mut cancelled_taker_orders = vec![];
     let mut currently_matching = vec![];
 
     let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
-    let mut maker_orders = ordermatch_ctx.my_maker_orders.lock().await;
+    let maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
     let mut taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
 
     macro_rules! cancel_maker_if_true {
         ($e: expr, $uuid: ident, $order: ident) => {
             if $e {
                 if $order.is_cancellable() {
-                    delete_my_maker_order(&ctx, &$order, MakerOrderCancellationReason::Cancelled);
                     cancelled_maker_orders.push($order);
                     cancelled.push($uuid);
-                    None
+                    true
                 } else {
                     currently_matching.push($uuid);
-                    Some(($uuid, $order))
+                    false
                 }
             } else {
-                Some(($uuid, $order))
+                false
             }
         };
     }
@@ -4760,7 +5186,7 @@ pub async fn cancel_orders_by(ctx: &MmArc, cancel_by: CancelBy) -> Result<(Vec<U
         ($e: expr, $uuid: ident, $order: ident) => {
             if $e {
                 if $order.is_cancellable() {
-                    delete_my_taker_order(&ctx, &$order, TakerOrderCancellationReason::Cancelled);
+                    cancelled_taker_orders.push($order);
                     cancelled.push($uuid);
                     None
                 } else {
@@ -4775,20 +5201,36 @@ pub async fn cancel_orders_by(ctx: &MmArc, cancel_by: CancelBy) -> Result<(Vec<U
 
     match cancel_by {
         CancelBy::All => {
-            *maker_orders = maker_orders
-                .drain()
-                .filter_map(|(uuid, order)| cancel_maker_if_true!(true, uuid, order))
-                .collect();
+            let mut to_remove = Vec::new();
+            for (uuid, order) in maker_orders.iter() {
+                let uuid = *uuid;
+                let order = order.lock().await.clone();
+                if cancel_maker_if_true!(true, uuid, order) {
+                    to_remove.push(uuid);
+                }
+            }
+            let mut maker_order_ctx = ordermatch_ctx.maker_orders_ctx.lock();
+            for uuid in to_remove.iter() {
+                maker_order_ctx.remove_order(uuid);
+            }
             *taker_orders = taker_orders
                 .drain()
                 .filter_map(|(uuid, order)| cancel_taker_if_true!(true, uuid, order))
                 .collect();
         },
         CancelBy::Pair { base, rel } => {
-            *maker_orders = maker_orders
-                .drain()
-                .filter_map(|(uuid, order)| cancel_maker_if_true!(order.base == base && order.rel == rel, uuid, order))
-                .collect();
+            let mut to_remove = Vec::new();
+            for (uuid, order) in maker_orders.iter() {
+                let uuid = *uuid;
+                let order = order.lock().await.clone();
+                if cancel_maker_if_true!(order.base == base && order.rel == rel, uuid, order) {
+                    to_remove.push(uuid);
+                }
+            }
+            let mut maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
+            for uuid in to_remove.iter() {
+                maker_orders_ctx.remove_order(uuid);
+            }
             *taker_orders = taker_orders
                 .drain()
                 .filter_map(|(uuid, order)| {
@@ -4797,12 +5239,18 @@ pub async fn cancel_orders_by(ctx: &MmArc, cancel_by: CancelBy) -> Result<(Vec<U
                 .collect();
         },
         CancelBy::Coin { ticker } => {
-            *maker_orders = maker_orders
-                .drain()
-                .filter_map(|(uuid, order)| {
-                    cancel_maker_if_true!(order.base == ticker || order.rel == ticker, uuid, order)
-                })
-                .collect();
+            let mut to_remove = Vec::new();
+            for (uuid, order) in maker_orders.iter() {
+                let uuid = *uuid;
+                let order = order.lock().await.clone();
+                if cancel_maker_if_true!(order.base == ticker || order.rel == ticker, uuid, order) {
+                    to_remove.push(uuid);
+                }
+            }
+            let mut maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
+            for uuid in to_remove.iter() {
+                maker_orders_ctx.remove_order(uuid);
+            }
             *taker_orders = taker_orders
                 .drain()
                 .filter_map(|(uuid, order)| {
@@ -4812,12 +5260,35 @@ pub async fn cancel_orders_by(ctx: &MmArc, cancel_by: CancelBy) -> Result<(Vec<U
         },
     };
     for order in cancelled_maker_orders {
-        maker_order_cancelled_p2p_notify(ctx.clone(), &order).await;
+        maker_order_cancelled_p2p_notify(ctx.clone(), &order);
+        delete_my_maker_order(ctx.clone(), order.clone(), MakerOrderCancellationReason::Cancelled)
+            .compat()
+            .await
+            .ok();
+    }
+    for order in cancelled_taker_orders {
+        delete_my_taker_order(ctx.clone(), order, TakerOrderCancellationReason::Cancelled)
+            .compat()
+            .await
+            .ok();
     }
     Ok((cancelled, currently_matching))
 }
 
-pub async fn cancel_all_orders(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+pub async fn cancel_all_orders(
+    ctx: MmArc,
+    cancel_by: CancelBy,
+) -> Result<CancelAllOrdersResponse, MmError<CancelAllOrdersError>> {
+    cancel_orders_by(&ctx, cancel_by)
+        .await
+        .map(|(cancelled, currently_matching)| CancelAllOrdersResponse {
+            cancelled,
+            currently_matching,
+        })
+        .map_to_mm(CancelAllOrdersError::LegacyError)
+}
+
+pub async fn cancel_all_orders_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
     let cancel_by: CancelBy = try_s!(json::from_value(req["cancel_by"].clone()));
 
     let (cancelled, currently_matching) = try_s!(cancel_orders_by(&ctx, cancel_by).await);
@@ -4850,7 +5321,7 @@ pub(self) async fn subscribe_to_orderbook_topic(
     let topic = orderbook_topic_from_base_rel(base, rel);
     let is_orderbook_filled = {
         let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
-        let mut orderbook = ordermatch_ctx.orderbook.lock().await;
+        let mut orderbook = ordermatch_ctx.orderbook.lock();
 
         match orderbook.topics_subscribed_to.entry(topic.clone()) {
             Entry::Vacant(e) => {
@@ -4858,7 +5329,7 @@ pub(self) async fn subscribe_to_orderbook_topic(
                 e.insert(OrderbookRequestingState::NotRequested {
                     subscribed_at: current_timestamp,
                 });
-                subscribe_to_topic(ctx, topic.clone()).await;
+                subscribe_to_topic(ctx, topic.clone());
                 // orderbook is not filled
                 false
             },
@@ -4867,17 +5338,10 @@ pub(self) async fn subscribe_to_orderbook_topic(
                     // We are subscribed to the topic and the orderbook was requested already
                     true
                 },
-                OrderbookRequestingState::NotRequested { subscribed_at }
-                    if *subscribed_at + ORDERBOOK_REQUESTING_TIMEOUT < current_timestamp =>
-                {
-                    // We are subscribed to the topic. Also we didn't request the orderbook,
-                    // but enough time has passed for the orderbook to fill by OrdermatchRequest::SyncPubkeyOrderbookState.
-                    true
-                }
-                OrderbookRequestingState::NotRequested { .. } => {
+                OrderbookRequestingState::NotRequested { subscribed_at } => {
                     // We are subscribed to the topic. Also we didn't request the orderbook,
-                    // and the orderbook has not filled up yet.
-                    false
+                    // True if enough time has passed for the orderbook to fill by OrdermatchRequest::SyncPubkeyOrderbookState.
+                    *subscribed_at + ORDERBOOK_REQUESTING_TIMEOUT < current_timestamp
                 },
             },
         }
@@ -4922,6 +5386,23 @@ pub struct RpcOrderbookEntry {
     rel_max_volume: DetailedRelMaxVolume,
     #[serde(flatten)]
     rel_min_volume: DetailedRelMinVolume,
+    #[serde(flatten)]
+    conf_settings: Option<OrderConfirmationsSettings>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct RpcOrderbookEntryV2 {
+    coin: String,
+    address: OrderbookAddress,
+    price: MmNumberMultiRepr,
+    pubkey: String,
+    uuid: Uuid,
+    is_mine: bool,
+    base_max_volume: MmNumberMultiRepr,
+    base_min_volume: MmNumberMultiRepr,
+    rel_max_volume: MmNumberMultiRepr,
+    rel_min_volume: MmNumberMultiRepr,
+    conf_settings: Option<OrderConfirmationsSettings>,
 }
 
 fn choose_maker_confs_and_notas(
@@ -5033,3 +5514,64 @@ fn choose_taker_confs_and_notas(
         taker_coin_nota,
     }
 }
+
+#[derive(Debug, Serialize)]
+#[serde(tag = "address_type", content = "address_data")]
+pub enum OrderbookAddress {
+    Transparent(String),
+    Shielded,
+}
+
+#[derive(Debug, Display)]
+enum OrderbookAddrErr {
+    AddrFromPubkeyError(String),
+    CoinIsNotSupported(String),
+    DeserializationError(json::Error),
+    InvalidPlatformCoinProtocol(String),
+    PlatformCoinConfIsNull(String),
+}
+
+impl From<json::Error> for OrderbookAddrErr {
+    fn from(err: json::Error) -> Self { OrderbookAddrErr::DeserializationError(err) }
+}
+
+fn orderbook_address(
+    ctx: &MmArc,
+    coin: &str,
+    conf: &Json,
+    pubkey: &str,
+    addr_format: UtxoAddressFormat,
+) -> Result<OrderbookAddress, MmError<OrderbookAddrErr>> {
+    let protocol: CoinProtocol = json::from_value(conf["protocol"].clone())?;
+    match protocol {
+        CoinProtocol::ERC20 { .. } | CoinProtocol::ETH => coins::eth::addr_from_pubkey_str(pubkey)
+            .map(OrderbookAddress::Transparent)
+            .map_to_mm(OrderbookAddrErr::AddrFromPubkeyError),
+        CoinProtocol::UTXO | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
+            coins::utxo::address_by_conf_and_pubkey_str(coin, conf, pubkey, addr_format)
+                .map(OrderbookAddress::Transparent)
+                .map_to_mm(OrderbookAddrErr::AddrFromPubkeyError)
+        },
+        CoinProtocol::SLPTOKEN { platform, .. } => {
+            let platform_conf = coin_conf(ctx, &platform);
+            if platform_conf.is_null() {
+                return MmError::err(OrderbookAddrErr::PlatformCoinConfIsNull(platform));
+            }
+            // TODO is there any way to make it better without duplicating the prefix in the SLP conf?
+            let platform_protocol: CoinProtocol = json::from_value(platform_conf["protocol"].clone())?;
+            match platform_protocol {
+                CoinProtocol::BCH { slp_prefix } => coins::utxo::slp::slp_addr_from_pubkey_str(pubkey, &slp_prefix)
+                    .map(OrderbookAddress::Transparent)
+                    .mm_err(|e| OrderbookAddrErr::AddrFromPubkeyError(e.to_string())),
+                _ => MmError::err(OrderbookAddrErr::InvalidPlatformCoinProtocol(platform)),
+            }
+        },
+        #[cfg(not(target_arch = "wasm32"))]
+        // TODO ask Slyris
+        CoinProtocol::SOLANA | CoinProtocol::SPLTOKEN { .. } => unimplemented!(),
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::LIGHTNING { .. } => MmError::err(OrderbookAddrErr::CoinIsNotSupported(coin.to_owned())),
+        #[cfg(not(target_arch = "wasm32"))]
+        CoinProtocol::ZHTLC { .. } => Ok(OrderbookAddress::Shielded),
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_ordermatch/best_orders.rs b/mm2src/mm2_main/src/lp_ordermatch/best_orders.rs
new file mode 100644
index 0000000000..4305052699
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_ordermatch/best_orders.rs
@@ -0,0 +1,491 @@
+use super::{addr_format_from_protocol_info, BaseRelProtocolInfo, OrderConfirmationsSettings,
+            OrderbookP2PItemWithProof, OrdermatchContext, OrdermatchRequest};
+use crate::mm2::lp_network::{request_any_relay, P2PRequest};
+use crate::mm2::lp_ordermatch::{orderbook_address, RpcOrderbookEntryV2};
+use coins::{address_by_coin_conf_and_pubkey_str, coin_conf, is_wallet_only_conf, is_wallet_only_ticker};
+use common::{log, HttpStatusCode};
+use derive_more::Display;
+use http::{Response, StatusCode};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigRational, MmNumber};
+use num_traits::Zero;
+use serde_json::{self as json, Value as Json};
+use std::collections::{HashMap, HashSet};
+use uuid::Uuid;
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum BestOrdersAction {
+    Buy,
+    Sell,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct BestOrdersRequest {
+    coin: String,
+    action: BestOrdersAction,
+    volume: MmNumber,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+struct BestOrdersP2PRes {
+    orders: HashMap<String, Vec<OrderbookP2PItemWithProof>>,
+    #[serde(default)]
+    protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
+    #[serde(default)]
+    conf_infos: HashMap<Uuid, OrderConfirmationsSettings>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(tag = "type", content = "value")]
+pub enum RequestBestOrdersBy {
+    #[serde(rename = "volume")]
+    Volume(MmNumber),
+    #[serde(rename = "number")]
+    Number(usize),
+}
+
+#[derive(Debug, Deserialize)]
+pub struct BestOrdersRequestV2 {
+    coin: String,
+    action: BestOrdersAction,
+    request_by: RequestBestOrdersBy,
+}
+
+pub fn process_best_orders_p2p_request(
+    ctx: MmArc,
+    coin: String,
+    action: BestOrdersAction,
+    required_volume: BigRational,
+) -> Result<Option<Vec<u8>>, String> {
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).expect("ordermatch_ctx must exist at this point");
+    let orderbook = ordermatch_ctx.orderbook.lock();
+    let search_pairs_in = match action {
+        BestOrdersAction::Buy => &orderbook.pairs_existing_for_base,
+        BestOrdersAction::Sell => &orderbook.pairs_existing_for_rel,
+    };
+    let tickers = match search_pairs_in.get(&coin) {
+        Some(tickers) => tickers,
+        None => return Ok(None),
+    };
+    let mut result = HashMap::new();
+    let pairs = tickers.iter().map(|ticker| match action {
+        BestOrdersAction::Buy => (coin.clone(), ticker.clone()),
+        BestOrdersAction::Sell => (ticker.clone(), coin.clone()),
+    });
+
+    let mut protocol_infos = HashMap::new();
+    let mut conf_infos = HashMap::new();
+
+    for pair in pairs {
+        let orders = match orderbook.ordered.get(&pair) {
+            Some(orders) => orders,
+            None => {
+                log::debug!("No orders for pair {:?}", pair);
+                continue;
+            },
+        };
+        let mut best_orders = vec![];
+        let mut collected_volume = BigRational::zero();
+        for ordered in orders {
+            match orderbook.order_set.get(&ordered.uuid) {
+                Some(o) => {
+                    let min_volume = match action {
+                        BestOrdersAction::Buy => o.min_volume.clone(),
+                        BestOrdersAction::Sell => &o.min_volume * &o.price,
+                    };
+                    if min_volume > required_volume {
+                        log::debug!("Order {} min_vol {:?} > {:?}", o.uuid, min_volume, required_volume);
+                        continue;
+                    }
+
+                    let max_volume = match action {
+                        BestOrdersAction::Buy => o.max_volume.clone(),
+                        BestOrdersAction::Sell => &o.max_volume * &o.price,
+                    };
+                    let order_w_proof = orderbook.orderbook_item_with_proof(o.clone());
+                    protocol_infos.insert(order_w_proof.order.uuid, order_w_proof.order.base_rel_proto_info());
+                    if let Some(info) = order_w_proof.order.conf_settings {
+                        conf_infos.insert(order_w_proof.order.uuid, info);
+                    }
+                    best_orders.push(order_w_proof.into());
+
+                    collected_volume += max_volume;
+                    if collected_volume >= required_volume {
+                        break;
+                    }
+                },
+                None => {
+                    log::debug!("No order with uuid {:?}", ordered.uuid);
+                    continue;
+                },
+            };
+        }
+        match action {
+            BestOrdersAction::Buy => result.insert(pair.1, best_orders),
+            BestOrdersAction::Sell => result.insert(pair.0, best_orders),
+        };
+    }
+
+    // Drop mutability of result, protocol_infos and conf_infos
+    let result = result;
+    let protocol_infos = protocol_infos;
+    let conf_infos = conf_infos;
+
+    let response = BestOrdersP2PRes {
+        orders: result,
+        protocol_infos,
+        conf_infos,
+    };
+    let encoded = rmp_serde::to_vec(&response).expect("rmp_serde::to_vec should not fail here");
+    Ok(Some(encoded))
+}
+
+pub fn process_best_orders_p2p_request_by_number(
+    ctx: MmArc,
+    coin: String,
+    action: BestOrdersAction,
+    number: usize,
+) -> Result<Option<Vec<u8>>, String> {
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).expect("ordermatch_ctx must exist at this point");
+    let orderbook = ordermatch_ctx.orderbook.lock();
+    let search_pairs_in = match action {
+        BestOrdersAction::Buy => &orderbook.pairs_existing_for_base,
+        BestOrdersAction::Sell => &orderbook.pairs_existing_for_rel,
+    };
+    let tickers = match search_pairs_in.get(&coin) {
+        Some(tickers) => tickers,
+        None => return Ok(None),
+    };
+    let mut result = HashMap::new();
+    let pairs = tickers.iter().map(|ticker| match action {
+        BestOrdersAction::Buy => (coin.clone(), ticker.clone()),
+        BestOrdersAction::Sell => (ticker.clone(), coin.clone()),
+    });
+
+    let mut protocol_infos = HashMap::new();
+    let mut conf_infos = HashMap::new();
+
+    for pair in pairs {
+        let orders = match orderbook.ordered.get(&pair) {
+            Some(orders) => orders.clone(),
+            None => {
+                log::debug!("No orders for pair {:?}", pair);
+                continue;
+            },
+        };
+        let mut best_orders = vec![];
+        for ordered in orders.iter().take(number) {
+            match orderbook.order_set.get(&ordered.uuid) {
+                Some(o) => {
+                    let order_w_proof = orderbook.orderbook_item_with_proof(o.clone());
+                    protocol_infos.insert(order_w_proof.order.uuid, order_w_proof.order.base_rel_proto_info());
+                    if let Some(info) = order_w_proof.order.conf_settings {
+                        conf_infos.insert(order_w_proof.order.uuid, info);
+                    }
+                    best_orders.push(order_w_proof.into());
+                },
+                None => {
+                    log::debug!("No order with uuid {:?}", ordered.uuid);
+                    continue;
+                },
+            };
+        }
+        match action {
+            BestOrdersAction::Buy => result.insert(pair.1, best_orders),
+            BestOrdersAction::Sell => result.insert(pair.0, best_orders),
+        };
+    }
+
+    // Drop mutability of result, protocol_infos and conf_infos
+    let result = result;
+    let protocol_infos = protocol_infos;
+    let conf_infos = conf_infos;
+
+    let response = BestOrdersP2PRes {
+        orders: result,
+        protocol_infos,
+        conf_infos,
+    };
+    let encoded = rmp_serde::to_vec(&response).expect("rmp_serde::to_vec should not fail here");
+    Ok(Some(encoded))
+}
+
+pub async fn best_orders_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let req: BestOrdersRequest = try_s!(json::from_value(req));
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
+    if is_wallet_only_ticker(&ctx, &req.coin) {
+        return ERR!("Coin {} is wallet only", &req.coin);
+    }
+    let p2p_request = OrdermatchRequest::BestOrders {
+        coin: ordermatch_ctx.orderbook_ticker_bypass(&req.coin),
+        action: req.action,
+        volume: req.volume.into(),
+    };
+
+    let best_orders_res =
+        try_s!(request_any_relay::<BestOrdersP2PRes>(ctx.clone(), P2PRequest::Ordermatch(p2p_request)).await);
+    let mut response = HashMap::new();
+    if let Some((p2p_response, peer_id)) = best_orders_res {
+        log::debug!("Got best orders {:?} from peer {}", p2p_response, peer_id);
+        for (coin, orders_w_proofs) in p2p_response.orders {
+            let coin_conf = coin_conf(&ctx, &coin);
+            if coin_conf.is_null() {
+                log::warn!("Coin {} is not found in config", coin);
+                continue;
+            }
+            if is_wallet_only_conf(&coin_conf) {
+                log::warn!(
+                    "Coin {} was removed from best orders because it's defined as wallet only in config",
+                    coin
+                );
+                continue;
+            }
+            for order_w_proof in orders_w_proofs {
+                let order = order_w_proof.order;
+                let empty_proto_info = BaseRelProtocolInfo::default();
+                let proto_infos = p2p_response
+                    .protocol_infos
+                    .get(&order.uuid)
+                    .unwrap_or(&empty_proto_info);
+                let addr_format = match req.action {
+                    BestOrdersAction::Buy => addr_format_from_protocol_info(&proto_infos.rel),
+                    BestOrdersAction::Sell => addr_format_from_protocol_info(&proto_infos.base),
+                };
+                let address =
+                    match address_by_coin_conf_and_pubkey_str(&ctx, &coin, &coin_conf, &order.pubkey, addr_format) {
+                        Ok(a) => a,
+                        Err(e) => {
+                            log::error!("Error {} getting coin {} address from pubkey {}", e, coin, order.pubkey);
+                            continue;
+                        },
+                    };
+                let conf_settings = p2p_response.conf_infos.get(&order.uuid);
+                let entry = match req.action {
+                    BestOrdersAction::Buy => order.as_rpc_best_orders_buy(address, conf_settings, false),
+                    BestOrdersAction::Sell => order.as_rpc_best_orders_sell(address, conf_settings, false),
+                };
+                response.entry(coin.clone()).or_insert_with(Vec::new).push(entry);
+            }
+        }
+    }
+
+    let res = json!({ "result": response, "original_tickers": &ordermatch_ctx.original_tickers });
+    Response::builder()
+        .body(json::to_vec(&res).expect("Serialization failed"))
+        .map_err(|e| ERRL!("{}", e))
+}
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum BestOrdersRpcError {
+    CoinIsWalletOnly(String),
+    P2PError(String),
+}
+
+impl HttpStatusCode for BestOrdersRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            BestOrdersRpcError::CoinIsWalletOnly(_) => StatusCode::BAD_REQUEST,
+            BestOrdersRpcError::P2PError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct BestOrdersV2Response {
+    orders: HashMap<String, Vec<RpcOrderbookEntryV2>>,
+    original_tickers: HashMap<String, HashSet<String>>,
+}
+
+pub async fn best_orders_rpc_v2(
+    ctx: MmArc,
+    req: BestOrdersRequestV2,
+) -> Result<BestOrdersV2Response, MmError<BestOrdersRpcError>> {
+    if is_wallet_only_ticker(&ctx, &req.coin) {
+        return MmError::err(BestOrdersRpcError::CoinIsWalletOnly(req.coin));
+    }
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
+    let p2p_request = match req.request_by {
+        RequestBestOrdersBy::Volume(mm_number) => OrdermatchRequest::BestOrders {
+            coin: ordermatch_ctx.orderbook_ticker_bypass(&req.coin),
+            action: req.action,
+            volume: mm_number.into(),
+        },
+        RequestBestOrdersBy::Number(size) => OrdermatchRequest::BestOrdersByNumber {
+            coin: ordermatch_ctx.orderbook_ticker_bypass(&req.coin),
+            action: req.action,
+            number: size,
+        },
+    };
+
+    let best_orders_res = request_any_relay::<BestOrdersP2PRes>(ctx.clone(), P2PRequest::Ordermatch(p2p_request))
+        .await
+        .mm_err(|e| BestOrdersRpcError::P2PError(format!("{:?}", e)))?;
+    let mut orders = HashMap::new();
+    if let Some((p2p_response, peer_id)) = best_orders_res {
+        log::debug!("Got best orders {:?} from peer {}", p2p_response, peer_id);
+        for (coin, orders_w_proofs) in p2p_response.orders {
+            let coin_conf = coin_conf(&ctx, &coin);
+            if coin_conf.is_null() {
+                log::warn!("Coin {} is not found in config", coin);
+                continue;
+            }
+            if is_wallet_only_conf(&coin_conf) {
+                log::warn!(
+                    "Coin {} was removed from best orders because it's defined as wallet only in config",
+                    coin
+                );
+                continue;
+            }
+            for order_w_proof in orders_w_proofs {
+                let order = order_w_proof.order;
+                let empty_proto_info = BaseRelProtocolInfo::default();
+                let proto_infos = p2p_response
+                    .protocol_infos
+                    .get(&order.uuid)
+                    .unwrap_or(&empty_proto_info);
+                let addr_format = match req.action {
+                    BestOrdersAction::Buy => addr_format_from_protocol_info(&proto_infos.rel),
+                    BestOrdersAction::Sell => addr_format_from_protocol_info(&proto_infos.base),
+                };
+                let address = match orderbook_address(&ctx, &coin, &coin_conf, &order.pubkey, addr_format) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        log::error!("Error {} getting coin {} address from pubkey {}", e, coin, order.pubkey);
+                        continue;
+                    },
+                };
+                let conf_settings = p2p_response.conf_infos.get(&order.uuid);
+                let entry = match req.action {
+                    BestOrdersAction::Buy => order.as_rpc_best_orders_buy_v2(address, conf_settings, false),
+                    BestOrdersAction::Sell => order.as_rpc_best_orders_sell_v2(address, conf_settings, false),
+                };
+                orders.entry(coin.clone()).or_insert_with(Vec::new).push(entry);
+            }
+        }
+    }
+
+    Ok(BestOrdersV2Response {
+        orders,
+        original_tickers: ordermatch_ctx.original_tickers.clone(),
+    })
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod best_orders_test {
+    use super::*;
+    use crate::mm2::lp_ordermatch::ordermatch_tests::make_random_orders;
+    use crate::mm2::lp_ordermatch::{OrderbookItem, TrieProof};
+    use std::iter::FromIterator;
+
+    #[test]
+    fn check_best_orders_p2p_res_serde() {
+        #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+        struct BestOrderV1 {
+            pubkey: String,
+            base: String,
+            rel: String,
+            price: BigRational,
+            max_volume: BigRational,
+            min_volume: BigRational,
+            uuid: Uuid,
+            created_at: u64,
+        }
+
+        impl From<OrderbookItem> for BestOrderV1 {
+            fn from(o: OrderbookItem) -> Self {
+                BestOrderV1 {
+                    pubkey: o.pubkey,
+                    base: o.base,
+                    rel: o.rel,
+                    price: o.price,
+                    max_volume: o.max_volume,
+                    min_volume: o.min_volume,
+                    uuid: o.uuid,
+                    created_at: o.created_at,
+                }
+            }
+        }
+
+        #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+        struct BestOrderWithProofV1 {
+            /// Orderbook item
+            order: BestOrderV1,
+            /// Last pubkey message payload that contains most recent pair trie root
+            last_message_payload: Vec<u8>,
+            /// Proof confirming that orderbook item is in the pair trie
+            proof: TrieProof,
+        }
+
+        #[derive(Debug, Deserialize, PartialEq, Serialize)]
+        struct BestOrdersResV1 {
+            orders: HashMap<String, Vec<BestOrderWithProofV1>>,
+        }
+
+        let orders = make_random_orders("".into(), &[1; 32], "RICK".into(), "MORTY".into(), 10);
+        let v1_orders: Vec<_> = orders
+            .clone()
+            .into_iter()
+            .map(|order| BestOrderWithProofV1 {
+                order: order.into(),
+                last_message_payload: vec![],
+                proof: vec![],
+            })
+            .collect();
+
+        let v1 = BestOrdersResV1 {
+            orders: HashMap::from_iter(std::iter::once(("RICK".into(), v1_orders))),
+        };
+
+        let v1_serialized = rmp_serde::to_vec(&v1).unwrap();
+
+        let mut new: BestOrdersP2PRes = rmp_serde::from_read_ref(&v1_serialized).unwrap();
+        new.protocol_infos.insert(Uuid::new_v4(), BaseRelProtocolInfo {
+            base: vec![1],
+            rel: vec![2],
+        });
+        new.conf_infos
+            .insert(Uuid::new_v4(), OrderConfirmationsSettings::default());
+
+        let new_serialized = rmp_serde::to_vec(&new).unwrap();
+
+        let v1_from_new: BestOrdersResV1 = rmp_serde::from_read_ref(&new_serialized).unwrap();
+        assert_eq!(v1, v1_from_new);
+
+        #[derive(Debug, Deserialize, PartialEq, Serialize)]
+        struct BestOrdersResV2 {
+            orders: HashMap<String, Vec<OrderbookP2PItemWithProof>>,
+            #[serde(default)]
+            protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
+        }
+        let v2_orders: Vec<_> = orders
+            .into_iter()
+            .map(|order| OrderbookP2PItemWithProof {
+                order: order.into(),
+                last_message_payload: vec![],
+                proof: vec![],
+            })
+            .collect();
+
+        let v2 = BestOrdersResV2 {
+            orders: HashMap::from_iter(std::iter::once(("RICK".into(), v2_orders))),
+            protocol_infos: HashMap::from_iter(std::iter::once((Uuid::new_v4(), BaseRelProtocolInfo {
+                base: vec![1],
+                rel: vec![2],
+            }))),
+        };
+
+        let v2_serialized = rmp_serde::to_vec(&v2).unwrap();
+
+        let mut new: BestOrdersP2PRes = rmp_serde::from_read_ref(&v2_serialized).unwrap();
+        new.conf_infos
+            .insert(Uuid::new_v4(), OrderConfirmationsSettings::default());
+
+        let new_serialized = rmp_serde::to_vec(&new).unwrap();
+
+        let v2_from_new: BestOrdersResV2 = rmp_serde::from_read_ref(&new_serialized).unwrap();
+        assert_eq!(v2, v2_from_new);
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_ordermatch/lp_bot.rs b/mm2src/mm2_main/src/lp_ordermatch/lp_bot.rs
new file mode 100644
index 0000000000..12613ffa21
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_ordermatch/lp_bot.rs
@@ -0,0 +1,269 @@
+//
+//  lp_bot.rs
+//  marketmaker
+//
+
+use async_trait::async_trait;
+use common::log::info;
+use derive_more::Display;
+use futures::lock::Mutex as AsyncMutex;
+use mm2_core::{event_dispatcher::{EventListener, EventUniqueId},
+               mm_ctx::{from_ctx, MmArc}};
+use mm2_number::MmNumber;
+#[cfg(test)] use mocktopus::macros::*;
+use std::any::TypeId;
+use std::ops::Deref;
+use std::{collections::HashMap, sync::Arc};
+
+#[path = "simple_market_maker.rs"] mod simple_market_maker_bot;
+use crate::mm2::lp_dispatcher::{LpEvents, StopCtxEvent};
+use crate::mm2::lp_message_service::{MessageServiceContext, MAKER_BOT_ROOM_ID};
+use crate::mm2::lp_ordermatch::lp_bot::simple_market_maker_bot::{tear_down_bot, BOT_DEFAULT_REFRESH_RATE,
+                                                                 PRECISION_FOR_NOTIFICATION};
+use crate::mm2::lp_swap::MakerSwapStatusChanged;
+pub use simple_market_maker_bot::{start_simple_market_maker_bot, stop_simple_market_maker_bot,
+                                  StartSimpleMakerBotRequest, KMD_PRICE_ENDPOINT};
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+#[path = "simple_market_maker_tests.rs"]
+pub mod simple_market_maker_tests;
+
+#[derive(Clone, Display)]
+#[display(fmt = "simple_market_maker_bot will stop within {} seconds", bot_refresh_rate)]
+pub struct TradingBotStopping {
+    bot_refresh_rate: f64,
+}
+
+impl TradingBotStopping {
+    fn event_id() -> TypeId { TypeId::of::<TradingBotStopping>() }
+}
+
+#[derive(Clone, Display)]
+#[display(fmt = "simple_market_maker_bot successfully started with {} pairs", nb_pairs)]
+pub struct TradingBotStarted {
+    nb_pairs: usize,
+}
+
+impl TradingBotStarted {
+    fn event_id() -> TypeId { TypeId::of::<TradingBotStarted>() }
+}
+
+#[derive(Clone, Display)]
+#[display(
+    fmt = "simple_market_maker_bot successfully stopped - cancelled {} orders",
+    nb_orders
+)]
+pub struct TradingBotStopped {
+    nb_orders: usize,
+}
+
+impl TradingBotStopped {
+    fn event_id() -> TypeId { TypeId::of::<TradingBotStopped>() }
+}
+
+#[derive(Clone, Display)]
+pub enum TradingBotEvent {
+    Started(TradingBotStarted),
+    Stopping(TradingBotStopping),
+    Stopped(TradingBotStopped),
+}
+
+impl EventUniqueId for TradingBotEvent {
+    fn event_id(&self) -> TypeId {
+        match self {
+            TradingBotEvent::Started(_) => TradingBotStarted::event_id(),
+            TradingBotEvent::Stopping(_) => TradingBotStopping::event_id(),
+            TradingBotEvent::Stopped(_) => TradingBotStopped::event_id(),
+        }
+    }
+}
+
+impl From<TradingBotStopping> for TradingBotEvent {
+    fn from(trading_bot_stopping: TradingBotStopping) -> Self { TradingBotEvent::Stopping(trading_bot_stopping) }
+}
+
+impl From<TradingBotStopped> for TradingBotEvent {
+    fn from(trading_bot_stopped: TradingBotStopped) -> Self { TradingBotEvent::Stopped(trading_bot_stopped) }
+}
+
+impl From<TradingBotStarted> for TradingBotEvent {
+    fn from(trading_bot_started: TradingBotStarted) -> Self { TradingBotEvent::Started(trading_bot_started) }
+}
+
+pub struct RunningState {
+    trading_bot_cfg: SimpleMakerBotRegistry,
+    bot_refresh_rate: f64,
+    price_url: String,
+}
+
+pub struct StoppingState {
+    trading_bot_cfg: SimpleMakerBotRegistry,
+}
+
+#[derive(Default)]
+pub struct StoppedState {
+    trading_bot_cfg: SimpleMakerBotRegistry,
+}
+
+enum TradingBotState {
+    Running(RunningState),
+    Stopping(StoppingState),
+    Stopped(StoppedState),
+}
+
+impl From<RunningState> for TradingBotState {
+    fn from(running_state: RunningState) -> Self { Self::Running(running_state) }
+}
+
+impl From<StoppingState> for TradingBotState {
+    fn from(stopping_state: StoppingState) -> Self { Self::Stopping(stopping_state) }
+}
+
+impl From<StoppedState> for TradingBotState {
+    fn from(stopped_state: StoppedState) -> Self { Self::Stopped(stopped_state) }
+}
+
+impl Default for TradingBotState {
+    fn default() -> Self { StoppedState::default().into() }
+}
+
+pub type SimpleMakerBotRegistry = HashMap<String, SimpleCoinMarketMakerCfg>;
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub enum VolumeSettings {
+    #[serde(rename = "percentage")]
+    Percentage(MmNumber),
+    #[serde(rename = "usd")]
+    Usd(MmNumber),
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct SimpleCoinMarketMakerCfg {
+    pub base: String,
+    pub rel: String,
+    pub min_volume: Option<VolumeSettings>,
+    pub max_volume: Option<VolumeSettings>,
+    pub max: Option<bool>,
+    pub spread: MmNumber,
+    pub base_confs: Option<u64>,
+    pub base_nota: Option<bool>,
+    pub rel_confs: Option<u64>,
+    pub rel_nota: Option<bool>,
+    pub enable: bool,
+    pub price_elapsed_validity: Option<f64>,
+    pub check_last_bidirectional_trade_thresh_hold: Option<bool>,
+    pub min_base_price: Option<MmNumber>,
+    pub min_rel_price: Option<MmNumber>,
+    pub min_pair_price: Option<MmNumber>,
+}
+
+#[derive(Default)]
+pub struct TradingBotContext {
+    trading_bot_states: AsyncMutex<TradingBotState>,
+}
+
+impl TradingBotContext {
+    async fn get_refresh_rate(&self) -> f64 {
+        let state = self.trading_bot_states.lock().await;
+        if let TradingBotState::Running(running_state) = &*state {
+            return running_state.bot_refresh_rate;
+        }
+        BOT_DEFAULT_REFRESH_RATE
+    }
+}
+
+#[derive(Clone)]
+pub struct ArcTradingBotContext(Arc<TradingBotContext>);
+
+impl Deref for ArcTradingBotContext {
+    type Target = TradingBotContext;
+    fn deref(&self) -> &TradingBotContext { &*self.0 }
+}
+
+#[allow(clippy::single_match)]
+impl TradingBotContext {
+    async fn on_trading_bot_event(&self, ctx: &MmArc, trading_bot_event: &TradingBotEvent) {
+        let msg_format = format!("{}", trading_bot_event);
+        info!("{}", msg_format);
+        let message_service_ctx = MessageServiceContext::from_ctx(ctx).unwrap();
+        let message_service = message_service_ctx.message_service.lock().await;
+        let _ = message_service.send_message(msg_format, MAKER_BOT_ROOM_ID, false).await;
+    }
+
+    async fn on_maker_swap_status_changed(&self, ctx: &MmArc, swap_infos: &MakerSwapStatusChanged) {
+        let msg = format!(
+            "[{}: {} ({}) <-> {} ({})] status changed: {}",
+            swap_infos.uuid,
+            swap_infos.taker_coin,
+            swap_infos.taker_amount.with_prec(PRECISION_FOR_NOTIFICATION),
+            swap_infos.maker_coin,
+            swap_infos.maker_amount.with_prec(PRECISION_FOR_NOTIFICATION),
+            swap_infos.event_status
+        );
+        info!("event received: {}", msg);
+        let state = self.trading_bot_states.lock().await;
+        match &*state {
+            TradingBotState::Running(_) => {
+                let message_service_ctx = MessageServiceContext::from_ctx(ctx).unwrap();
+                let message_service = message_service_ctx.message_service.lock().await;
+                let _ = message_service
+                    .send_message(msg.to_string(), MAKER_BOT_ROOM_ID, false)
+                    .await;
+            },
+            _ => {},
+        }
+    }
+
+    async fn on_ctx_stop(&self, ctx: &MmArc) {
+        info!("on_ctx_stop event received");
+        let simple_market_maker_bot_ctx = TradingBotContext::from_ctx(ctx).unwrap();
+        let mut state = simple_market_maker_bot_ctx.trading_bot_states.lock().await;
+        match &*state {
+            TradingBotState::Running(running_state) => {
+                *state = StoppedState {
+                    trading_bot_cfg: running_state.trading_bot_cfg.clone(),
+                }
+                .into();
+                drop(state);
+                tear_down_bot(ctx.clone()).await
+            },
+            _ => {},
+        }
+    }
+}
+
+#[async_trait]
+impl EventListener for ArcTradingBotContext {
+    type Event = LpEvents;
+
+    async fn process_event_async(&self, ctx: MmArc, event: Self::Event) {
+        match &event {
+            LpEvents::MakerSwapStatusChanged(swap_infos) => self.on_maker_swap_status_changed(&ctx, swap_infos).await,
+            LpEvents::StopCtxEvent(_) => self.on_ctx_stop(&ctx).await,
+            LpEvents::TradingBotEvent(trading_bot_event) => self.on_trading_bot_event(&ctx, trading_bot_event).await,
+        }
+    }
+
+    fn get_desired_events(&self) -> Vec<TypeId> {
+        vec![
+            MakerSwapStatusChanged::event_id(),
+            StopCtxEvent::event_id(),
+            TradingBotStopping::event_id(),
+            TradingBotStarted::event_id(),
+            TradingBotStopped::event_id(),
+        ]
+    }
+
+    fn listener_id(&self) -> &'static str { "lp_bot_listener" }
+}
+
+#[cfg_attr(test, mockable)]
+impl TradingBotContext {
+    /// Obtains a reference to this crate context, creating it if necessary.
+    fn from_ctx(ctx: &MmArc) -> Result<ArcTradingBotContext, String> {
+        let arc_bot_context = try_s!(from_ctx(&ctx.simple_market_maker_bot_ctx, move || {
+            Ok(TradingBotContext::default())
+        }));
+        Ok(ArcTradingBotContext(arc_bot_context))
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_ordermatch/my_orders_storage.rs b/mm2src/mm2_main/src/lp_ordermatch/my_orders_storage.rs
new file mode 100644
index 0000000000..3fa0c7970a
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_ordermatch/my_orders_storage.rs
@@ -0,0 +1,984 @@
+use super::{MakerOrder, MakerOrderCancellationReason, MyOrdersFilter, Order, RecentOrdersSelectResult, TakerOrder,
+            TakerOrderCancellationReason};
+use async_trait::async_trait;
+use common::log::LogOnError;
+use common::{BoxFut, PagingOptions};
+use derive_more::Display;
+use futures::{FutureExt, TryFutureExt};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+#[cfg(test)] use mocktopus::macros::*;
+use uuid::Uuid;
+
+pub type MyOrdersResult<T> = Result<T, MmError<MyOrdersError>>;
+
+#[cfg(target_arch = "wasm32")]
+pub use wasm_impl::MyOrdersStorage;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use native_impl::MyOrdersStorage;
+
+#[derive(Debug, Display, Eq, PartialEq)]
+pub enum MyOrdersError {
+    #[display(fmt = "Order with uuid {} is not found", uuid)]
+    NoSuchOrder { uuid: Uuid },
+    #[display(fmt = "Error saving an order: {}", _0)]
+    ErrorSaving(String),
+    #[display(fmt = "Error loading an order: {}", _0)]
+    ErrorLoading(String),
+    #[display(fmt = "Error deserializing an order: {}", _0)]
+    ErrorDeserializing(String),
+    #[display(fmt = "Error serializing an order: {}", _0)]
+    ErrorSerializing(String),
+    #[allow(dead_code)]
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+pub async fn save_my_new_maker_order(ctx: MmArc, order: &MakerOrder) -> MyOrdersResult<()> {
+    let storage = MyOrdersStorage::new(ctx);
+    storage
+        .save_new_active_maker_order(order)
+        .await
+        .error_log_with_msg("!save_new_active_maker_order");
+
+    if order.save_in_history {
+        storage.save_maker_order_in_filtering_history(order).await?;
+    }
+    Ok(())
+}
+
+pub async fn save_my_new_taker_order(ctx: MmArc, order: &TakerOrder) -> MyOrdersResult<()> {
+    let storage = MyOrdersStorage::new(ctx);
+    storage
+        .save_new_active_taker_order(order)
+        .await
+        .error_log_with_msg("!save_new_active_taker_order");
+
+    if order.save_in_history {
+        storage.save_taker_order_in_filtering_history(order).await?;
+    }
+    Ok(())
+}
+
+pub async fn save_maker_order_on_update(ctx: MmArc, order: &MakerOrder) -> MyOrdersResult<()> {
+    let storage = MyOrdersStorage::new(ctx);
+    storage.update_active_maker_order(order).await?;
+
+    if order.save_in_history {
+        storage.update_maker_order_in_filtering_history(order).await?;
+    }
+    Ok(())
+}
+
+#[cfg_attr(test, mockable)]
+pub fn delete_my_taker_order(ctx: MmArc, order: TakerOrder, reason: TakerOrderCancellationReason) -> BoxFut<(), ()> {
+    let fut = async move {
+        let uuid = order.request.uuid;
+        let save_in_history = order.save_in_history;
+
+        let storage = MyOrdersStorage::new(ctx);
+        storage
+            .delete_active_taker_order(uuid)
+            .await
+            .error_log_with_msg("!delete_active_taker_order");
+
+        match reason {
+            TakerOrderCancellationReason::ToMaker => (),
+            _ => {
+                if save_in_history {
+                    storage
+                        .save_order_in_history(&Order::Taker(order))
+                        .await
+                        .error_log_with_msg("!save_order_in_history");
+                }
+            },
+        }
+
+        if save_in_history {
+            storage
+                .update_order_status_in_filtering_history(uuid, reason.to_string())
+                .await
+                .error_log_with_msg("!update_order_status_in_filtering_history");
+        }
+        Ok(())
+    };
+    Box::new(fut.boxed().compat())
+}
+
+#[cfg_attr(test, mockable)]
+pub fn delete_my_maker_order(ctx: MmArc, order: MakerOrder, reason: MakerOrderCancellationReason) -> BoxFut<(), ()> {
+    let fut = async move {
+        let mut order_to_save = order;
+        let uuid = order_to_save.uuid;
+        let save_in_history = order_to_save.save_in_history;
+
+        let storage = MyOrdersStorage::new(ctx);
+        if order_to_save.was_updated() {
+            if let Ok(order_from_file) = storage.load_active_maker_order(order_to_save.uuid).await {
+                order_to_save = order_from_file;
+            }
+        }
+        storage
+            .delete_active_maker_order(uuid)
+            .await
+            .error_log_with_msg("!delete_active_maker_order");
+
+        if save_in_history {
+            storage
+                .save_order_in_history(&Order::Maker(order_to_save.clone()))
+                .await
+                .error_log_with_msg("!save_order_in_history");
+            storage
+                .update_order_status_in_filtering_history(uuid, reason.to_string())
+                .await
+                .error_log_with_msg("!update_order_status_in_filtering_history");
+        }
+        Ok(())
+    };
+    Box::new(fut.boxed().compat())
+}
+
+#[async_trait]
+pub trait MyActiveOrders {
+    async fn load_active_maker_orders(&self) -> MyOrdersResult<Vec<MakerOrder>>;
+
+    async fn load_active_maker_order(&self, uuid: Uuid) -> MyOrdersResult<MakerOrder>;
+
+    async fn load_active_taker_orders(&self) -> MyOrdersResult<Vec<TakerOrder>>;
+
+    async fn save_new_active_order(&self, order: &Order) -> MyOrdersResult<()> {
+        match order {
+            Order::Maker(maker) => self.save_new_active_maker_order(maker).await,
+            Order::Taker(taker) => self.save_new_active_taker_order(taker).await,
+        }
+    }
+
+    async fn save_new_active_maker_order(&self, order: &MakerOrder) -> MyOrdersResult<()>;
+
+    async fn save_new_active_taker_order(&self, order: &TakerOrder) -> MyOrdersResult<()>;
+
+    async fn delete_active_maker_order(&self, uuid: Uuid) -> MyOrdersResult<()>;
+
+    async fn delete_active_taker_order(&self, uuid: Uuid) -> MyOrdersResult<()>;
+
+    async fn update_active_maker_order(&self, order: &MakerOrder) -> MyOrdersResult<()>;
+
+    async fn update_active_taker_order(&self, order: &TakerOrder) -> MyOrdersResult<()>;
+}
+
+#[async_trait]
+pub trait MyOrdersHistory {
+    async fn save_order_in_history(&self, order: &Order) -> MyOrdersResult<()>;
+
+    async fn load_order_from_history(&self, uuid: Uuid) -> MyOrdersResult<Order>;
+}
+
+#[async_trait]
+pub trait MyOrdersFilteringHistory {
+    async fn select_orders_by_filter(
+        &self,
+        filter: &MyOrdersFilter,
+        paging_options: Option<&PagingOptions>,
+    ) -> MyOrdersResult<RecentOrdersSelectResult>;
+
+    async fn select_order_status(&self, uuid: Uuid) -> MyOrdersResult<String>;
+
+    async fn save_order_in_filtering_history(&self, order: &Order) -> MyOrdersResult<()> {
+        match order {
+            Order::Maker(maker) => self.save_maker_order_in_filtering_history(maker).await,
+            Order::Taker(taker) => self.save_taker_order_in_filtering_history(taker).await,
+        }
+    }
+
+    async fn save_maker_order_in_filtering_history(&self, order: &MakerOrder) -> MyOrdersResult<()>;
+
+    async fn save_taker_order_in_filtering_history(&self, order: &TakerOrder) -> MyOrdersResult<()>;
+
+    async fn update_maker_order_in_filtering_history(&self, order: &MakerOrder) -> MyOrdersResult<()>;
+
+    async fn update_order_status_in_filtering_history(&self, uuid: Uuid, status: String) -> MyOrdersResult<()>;
+
+    async fn update_was_taker_in_filtering_history(&self, uuid: Uuid) -> MyOrdersResult<()>;
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+mod native_impl {
+    use super::*;
+    use crate::mm2::database::my_orders::{insert_maker_order, insert_taker_order, select_orders_by_filter,
+                                          select_status_by_uuid, update_maker_order, update_order_status,
+                                          update_was_taker};
+    use crate::mm2::lp_ordermatch::{my_maker_order_file_path, my_maker_orders_dir, my_order_history_file_path,
+                                    my_taker_order_file_path, my_taker_orders_dir};
+    use mm2_io::fs::{read_dir_json, read_json, remove_file_async, write_json, FsJsonError};
+
+    const USE_TMP_FILE: bool = false;
+
+    impl From<FsJsonError> for MyOrdersError {
+        fn from(fs: FsJsonError) -> Self {
+            match fs {
+                FsJsonError::IoReading(reading) => MyOrdersError::ErrorLoading(reading.to_string()),
+                FsJsonError::IoWriting(writing) => MyOrdersError::ErrorSaving(writing.to_string()),
+                FsJsonError::Serializing(serializing) => MyOrdersError::ErrorSerializing(serializing.to_string()),
+                FsJsonError::Deserializing(deserializing) => {
+                    MyOrdersError::ErrorDeserializing(deserializing.to_string())
+                },
+            }
+        }
+    }
+
+    #[derive(Clone)]
+    pub struct MyOrdersStorage {
+        ctx: MmArc,
+    }
+
+    impl MyOrdersStorage {
+        pub fn new(ctx: MmArc) -> MyOrdersStorage { MyOrdersStorage { ctx } }
+    }
+
+    #[async_trait]
+    impl MyActiveOrders for MyOrdersStorage {
+        async fn load_active_maker_orders(&self) -> MyOrdersResult<Vec<MakerOrder>> {
+            let dir_path = my_maker_orders_dir(&self.ctx);
+            Ok(read_dir_json(&dir_path).await?)
+        }
+
+        async fn load_active_maker_order(&self, uuid: Uuid) -> MyOrdersResult<MakerOrder> {
+            let path = my_maker_order_file_path(&self.ctx, &uuid);
+            read_json(&path)
+                .await?
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid })
+        }
+
+        async fn load_active_taker_orders(&self) -> MyOrdersResult<Vec<TakerOrder>> {
+            let dir_path = my_taker_orders_dir(&self.ctx);
+            Ok(read_dir_json(&dir_path).await?)
+        }
+
+        async fn save_new_active_maker_order(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            let path = my_maker_order_file_path(&self.ctx, &order.uuid);
+            write_json(order, &path, USE_TMP_FILE).await?;
+            Ok(())
+        }
+
+        async fn save_new_active_taker_order(&self, order: &TakerOrder) -> MyOrdersResult<()> {
+            let path = my_taker_order_file_path(&self.ctx, &order.request.uuid);
+            write_json(order, &path, USE_TMP_FILE).await?;
+            Ok(())
+        }
+
+        async fn delete_active_maker_order(&self, uuid: Uuid) -> MyOrdersResult<()> {
+            let path = my_maker_order_file_path(&self.ctx, &uuid);
+            remove_file_async(&path)
+                .await
+                .mm_err(|e| MyOrdersError::ErrorSaving(e.to_string()))?;
+            Ok(())
+        }
+
+        async fn delete_active_taker_order(&self, uuid: Uuid) -> MyOrdersResult<()> {
+            let path = my_taker_order_file_path(&self.ctx, &uuid);
+            remove_file_async(&path)
+                .await
+                .mm_err(|e| MyOrdersError::ErrorSaving(e.to_string()))?;
+            Ok(())
+        }
+
+        async fn update_active_maker_order(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            self.save_new_active_maker_order(order).await
+        }
+
+        async fn update_active_taker_order(&self, order: &TakerOrder) -> MyOrdersResult<()> {
+            self.save_new_active_taker_order(order).await
+        }
+    }
+
+    #[async_trait]
+    impl MyOrdersHistory for MyOrdersStorage {
+        async fn save_order_in_history(&self, order: &Order) -> MyOrdersResult<()> {
+            let path = my_order_history_file_path(&self.ctx, &order.uuid());
+            write_json(order, &path, USE_TMP_FILE).await?;
+            Ok(())
+        }
+
+        async fn load_order_from_history(&self, uuid: Uuid) -> MyOrdersResult<Order> {
+            let path = my_order_history_file_path(&self.ctx, &uuid);
+            read_json(&path)
+                .await?
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid })
+        }
+    }
+
+    #[async_trait]
+    impl MyOrdersFilteringHistory for MyOrdersStorage {
+        async fn select_orders_by_filter(
+            &self,
+            filter: &MyOrdersFilter,
+            paging_options: Option<&PagingOptions>,
+        ) -> MyOrdersResult<RecentOrdersSelectResult> {
+            select_orders_by_filter(&self.ctx.sqlite_connection(), filter, paging_options)
+                .map_to_mm(|e| MyOrdersError::ErrorLoading(e.to_string()))
+        }
+
+        async fn select_order_status(&self, uuid: Uuid) -> MyOrdersResult<String> {
+            select_status_by_uuid(&self.ctx.sqlite_connection(), &uuid)
+                .map_to_mm(|e| MyOrdersError::ErrorLoading(e.to_string()))
+        }
+
+        async fn save_maker_order_in_filtering_history(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            insert_maker_order(&self.ctx, order.uuid, order).map_to_mm(|e| MyOrdersError::ErrorSaving(e.to_string()))
+        }
+
+        async fn save_taker_order_in_filtering_history(&self, order: &TakerOrder) -> MyOrdersResult<()> {
+            insert_taker_order(&self.ctx, order.request.uuid, order)
+                .map_to_mm(|e| MyOrdersError::ErrorSaving(e.to_string()))
+        }
+
+        async fn update_maker_order_in_filtering_history(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            update_maker_order(&self.ctx, order.uuid, order).map_to_mm(|e| MyOrdersError::ErrorSaving(e.to_string()))
+        }
+
+        async fn update_order_status_in_filtering_history(&self, uuid: Uuid, status: String) -> MyOrdersResult<()> {
+            update_order_status(&self.ctx, uuid, status).map_to_mm(|e| MyOrdersError::ErrorSaving(e.to_string()))
+        }
+
+        async fn update_was_taker_in_filtering_history(&self, uuid: Uuid) -> MyOrdersResult<()> {
+            update_was_taker(&self.ctx, uuid).map_to_mm(|e| MyOrdersError::ErrorSaving(e.to_string()))
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_impl {
+    use super::*;
+    use crate::mm2::lp_ordermatch::ordermatch_wasm_db::{DbTransactionError, InitDbError, MyActiveMakerOrdersTable,
+                                                        MyActiveTakerOrdersTable, MyFilteringHistoryOrdersTable,
+                                                        MyHistoryOrdersTable};
+    use crate::mm2::lp_ordermatch::{OrdermatchContext, TakerAction};
+    use common::log::warn;
+    use num_traits::ToPrimitive;
+    use std::sync::Arc;
+
+    impl From<InitDbError> for MyOrdersError {
+        fn from(e: InitDbError) -> Self { MyOrdersError::InternalError(e.to_string()) }
+    }
+
+    impl From<DbTransactionError> for MyOrdersError {
+        fn from(e: DbTransactionError) -> Self {
+            let stringified_error = e.to_string();
+            match e {
+                DbTransactionError::NoSuchTable { .. }
+                | DbTransactionError::ErrorCreatingTransaction(_)
+                | DbTransactionError::ErrorOpeningTable { .. }
+                // We don't expect that the `Uuid` type serialization to fail.
+                | DbTransactionError::ErrorSerializingIndex { .. }
+                | DbTransactionError::MultipleItemsByUniqueIndex { .. }
+                | DbTransactionError::NoSuchIndex { .. }
+                | DbTransactionError::InvalidIndex { .. }
+                | DbTransactionError::UnexpectedState(_)
+                | DbTransactionError::TransactionAborted => MyOrdersError::InternalError(stringified_error),
+                DbTransactionError::ErrorSerializingItem(_) => MyOrdersError::ErrorSerializing(stringified_error),
+                DbTransactionError::ErrorDeserializingItem(_) => MyOrdersError::ErrorDeserializing(stringified_error),
+                DbTransactionError::ErrorUploadingItem(_)
+                | DbTransactionError::ErrorDeletingItems(_) => MyOrdersError::ErrorSaving(stringified_error),
+                DbTransactionError::ErrorGettingItems(_)
+                | DbTransactionError::ErrorCountingItems(_) => MyOrdersError::ErrorLoading(stringified_error),
+            }
+        }
+    }
+
+    #[derive(Clone)]
+    pub struct MyOrdersStorage {
+        ctx: Arc<OrdermatchContext>,
+    }
+
+    impl MyOrdersStorage {
+        pub fn new(ctx: MmArc) -> MyOrdersStorage {
+            MyOrdersStorage {
+                ctx: OrdermatchContext::from_ctx(&ctx).expect("!OrdermatchContext::from_ctx"),
+            }
+        }
+    }
+
+    #[async_trait]
+    impl MyActiveOrders for MyOrdersStorage {
+        async fn load_active_maker_orders(&self) -> MyOrdersResult<Vec<MakerOrder>> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveMakerOrdersTable>().await?;
+            let maker_orders = table.get_all_items().await?;
+            Ok(maker_orders
+                .into_iter()
+                .map(|(_item_id, MyActiveMakerOrdersTable { order_payload, .. })| order_payload)
+                .collect())
+        }
+
+        async fn load_active_maker_order(&self, uuid: Uuid) -> MyOrdersResult<MakerOrder> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveMakerOrdersTable>().await?;
+
+            table
+                .get_item_by_unique_index("uuid", uuid)
+                .await?
+                .map(|(_item_id, MyActiveMakerOrdersTable { order_payload, .. })| order_payload)
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid })
+        }
+
+        async fn load_active_taker_orders(&self) -> MyOrdersResult<Vec<TakerOrder>> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveTakerOrdersTable>().await?;
+            let maker_orders = table.get_all_items().await?;
+            Ok(maker_orders
+                .into_iter()
+                .map(|(_item_id, MyActiveTakerOrdersTable { order_payload, .. })| order_payload)
+                .collect())
+        }
+
+        async fn save_new_active_maker_order(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveMakerOrdersTable>().await?;
+
+            let item = MyActiveMakerOrdersTable {
+                uuid: order.uuid,
+                order_payload: order.clone(),
+            };
+            table.add_item(&item).await?;
+            Ok(())
+        }
+
+        async fn save_new_active_taker_order(&self, order: &TakerOrder) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveTakerOrdersTable>().await?;
+
+            let item = MyActiveTakerOrdersTable {
+                uuid: order.request.uuid,
+                order_payload: order.clone(),
+            };
+            table.add_item(&item).await?;
+            Ok(())
+        }
+
+        async fn delete_active_maker_order(&self, uuid: Uuid) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveMakerOrdersTable>().await?;
+            table.delete_item_by_unique_index("uuid", uuid).await?;
+            Ok(())
+        }
+
+        async fn delete_active_taker_order(&self, uuid: Uuid) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveTakerOrdersTable>().await?;
+            table.delete_item_by_unique_index("uuid", uuid).await?;
+            Ok(())
+        }
+
+        async fn update_active_maker_order(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveMakerOrdersTable>().await?;
+
+            let item = MyActiveMakerOrdersTable {
+                uuid: order.uuid,
+                order_payload: order.clone(),
+            };
+            table.replace_item_by_unique_index("uuid", order.uuid, &item).await?;
+            Ok(())
+        }
+
+        async fn update_active_taker_order(&self, order: &TakerOrder) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyActiveTakerOrdersTable>().await?;
+
+            let item = MyActiveTakerOrdersTable {
+                uuid: order.request.uuid,
+                order_payload: order.clone(),
+            };
+            table
+                .replace_item_by_unique_index("uuid", order.request.uuid, &item)
+                .await?;
+            Ok(())
+        }
+    }
+
+    #[async_trait]
+    impl MyOrdersHistory for MyOrdersStorage {
+        async fn save_order_in_history(&self, order: &Order) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyHistoryOrdersTable>().await?;
+
+            let item = MyHistoryOrdersTable {
+                uuid: order.uuid(),
+                order_payload: order.clone(),
+            };
+            table.add_item(&item).await?;
+            Ok(())
+        }
+
+        async fn load_order_from_history(&self, uuid: Uuid) -> MyOrdersResult<Order> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyHistoryOrdersTable>().await?;
+
+            table
+                .get_item_by_unique_index("uuid", uuid)
+                .await?
+                .map(|(_item_id, MyHistoryOrdersTable { order_payload, .. })| order_payload)
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid })
+        }
+    }
+
+    #[async_trait]
+    impl MyOrdersFilteringHistory for MyOrdersStorage {
+        async fn select_orders_by_filter(
+            &self,
+            _filter: &MyOrdersFilter,
+            _paging_options: Option<&PagingOptions>,
+        ) -> MyOrdersResult<RecentOrdersSelectResult> {
+            warn!("'select_orders_by_filter' not supported in WASM yet");
+            MmError::err(MyOrdersError::InternalError(
+                "'select_orders_by_filter' not supported in WASM".to_owned(),
+            ))
+        }
+
+        async fn select_order_status(&self, uuid: Uuid) -> MyOrdersResult<String> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyFilteringHistoryOrdersTable>().await?;
+
+            table
+                .get_item_by_unique_index("uuid", uuid)
+                .await?
+                .map(|(_item_id, MyFilteringHistoryOrdersTable { status, .. })| status)
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid })
+        }
+
+        async fn save_maker_order_in_filtering_history(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            let item = maker_order_to_filtering_history_item(order, "Created".to_owned(), false)?;
+
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyFilteringHistoryOrdersTable>().await?;
+            table.add_item(&item).await?;
+            Ok(())
+        }
+
+        async fn save_taker_order_in_filtering_history(&self, order: &TakerOrder) -> MyOrdersResult<()> {
+            let item = taker_order_to_filtering_history_item(order, "Created".to_owned())?;
+
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyFilteringHistoryOrdersTable>().await?;
+            table.add_item(&item).await?;
+            Ok(())
+        }
+
+        async fn update_maker_order_in_filtering_history(&self, order: &MakerOrder) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyFilteringHistoryOrdersTable>().await?;
+            // get the previous item to see if the order was taker
+            let (item_id, prev_item) = table
+                .get_item_by_unique_index("uuid", order.uuid)
+                .await?
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid: order.uuid })?;
+
+            let item = maker_order_to_filtering_history_item(order, "Updated".to_owned(), prev_item.was_taker)?;
+            table.replace_item(item_id, &item).await?;
+            Ok(())
+        }
+
+        async fn update_order_status_in_filtering_history(&self, uuid: Uuid, status: String) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyFilteringHistoryOrdersTable>().await?;
+
+            let (item_id, mut item) = table
+                .get_item_by_unique_index("uuid", uuid)
+                .await?
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid })?;
+
+            item.status = status;
+            table.replace_item(item_id, &item).await?;
+            Ok(())
+        }
+
+        async fn update_was_taker_in_filtering_history(&self, uuid: Uuid) -> MyOrdersResult<()> {
+            let db = self.ctx.ordermatch_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<MyFilteringHistoryOrdersTable>().await?;
+
+            let (item_id, mut item) = table
+                .get_item_by_unique_index("uuid", uuid)
+                .await?
+                .or_mm_err(|| MyOrdersError::NoSuchOrder { uuid })?;
+
+            item.was_taker = true;
+            table.replace_item(item_id, &item).await?;
+            Ok(())
+        }
+    }
+
+    pub(super) fn maker_order_to_filtering_history_item(
+        order: &MakerOrder,
+        status: String,
+        was_taker: bool,
+    ) -> MyOrdersResult<MyFilteringHistoryOrdersTable> {
+        let price_dec = order.price.to_decimal();
+        let price = price_dec.to_f64().or_mm_err(|| {
+            let error = format!("Couldn't convert the order price '{}' to f64", price_dec);
+            MyOrdersError::ErrorSerializing(error)
+        })?;
+
+        let volume_dec = order.max_base_vol.to_decimal();
+        let volume = volume_dec.to_f64().or_mm_err(|| {
+            let error = format!("Couldn't convert the order volume '{}' to f64", volume_dec);
+            MyOrdersError::ErrorSerializing(error)
+        })?;
+
+        Ok(MyFilteringHistoryOrdersTable {
+            uuid: order.uuid,
+            order_type: "Maker".to_owned(),
+            initial_action: "Sell".to_owned(),
+            base: order.base.clone(),
+            rel: order.rel.clone(),
+            price,
+            volume,
+            created_at: order.created_at as u32,
+            last_updated: order.updated_at.unwrap_or(0) as u32,
+            was_taker,
+            status,
+        })
+    }
+
+    pub(super) fn taker_order_to_filtering_history_item(
+        order: &TakerOrder,
+        status: String,
+    ) -> MyOrdersResult<MyFilteringHistoryOrdersTable> {
+        let price_dec = order.request.rel_amount.to_decimal() / order.request.base_amount.to_decimal();
+        let price = price_dec.to_f64().or_mm_err(|| {
+            let error = format!("Couldn't convert the order price '{}' to f64", price_dec);
+            MyOrdersError::ErrorSerializing(error)
+        })?;
+
+        let volume_dec = order.request.base_amount.to_decimal();
+        let volume = volume_dec.to_f64().or_mm_err(|| {
+            let error = format!("Couldn't convert the order volume '{}' to f64", volume_dec);
+            MyOrdersError::ErrorSerializing(error)
+        })?;
+
+        Ok(MyFilteringHistoryOrdersTable {
+            uuid: order.request.uuid,
+            order_type: "Taker".to_owned(),
+            initial_action: format!("{:?}", order.request.action),
+            base: order.request.base.clone(),
+            rel: order.request.rel.clone(),
+            price,
+            volume,
+            created_at: order.created_at as u32,
+            last_updated: order.created_at as u32,
+            was_taker: false,
+            status,
+        })
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod tests {
+    use super::wasm_impl::{maker_order_to_filtering_history_item, taker_order_to_filtering_history_item};
+    use super::*;
+    use crate::mm2::lp_ordermatch::ordermatch_wasm_db::{ItemId, MyFilteringHistoryOrdersTable};
+    use crate::mm2::lp_ordermatch::{MatchBy, OrderType, OrdermatchContext, TakerAction, TakerRequest};
+    use common::{new_uuid, now_ms};
+    use futures::compat::Future01CompatExt;
+    use itertools::Itertools;
+    use mm2_core::mm_ctx::MmCtxBuilder;
+    use mm2_db::indexed_db::TableSignature;
+    use std::collections::HashMap;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    fn maker_order_for_test() -> MakerOrder {
+        MakerOrder {
+            base: "BASE".to_owned(),
+            rel: "REL".to_owned(),
+            created_at: now_ms(),
+            updated_at: Some(now_ms()),
+            max_base_vol: 10.into(),
+            min_base_vol: 0.into(),
+            price: 1.into(),
+            matches: HashMap::new(),
+            started_swaps: Vec::new(),
+            uuid: new_uuid(),
+            conf_settings: None,
+            changes_history: None,
+            save_in_history: true,
+            base_orderbook_ticker: None,
+            rel_orderbook_ticker: None,
+            p2p_privkey: None,
+        }
+    }
+
+    fn taker_order_for_test() -> TakerOrder {
+        TakerOrder {
+            request: TakerRequest {
+                base: "BASE".to_owned(),
+                rel: "REL".to_owned(),
+                uuid: new_uuid(),
+                dest_pub_key: Default::default(),
+                sender_pubkey: Default::default(),
+                base_amount: 10.into(),
+                rel_amount: 20.into(),
+                action: TakerAction::Buy,
+                match_by: MatchBy::Any,
+                conf_settings: None,
+                base_protocol_info: None,
+                rel_protocol_info: None,
+            },
+            matches: HashMap::new(),
+            created_at: now_ms(),
+            order_type: OrderType::GoodTillCancelled,
+            min_volume: 0.into(),
+            timeout: 30,
+            save_in_history: true,
+            base_orderbook_ticker: None,
+            rel_orderbook_ticker: None,
+            p2p_privkey: None,
+        }
+    }
+
+    async fn get_all_items<Table: TableSignature>(ctx: &MmArc) -> Vec<Table> {
+        let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
+        let db = ordermatch_ctx.ordermatch_db().await.unwrap();
+        let transaction = db.transaction().await.unwrap();
+        let table = transaction.table::<Table>().await.unwrap();
+        table
+            .get_all_items()
+            .await
+            .expect("Error getting items")
+            .into_iter()
+            .map(|(_item_id, item)| item)
+            .collect()
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_delete_my_maker_order() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let storage = MyOrdersStorage::new(ctx.clone());
+
+        let maker1 = maker_order_for_test();
+
+        // Save the `maker1` order and remove it with the `InsufficientBalance` reason.
+        // The order has to be saved in history table.
+
+        save_my_new_maker_order(ctx.clone(), &maker1).await.unwrap();
+        delete_my_maker_order(
+            ctx.clone(),
+            maker1.clone(),
+            MakerOrderCancellationReason::InsufficientBalance,
+        )
+        .compat()
+        .await
+        .unwrap();
+
+        let actual_active_maker_orders = storage
+            .load_active_taker_orders()
+            .await
+            .expect("!MyOrdersStorage::load_active_taker_orders");
+        assert!(actual_active_maker_orders.is_empty());
+        let actual_history_order = storage
+            .load_order_from_history(maker1.uuid)
+            .await
+            .expect("!MyOrdersStorage::load_order_from_history");
+        assert_eq!(actual_history_order, Order::Maker(maker1.clone()));
+        let actual_filtering_history_items = get_all_items::<MyFilteringHistoryOrdersTable>(&ctx).await;
+        let expected_filtering_history_items =
+            vec![maker_order_to_filtering_history_item(&maker1, "InsufficientBalance".to_owned(), false).unwrap()];
+        assert_eq!(actual_filtering_history_items, expected_filtering_history_items);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_delete_my_taker_order() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let storage = MyOrdersStorage::new(ctx.clone());
+
+        let taker1 = taker_order_for_test();
+        let taker2 = TakerOrder {
+            created_at: 10000,
+            timeout: 10,
+            ..taker_order_for_test()
+        };
+
+        // Save the `taker1` order and remove it with the `TimedOut` reason.
+        // The order has to be saved in history table.
+
+        save_my_new_taker_order(ctx.clone(), &taker1).await.unwrap();
+        delete_my_taker_order(ctx.clone(), taker1.clone(), TakerOrderCancellationReason::TimedOut)
+            .compat()
+            .await
+            .unwrap();
+
+        let actual_active_taker_orders = storage
+            .load_active_taker_orders()
+            .await
+            .expect("!MyOrdersStorage::load_active_taker_orders");
+        assert!(actual_active_taker_orders.is_empty());
+        let actual_history_order = storage
+            .load_order_from_history(taker1.request.uuid)
+            .await
+            .expect("!MyOrdersStorage::load_order_from_history");
+        assert_eq!(actual_history_order, Order::Taker(taker1.clone()));
+        let actual_filtering_history_items = get_all_items::<MyFilteringHistoryOrdersTable>(&ctx).await;
+        let expected_filtering_history_items =
+            vec![taker_order_to_filtering_history_item(&taker1, "TimedOut".to_owned()).unwrap()];
+        assert_eq!(actual_filtering_history_items, expected_filtering_history_items);
+
+        // Save the `taker2` order and remove it with the `ToMaker` reason.
+        // The order hasn't to be saved in history as it's assumed to be active as a `MakerOrder`.
+
+        save_my_new_taker_order(ctx.clone(), &taker2).await.unwrap();
+        delete_my_taker_order(ctx.clone(), taker2.clone(), TakerOrderCancellationReason::ToMaker)
+            .compat()
+            .await
+            .unwrap();
+
+        let actual_active_taker_orders = storage
+            .load_active_taker_orders()
+            .await
+            .expect("!MyOrdersStorage::load_active_taker_orders");
+        assert!(actual_active_taker_orders.is_empty());
+        let error = storage.load_order_from_history(taker2.request.uuid).await.expect_err(
+            "!MyOrdersStorage::load_order_from_history should have failed with the 'MyOrdersError::NoSuchOrder' error",
+        );
+        assert_eq!(error.into_inner(), MyOrdersError::NoSuchOrder {
+            uuid: taker2.request.uuid
+        });
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_load_active_maker_taker_orders() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let storage = MyOrdersStorage::new(ctx.clone());
+
+        let maker1 = maker_order_for_test();
+        let mut maker2 = MakerOrder {
+            base: "RICK".to_owned(),
+            rel: "MORTY".to_owned(),
+            ..maker_order_for_test()
+        };
+        let taker1 = taker_order_for_test();
+
+        // Save the `taker1` order and remove it with the `TimedOut` reason.
+        // The order has to be saved in history table.
+
+        save_my_new_taker_order(ctx.clone(), &taker1).await.unwrap();
+        save_my_new_maker_order(ctx.clone(), &maker1).await.unwrap();
+        save_my_new_maker_order(ctx.clone(), &maker2).await.unwrap();
+
+        maker2.rel = "KMD".to_owned();
+        storage
+            .update_active_maker_order(&maker2)
+            .await
+            .expect("!MyOrdersStorage::update_active_maker_order");
+
+        let actual_maker_orders: Vec<_> = storage
+            .load_active_maker_orders()
+            .await
+            .expect("!MyOrdersStorage::load_active_maker_orders")
+            .into_iter()
+            .sorted_by(|x, y| x.uuid.cmp(&y.uuid))
+            .collect();
+        let expected_maker_orders: Vec<_> = vec![maker1, maker2]
+            .into_iter()
+            .sorted_by(|x, y| x.uuid.cmp(&y.uuid))
+            .collect();
+        assert_eq!(actual_maker_orders, expected_maker_orders);
+
+        let actual_taker_orders: Vec<_> = storage
+            .load_active_taker_orders()
+            .await
+            .expect("!MyOrdersStorage::load_active_taker_orders");
+        let expected_taker_orders = vec![taker1];
+        assert_eq!(actual_taker_orders, expected_taker_orders);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_filtering_history() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let storage = MyOrdersStorage::new(ctx.clone());
+
+        let maker1 = maker_order_for_test();
+        let mut maker2 = MakerOrder {
+            base: "RICK".to_owned(),
+            rel: "MORTY".to_owned(),
+            ..maker_order_for_test()
+        };
+        let taker1 = taker_order_for_test();
+
+        storage
+            .save_maker_order_in_filtering_history(&maker1)
+            .await
+            .expect("!MyOrdersStorage::save_maker_order_in_filtering_history");
+        storage
+            .save_maker_order_in_filtering_history(&maker2)
+            .await
+            .expect("!MyOrdersStorage::save_maker_order_in_filtering_history");
+        storage
+            .save_taker_order_in_filtering_history(&taker1)
+            .await
+            .expect("!MyOrdersStorage::save_taker_order_in_filtering_history");
+
+        storage
+            .update_order_status_in_filtering_history(taker1.request.uuid, "MyCustomStatus".to_owned())
+            .await
+            .expect("!MyOrdersStorage::update_order_status_in_filtering_history");
+
+        maker2.base = "KMD".to_owned();
+        storage
+            .update_maker_order_in_filtering_history(&maker2)
+            .await
+            .expect("MyOrdersStorage::update_maker_order_in_filtering_history");
+
+        storage
+            .update_was_taker_in_filtering_history(maker1.uuid)
+            .await
+            .expect("MyOrdersStorage::update_was_taker_in_filtering_history");
+
+        let actual_items: Vec<_> = get_all_items::<MyFilteringHistoryOrdersTable>(&ctx)
+            .await
+            .into_iter()
+            .sorted_by(|x, y| x.uuid.cmp(&y.uuid))
+            .collect();
+
+        let expected_items: Vec<_> = vec![
+            maker_order_to_filtering_history_item(&maker1, "Created".to_owned(), true).unwrap(),
+            maker_order_to_filtering_history_item(&maker2, "Updated".to_owned(), false).unwrap(),
+            taker_order_to_filtering_history_item(&taker1, "MyCustomStatus".to_owned()).unwrap(),
+        ]
+        .into_iter()
+        .sorted_by(|x, y| x.uuid.cmp(&y.uuid))
+        .collect();
+
+        assert_eq!(actual_items, expected_items);
+
+        let taker1_status = storage
+            .select_order_status(taker1.request.uuid)
+            .await
+            .expect("!MyOrdersStorage::select_order_status");
+        assert_eq!(taker1_status, "MyCustomStatus");
+
+        let unknown_uuid = new_uuid();
+        let err = storage
+            .select_order_status(unknown_uuid)
+            .await
+            .expect_err("!MyOrdersStorage::select_order_status should have failed");
+        assert_eq!(err.into_inner(), MyOrdersError::NoSuchOrder { uuid: unknown_uuid });
+    }
+}
diff --git a/mm2src/lp_ordermatch/new_protocol.rs b/mm2src/mm2_main/src/lp_ordermatch/new_protocol.rs
similarity index 99%
rename from mm2src/lp_ordermatch/new_protocol.rs
rename to mm2src/mm2_main/src/lp_ordermatch/new_protocol.rs
index 106af5da20..0801e0a534 100644
--- a/mm2src/lp_ordermatch/new_protocol.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch/new_protocol.rs
@@ -1,8 +1,8 @@
 use super::{MatchBy as SuperMatchBy, TakerAction};
 use crate::mm2::lp_ordermatch::{AlbOrderedOrderbookPair, OrderConfirmationsSettings, H64};
-use common::{mm_number::MmNumber, now_ms};
+use common::now_ms;
 use compact_uuid::CompactUuid;
-use num_rational::BigRational;
+use mm2_number::{BigRational, MmNumber};
 use std::collections::{HashMap, HashSet};
 use uuid::Uuid;
 
diff --git a/mm2src/lp_ordermatch/order_requests_tracker.rs b/mm2src/mm2_main/src/lp_ordermatch/order_requests_tracker.rs
similarity index 100%
rename from mm2src/lp_ordermatch/order_requests_tracker.rs
rename to mm2src/mm2_main/src/lp_ordermatch/order_requests_tracker.rs
diff --git a/mm2src/lp_ordermatch/orderbook_depth.rs b/mm2src/mm2_main/src/lp_ordermatch/orderbook_depth.rs
similarity index 74%
rename from mm2src/lp_ordermatch/orderbook_depth.rs
rename to mm2src/mm2_main/src/lp_ordermatch/orderbook_depth.rs
index 7c532b473e..dcc991a361 100644
--- a/mm2src/lp_ordermatch/orderbook_depth.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch/orderbook_depth.rs
@@ -1,8 +1,9 @@
 use super::{orderbook_topic_from_base_rel, OrdermatchContext, OrdermatchRequest};
 use crate::mm2::lp_network::{request_any_relay, P2PRequest};
 use coins::is_wallet_only_ticker;
-use common::{log, mm_ctx::MmArc};
+use common::log;
 use http::Response;
+use mm2_core::mm_ctx::MmArc;
 use serde_json::{self as json, Value as Json};
 use std::collections::HashMap;
 
@@ -44,36 +45,34 @@ pub async fn orderbook_depth_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u
 
     let mut result = Vec::with_capacity(req.pairs.len());
 
-    let orderbook = ordermatch_ctx.orderbook.lock().await;
-
     // the Iter::filter uses &Self::Item, which is undesirable, we need owned pair
     #[allow(clippy::unnecessary_filter_map)]
-    let mut to_request_from_relay: Vec<_> = req
-        .pairs
-        .into_iter()
-        .filter_map(|original_pair| {
-            let orderbook_pair = ordermatch_ctx.orderbook_pair_bypass(&original_pair);
-            let topic = orderbook_topic_from_base_rel(&orderbook_pair.0, &orderbook_pair.1);
-            if orderbook.is_subscribed_to(&topic) {
-                let asks = orderbook
-                    .unordered
-                    .get(&orderbook_pair)
-                    .map_or(0, |orders| orders.len());
-                let reversed = (orderbook_pair.1, orderbook_pair.0);
-                let bids = orderbook.unordered.get(&reversed).map_or(0, |orders| orders.len());
-                result.push(PairWithDepth {
-                    pair: original_pair,
-                    depth: PairDepth { asks, bids },
-                });
-                None
-            } else {
-                Some((orderbook_pair, original_pair))
-            }
-        })
-        .collect();
+    let mut to_request_from_relay: Vec<_> = {
+        let orderbook = ordermatch_ctx.orderbook.lock();
+        req.pairs
+            .into_iter()
+            .filter_map(|original_pair| {
+                let orderbook_pair = ordermatch_ctx.orderbook_pair_bypass(&original_pair);
+                let topic = orderbook_topic_from_base_rel(&orderbook_pair.0, &orderbook_pair.1);
+                if orderbook.is_subscribed_to(&topic) {
+                    let asks = orderbook
+                        .unordered
+                        .get(&orderbook_pair)
+                        .map_or(0, |orders| orders.len());
+                    let reversed = (orderbook_pair.1, orderbook_pair.0);
+                    let bids = orderbook.unordered.get(&reversed).map_or(0, |orders| orders.len());
+                    result.push(PairWithDepth {
+                        pair: original_pair,
+                        depth: PairDepth { asks, bids },
+                    });
+                    None
+                } else {
+                    Some((orderbook_pair, original_pair))
+                }
+            })
+            .collect()
+    };
 
-    // avoid locking orderbook for long time during P2P request
-    drop(orderbook);
     if !to_request_from_relay.is_empty() {
         let p2p_request = OrdermatchRequest::OrderbookDepth {
             pairs: to_request_from_relay
@@ -113,12 +112,12 @@ pub async fn orderbook_depth_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u
         .map_err(|e| ERRL!("{}", e))
 }
 
-pub async fn process_orderbook_depth_p2p_request(
+pub fn process_orderbook_depth_p2p_request(
     ctx: MmArc,
     pairs: Vec<(String, String)>,
 ) -> Result<Option<Vec<u8>>, String> {
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).expect("ordermatch_ctx must exist at this point");
-    let orderbook = ordermatch_ctx.orderbook.lock().await;
+    let orderbook = ordermatch_ctx.orderbook.lock();
     let depth = pairs
         .into_iter()
         .map(|pair| {
diff --git a/mm2src/mm2_main/src/lp_ordermatch/orderbook_rpc.rs b/mm2src/mm2_main/src/lp_ordermatch/orderbook_rpc.rs
new file mode 100644
index 0000000000..5b04afcba9
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_ordermatch/orderbook_rpc.rs
@@ -0,0 +1,388 @@
+use super::{orderbook_address, subscribe_to_orderbook_topic, OrdermatchContext, RpcOrderbookEntry};
+use crate::mm2::lp_ordermatch::{addr_format_from_protocol_info, RpcOrderbookEntryV2};
+use coins::{address_by_coin_conf_and_pubkey_str, coin_conf, is_wallet_only_conf};
+use common::log::warn;
+use common::{now_ms, HttpStatusCode};
+use crypto::CryptoCtx;
+use derive_more::Display;
+use http::{Response, StatusCode};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{construct_detailed, BigRational, MmNumber, MmNumberMultiRepr};
+use num_traits::Zero;
+use serde_json::{self as json, Value as Json};
+
+#[derive(Deserialize)]
+pub struct OrderbookReq {
+    base: String,
+    rel: String,
+}
+
+construct_detailed!(TotalAsksBaseVol, total_asks_base_vol);
+construct_detailed!(TotalAsksRelVol, total_asks_rel_vol);
+construct_detailed!(TotalBidsBaseVol, total_bids_base_vol);
+construct_detailed!(TotalBidsRelVol, total_bids_rel_vol);
+construct_detailed!(AggregatedBaseVol, base_max_volume_aggr);
+construct_detailed!(AggregatedRelVol, rel_max_volume_aggr);
+
+#[derive(Debug, Serialize)]
+pub struct AggregatedOrderbookEntry {
+    #[serde(flatten)]
+    entry: RpcOrderbookEntry,
+    #[serde(flatten)]
+    base_max_volume_aggr: AggregatedBaseVol,
+    #[serde(flatten)]
+    rel_max_volume_aggr: AggregatedRelVol,
+}
+
+#[derive(Debug, Serialize)]
+pub struct AggregatedOrderbookEntryV2 {
+    #[serde(flatten)]
+    entry: RpcOrderbookEntryV2,
+    base_max_volume_aggr: MmNumberMultiRepr,
+    rel_max_volume_aggr: MmNumberMultiRepr,
+}
+
+#[derive(Debug, Serialize)]
+pub struct OrderbookResponse {
+    #[serde(rename = "askdepth")]
+    ask_depth: u32,
+    asks: Vec<AggregatedOrderbookEntry>,
+    base: String,
+    #[serde(rename = "biddepth")]
+    bid_depth: u32,
+    bids: Vec<AggregatedOrderbookEntry>,
+    netid: u16,
+    #[serde(rename = "numasks")]
+    num_asks: usize,
+    #[serde(rename = "numbids")]
+    num_bids: usize,
+    rel: String,
+    timestamp: u64,
+    #[serde(flatten)]
+    total_asks_base: TotalAsksBaseVol,
+    #[serde(flatten)]
+    total_asks_rel: TotalAsksRelVol,
+    #[serde(flatten)]
+    total_bids_base: TotalBidsBaseVol,
+    #[serde(flatten)]
+    total_bids_rel: TotalBidsRelVol,
+}
+
+fn build_aggregated_entries(entries: Vec<RpcOrderbookEntry>) -> (Vec<AggregatedOrderbookEntry>, MmNumber, MmNumber) {
+    let mut total_base = BigRational::zero();
+    let mut total_rel = BigRational::zero();
+    let aggregated = entries
+        .into_iter()
+        .map(|entry| {
+            total_base += entry.base_max_volume.as_ratio();
+            total_rel += entry.rel_max_volume.as_ratio();
+            AggregatedOrderbookEntry {
+                entry,
+                base_max_volume_aggr: MmNumber::from(total_base.clone()).into(),
+                rel_max_volume_aggr: MmNumber::from(total_rel.clone()).into(),
+            }
+        })
+        .collect();
+    (aggregated, total_base.into(), total_rel.into())
+}
+
+fn build_aggregated_entries_v2(
+    entries: Vec<RpcOrderbookEntryV2>,
+) -> (Vec<AggregatedOrderbookEntryV2>, MmNumberMultiRepr, MmNumberMultiRepr) {
+    let mut total_base = BigRational::zero();
+    let mut total_rel = BigRational::zero();
+    let aggregated = entries
+        .into_iter()
+        .map(|entry| {
+            total_base += &entry.base_max_volume.rational;
+            total_rel += &entry.rel_max_volume.rational;
+            AggregatedOrderbookEntryV2 {
+                entry,
+                base_max_volume_aggr: MmNumber::from(total_base.clone()).into(),
+                rel_max_volume_aggr: MmNumber::from(total_rel.clone()).into(),
+            }
+        })
+        .collect();
+    (aggregated, total_base.into(), total_rel.into())
+}
+
+pub fn is_my_order(my_pub: &Option<String>, order_pubkey: &str) -> bool {
+    my_pub.as_ref().map(|my| my == order_pubkey).unwrap_or(false)
+}
+
+pub async fn orderbook_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let req: OrderbookReq = try_s!(json::from_value(req));
+    if req.base == req.rel {
+        return ERR!("Base and rel must be different coins");
+    }
+    let base_coin_conf = coin_conf(&ctx, &req.base);
+    if base_coin_conf.is_null() {
+        return ERR!("Coin {} is not found in config", req.base);
+    }
+    if is_wallet_only_conf(&base_coin_conf) {
+        return ERR!("Base Coin {} is wallet only", req.base);
+    }
+    let rel_coin_conf = coin_conf(&ctx, &req.rel);
+    if rel_coin_conf.is_null() {
+        return ERR!("Coin {} is not found in config", req.rel);
+    }
+    if is_wallet_only_conf(&rel_coin_conf) {
+        return ERR!("Base Coin {} is wallet only", req.rel);
+    }
+    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(&ctx));
+    let request_orderbook = true;
+    let base_ticker = ordermatch_ctx.orderbook_ticker_bypass(&req.base);
+    let rel_ticker = ordermatch_ctx.orderbook_ticker_bypass(&req.rel);
+    if base_ticker == rel_ticker && base_coin_conf["protocol"] == rel_coin_conf["protocol"] {
+        return ERR!("Base and rel coins have the same orderbook tickers and protocols.");
+    }
+
+    try_s!(subscribe_to_orderbook_topic(&ctx, &base_ticker, &rel_ticker, request_orderbook).await);
+    let orderbook = ordermatch_ctx.orderbook.lock();
+    let my_pubsecp = ctx.secp256k1_key_pair_as_option().map(|_| {
+        CryptoCtx::from_ctx(&ctx)
+            .expect("ctx is available")
+            .secp256k1_pubkey_hex()
+    });
+
+    let mut asks = match orderbook.unordered.get(&(base_ticker.clone(), rel_ticker.clone())) {
+        Some(uuids) => {
+            let mut orderbook_entries = Vec::new();
+            for uuid in uuids {
+                let ask = orderbook.order_set.get(uuid).ok_or(ERRL!(
+                    "Orderbook::unordered contains {:?} uuid that is not in Orderbook::order_set",
+                    uuid
+                ))?;
+                let address_format = addr_format_from_protocol_info(&ask.base_protocol_info);
+                let address = try_s!(address_by_coin_conf_and_pubkey_str(
+                    &ctx,
+                    &req.base,
+                    &base_coin_conf,
+                    &ask.pubkey,
+                    address_format,
+                ));
+                let is_mine = is_my_order(&my_pubsecp, &ask.pubkey);
+                orderbook_entries.push(ask.as_rpc_entry_ask(address, is_mine));
+            }
+            orderbook_entries
+        },
+        None => Vec::new(),
+    };
+    asks.sort_unstable_by(|ask1, ask2| ask1.price_rat.cmp(&ask2.price_rat));
+    let (mut asks, total_asks_base_vol, total_asks_rel_vol) = build_aggregated_entries(asks);
+    asks.reverse();
+
+    let mut bids = match orderbook.unordered.get(&(rel_ticker, base_ticker)) {
+        Some(uuids) => {
+            let mut orderbook_entries = vec![];
+            for uuid in uuids {
+                let bid = orderbook.order_set.get(uuid).ok_or(ERRL!(
+                    "Orderbook::unordered contains {:?} uuid that is not in Orderbook::order_set",
+                    uuid
+                ))?;
+                let address_format = addr_format_from_protocol_info(&bid.base_protocol_info);
+                let address = try_s!(address_by_coin_conf_and_pubkey_str(
+                    &ctx,
+                    &req.rel,
+                    &rel_coin_conf,
+                    &bid.pubkey,
+                    address_format,
+                ));
+                let is_mine = is_my_order(&my_pubsecp, &bid.pubkey);
+                orderbook_entries.push(bid.as_rpc_entry_bid(address, is_mine));
+            }
+            orderbook_entries
+        },
+        None => vec![],
+    };
+    bids.sort_unstable_by(|bid1, bid2| bid2.price_rat.cmp(&bid1.price_rat));
+    let (bids, total_bids_base_vol, total_bids_rel_vol) = build_aggregated_entries(bids);
+
+    let response = OrderbookResponse {
+        num_asks: asks.len(),
+        num_bids: bids.len(),
+        ask_depth: 0,
+        asks,
+        base: req.base,
+        bid_depth: 0,
+        bids,
+        netid: ctx.netid(),
+        rel: req.rel,
+        timestamp: now_ms() / 1000,
+        total_asks_base: total_asks_base_vol.into(),
+        total_asks_rel: total_asks_rel_vol.into(),
+        total_bids_base: total_bids_base_vol.into(),
+        total_bids_rel: total_bids_rel_vol.into(),
+    };
+    let response = try_s!(json::to_vec(&response));
+    Ok(try_s!(Response::builder().body(response)))
+}
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum OrderbookRpcError {
+    BaseRelSame,
+    BaseRelSameOrderbookTickersAndProtocols,
+    CoinConfigNotFound(String),
+    CoinIsWalletOnly(String),
+    P2PSubscribeError(String),
+}
+
+impl HttpStatusCode for OrderbookRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            OrderbookRpcError::BaseRelSame
+            | OrderbookRpcError::BaseRelSameOrderbookTickersAndProtocols
+            | OrderbookRpcError::CoinConfigNotFound(_)
+            | OrderbookRpcError::CoinIsWalletOnly(_) => StatusCode::BAD_REQUEST,
+            OrderbookRpcError::P2PSubscribeError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct OrderbookV2Response {
+    asks: Vec<AggregatedOrderbookEntryV2>,
+    base: String,
+    bids: Vec<AggregatedOrderbookEntryV2>,
+    net_id: u16,
+    num_asks: usize,
+    num_bids: usize,
+    rel: String,
+    timestamp: u64,
+    total_asks_base_vol: MmNumberMultiRepr,
+    total_asks_rel_vol: MmNumberMultiRepr,
+    total_bids_base_vol: MmNumberMultiRepr,
+    total_bids_rel_vol: MmNumberMultiRepr,
+}
+
+enum GetTradeableCoinConfErr {
+    CoinConfigNotFound(String),
+    CoinIsWalletOnly(String),
+}
+
+fn get_tradeable_coin_conf(ctx: &MmArc, ticker: &str) -> MmResult<Json, GetTradeableCoinConfErr> {
+    let conf = coin_conf(ctx, ticker);
+    if conf.is_null() {
+        return MmError::err(GetTradeableCoinConfErr::CoinConfigNotFound(ticker.to_owned()));
+    }
+    if is_wallet_only_conf(&conf) {
+        return MmError::err(GetTradeableCoinConfErr::CoinIsWalletOnly(ticker.to_owned()));
+    }
+    Ok(conf)
+}
+
+impl From<GetTradeableCoinConfErr> for OrderbookRpcError {
+    fn from(err: GetTradeableCoinConfErr) -> Self {
+        match err {
+            GetTradeableCoinConfErr::CoinConfigNotFound(ticker) => OrderbookRpcError::CoinConfigNotFound(ticker),
+            GetTradeableCoinConfErr::CoinIsWalletOnly(ticker) => OrderbookRpcError::CoinIsWalletOnly(ticker),
+        }
+    }
+}
+
+pub async fn orderbook_rpc_v2(
+    ctx: MmArc,
+    req: OrderbookReq,
+) -> Result<OrderbookV2Response, MmError<OrderbookRpcError>> {
+    if req.base == req.rel {
+        return MmError::err(OrderbookRpcError::BaseRelSame);
+    }
+    let base_coin_conf = get_tradeable_coin_conf(&ctx, &req.base)?;
+
+    let rel_coin_conf = get_tradeable_coin_conf(&ctx, &req.rel)?;
+
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).expect("ctx is available");
+    let base_ticker = ordermatch_ctx.orderbook_ticker_bypass(&req.base);
+    let rel_ticker = ordermatch_ctx.orderbook_ticker_bypass(&req.rel);
+    if base_ticker == rel_ticker && base_coin_conf["protocol"] == rel_coin_conf["protocol"] {
+        return MmError::err(OrderbookRpcError::BaseRelSameOrderbookTickersAndProtocols);
+    }
+
+    let request_orderbook = true;
+    subscribe_to_orderbook_topic(&ctx, &base_ticker, &rel_ticker, request_orderbook)
+        .await
+        .map_to_mm(OrderbookRpcError::P2PSubscribeError)?;
+
+    let orderbook = ordermatch_ctx.orderbook.lock();
+    let my_pubsecp = ctx.secp256k1_key_pair_as_option().map(|_| {
+        CryptoCtx::from_ctx(&ctx)
+            .expect("ctx is available")
+            .secp256k1_pubkey_hex()
+    });
+
+    let mut asks = match orderbook.unordered.get(&(base_ticker.clone(), rel_ticker.clone())) {
+        Some(uuids) => {
+            let mut orderbook_entries = Vec::new();
+            for uuid in uuids {
+                let ask = match orderbook.order_set.get(uuid) {
+                    Some(a) => a,
+                    None => {
+                        warn!("unordered contains {:?} uuid that is not in order_set", uuid);
+                        continue;
+                    },
+                };
+                let address_format = addr_format_from_protocol_info(&ask.base_protocol_info);
+                let address = match orderbook_address(&ctx, &req.base, &base_coin_conf, &ask.pubkey, address_format) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        warn!("Error {} on getting address for order {}", e, ask.uuid);
+                        continue;
+                    },
+                };
+                let is_mine = is_my_order(&my_pubsecp, &ask.pubkey);
+                orderbook_entries.push(ask.as_rpc_v2_entry_ask(address, is_mine));
+            }
+            orderbook_entries
+        },
+        None => Vec::new(),
+    };
+    asks.sort_unstable_by(|ask1, ask2| ask1.price.rational.cmp(&ask2.price.rational));
+    let (mut asks, total_asks_base_vol, total_asks_rel_vol) = build_aggregated_entries_v2(asks);
+    asks.reverse();
+
+    let mut bids = match orderbook.unordered.get(&(rel_ticker, base_ticker)) {
+        Some(uuids) => {
+            let mut orderbook_entries = vec![];
+            for uuid in uuids {
+                let bid = match orderbook.order_set.get(uuid) {
+                    Some(b) => b,
+                    None => {
+                        warn!("unordered contains {:?} uuid that is not in order_set", uuid);
+                        continue;
+                    },
+                };
+                let address_format = addr_format_from_protocol_info(&bid.base_protocol_info);
+                let address = match orderbook_address(&ctx, &req.rel, &rel_coin_conf, &bid.pubkey, address_format) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        warn!("Error {} on getting address for order {}", e, bid.uuid);
+                        continue;
+                    },
+                };
+                let is_mine = is_my_order(&my_pubsecp, &bid.pubkey);
+                orderbook_entries.push(bid.as_rpc_v2_entry_bid(address, is_mine));
+            }
+            orderbook_entries
+        },
+        None => vec![],
+    };
+    bids.sort_unstable_by(|bid1, bid2| bid2.price.rational.cmp(&bid1.price.rational));
+    let (bids, total_bids_base_vol, total_bids_rel_vol) = build_aggregated_entries_v2(bids);
+
+    Ok(OrderbookV2Response {
+        num_asks: asks.len(),
+        num_bids: bids.len(),
+        asks,
+        bids,
+        net_id: ctx.netid(),
+        base: req.base,
+        rel: req.rel,
+        timestamp: now_ms() / 1000,
+        total_asks_base_vol,
+        total_asks_rel_vol,
+        total_bids_base_vol,
+        total_bids_rel_vol,
+    })
+}
diff --git a/mm2src/mm2_main/src/lp_ordermatch/ordermatch_wasm_db.rs b/mm2src/mm2_main/src/lp_ordermatch/ordermatch_wasm_db.rs
new file mode 100644
index 0000000000..264a696879
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_ordermatch/ordermatch_wasm_db.rs
@@ -0,0 +1,136 @@
+use async_trait::async_trait;
+use mm2_db::indexed_db::{DbIdentifier, DbInstance, DbUpgrader, IndexedDb, IndexedDbBuilder, OnUpgradeResult,
+                         TableSignature};
+use std::ops::Deref;
+use uuid::Uuid;
+
+pub use mm2_db::indexed_db::{cursor_prelude, DbTransactionError, DbTransactionResult, InitDbError, InitDbResult,
+                             ItemId};
+pub use tables::{MyActiveMakerOrdersTable, MyActiveTakerOrdersTable, MyFilteringHistoryOrdersTable,
+                 MyHistoryOrdersTable};
+
+const DB_NAME: &str = "ordermatch";
+const DB_VERSION: u32 = 1;
+
+pub struct OrdermatchDb {
+    inner: IndexedDb,
+}
+
+#[async_trait]
+impl DbInstance for OrdermatchDb {
+    fn db_name() -> &'static str { DB_NAME }
+
+    async fn init(db_id: DbIdentifier) -> InitDbResult<Self> {
+        let inner = IndexedDbBuilder::new(db_id)
+            .with_version(DB_VERSION)
+            .with_table::<MyActiveMakerOrdersTable>()
+            .with_table::<MyActiveTakerOrdersTable>()
+            .with_table::<MyHistoryOrdersTable>()
+            .with_table::<MyFilteringHistoryOrdersTable>()
+            .build()
+            .await?;
+        Ok(OrdermatchDb { inner })
+    }
+}
+
+impl Deref for OrdermatchDb {
+    type Target = IndexedDb;
+
+    fn deref(&self) -> &Self::Target { &self.inner }
+}
+
+pub mod tables {
+    use super::*;
+    use crate::mm2::lp_ordermatch::{MakerOrder, Order, TakerOrder};
+    use serde_json::Value as Json;
+
+    #[derive(Debug, Deserialize, Eq, PartialEq, Serialize)]
+    pub struct MyActiveMakerOrdersTable {
+        pub uuid: Uuid,
+        pub order_payload: MakerOrder,
+    }
+
+    impl TableSignature for MyActiveMakerOrdersTable {
+        fn table_name() -> &'static str { "my_active_maker_orders" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+            on_upgrade_swap_table_by_uuid_v1(upgrader, old_version, new_version, Self::table_name())
+        }
+    }
+
+    #[derive(Debug, Deserialize, Eq, PartialEq, Serialize)]
+    pub struct MyActiveTakerOrdersTable {
+        pub uuid: Uuid,
+        pub order_payload: TakerOrder,
+    }
+
+    impl TableSignature for MyActiveTakerOrdersTable {
+        fn table_name() -> &'static str { "my_active_taker_orders" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+            on_upgrade_swap_table_by_uuid_v1(upgrader, old_version, new_version, Self::table_name())
+        }
+    }
+
+    #[derive(Debug, Deserialize, Eq, PartialEq, Serialize)]
+    pub struct MyHistoryOrdersTable {
+        pub uuid: Uuid,
+        pub order_payload: Order,
+    }
+
+    impl TableSignature for MyHistoryOrdersTable {
+        fn table_name() -> &'static str { "my_history_orders" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+            on_upgrade_swap_table_by_uuid_v1(upgrader, old_version, new_version, Self::table_name())
+        }
+    }
+
+    #[derive(Debug, Deserialize, PartialEq, Serialize)]
+    pub struct MyFilteringHistoryOrdersTable {
+        pub uuid: Uuid,
+        pub order_type: String,
+        pub initial_action: String,
+        pub base: String,
+        pub rel: String,
+        pub price: f64,
+        pub volume: f64,
+        pub created_at: u32,
+        pub last_updated: u32,
+        pub was_taker: bool,
+        pub status: String,
+    }
+
+    impl TableSignature for MyFilteringHistoryOrdersTable {
+        fn table_name() -> &'static str { "my_filtering_history_orders" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+            match (old_version, new_version) {
+                (0, 1) => {
+                    let table = upgrader.create_table(Self::table_name())?;
+                    table.create_index("uuid", true)?;
+                    // TODO add other indexes during [`MyOrdersStorage::select_orders_by_filter`] implementation.
+                },
+                _ => (),
+            }
+            Ok(())
+        }
+    }
+
+    /// [`TableSignature::on_upgrade_needed`] implementation common for the most tables with the only `uuid` unique index.
+    fn on_upgrade_swap_table_by_uuid_v1(
+        upgrader: &DbUpgrader,
+        old_version: u32,
+        new_version: u32,
+        table_name: &'static str,
+    ) -> OnUpgradeResult<()> {
+        match (old_version, new_version) {
+            (0, 1) => {
+                let table = upgrader.create_table(table_name)?;
+                table.create_index("uuid", true)?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker.rs b/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker.rs
new file mode 100644
index 0000000000..d447e16302
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker.rs
@@ -0,0 +1,766 @@
+use crate::mm2::lp_dispatcher::{dispatch_lp_event, DispatcherContext};
+use crate::mm2::lp_ordermatch::lp_bot::{RunningState, StoppedState, StoppingState, TradingBotStarted,
+                                        TradingBotStopped, TradingBotStopping, VolumeSettings};
+use crate::mm2::lp_ordermatch::{cancel_all_orders, CancelBy, TradingBotEvent};
+use crate::mm2::lp_price::{fetch_price_tickers, Provider, RateInfos};
+use crate::mm2::lp_swap::SavedSwap;
+use crate::mm2::{lp_ordermatch::{cancel_order, create_maker_order,
+                                 lp_bot::{SimpleCoinMarketMakerCfg, SimpleMakerBotRegistry, TradingBotContext,
+                                          TradingBotState},
+                                 update_maker_order, CancelOrderReq, MakerOrder, MakerOrderUpdateReq,
+                                 OrdermatchContext, SetPriceReq},
+                 lp_swap::{latest_swaps_for_pair, LatestSwapsErr}};
+use coins::{lp_coinfind, GetNonZeroBalance};
+use common::Future01CompatExt;
+use common::{executor::{spawn, Timer},
+             log::{debug, error, info, warn},
+             HttpStatusCode, StatusCode};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::MmNumber;
+use serde_json::Value as Json;
+use std::collections::{HashMap, HashSet};
+use uuid::Uuid;
+
+// !< constants
+pub const KMD_PRICE_ENDPOINT: &str = "https://prices.komodo.live:1313/api/v2/tickers";
+pub const BOT_DEFAULT_REFRESH_RATE: f64 = 30.0;
+pub const PRECISION_FOR_NOTIFICATION: u64 = 8;
+const LATEST_SWAPS_LIMIT: usize = 1000;
+
+// !< Type definitions
+pub type StartSimpleMakerBotResult = Result<StartSimpleMakerBotRes, MmError<StartSimpleMakerBotError>>;
+pub type StopSimpleMakerBotResult = Result<StopSimpleMakerBotRes, MmError<StopSimpleMakerBotError>>;
+pub type OrderProcessingResult = Result<bool, MmError<OrderProcessingError>>;
+pub type VwapProcessingResult = Result<MmNumber, MmError<OrderProcessingError>>;
+pub type OrderPreparationResult = Result<(Option<MmNumber>, MmNumber, MmNumber, bool), MmError<OrderProcessingError>>;
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum OrderProcessingError {
+    #[display(fmt = "Rates from provider are Unknown - skipping for {}", key_trade_pair)]
+    ProviderUnknown { key_trade_pair: String },
+    #[display(fmt = "Price from provider is zero - skipping for {}", key_trade_pair)]
+    PriceIsZero { key_trade_pair: String },
+    #[display(fmt = "Last updated price timestamp is invalid - skipping for {}", key_trade_pair)]
+    LastUpdatedTimestampInvalid { key_trade_pair: String },
+    #[display(
+        fmt = "Last updated price timestamp elapsed {} is more than the elapsed validity {} - skipping for {}",
+        elapsed,
+        elapsed_validity,
+        key_trade_pair
+    )]
+    PriceElapsedValidityExpired {
+        elapsed: f64,
+        elapsed_validity: f64,
+        key_trade_pair: String,
+    },
+    #[display(fmt = "Unable to parse/treat elapsed time {} - skipping", _0)]
+    PriceElapsedValidityUntreatable(String),
+    #[display(fmt = "Price of base coin {} is below min_base_price {}", base_price, min_base_price)]
+    PriceBelowMinBasePrice { base_price: String, min_base_price: String },
+    #[display(fmt = "Price of rel coin {} is below min_rel_price {}", rel_price, min_rel_price)]
+    PriceBelowMinRelPrice { rel_price: String, min_rel_price: String },
+    #[display(
+        fmt = "Price of pair {} ({}) is below min_pair_price {}",
+        pair,
+        pair_price,
+        min_pair_price
+    )]
+    PriceBelowPairPrice {
+        pair: String,
+        pair_price: String,
+        min_pair_price: String,
+    },
+
+    #[display(fmt = "Asset not enabled - skipping")]
+    AssetNotEnabled,
+    #[display(fmt = "Internal coin find error - skipping")]
+    InternalCoinFindError,
+    #[display(fmt = "Internal error when retrieving balance - skipping")]
+    BalanceInternalError,
+    #[display(fmt = "Balance is zero - skipping")]
+    BalanceIsZero,
+    #[display(fmt = "{}", _0)]
+    OrderCreationError(String),
+    #[display(fmt = "{}", _0)]
+    OrderUpdateError(String),
+    #[display(fmt = "Error when querying swap history: {}", _0)]
+    MyRecentSwapsError(String),
+    #[display(fmt = "Base balance is less than the min_vol_usd - skipping")]
+    MinVolUsdAboveBalanceUsd,
+    #[display(fmt = "Legacy error - skipping")]
+    LegacyError(String),
+}
+
+impl From<LatestSwapsErr> for OrderProcessingError {
+    fn from(e: LatestSwapsErr) -> Self { OrderProcessingError::MyRecentSwapsError(format!("{}", e)) }
+}
+
+impl From<GetNonZeroBalance> for OrderProcessingError {
+    fn from(err: GetNonZeroBalance) -> Self {
+        match err {
+            GetNonZeroBalance::MyBalanceError(_) => OrderProcessingError::BalanceInternalError,
+            GetNonZeroBalance::BalanceIsZero => OrderProcessingError::BalanceIsZero,
+        }
+    }
+}
+
+impl From<std::string::String> for OrderProcessingError {
+    fn from(error: std::string::String) -> Self { OrderProcessingError::LegacyError(error) }
+}
+
+#[allow(dead_code)]
+#[derive(Deserialize)]
+pub struct StartSimpleMakerBotRequest {
+    cfg: SimpleMakerBotRegistry,
+    price_url: Option<String>,
+    bot_refresh_rate: Option<f64>,
+}
+
+#[cfg(test)]
+impl StartSimpleMakerBotRequest {
+    pub fn new() -> StartSimpleMakerBotRequest {
+        return StartSimpleMakerBotRequest {
+            cfg: Default::default(),
+            price_url: None,
+            bot_refresh_rate: None,
+        };
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct StopSimpleMakerBotRes {
+    result: String,
+}
+
+#[cfg(test)]
+impl StopSimpleMakerBotRes {
+    pub fn get_result(&self) -> String { self.result.clone() }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct StartSimpleMakerBotRes {
+    result: String,
+}
+
+#[cfg(test)]
+impl StartSimpleMakerBotRes {
+    pub fn get_result(&self) -> String { self.result.clone() }
+}
+
+enum VwapSide {
+    Base,
+    Rel,
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum StopSimpleMakerBotError {
+    #[display(fmt = "The bot is already stopped")]
+    AlreadyStopped,
+    #[display(fmt = "The bot is already stopping")]
+    AlreadyStopping,
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum StartSimpleMakerBotError {
+    #[display(fmt = "The bot is already started")]
+    AlreadyStarted,
+    #[display(fmt = "Invalid bot configuration")]
+    InvalidBotConfiguration,
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Cannot start the bot if it's currently stopping")]
+    CannotStartFromStopping,
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum SwapUpdateNotificationError {
+    #[display(fmt = "{}", _0)]
+    MyRecentSwapsError(LatestSwapsErr),
+    #[display(fmt = "Swap info not available")]
+    SwapInfoNotAvailable,
+}
+
+impl From<LatestSwapsErr> for SwapUpdateNotificationError {
+    fn from(e: LatestSwapsErr) -> Self { SwapUpdateNotificationError::MyRecentSwapsError(e) }
+}
+
+impl HttpStatusCode for StartSimpleMakerBotError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            StartSimpleMakerBotError::AlreadyStarted
+            | StartSimpleMakerBotError::InvalidBotConfiguration
+            | StartSimpleMakerBotError::CannotStartFromStopping => StatusCode::BAD_REQUEST,
+            StartSimpleMakerBotError::Transport(_) | StartSimpleMakerBotError::InternalError(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
+
+impl HttpStatusCode for StopSimpleMakerBotError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            // maybe bad request is not adapted for the first errors.
+            StopSimpleMakerBotError::AlreadyStopped | StopSimpleMakerBotError::AlreadyStopping => {
+                StatusCode::BAD_REQUEST
+            },
+            StopSimpleMakerBotError::Transport(_) | StopSimpleMakerBotError::InternalError(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
+
+#[derive(Clone)]
+struct TradingPair {
+    base: String,
+    rel: String,
+}
+
+impl TradingPair {
+    pub fn new(base: String, rel: String) -> TradingPair { TradingPair { base, rel } }
+
+    pub fn as_combination(&self) -> String { self.base.clone() + "/" + self.rel.clone().as_str() }
+}
+
+pub async fn tear_down_bot(ctx: MmArc) {
+    let simple_market_maker_bot_ctx = TradingBotContext::from_ctx(&ctx).unwrap();
+    let mut state = simple_market_maker_bot_ctx.trading_bot_states.lock().await;
+    if let TradingBotState::Stopped(ref mut stopped_state) = *state {
+        let nb_orders = cancel_pending_orders(&ctx, &stopped_state.trading_bot_cfg.clone()).await;
+        let event: TradingBotEvent = TradingBotStopped { nb_orders }.into();
+        dispatch_lp_event(ctx.clone(), event.into()).await;
+        stopped_state.trading_bot_cfg.clear();
+    }
+}
+
+fn sum_vwap(base_amount: &MmNumber, rel_amount: &MmNumber, total_volume: &mut MmNumber) -> MmNumber {
+    let cur_price = base_amount / rel_amount;
+    let cur_sum_price_volume = &cur_price * rel_amount;
+    *total_volume += rel_amount;
+    cur_sum_price_volume
+}
+
+fn vwap_calculation(kind: VwapSide, swaps: Vec<SavedSwap>, calculated_price: MmNumber) -> (MmNumber, i32) {
+    let mut nb_trades_treated = 0;
+    let mut total_sum_price_volume = MmNumber::default();
+    let mut total_vol = MmNumber::default();
+    for swap in swaps.iter() {
+        if !swap.is_finished_and_success() {
+            continue;
+        }
+        let (my_amount, other_amount) = match swap.get_my_info() {
+            Some(x) => {
+                nb_trades_treated += 1;
+                (MmNumber::from(x.my_amount), MmNumber::from(x.other_amount))
+            },
+            None => continue,
+        };
+        let cur_sum_price_volume = match kind {
+            VwapSide::Base => sum_vwap(&my_amount, &other_amount, &mut total_vol),
+            VwapSide::Rel => sum_vwap(&other_amount, &my_amount, &mut total_vol),
+        };
+        total_sum_price_volume += cur_sum_price_volume;
+    }
+    if total_sum_price_volume.is_zero() {
+        debug!("Unable to get average price from last trades - stick with calculated price");
+        return (calculated_price, nb_trades_treated);
+    }
+    (total_sum_price_volume / total_vol, nb_trades_treated)
+}
+
+async fn vwap_logic(
+    base_swaps: Vec<SavedSwap>,
+    rel_swaps: Vec<SavedSwap>,
+    calculated_price: MmNumber,
+    cfg: &SimpleCoinMarketMakerCfg,
+) -> MmNumber {
+    let base_swaps_empty = base_swaps.is_empty();
+    let rel_swaps_empty = rel_swaps.is_empty();
+    let (base_vwap, nb_base_trades) = vwap_calculation(VwapSide::Rel, base_swaps, calculated_price.clone());
+    let (rel_vwap, nb_rel_trades) = vwap_calculation(VwapSide::Base, rel_swaps, calculated_price.clone());
+    let total_trades_treated = nb_base_trades + nb_rel_trades;
+    if base_vwap == calculated_price && rel_vwap == calculated_price {
+        return calculated_price;
+    }
+    let mut to_divide = 0;
+    let mut total_vwap = MmNumber::default();
+    if !base_swaps_empty {
+        to_divide += 1;
+        total_vwap += base_vwap;
+    }
+    if !rel_swaps_empty {
+        to_divide += 1;
+        total_vwap += rel_vwap;
+    }
+    // here divide cannot be 0 anymore because if both swaps history are empty we do not pass through this function.
+    let vwap_price = total_vwap / MmNumber::from(to_divide);
+    if vwap_price > calculated_price {
+        debug!(
+            "[{}/{}]: price: {} is less than average trading price ({} swaps): - using vwap price: {}",
+            cfg.base, cfg.rel, calculated_price, total_trades_treated, vwap_price
+        );
+        return vwap_price;
+    }
+    debug!("price calculated by the CEX rates {} is above the vwap price ({} swaps) {} - skipping threshold readjustment for pair: [{}/{}]",
+    calculated_price, total_trades_treated, vwap_price, cfg.base, cfg.rel);
+    calculated_price
+}
+
+pub async fn vwap(
+    base_swaps: Vec<SavedSwap>,
+    rel_swaps: Vec<SavedSwap>,
+    calculated_price: MmNumber,
+    cfg: &SimpleCoinMarketMakerCfg,
+) -> MmNumber {
+    let is_equal_history_len = rel_swaps.len() == base_swaps.len();
+    let have_precedent_swaps = !rel_swaps.is_empty() && !base_swaps.is_empty();
+    if is_equal_history_len && !have_precedent_swaps {
+        debug!(
+            "No last trade for trading pair: [{}/{}] - keeping calculated price: {}",
+            cfg.base, cfg.rel, calculated_price
+        );
+        return calculated_price;
+    }
+    vwap_logic(base_swaps, rel_swaps, calculated_price, cfg).await
+}
+
+async fn vwap_calculator(
+    calculated_price: MmNumber,
+    ctx: &MmArc,
+    cfg: &SimpleCoinMarketMakerCfg,
+) -> VwapProcessingResult {
+    let base_swaps = latest_swaps_for_pair(ctx.clone(), cfg.base.clone(), cfg.rel.clone(), LATEST_SWAPS_LIMIT).await?;
+    let rel_swaps = latest_swaps_for_pair(ctx.clone(), cfg.rel.clone(), cfg.base.clone(), LATEST_SWAPS_LIMIT).await?;
+    Ok(vwap(base_swaps, rel_swaps, calculated_price, cfg).await)
+}
+
+async fn cancel_pending_orders(ctx: &MmArc, cfg_registry: &HashMap<String, SimpleCoinMarketMakerCfg>) -> usize {
+    let mut nb_orders = 0;
+    for (trading_pair, cfg) in cfg_registry.iter() {
+        match cancel_all_orders(ctx.clone(), CancelBy::Pair {
+            base: cfg.base.clone(),
+            rel: cfg.rel.clone(),
+        })
+        .await
+        {
+            Ok(resp) => {
+                info!(
+                    "Successfully deleted orders: {:?} for pair: {}",
+                    resp.cancelled, trading_pair
+                );
+                nb_orders += resp.cancelled.len();
+            },
+            Err(err) => error!("Couldn't cancel pending orders: {} for pair: {}", err, trading_pair),
+        }
+    }
+    nb_orders
+}
+
+async fn cancel_single_order(ctx: &MmArc, uuid: Uuid) {
+    match cancel_order(ctx.clone(), CancelOrderReq { uuid }).await {
+        Ok(_) => info!("Order with uuid: {} successfully cancelled", uuid),
+        Err(err) => warn!("Couldn't cancel the order with uuid: {} - err: {}", uuid, err),
+    };
+}
+
+async fn checks_order_prerequisites(
+    rates: &RateInfos,
+    cfg: &SimpleCoinMarketMakerCfg,
+    key_trade_pair: &str,
+) -> OrderProcessingResult {
+    if rates.base_provider == Provider::Unknown || rates.rel_provider == Provider::Unknown {
+        return MmError::err(OrderProcessingError::ProviderUnknown {
+            key_trade_pair: key_trade_pair.to_string(),
+        });
+    }
+
+    if rates.price.is_zero() {
+        return MmError::err(OrderProcessingError::PriceIsZero {
+            key_trade_pair: key_trade_pair.to_string(),
+        });
+    }
+
+    if let Some(min_base_price) = &cfg.min_base_price {
+        if &rates.base_price < min_base_price {
+            return MmError::err(OrderProcessingError::PriceBelowMinBasePrice {
+                base_price: rates.base_price.to_string(),
+                min_base_price: min_base_price.to_string(),
+            });
+        }
+    }
+
+    if let Some(rel_min_price) = &cfg.min_rel_price {
+        if &rates.rel_price < rel_min_price {
+            return MmError::err(OrderProcessingError::PriceBelowMinRelPrice {
+                rel_price: rates.rel_price.to_string(),
+                min_rel_price: rel_min_price.to_string(),
+            });
+        }
+    }
+
+    if let Some(min_pair_price) = &cfg.min_pair_price {
+        if &rates.price < min_pair_price {
+            return MmError::err(OrderProcessingError::PriceBelowPairPrice {
+                pair: key_trade_pair.to_string(),
+                pair_price: rates.price.to_string(),
+                min_pair_price: min_pair_price.to_string(),
+            });
+        }
+    }
+
+    if rates.last_updated_timestamp.is_none() {
+        return MmError::err(OrderProcessingError::LastUpdatedTimestampInvalid {
+            key_trade_pair: key_trade_pair.to_string(),
+        });
+    }
+
+    // Elapsed validity is the field defined in the cfg or 5 min by default (300 sec)
+    let elapsed = rates.retrieve_elapsed_times();
+    let elapsed_validity = cfg.price_elapsed_validity.unwrap_or(300.0);
+
+    if elapsed > elapsed_validity {
+        return MmError::err(OrderProcessingError::PriceElapsedValidityExpired {
+            elapsed,
+            elapsed_validity,
+            key_trade_pair: key_trade_pair.to_string(),
+        });
+    }
+    debug!("elapsed since last price update: {} secs", elapsed);
+    Ok(true)
+}
+
+async fn prepare_order(
+    rates: RateInfos,
+    cfg: &SimpleCoinMarketMakerCfg,
+    key_trade_pair: &str,
+    ctx: &MmArc,
+) -> OrderPreparationResult {
+    checks_order_prerequisites(&rates, cfg, key_trade_pair).await?;
+    let base_coin = lp_coinfind(ctx, cfg.base.as_str())
+        .await?
+        .ok_or_else(|| MmError::new(OrderProcessingError::AssetNotEnabled))?;
+    let base_balance = base_coin.get_non_zero_balance().compat().await?;
+    lp_coinfind(ctx, cfg.rel.as_str())
+        .await?
+        .ok_or_else(|| MmError::new(OrderProcessingError::AssetNotEnabled))?;
+
+    debug!("balance for {} is {}", cfg.base, base_balance);
+
+    let mut calculated_price = rates.price * cfg.spread.clone();
+    debug!("calculated price is: {}", calculated_price);
+    if cfg.check_last_bidirectional_trade_thresh_hold.unwrap_or(false) {
+        calculated_price = vwap_calculator(calculated_price.clone(), ctx, cfg).await?;
+    }
+
+    let mut is_max = cfg.max.unwrap_or(false);
+
+    let volume = match &cfg.max_volume {
+        Some(VolumeSettings::Percentage(balance_percent)) => {
+            if *balance_percent >= MmNumber::from(1) {
+                is_max = true;
+                MmNumber::default()
+            } else {
+                balance_percent * &base_balance
+            }
+        },
+        Some(VolumeSettings::Usd(max_volume_usd)) => {
+            if &base_balance * &rates.base_price < *max_volume_usd {
+                is_max = true;
+                MmNumber::default()
+            } else {
+                max_volume_usd / &rates.base_price
+            }
+        },
+        _ => MmNumber::default(),
+    };
+
+    let min_vol = match &cfg.min_volume {
+        Some(VolumeSettings::Percentage(min_volume_percentage)) => {
+            if is_max {
+                Some(min_volume_percentage * &base_balance)
+            } else {
+                Some(min_volume_percentage * &volume)
+            }
+        },
+        Some(VolumeSettings::Usd(min_volume_usd)) => {
+            if &base_balance * &rates.base_price < *min_volume_usd {
+                return MmError::err(OrderProcessingError::MinVolUsdAboveBalanceUsd);
+            }
+            Some(min_volume_usd / &rates.base_price)
+        },
+        None => None,
+    };
+
+    Ok((min_vol, volume, calculated_price, is_max))
+}
+
+async fn update_single_order(
+    rates: RateInfos,
+    cfg: SimpleCoinMarketMakerCfg,
+    uuid: Uuid,
+    key_trade_pair: String,
+    ctx: &MmArc,
+) -> OrderProcessingResult {
+    let (min_vol, _, calculated_price, is_max) = prepare_order(rates, &cfg, &key_trade_pair, ctx).await?;
+
+    let req = MakerOrderUpdateReq {
+        uuid,
+        new_price: Some(calculated_price),
+        max: is_max.into(),
+        volume_delta: None,
+        min_volume: min_vol,
+        base_confs: cfg.base_confs,
+        base_nota: cfg.base_nota,
+        rel_confs: cfg.rel_confs,
+        rel_nota: cfg.rel_nota,
+    };
+
+    let resp = update_maker_order(ctx, req)
+        .await
+        .map_to_mm(OrderProcessingError::OrderUpdateError)?;
+    info!("Successfully update order for {} - uuid: {}", key_trade_pair, resp.uuid);
+    Ok(true)
+}
+
+async fn execute_update_order(
+    uuid: Uuid,
+    order: MakerOrder,
+    cloned_infos: (MmArc, RateInfos, TradingPair, SimpleCoinMarketMakerCfg),
+) -> bool {
+    let (ctx, rates, key_trade_pair, cfg) = cloned_infos;
+    match update_single_order(rates, cfg, uuid, key_trade_pair.as_combination(), &ctx).await {
+        Ok(resp) => resp,
+        Err(err) => {
+            error!(
+                "Order with uuid: {} for {} cannot be updated - {}",
+                order.uuid,
+                key_trade_pair.as_combination(),
+                err
+            );
+            cancel_single_order(&ctx, order.uuid).await;
+            false
+        },
+    }
+}
+
+async fn create_single_order(
+    rates: RateInfos,
+    cfg: SimpleCoinMarketMakerCfg,
+    key_trade_pair: String,
+    ctx: MmArc,
+) -> OrderProcessingResult {
+    let (min_vol, volume, calculated_price, is_max) = prepare_order(rates, &cfg, &key_trade_pair, &ctx).await?;
+
+    let req = SetPriceReq {
+        base: cfg.base.clone(),
+        rel: cfg.rel.clone(),
+        price: calculated_price,
+        max: is_max,
+        volume,
+        min_volume: min_vol,
+        cancel_previous: true,
+        base_confs: cfg.base_confs,
+        base_nota: cfg.base_nota,
+        rel_confs: cfg.rel_confs,
+        rel_nota: cfg.rel_nota,
+        save_in_history: true,
+    };
+
+    let resp = create_maker_order(&ctx, req)
+        .await
+        .map_to_mm(OrderProcessingError::OrderUpdateError)?;
+    info!("Successfully placed order for {} - uuid: {}", key_trade_pair, resp.uuid);
+    Ok(true)
+}
+
+async fn execute_create_single_order(
+    rates: RateInfos,
+    cfg: SimpleCoinMarketMakerCfg,
+    key_trade_pair: String,
+    ctx: &MmArc,
+) -> bool {
+    match create_single_order(rates, cfg, key_trade_pair.clone(), ctx.clone()).await {
+        Ok(resp) => resp,
+        Err(err) => {
+            error!("{} - order cannot be created for: {}", err, key_trade_pair);
+            false
+        },
+    }
+}
+
+async fn process_bot_logic(ctx: &MmArc) {
+    let simple_market_maker_bot_ctx = TradingBotContext::from_ctx(ctx).unwrap();
+    let state = simple_market_maker_bot_ctx.trading_bot_states.lock().await;
+    let (cfg, price_url) = if let TradingBotState::Running(running_state) = &*state {
+        let res = (running_state.trading_bot_cfg.clone(), running_state.price_url.clone());
+        drop(state);
+        res
+    } else {
+        drop(state);
+        return;
+    };
+    let rates_registry = match fetch_price_tickers(price_url.as_str()).await {
+        Ok(model) => {
+            info!("price successfully fetched");
+            model
+        },
+        Err(err) => {
+            let nb_orders = cancel_pending_orders(ctx, &cfg).await;
+            error!("error during fetching price: {:?} - cancel {} orders", err, nb_orders);
+            return;
+        },
+    };
+
+    let mut memoization_pair_registry: HashSet<String> = HashSet::new();
+    let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
+    let maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+    let mut futures_order_update = Vec::with_capacity(0);
+    // Iterating over maker orders and update order that are present in cfg as the key_trade_pair e.g KMD/LTC
+    for (uuid, order_mutex) in maker_orders.into_iter() {
+        let order = order_mutex.lock().await;
+        let key_trade_pair = TradingPair::new(order.base.clone(), order.rel.clone());
+        match cfg.get(&key_trade_pair.as_combination()) {
+            Some(coin_cfg) => {
+                if !coin_cfg.enable {
+                    continue;
+                }
+                let cloned_infos = (
+                    ctx.clone(),
+                    rates_registry
+                        .get_cex_rates(&coin_cfg.base, &coin_cfg.rel)
+                        .unwrap_or_default(),
+                    key_trade_pair.clone(),
+                    coin_cfg.clone(),
+                );
+                futures_order_update.push(execute_update_order(uuid, order.clone(), cloned_infos));
+                memoization_pair_registry.insert(key_trade_pair.as_combination());
+            },
+            _ => continue,
+        }
+    }
+
+    let all_updated_orders_tasks = futures::future::join_all(futures_order_update);
+    let _results_order_updates = all_updated_orders_tasks.await;
+
+    let mut futures_order_creation = Vec::with_capacity(0);
+    // Now iterate over the registry and for every pairs that are not hit let's create an order
+    for (trading_pair, cur_cfg) in cfg.into_iter() {
+        match memoization_pair_registry.get(&trading_pair) {
+            Some(_) => continue,
+            None => {
+                if !cur_cfg.enable {
+                    continue;
+                }
+                let rates_infos = rates_registry
+                    .get_cex_rates(&cur_cfg.base, &cur_cfg.rel)
+                    .unwrap_or_default();
+                futures_order_creation.push(execute_create_single_order(
+                    rates_infos,
+                    cur_cfg,
+                    trading_pair.clone(),
+                    ctx,
+                ));
+            },
+        };
+    }
+    let all_created_orders_tasks = futures::future::join_all(futures_order_creation);
+    let _results_order_creations = all_created_orders_tasks.await;
+}
+
+pub async fn lp_bot_loop(ctx: MmArc) {
+    info!("lp_bot_loop successfully started");
+    loop {
+        debug!("tick lp_bot_loop");
+        if ctx.is_stopping() {
+            break;
+        }
+        let simple_market_maker_bot_ctx = TradingBotContext::from_ctx(&ctx).unwrap();
+        let mut states = simple_market_maker_bot_ctx.trading_bot_states.lock().await;
+        if let TradingBotState::Stopping(stopping_state) = &*states {
+            *states = StoppedState {
+                trading_bot_cfg: stopping_state.trading_bot_cfg.clone(),
+            }
+            .into();
+            drop(states);
+            tear_down_bot(ctx).await;
+            break;
+        }
+        drop(states);
+        let started = common::now_float();
+        process_bot_logic(&ctx).await;
+        let elapsed = common::now_float() - started;
+        info!("bot logic processed in {} seconds", elapsed);
+        let refresh_rate = simple_market_maker_bot_ctx.get_refresh_rate().await;
+        Timer::sleep(refresh_rate).await;
+    }
+    info!("lp_bot_loop successfully stopped");
+}
+
+pub async fn start_simple_market_maker_bot(ctx: MmArc, req: StartSimpleMakerBotRequest) -> StartSimpleMakerBotResult {
+    let simple_market_maker_bot_ctx = TradingBotContext::from_ctx(&ctx).unwrap();
+    let mut state = simple_market_maker_bot_ctx.trading_bot_states.lock().await;
+    match *state {
+        TradingBotState::Running { .. } => MmError::err(StartSimpleMakerBotError::AlreadyStarted),
+        TradingBotState::Stopping(_) => MmError::err(StartSimpleMakerBotError::CannotStartFromStopping),
+        TradingBotState::Stopped(_) => {
+            let dispatcher_ctx = DispatcherContext::from_ctx(&ctx).unwrap();
+            let mut dispatcher = dispatcher_ctx.dispatcher.write().await;
+            dispatcher.add_listener(simple_market_maker_bot_ctx.clone());
+            let mut refresh_rate = req.bot_refresh_rate.unwrap_or(BOT_DEFAULT_REFRESH_RATE);
+            if refresh_rate < BOT_DEFAULT_REFRESH_RATE {
+                refresh_rate = BOT_DEFAULT_REFRESH_RATE;
+            }
+            let nb_pairs = req.cfg.len();
+            *state = RunningState {
+                trading_bot_cfg: req.cfg,
+                bot_refresh_rate: refresh_rate,
+                price_url: req.price_url.unwrap_or_else(|| KMD_PRICE_ENDPOINT.to_string()),
+            }
+            .into();
+            drop(state);
+            let event: TradingBotEvent = TradingBotStarted { nb_pairs }.into();
+            dispatcher.dispatch_async(ctx.clone(), event.into()).await;
+            spawn(lp_bot_loop(ctx.clone()));
+            Ok(StartSimpleMakerBotRes {
+                result: "Success".to_string(),
+            })
+        },
+    }
+}
+
+pub async fn stop_simple_market_maker_bot(ctx: MmArc, _req: Json) -> StopSimpleMakerBotResult {
+    let simple_market_maker_bot_ctx = TradingBotContext::from_ctx(&ctx).unwrap();
+    let mut state = simple_market_maker_bot_ctx.trading_bot_states.lock().await;
+    match &*state {
+        TradingBotState::Stopped(_) => MmError::err(StopSimpleMakerBotError::AlreadyStopped),
+        TradingBotState::Stopping(_) => MmError::err(StopSimpleMakerBotError::AlreadyStopping),
+        TradingBotState::Running(running_state) => {
+            let event: TradingBotEvent = TradingBotStopping {
+                bot_refresh_rate: running_state.bot_refresh_rate,
+            }
+            .into();
+            *state = StoppingState {
+                trading_bot_cfg: running_state.trading_bot_cfg.clone(),
+            }
+            .into();
+            drop(state);
+            dispatch_lp_event(ctx.clone(), event.into()).await;
+            Ok(StopSimpleMakerBotRes {
+                result: "Success".to_string(),
+            })
+        },
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker_tests.rs b/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker_tests.rs
new file mode 100644
index 0000000000..230bb0d872
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker_tests.rs
@@ -0,0 +1,195 @@
+use crate::mm2::{lp_ordermatch::lp_bot::simple_market_maker_bot::vwap,
+                 lp_ordermatch::lp_bot::SimpleCoinMarketMakerCfg,
+                 lp_swap::{MakerSavedSwap, SavedSwap}};
+use common::{block_on, log::UnifiedLoggerBuilder};
+use mm2_number::MmNumber;
+
+fn generate_swaps_from_values(swaps_value: Vec<(MmNumber, MmNumber)>) -> Vec<SavedSwap> {
+    swaps_value
+        .iter()
+        .map(|(base_amount, other_amount)| SavedSwap::Maker(MakerSavedSwap::new(base_amount, other_amount)))
+        .collect()
+}
+
+fn generate_cfg_from_params(base: String, rel: String, spread: MmNumber) -> SimpleCoinMarketMakerCfg {
+    SimpleCoinMarketMakerCfg {
+        base,
+        rel,
+        min_volume: None,
+        max_volume: None,
+        spread,
+        base_confs: None,
+        base_nota: None,
+        rel_confs: None,
+        rel_nota: None,
+        enable: true,
+        price_elapsed_validity: None,
+        check_last_bidirectional_trade_thresh_hold: Some(true),
+        max: Some(true),
+        min_base_price: None,
+        min_rel_price: None,
+        min_pair_price: None,
+    }
+}
+
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_empty_base_rel() {
+        let base_swaps = generate_swaps_from_values(vec![]);
+        let rel_swaps = generate_swaps_from_values(vec![]);
+        let mut calculated_price = MmNumber::from("7.14455729");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        assert_eq!(calculated_price, MmNumber::from("7.14455729"));
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_single_base_side() {
+        UnifiedLoggerBuilder::default().try_init().unwrap_or(());
+        let base_swaps =
+            generate_swaps_from_values(vec![(MmNumber::from("29.99997438"), MmNumber::from("222.76277576"))]);
+        let rel_swaps = generate_swaps_from_values(vec![]);
+        let mut calculated_price = MmNumber::from("7.6");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        assert_eq!(calculated_price.to_decimal(), MmNumber::from("7.6").to_decimal());
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_single_base_side_forced_price() {
+        UnifiedLoggerBuilder::default().try_init().unwrap_or(());
+        let base_swaps =
+            generate_swaps_from_values(vec![(MmNumber::from("29.99997438"), MmNumber::from("222.76277576"))]);
+        let rel_swaps = generate_swaps_from_values(vec![]);
+        let mut calculated_price = MmNumber::from("7.14455729");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        let expected_price = MmNumber::from(
+            "7.425432199985765454510364818518221681227982435363666467237829687773220024996568013735750396997505703",
+        );
+        assert_eq!(calculated_price.to_decimal(), expected_price.to_decimal());
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_multiple_base_side() {
+        UnifiedLoggerBuilder::default().try_init().unwrap_or(());
+        let base_swaps = generate_swaps_from_values(vec![
+            (MmNumber::from("29.99997438"), MmNumber::from("222.76277576")),
+            (MmNumber::from("14.99998719"), MmNumber::from("105.38138788")),
+        ]);
+        let rel_swaps = generate_swaps_from_values(vec![]);
+        let mut calculated_price = MmNumber::from("7.14455729");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        let expected_price = MmNumber::from(
+            "7.292098752785668212293986632397917401154793919527340609682214001944090993587041856667078927018737007",
+        );
+        assert_eq!(calculated_price.to_decimal(), expected_price.to_decimal());
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_multiple_base_side_forced_price() {
+        UnifiedLoggerBuilder::default().try_init().unwrap_or(());
+        let base_swaps = generate_swaps_from_values(vec![
+            (MmNumber::from("29.99997438"), MmNumber::from("222.76277576")),
+            (MmNumber::from("29.99997438"), MmNumber::from("190.76277576")),
+        ]);
+        let rel_swaps = generate_swaps_from_values(vec![]);
+        let mut calculated_price = MmNumber::from("7.14455729");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        let expected_price = MmNumber::from("7.14455729");
+        assert_eq!(calculated_price.to_decimal(), expected_price.to_decimal());
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_single_reversed_side() {
+        UnifiedLoggerBuilder::default().try_init().unwrap_or(());
+        let base_swaps = generate_swaps_from_values(vec![]);
+        let rel_swaps = generate_swaps_from_values(vec![(MmNumber::from("219.4709"), MmNumber::from("29.99999"))]);
+        let mut calculated_price = MmNumber::from("7.14455729");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        let expected_price = MmNumber::from(
+            "7.3156991052330350776783592261197420399140133046711015570338523446174482058160686053562017854005951340",
+        );
+        assert_eq!(calculated_price.to_decimal(), expected_price.to_decimal());
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_single_reversed_side_forced_price() {
+        let base_swaps = generate_swaps_from_values(vec![]);
+        let rel_swaps = generate_swaps_from_values(vec![(MmNumber::from("219.4709"), MmNumber::from("29.99999"))]);
+        let mut calculated_price = MmNumber::from("7.6");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        assert_eq!(calculated_price, MmNumber::from("7.6"));
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_multiple_reversed_side() {
+        let base_swaps = generate_swaps_from_values(vec![]);
+        let rel_swaps = generate_swaps_from_values(vec![
+            (MmNumber::from("219.4709"), MmNumber::from("29.99999")),
+            (MmNumber::from("222.762"), MmNumber::from("29.99999")),
+        ]);
+        let mut calculated_price = MmNumber::from("7.14455729");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        let expected_price = MmNumber::from(
+            "7.370550790183596727865575955191985063995021331673777224592408197469399156466385488795162931720977240",
+        );
+        assert_eq!(calculated_price.to_decimal(), expected_price.to_decimal());
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_multiple_reversed_side_forced_price() {
+        let base_swaps = generate_swaps_from_values(vec![]);
+        let rel_swaps = generate_swaps_from_values(vec![
+            (MmNumber::from("219.4709"), MmNumber::from("29.99999")),
+            (MmNumber::from("222.762"), MmNumber::from("29.99999")),
+        ]);
+        let mut calculated_price = MmNumber::from("7.54455729");
+        let cfg = generate_cfg_from_params("FIRO".to_string(), "KMD".to_string(), MmNumber::from("1.015"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        assert_eq!(calculated_price, MmNumber::from("7.54455729"));
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_vwap_multiple_trade_both_side() {
+        let base_swaps = generate_swaps_from_values(vec![
+            (MmNumber::from("4.102174"), MmNumber::from("752.8892")),
+            (MmNumber::from("1.719676"), MmNumber::from("316.4945")),
+            (MmNumber::from("0.052971"), MmNumber::from("10.24148")),
+            (MmNumber::from("0.133952"), MmNumber::from("25.98481")),
+        ]);
+        let rel_swaps = generate_swaps_from_values(vec![
+            (MmNumber::from("27.18649"), MmNumber::from("0.161065")),
+            (MmNumber::from("13.17659"), MmNumber::from("0.077728")),
+            (MmNumber::from("37.00451"), MmNumber::from("0.208161")),
+            (MmNumber::from("743.0625"), MmNumber::from("4.266546")),
+            (MmNumber::from("2819.370"), MmNumber::from("15.68015")),
+            (MmNumber::from("2633.345"), MmNumber::from("14.61151")),
+            (MmNumber::from("559.7940"), MmNumber::from("3.006166")),
+        ]);
+        let mut calculated_price = MmNumber::from("174.1375");
+        let cfg = generate_cfg_from_params("LTC".to_string(), "KMD".to_string(), MmNumber::from("1.013"));
+        calculated_price = block_on(vwap(base_swaps, rel_swaps, calculated_price.clone(), &cfg));
+        let expected_price = MmNumber::from(
+            "181.8799512443925929123148242562683065552235106947031231789891984094078454989954152150057794418761367",
+        );
+        assert_eq!(calculated_price.to_decimal(), expected_price.to_decimal());
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_price.rs b/mm2src/mm2_main/src/lp_price.rs
new file mode 100644
index 0000000000..e35222c2b8
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_price.rs
@@ -0,0 +1,342 @@
+use common::log::{debug, error};
+use common::StatusCode;
+use mm2_err_handle::prelude::{MmError, OrMmError};
+use mm2_net::transport::SlurpError;
+use mm2_number::{BigDecimal, MmNumber};
+use std::collections::HashMap;
+use std::str::Utf8Error;
+
+const PRICE_ENDPOINTS: [&str; 2] = [
+    "https://prices.komodo.live:1313/api/v2/tickers",
+    "https://prices.cipig.net:1717/api/v2/tickers",
+];
+
+#[derive(Debug)]
+pub enum PriceServiceRequestError {
+    HttpProcessError(String),
+    ParsingAnswerError(String),
+    Internal(String),
+}
+
+impl From<serde_json::Error> for PriceServiceRequestError {
+    fn from(error: serde_json::Error) -> Self { PriceServiceRequestError::ParsingAnswerError(error.to_string()) }
+}
+
+impl From<std::string::String> for PriceServiceRequestError {
+    fn from(error: String) -> Self { PriceServiceRequestError::HttpProcessError(error) }
+}
+
+impl From<std::str::Utf8Error> for PriceServiceRequestError {
+    fn from(error: Utf8Error) -> Self { PriceServiceRequestError::HttpProcessError(error.to_string()) }
+}
+
+impl From<SlurpError> for PriceServiceRequestError {
+    fn from(e: SlurpError) -> Self {
+        let error = e.to_string();
+        match e {
+            SlurpError::ErrorDeserializing { .. } => PriceServiceRequestError::ParsingAnswerError(error),
+            SlurpError::Transport { .. } | SlurpError::Timeout { .. } => {
+                PriceServiceRequestError::HttpProcessError(error)
+            },
+            SlurpError::Internal(_) | SlurpError::InvalidRequest(_) => PriceServiceRequestError::Internal(error),
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct TickerInfosRegistry(HashMap<String, TickerInfos>);
+
+#[derive(Debug, Serialize, Deserialize)]
+struct TickerInfos {
+    ticker: String,
+    last_price: MmNumber,
+    last_updated: String,
+    last_updated_timestamp: u64,
+    #[serde(rename = "volume24h")]
+    volume24_h: MmNumber,
+    price_provider: Provider,
+    volume_provider: Provider,
+    #[serde(rename = "sparkline_7d")]
+    sparkline_7_d: Option<Vec<f64>>,
+    sparkline_provider: Provider,
+    #[serde(rename = "change_24h")]
+    change_24_h: MmNumber,
+    #[serde(rename = "change_24h_provider")]
+    change_24_h_provider: Provider,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub enum Provider {
+    #[serde(rename = "binance")]
+    Binance,
+    #[serde(rename = "coingecko")]
+    Coingecko,
+    #[serde(rename = "coinpaprika")]
+    Coinpaprika,
+    #[serde(rename = "forex")]
+    Forex,
+    #[serde(rename = "nomics")]
+    Nomics,
+    #[serde(rename = "unknown", other)]
+    Unknown,
+}
+
+impl Default for Provider {
+    fn default() -> Self { Provider::Unknown }
+}
+
+#[derive(Default, Clone, Debug)]
+pub struct RateInfos {
+    #[allow(dead_code)]
+    pub base: String,
+    #[allow(dead_code)]
+    pub rel: String,
+    pub base_price: MmNumber,
+    pub rel_price: MmNumber,
+    pub price: MmNumber,
+    pub last_updated_timestamp: Option<u64>,
+    pub base_provider: Provider,
+    pub rel_provider: Provider,
+}
+
+impl RateInfos {
+    #[inline]
+    pub fn retrieve_elapsed_times(&self) -> f64 {
+        let time_diff: f64 = common::now_float() - self.last_updated_timestamp.unwrap_or_default() as f64;
+        time_diff
+    }
+
+    pub fn new(base: String, rel: String) -> RateInfos {
+        RateInfos {
+            base,
+            rel,
+            base_provider: Provider::Unknown,
+            rel_provider: Provider::Unknown,
+            last_updated_timestamp: None,
+            ..Default::default()
+        }
+    }
+
+    pub fn get_rate_price(&self) -> (BigDecimal, BigDecimal) {
+        (self.base_price.clone().into(), self.rel_price.clone().into())
+    }
+}
+
+impl TickerInfosRegistry {
+    fn get_infos(&self, ticker: &str) -> Option<&TickerInfos> {
+        let mut ticker_infos = self.0.get(ticker);
+        let limit = ticker.len() - 1;
+        let pos = ticker.find('-').unwrap_or(limit);
+        if ticker_infos.is_none() && pos < limit {
+            ticker_infos = self.0.get(&ticker[0..pos])
+        }
+        ticker_infos
+    }
+
+    fn get_infos_pair(&self, base: &str, rel: &str) -> Option<(&TickerInfos, &TickerInfos)> {
+        self.get_infos(base).zip(self.get_infos(rel))
+    }
+
+    pub fn get_cex_rates(&self, base: &str, rel: &str) -> Option<RateInfos> {
+        match self.get_infos_pair(base, rel) {
+            Some((base_price_infos, rel_price_infos)) => {
+                let mut rate_infos = RateInfos::new(base.to_string(), rel.to_string());
+                if base_price_infos.price_provider == Provider::Unknown
+                    || rel_price_infos.price_provider == Provider::Unknown
+                    || base_price_infos.last_updated_timestamp == 0
+                    || rel_price_infos.last_updated_timestamp == 0
+                {
+                    debug!(
+                        "Unable to fetch tickers price. Tickers ({}/{})",
+                        base_price_infos.last_price, rel_price_infos.last_price
+                    );
+                    return None;
+                }
+
+                rate_infos.base_provider = base_price_infos.price_provider.clone();
+                rate_infos.rel_provider = rel_price_infos.price_provider.clone();
+                rate_infos.last_updated_timestamp =
+                    if base_price_infos.last_updated_timestamp <= rel_price_infos.last_updated_timestamp {
+                        Some(base_price_infos.last_updated_timestamp)
+                    } else {
+                        Some(rel_price_infos.last_updated_timestamp)
+                    };
+                rate_infos.base_price = base_price_infos.last_price.clone();
+                rate_infos.rel_price = rel_price_infos.last_price.clone();
+                rate_infos.price = &base_price_infos.last_price / &rel_price_infos.last_price;
+                Some(rate_infos)
+            },
+            None => None,
+        }
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+async fn process_price_request(price_url: &str) -> Result<TickerInfosRegistry, MmError<PriceServiceRequestError>> {
+    debug!("Fetching price from: {}", price_url);
+    let (status, headers, body) = mm2_net::native_http::slurp_url(price_url).await?;
+    let (status_code, body, _) = (status, std::str::from_utf8(&body)?.trim().into(), headers);
+    if status_code != StatusCode::OK {
+        return MmError::err(PriceServiceRequestError::HttpProcessError(body));
+    }
+    let model: HashMap<String, TickerInfos> = serde_json::from_str(&body)?;
+    Ok(TickerInfosRegistry(model))
+}
+
+#[cfg(target_arch = "wasm32")]
+async fn process_price_request(price_url: &str) -> Result<TickerInfosRegistry, MmError<PriceServiceRequestError>> {
+    debug!("Fetching price from: {}", price_url);
+    let (status, headers, body) = mm2_net::wasm_http::slurp_url(price_url).await?;
+    let (status_code, body, _) = (status, std::str::from_utf8(&body)?.trim().into(), headers);
+    if status_code != StatusCode::OK {
+        return MmError::err(PriceServiceRequestError::HttpProcessError(body));
+    }
+    let model: HashMap<String, TickerInfos> = serde_json::from_str(&body)?;
+    Ok(TickerInfosRegistry(model))
+}
+
+pub async fn fetch_price_tickers(price_url: &str) -> Result<TickerInfosRegistry, MmError<PriceServiceRequestError>> {
+    let model = process_price_request(price_url).await?;
+    debug!("price registry size: {}", model.0.len());
+    Ok(model)
+}
+
+/// CEXRates, structure for storing `base` coin and `rel` coin USD price
+#[derive(Default, Clone, Debug, PartialEq)]
+pub struct CEXRates {
+    pub base: BigDecimal,
+    pub rel: BigDecimal,
+}
+
+/// Fetcher function to fetch latest price from a single endpoint.
+async fn try_price_fetcher_endpoint(
+    endpoint: &str,
+    base: &str,
+    rel: &str,
+) -> Result<CEXRates, MmError<PriceServiceRequestError>> {
+    let response = process_price_request(endpoint).await?;
+    let fiat_price = response
+        .get_cex_rates(base, rel)
+        .or_mm_err(|| PriceServiceRequestError::Internal("couldn't fetch price".to_string()))?;
+    let (base_usd_price, rel_usd_price) = fiat_price.get_rate_price();
+    Ok(CEXRates {
+        base: base_usd_price,
+        rel: rel_usd_price,
+    })
+}
+
+/// Consume `try_price_fetcher_endpoint` result here using different endpoints.
+/// Return price data on success or None on failure.
+pub async fn fetch_swap_coins_price(base: Option<String>, rel: Option<String>) -> Option<CEXRates> {
+    debug!("Trying to fetch coins latest price...");
+    if let (Some(base), Some(rel)) = (base, rel) {
+        for endpoint in PRICE_ENDPOINTS {
+            match try_price_fetcher_endpoint(endpoint, &base, &rel).await {
+                Ok(response) => return Some(response),
+                Err(err) => error!("{:?}", err),
+            }
+        }
+    }
+    // couldn't fetch prices.
+    None
+}
+
+#[cfg(test)]
+#[cfg(not(target_arch = "wasm32"))]
+mod tests {
+    #[test]
+    fn test_process_price_request() {
+        use common::block_on;
+
+        use super::*;
+        for endpoint in PRICE_ENDPOINTS {
+            block_on(process_price_request(endpoint)).unwrap();
+        }
+    }
+
+    #[test]
+    fn test_fetch_swap_coins_price() {
+        use common::block_on;
+
+        use super::*;
+        let actual = block_on(fetch_swap_coins_price(Some("ETH".to_string()), Some("BTC".to_string())));
+        assert!(actual.is_some());
+    }
+
+    #[test]
+    fn test_get_cex_rates() {
+        use mm2_number::MmNumber;
+        use wasm_timer::SystemTime;
+
+        use crate::mm2::lp_price::{Provider, TickerInfos, TickerInfosRegistry};
+
+        let mut registry = TickerInfosRegistry::default();
+        let rates = registry.get_cex_rates("KMD", "LTC").unwrap_or_default();
+        assert_eq!(rates.base_provider, Provider::Unknown);
+        assert_eq!(rates.rel_provider, Provider::Unknown);
+
+        registry.0.insert("KMD".to_string(), TickerInfos {
+            ticker: "KMD".to_string(),
+            last_price: MmNumber::from("10"),
+            last_updated: "".to_string(),
+            last_updated_timestamp: SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap()
+                .as_secs(),
+            volume24_h: MmNumber::from("25000"),
+            price_provider: Provider::Binance,
+            volume_provider: Provider::Coinpaprika,
+            sparkline_7_d: None,
+            sparkline_provider: Default::default(),
+            change_24_h: MmNumber::default(),
+            change_24_h_provider: Default::default(),
+        });
+
+        registry.0.insert("LTC".to_string(), TickerInfos {
+            ticker: "LTC".to_string(),
+            last_price: MmNumber::from("500.0"),
+            last_updated: "".to_string(),
+            last_updated_timestamp: SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap()
+                .as_secs(),
+            volume24_h: MmNumber::from("25000"),
+            price_provider: Provider::Coingecko,
+            volume_provider: Provider::Binance,
+            sparkline_7_d: None,
+            sparkline_provider: Default::default(),
+            change_24_h: MmNumber::default(),
+            change_24_h_provider: Default::default(),
+        });
+
+        registry.0.insert("USDT".to_string(), TickerInfos {
+            ticker: "USDT".to_string(),
+            last_price: MmNumber::from("1"),
+            last_updated: "".to_string(),
+            last_updated_timestamp: SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap()
+                .as_secs(),
+            volume24_h: MmNumber::from("25000"),
+            price_provider: Provider::Coingecko,
+            volume_provider: Provider::Binance,
+            sparkline_7_d: None,
+            sparkline_provider: Default::default(),
+            change_24_h: MmNumber::default(),
+            change_24_h_provider: Default::default(),
+        });
+
+        let rates = registry.get_cex_rates("KMD", "LTC").unwrap_or_default();
+        assert_eq!(rates.base_provider, Provider::Binance);
+        assert_eq!(rates.rel_provider, Provider::Coingecko);
+        assert_eq!(rates.price, MmNumber::from("0.02"));
+
+        let usdt_infos = registry.get_infos("USDT-PLG20");
+        assert_eq!(usdt_infos.is_some(), true);
+        assert_eq!(usdt_infos.unwrap().last_price, MmNumber::from(1));
+
+        let usdt_infos = registry.get_infos("USDT");
+        assert_eq!(usdt_infos.is_some(), true);
+        assert_eq!(usdt_infos.unwrap().last_price, MmNumber::from(1));
+    }
+}
diff --git a/mm2src/lp_stats.rs b/mm2src/mm2_main/src/lp_stats.rs
similarity index 93%
rename from mm2src/lp_stats.rs
rename to mm2src/mm2_main/src/lp_stats.rs
index 7ebef36f25..f73500cfd9 100644
--- a/mm2src/lp_stats.rs
+++ b/mm2src/mm2_main/src/lp_stats.rs
@@ -1,20 +1,20 @@
 /// The module is responsible for mm2 network stats collection
 ///
 use common::executor::{spawn, Timer};
-use common::mm_ctx::{from_ctx, MmArc};
-use common::mm_error::prelude::*;
 use common::{log, now_ms, HttpStatusCode};
 use derive_more::Display;
 use futures::lock::Mutex as AsyncMutex;
 use http::StatusCode;
-use mm2_libp2p::atomicdex_behaviour::parse_relay_address;
-use mm2_libp2p::{encode_message, PeerId};
+use mm2_core::mm_ctx::{from_ctx, MmArc};
+use mm2_err_handle::prelude::*;
+use mm2_libp2p::{encode_message, NetworkInfo, PeerId, RelayAddress, RelayAddressError};
 use serde_json::{self as json, Value as Json};
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
-use crate::mm2::lp_network::{add_reserved_peer_addresses, lp_ports, request_peers, NetIdError, P2PRequest,
+use crate::mm2::lp_network::{add_reserved_peer_addresses, lp_network_ports, request_peers, NetIdError, P2PRequest,
                              ParseAddressError, PeerDecodedResponse};
+use std::str::FromStr;
 
 pub type NodeVersionResult<T> = Result<T, MmError<NodeVersionError>>;
 
@@ -66,6 +66,10 @@ impl From<ParseAddressError> for NodeVersionError {
     fn from(e: ParseAddressError) -> Self { NodeVersionError::InvalidAddress(e.to_string()) }
 }
 
+impl From<RelayAddressError> for NodeVersionError {
+    fn from(e: RelayAddressError) -> Self { NodeVersionError::InvalidAddress(e.to_string()) }
+}
+
 #[derive(Serialize, Deserialize)]
 pub struct NodeInfo {
     pub name: String,
@@ -171,16 +175,16 @@ pub enum NetworkInfoRequest {
     GetMm2Version,
 }
 
-async fn process_get_version_request(ctx: MmArc) -> Result<Option<Vec<u8>>, String> {
+fn process_get_version_request(ctx: MmArc) -> Result<Option<Vec<u8>>, String> {
     let response = ctx.mm_version().to_string();
     let encoded = try_s!(encode_message(&response));
     Ok(Some(encoded))
 }
 
-pub async fn process_info_request(ctx: MmArc, request: NetworkInfoRequest) -> Result<Option<Vec<u8>>, String> {
+pub fn process_info_request(ctx: MmArc, request: NetworkInfoRequest) -> Result<Option<Vec<u8>>, String> {
     log::debug!("Got stats request {:?}", request);
     match request {
-        NetworkInfoRequest::GetMm2Version => process_get_version_request(ctx).await,
+        NetworkInfoRequest::GetMm2Version => process_get_version_request(ctx),
     }
 }
 
@@ -235,14 +239,22 @@ pub async fn start_version_stat_collection(ctx: MmArc, req: Json) -> NodeVersion
     let peers_addresses = select_peers_addresses_from_db(&ctx).map_to_mm(NodeVersionError::DatabaseError)?;
 
     let netid = ctx.conf["netid"].as_u64().unwrap_or(0) as u16;
-    let (_, pubport, _) = lp_ports(netid)?;
+    let network_info = if ctx.p2p_in_memory() {
+        NetworkInfo::InMemory
+    } else {
+        let network_ports = lp_network_ports(netid)?;
+        NetworkInfo::Distributed { network_ports }
+    };
 
     for (peer_id, address) in peers_addresses {
         let peer_id = peer_id
             .parse::<PeerId>()
             .map_to_mm(|e| NodeVersionError::PeerIdParseError(peer_id, e.to_string()))?;
+
+        let relay_addr = RelayAddress::from_str(&address)?;
+        let multi_address = relay_addr.try_to_multiaddr(network_info)?;
+
         let mut addresses = HashSet::new();
-        let multi_address = parse_relay_address(address, pubport);
         addresses.insert(multi_address);
         add_reserved_peer_addresses(&ctx, peer_id, addresses);
     }
diff --git a/mm2src/lp_swap.rs b/mm2src/mm2_main/src/lp_swap.rs
similarity index 66%
rename from mm2src/lp_swap.rs
rename to mm2src/mm2_main/src/lp_swap.rs
index 0d0d2849a9..66a32b9249 100644
--- a/mm2src/lp_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap.rs
@@ -37,15 +37,17 @@
 //!
 
 /******************************************************************************
- * Copyright © 2014-2018 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -55,57 +57,75 @@
 //  marketmaker
 //
 
-#[cfg(not(target_arch = "wasm32"))]
-use crate::mm2::database::database_common::PagingOptions;
-use crate::mm2::lp_network::broadcast_p2p_msg;
+use crate::mm2::lp_network::{broadcast_p2p_msg, Libp2pPeerId};
 use async_std::sync as async_std_sync;
-use bigdecimal::BigDecimal;
 use coins::{lp_coinfind, MmCoinEnum, TradeFee, TransactionEnum};
-use common::{bits256, block_on, calc_total_pages,
+use common::log::{debug, warn};
+use common::{bits256, calc_total_pages,
              executor::{spawn, Timer},
              log::{error, info},
-             mm_ctx::{from_ctx, MmArc},
-             mm_number::MmNumber,
-             now_ms, read_dir, rpc_response, slurp, var, write, HyRes};
-use futures::future::{abortable, AbortHandle, TryFutureExt};
+             now_ms, spawn_abortable, var, AbortOnDropHandle, PagingOptions};
+use derive_more::Display;
 use http::Response;
+use mm2_core::mm_ctx::{from_ctx, MmArc};
+use mm2_err_handle::prelude::*;
 use mm2_libp2p::{decode_signed, encode_and_sign, pub_sub_topic, TopicPrefix};
-use num_rational::BigRational;
+use mm2_number::{BigDecimal, BigRational, MmNumber};
 use primitives::hash::{H160, H264};
 use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
 use serde_json::{self as json, Value as Json};
 use std::collections::{HashMap, HashSet};
-use std::ffi::OsStr;
+use std::num::NonZeroUsize;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex, Weak};
-use std::thread;
-use std::time::Duration;
 use uuid::Uuid;
 
-#[path = "lp_swap/maker_swap.rs"] mod maker_swap;
-
-#[path = "lp_swap/taker_swap.rs"] mod taker_swap;
-
-#[path = "lp_swap/pubkey_banning.rs"] mod pubkey_banning;
+#[cfg(feature = "custom-swap-locktime")]
+use std::sync::atomic::{AtomicU64, Ordering};
 
 #[path = "lp_swap/check_balance.rs"] mod check_balance;
+#[path = "lp_swap/maker_swap.rs"] mod maker_swap;
+#[path = "lp_swap/my_swaps_storage.rs"] mod my_swaps_storage;
+#[path = "lp_swap/pubkey_banning.rs"] mod pubkey_banning;
+#[path = "lp_swap/recreate_swap_data.rs"] mod recreate_swap_data;
+#[path = "lp_swap/saved_swap.rs"] mod saved_swap;
+#[path = "lp_swap/swap_lock.rs"] mod swap_lock;
+#[path = "lp_swap/taker_swap.rs"] mod taker_swap;
 #[path = "lp_swap/trade_preimage.rs"] mod trade_preimage;
 
+#[cfg(target_arch = "wasm32")]
+#[path = "lp_swap/swap_wasm_db.rs"]
+mod swap_wasm_db;
+
 pub use check_balance::{check_other_coin_balance_for_swap, CheckBalanceError};
+use keys::KeyPair;
+use maker_swap::MakerSwapEvent;
 pub use maker_swap::{calc_max_maker_vol, check_balance_for_maker_swap, maker_swap_trade_preimage, run_maker_swap,
-                     stats_maker_swap_dir, MakerSavedSwap, MakerSwap, MakerTradePreimage, RunMakerSwapInput};
-use maker_swap::{stats_maker_swap_file_path, MakerSwapEvent};
+                     MakerSavedEvent, MakerSavedSwap, MakerSwap, MakerSwapStatusChanged, MakerTradePreimage,
+                     RunMakerSwapInput};
+use my_swaps_storage::{MySwapsOps, MySwapsStorage};
 use pubkey_banning::BanReason;
 pub use pubkey_banning::{ban_pubkey_rpc, is_pubkey_banned, list_banned_pubkeys_rpc, unban_pubkeys_rpc};
+pub use recreate_swap_data::recreate_swap_data;
+pub use saved_swap::{SavedSwap, SavedSwapError, SavedSwapIo, SavedSwapResult};
+use taker_swap::TakerSwapEvent;
 pub use taker_swap::{calc_max_taker_vol, check_balance_for_taker_swap, max_taker_vol, max_taker_vol_from_available,
-                     run_taker_swap, stats_taker_swap_dir, taker_swap_trade_preimage, RunTakerSwapInput,
-                     TakerSavedSwap, TakerSwap, TakerSwapPreparedParams, TakerTradePreimage};
-use taker_swap::{stats_taker_swap_file_path, TakerSwapEvent};
+                     run_taker_swap, taker_swap_trade_preimage, RunTakerSwapInput, TakerSavedSwap, TakerSwap,
+                     TakerSwapPreparedParams, TakerTradePreimage};
 pub use trade_preimage::trade_preimage_rpc;
 
 pub const SWAP_PREFIX: TopicPrefix = "swap";
 
+pub const TX_HELPER_PREFIX: TopicPrefix = "txhlp";
+
+cfg_wasm32! {
+    use mm2_db::indexed_db::{ConstructibleDb, DbLocked};
+    use swap_wasm_db::{InitDbResult, SwapDb};
+
+    pub type SwapDbLocked<'a> = DbLocked<'a, SwapDb>;
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum SwapMsg {
     Negotiation(NegotiationDataMsg),
@@ -136,35 +156,46 @@ impl SwapMsgStore {
     }
 }
 
-/// The AbortHandle that aborts on drop
-pub struct AbortOnDropHandle(AbortHandle);
-
-impl Drop for AbortOnDropHandle {
-    fn drop(&mut self) { self.0.abort(); }
-}
-
 /// Spawns the loop that broadcasts message every `interval` seconds returning the AbortOnDropHandle
 /// to stop it
-pub fn broadcast_swap_message_every(ctx: MmArc, topic: String, msg: SwapMsg, interval: f64) -> AbortOnDropHandle {
+pub fn broadcast_swap_message_every(
+    ctx: MmArc,
+    topic: String,
+    msg: SwapMsg,
+    interval: f64,
+    p2p_privkey: Option<KeyPair>,
+) -> AbortOnDropHandle {
     let fut = async move {
         loop {
-            broadcast_swap_message(&ctx, topic.clone(), msg.clone());
+            broadcast_swap_message(&ctx, topic.clone(), msg.clone(), &p2p_privkey);
             Timer::sleep(interval).await;
         }
     };
-    let (abortable, abort_handle) = abortable(fut);
-    spawn(abortable.unwrap_or_else(|_| ()));
-    AbortOnDropHandle(abort_handle)
+    spawn_abortable(fut)
 }
 
 /// Broadcast the swap message once
-pub fn broadcast_swap_message(ctx: &MmArc, topic: String, msg: SwapMsg) {
-    let key_pair = ctx.secp256k1_key_pair.or(&&|| panic!());
-    let encoded_msg = encode_and_sign(&msg, &*key_pair.private().secret).unwrap();
-    broadcast_p2p_msg(ctx, vec![topic], encoded_msg);
+pub fn broadcast_swap_message(ctx: &MmArc, topic: String, msg: SwapMsg, p2p_privkey: &Option<KeyPair>) {
+    let (p2p_private, from) = match p2p_privkey {
+        Some(keypair) => (keypair.private_bytes(), Some(keypair.libp2p_peer_id())),
+        None => (ctx.secp256k1_key_pair().private().secret.take(), None),
+    };
+    let encoded_msg = encode_and_sign(&msg, &p2p_private).unwrap();
+    broadcast_p2p_msg(ctx, vec![topic], encoded_msg, from);
+}
+
+/// Broadcast the tx message once
+pub fn broadcast_p2p_tx_msg(ctx: &MmArc, topic: String, msg: &TransactionEnum, p2p_privkey: &Option<KeyPair>) {
+    let (p2p_private, from) = match p2p_privkey {
+        Some(keypair) => (keypair.private_bytes(), Some(keypair.libp2p_peer_id())),
+        None => (ctx.secp256k1_key_pair().private().secret.take(), None),
+    };
+
+    let encoded_msg = encode_and_sign(&msg.tx_hex(), &p2p_private).unwrap();
+    broadcast_p2p_msg(ctx, vec![topic], encoded_msg, from);
 }
 
-pub fn process_msg(ctx: MmArc, topic: &str, msg: &[u8]) {
+pub async fn process_msg(ctx: MmArc, topic: &str, msg: &[u8]) {
     let uuid = match Uuid::from_str(topic) {
         Ok(u) => u,
         Err(_) => return,
@@ -172,16 +203,26 @@ pub fn process_msg(ctx: MmArc, topic: &str, msg: &[u8]) {
     let msg = match decode_signed::<SwapMsg>(msg) {
         Ok(m) => m,
         Err(swap_msg_err) => {
+            #[cfg(not(target_arch = "wasm32"))]
             match json::from_slice::<SwapStatus>(msg) {
-                Ok(status) => save_stats_swap(&ctx, &status.data).unwrap(),
+                Ok(mut status) => {
+                    status.data.fetch_and_set_usd_prices().await;
+                    if let Err(e) = save_stats_swap(&ctx, &status.data).await {
+                        error!("Error saving the swap {} status: {}", status.data.uuid(), e);
+                    }
+                },
                 Err(swap_status_err) => {
                     error!("Couldn't deserialize 'SwapMsg': {:?}", swap_msg_err);
                     error!("Couldn't deserialize 'SwapStatus': {:?}", swap_status_err);
                 },
             };
+            // Drop it to avoid dead_code warning
+            drop(swap_msg_err);
             return;
         },
     };
+
+    debug!("Processing swap msg {:?} for uuid {}", msg, uuid);
     let swap_ctx = SwapsContext::from_ctx(&ctx).unwrap();
     let mut msgs = swap_ctx.swap_msgs.lock().unwrap();
     if let Some(msg_store) = msgs.get_mut(&uuid) {
@@ -194,12 +235,24 @@ pub fn process_msg(ctx: MmArc, topic: &str, msg: &[u8]) {
                 SwapMsg::MakerPayment(maker_payment) => msg_store.maker_payment = Some(maker_payment),
                 SwapMsg::TakerPayment(taker_payment) => msg_store.taker_payment = Some(taker_payment),
             }
+        } else {
+            warn!("Received message from unexpected sender for swap {}", uuid);
         }
     }
 }
 
 pub fn swap_topic(uuid: &Uuid) -> String { pub_sub_topic(SWAP_PREFIX, &uuid.to_string()) }
 
+/// Formats and returns a topic format for `txhlp`.
+///
+/// # Usage
+/// ```ignore
+/// let topic = tx_helper_topic("BTC");
+/// // Returns topic format `txhlp/BTC` as String type.
+/// ```
+#[inline(always)]
+pub fn tx_helper_topic(coin: &str) -> String { pub_sub_topic(TX_HELPER_PREFIX, coin) }
+
 async fn recv_swap_msg<T>(
     ctx: MmArc,
     mut getter: impl FnMut(&mut SwapMsgStore) -> Option<T>,
@@ -229,10 +282,27 @@ async fn recv_swap_msg<T>(
 /// in order to give different and/or heavy communication channels a chance.
 const BASIC_COMM_TIMEOUT: u64 = 90;
 
+#[cfg(not(feature = "custom-swap-locktime"))]
+/// Default atomic swap payment locktime, in seconds.
+/// Maker sends payment with LOCKTIME * 2
+/// Taker sends payment with LOCKTIME
+const PAYMENT_LOCKTIME: u64 = 3600 * 2 + 300 * 2;
+
+#[cfg(feature = "custom-swap-locktime")]
 /// Default atomic swap payment locktime, in seconds.
 /// Maker sends payment with LOCKTIME * 2
 /// Taker sends payment with LOCKTIME
-pub const PAYMENT_LOCKTIME: u64 = 3600 * 2 + 300 * 2;
+pub(crate) static PAYMENT_LOCKTIME: AtomicU64 = AtomicU64::new(super::CUSTOM_PAYMENT_LOCKTIME_DEFAULT);
+
+#[inline]
+/// Returns `PAYMENT_LOCKTIME`
+pub fn get_payment_locktime() -> u64 {
+    #[cfg(not(feature = "custom-swap-locktime"))]
+    return PAYMENT_LOCKTIME;
+    #[cfg(feature = "custom-swap-locktime")]
+    PAYMENT_LOCKTIME.load(Ordering::Relaxed)
+}
+
 const _SWAP_DEFAULT_NUM_CONFIRMS: u32 = 1;
 const _SWAP_DEFAULT_MAX_CONFIRMS: u32 = 6;
 /// MM2 checks that swap payment is confirmed every WAIT_CONFIRM_INTERVAL seconds
@@ -267,6 +337,8 @@ pub trait AtomicSwap: Send + Sync {
     fn maker_coin(&self) -> &str;
 
     fn taker_coin(&self) -> &str;
+
+    fn unique_swap_data(&self) -> Vec<u8>;
 }
 
 #[derive(Serialize)]
@@ -294,6 +366,8 @@ struct SwapsContext {
     /// Very unpleasant consequences
     shutdown_rx: async_std_sync::Receiver<()>,
     swap_msgs: Mutex<HashMap<Uuid, SwapMsgStore>>,
+    #[cfg(target_arch = "wasm32")]
+    swap_db: ConstructibleDb<SwapDb>,
 }
 
 impl SwapsContext {
@@ -317,8 +391,10 @@ impl SwapsContext {
             Ok(SwapsContext {
                 running_swaps: Mutex::new(vec![]),
                 banned_pubkeys: Mutex::new(HashMap::new()),
-                swap_msgs: Mutex::new(HashMap::new()),
                 shutdown_rx,
+                swap_msgs: Mutex::new(HashMap::new()),
+                #[cfg(target_arch = "wasm32")]
+                swap_db: ConstructibleDb::new(ctx),
             })
         })))
     }
@@ -327,6 +403,9 @@ impl SwapsContext {
         let store = SwapMsgStore::new(accept_only_from);
         self.swap_msgs.lock().unwrap().insert(uuid, store);
     }
+
+    #[cfg(target_arch = "wasm32")]
+    pub async fn swap_db(&self) -> InitDbResult<SwapDbLocked<'_>> { Ok(self.swap_db.get_or_initialize().await?) }
 }
 
 /// Get total amount of selected coin locked by all currently ongoing swaps
@@ -337,8 +416,7 @@ pub fn get_locked_amount(ctx: &MmArc, coin: &str) -> MmNumber {
     swap_lock
         .iter()
         .filter_map(|swap| swap.upgrade())
-        .map(|swap| swap.locked_amount())
-        .flatten()
+        .flat_map(|swap| swap.locked_amount())
         .fold(MmNumber::from(0), |mut total_amount, locked| {
             if locked.coin == coin {
                 total_amount += locked.amount;
@@ -371,8 +449,7 @@ fn get_locked_amount_by_other_swaps(ctx: &MmArc, except_uuid: &Uuid, coin: &str)
         .iter()
         .filter_map(|swap| swap.upgrade())
         .filter(|swap| swap.uuid() != except_uuid)
-        .map(|swap| swap.locked_amount())
-        .flatten()
+        .flat_map(|swap| swap.locked_amount())
         .fold(MmNumber::from(0), |mut total_amount, locked| {
             if locked.coin == coin {
                 total_amount += locked.amount;
@@ -437,11 +514,11 @@ pub enum AtomicLocktimeVersion {
 
 pub fn lp_atomic_locktime_v1(maker_coin: &str, taker_coin: &str) -> u64 {
     if maker_coin == "BTC" || taker_coin == "BTC" {
-        PAYMENT_LOCKTIME * 10
+        get_payment_locktime() * 10
     } else if coin_with_4x_locktime(maker_coin) || coin_with_4x_locktime(taker_coin) {
-        PAYMENT_LOCKTIME * 4
+        get_payment_locktime() * 4
     } else {
-        PAYMENT_LOCKTIME
+        get_payment_locktime()
     }
 }
 
@@ -458,9 +535,9 @@ pub fn lp_atomic_locktime_v2(
         || my_conf_settings.requires_notarization()
         || other_conf_settings.requires_notarization()
     {
-        PAYMENT_LOCKTIME * 4
+        get_payment_locktime() * 4
     } else {
-        PAYMENT_LOCKTIME
+        get_payment_locktime()
     }
 }
 
@@ -535,11 +612,23 @@ pub struct NegotiationDataV2 {
     taker_coin_swap_contract: Vec<u8>,
 }
 
+#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
+pub struct NegotiationDataV3 {
+    started_at: u64,
+    payment_locktime: u64,
+    secret_hash: Vec<u8>,
+    maker_coin_swap_contract: Vec<u8>,
+    taker_coin_swap_contract: Vec<u8>,
+    maker_coin_htlc_pub: Vec<u8>,
+    taker_coin_htlc_pub: Vec<u8>,
+}
+
 #[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
 #[serde(untagged)]
 pub enum NegotiationDataMsg {
     V1(NegotiationDataV1),
     V2(NegotiationDataV2),
+    V3(NegotiationDataV3),
 }
 
 impl NegotiationDataMsg {
@@ -547,6 +636,7 @@ impl NegotiationDataMsg {
         match self {
             NegotiationDataMsg::V1(v1) => v1.started_at,
             NegotiationDataMsg::V2(v2) => v2.started_at,
+            NegotiationDataMsg::V3(v3) => v3.started_at,
         }
     }
 
@@ -554,6 +644,7 @@ impl NegotiationDataMsg {
         match self {
             NegotiationDataMsg::V1(v1) => v1.payment_locktime,
             NegotiationDataMsg::V2(v2) => v2.payment_locktime,
+            NegotiationDataMsg::V3(v3) => v3.payment_locktime,
         }
     }
 
@@ -561,13 +652,23 @@ impl NegotiationDataMsg {
         match self {
             NegotiationDataMsg::V1(v1) => &v1.secret_hash,
             NegotiationDataMsg::V2(v2) => &v2.secret_hash,
+            NegotiationDataMsg::V3(v3) => &v3.secret_hash,
+        }
+    }
+
+    pub fn maker_coin_htlc_pub(&self) -> &[u8] {
+        match self {
+            NegotiationDataMsg::V1(v1) => &v1.persistent_pubkey,
+            NegotiationDataMsg::V2(v2) => &v2.persistent_pubkey,
+            NegotiationDataMsg::V3(v3) => &v3.maker_coin_htlc_pub,
         }
     }
 
-    pub fn persistent_pubkey(&self) -> &[u8] {
+    pub fn taker_coin_htlc_pub(&self) -> &[u8] {
         match self {
             NegotiationDataMsg::V1(v1) => &v1.persistent_pubkey,
             NegotiationDataMsg::V2(v2) => &v2.persistent_pubkey,
+            NegotiationDataMsg::V3(v3) => &v3.taker_coin_htlc_pub,
         }
     }
 
@@ -575,6 +676,7 @@ impl NegotiationDataMsg {
         match self {
             NegotiationDataMsg::V1(_) => None,
             NegotiationDataMsg::V2(v2) => Some(&v2.maker_coin_swap_contract),
+            NegotiationDataMsg::V3(v3) => Some(&v3.maker_coin_swap_contract),
         }
     }
 
@@ -582,6 +684,7 @@ impl NegotiationDataMsg {
         match self {
             NegotiationDataMsg::V1(_) => None,
             NegotiationDataMsg::V2(v2) => Some(&v2.taker_coin_swap_contract),
+            NegotiationDataMsg::V3(v3) => Some(&v3.taker_coin_swap_contract),
         }
     }
 }
@@ -607,153 +710,42 @@ pub fn my_swaps_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("SWAPS").join("MY
 
 pub fn my_swap_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf { my_swaps_dir(ctx).join(format!("{}.json", uuid)) }
 
-#[cfg(not(target_arch = "wasm32"))]
-pub fn insert_new_swap_to_db(
-    ctx: &MmArc,
+pub async fn insert_new_swap_to_db(
+    ctx: MmArc,
     my_coin: &str,
     other_coin: &str,
-    uuid: &str,
-    started_at: &str,
+    uuid: Uuid,
+    started_at: u64,
 ) -> Result<(), String> {
-    crate::mm2::database::my_swaps::insert_new_swap(ctx, my_coin, other_coin, uuid, started_at)
+    MySwapsStorage::new(ctx)
+        .save_new_swap(my_coin, other_coin, uuid, started_at)
+        .await
         .map_err(|e| ERRL!("{}", e))
 }
 
-#[cfg(target_arch = "wasm32")]
-pub fn insert_new_swap_to_db(
-    _ctx: &MmArc,
-    _my_coin: &str,
-    _other_coin: &str,
-    _uuid: &str,
-    _started_at: &str,
-) -> Result<(), String> {
-    Ok(())
-}
-
 #[cfg(not(target_arch = "wasm32"))]
 fn add_swap_to_db_index(ctx: &MmArc, swap: &SavedSwap) {
     crate::mm2::database::stats_swaps::add_swap_to_index(&ctx.sqlite_connection(), swap)
 }
 
-#[cfg(target_arch = "wasm32")]
-fn add_swap_to_db_index(_ctx: &MmArc, _swap: &SavedSwap) {}
-
-fn save_stats_swap(ctx: &MmArc, swap: &SavedSwap) -> Result<(), String> {
-    let (path, content) = match &swap {
-        SavedSwap::Maker(maker_swap) => (
-            stats_maker_swap_file_path(ctx, &maker_swap.uuid),
-            try_s!(json::to_vec(&maker_swap)),
-        ),
-        SavedSwap::Taker(taker_swap) => (
-            stats_taker_swap_file_path(ctx, &taker_swap.uuid),
-            try_s!(json::to_vec(&taker_swap)),
-        ),
-    };
-    try_s!(write(&path, &content));
+#[cfg(not(target_arch = "wasm32"))]
+async fn save_stats_swap(ctx: &MmArc, swap: &SavedSwap) -> Result<(), String> {
+    try_s!(swap.save_to_stats_db(ctx).await);
     add_swap_to_db_index(ctx, swap);
     Ok(())
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum SavedSwap {
-    Maker(MakerSavedSwap),
-    Taker(TakerSavedSwap),
-}
-
 /// The helper structure that makes easier to parse the response for GUI devs
 /// They won't have to parse the events themselves handling possible errors, index out of bounds etc.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct MySwapInfo {
     pub my_coin: String,
     pub other_coin: String,
-    my_amount: BigDecimal,
-    other_amount: BigDecimal,
+    pub my_amount: BigDecimal,
+    pub other_amount: BigDecimal,
     pub started_at: u64,
 }
 
-impl SavedSwap {
-    fn is_finished(&self) -> bool {
-        match self {
-            SavedSwap::Maker(swap) => swap.is_finished(),
-            SavedSwap::Taker(swap) => swap.is_finished(),
-        }
-    }
-
-    pub fn uuid(&self) -> &Uuid {
-        match self {
-            SavedSwap::Maker(swap) => &swap.uuid,
-            SavedSwap::Taker(swap) => &swap.uuid,
-        }
-    }
-
-    pub fn maker_coin_ticker(&self) -> Result<String, String> {
-        match self {
-            SavedSwap::Maker(swap) => swap.maker_coin(),
-            SavedSwap::Taker(swap) => swap.maker_coin(),
-        }
-    }
-
-    pub fn taker_coin_ticker(&self) -> Result<String, String> {
-        match self {
-            SavedSwap::Maker(swap) => swap.taker_coin(),
-            SavedSwap::Taker(swap) => swap.taker_coin(),
-        }
-    }
-
-    pub fn get_my_info(&self) -> Option<MySwapInfo> {
-        match self {
-            SavedSwap::Maker(swap) => swap.get_my_info(),
-            SavedSwap::Taker(swap) => swap.get_my_info(),
-        }
-    }
-
-    fn recover_funds(self, ctx: MmArc) -> Result<RecoveredSwap, String> {
-        let maker_ticker = try_s!(self.maker_coin_ticker());
-        // Should remove `block_on` when recover_funds is async.
-        let maker_coin = match block_on(lp_coinfind(&ctx, &maker_ticker)) {
-            Ok(Some(c)) => c,
-            Ok(None) => return ERR!("Coin {} is not activated", maker_ticker),
-            Err(e) => return ERR!("Error {} on {} coin find attempt", e, maker_ticker),
-        };
-
-        let taker_ticker = try_s!(self.taker_coin_ticker());
-        // Should remove `block_on` when recover_funds is async.
-        let taker_coin = match block_on(lp_coinfind(&ctx, &taker_ticker)) {
-            Ok(Some(c)) => c,
-            Ok(None) => return ERR!("Coin {} is not activated", taker_ticker),
-            Err(e) => return ERR!("Error {} on {} coin find attempt", e, taker_ticker),
-        };
-        match self {
-            SavedSwap::Maker(saved) => {
-                let (maker_swap, _) = try_s!(MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, saved));
-                Ok(try_s!(maker_swap.recover_funds()))
-            },
-            SavedSwap::Taker(saved) => {
-                let (taker_swap, _) = try_s!(TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, saved));
-                Ok(try_s!(taker_swap.recover_funds()))
-            },
-        }
-    }
-
-    fn is_recoverable(&self) -> bool {
-        match self {
-            SavedSwap::Maker(saved) => saved.is_recoverable(),
-            SavedSwap::Taker(saved) => saved.is_recoverable(),
-        }
-    }
-
-    fn save_to_db(&self, ctx: &MmArc) -> Result<(), String> {
-        let path = my_swap_file_path(ctx, self.uuid());
-        if path.exists() {
-            return ERR!("File already exists");
-        };
-        let content = try_s!(json::to_vec(self));
-        try_s!(std::fs::write(path, &content));
-        Ok(())
-    }
-}
-
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
 pub struct SavedTradeFee {
     coin: String,
@@ -797,84 +789,63 @@ impl From<&str> for SwapError {
 }
 
 #[derive(Serialize)]
-struct MySwapStatusResponse<'a> {
+struct MySwapStatusResponse {
     #[serde(flatten)]
-    swap: &'a SavedSwap,
+    swap: SavedSwap,
     my_info: Option<MySwapInfo>,
     recoverable: bool,
 }
 
-impl<'a> From<&'a SavedSwap> for MySwapStatusResponse<'a> {
-    fn from(swap: &'a SavedSwap) -> MySwapStatusResponse {
+impl From<SavedSwap> for MySwapStatusResponse {
+    fn from(mut swap: SavedSwap) -> MySwapStatusResponse {
+        swap.hide_secrets();
         MySwapStatusResponse {
-            swap,
             my_info: swap.get_my_info(),
             recoverable: swap.is_recoverable(),
+            swap,
         }
     }
 }
 
 /// Returns the status of swap performed on `my` node
-pub fn my_swap_status(ctx: MmArc, req: Json) -> HyRes {
-    let uuid: Uuid = try_h!(json::from_value(req["params"]["uuid"].clone()));
-    let path = my_swap_file_path(&ctx, &uuid);
-    let content = try_h!(slurp(&path));
-    if content.is_empty() {
-        return rpc_response(
-            404,
-            json!({
-                "error": "swap data is not found"
-            })
-            .to_string(),
-        );
-    }
-    let status: SavedSwap = try_h!(json::from_slice(&content));
+pub async fn my_swap_status(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let uuid: Uuid = try_s!(json::from_value(req["params"]["uuid"].clone()));
+    let status = match SavedSwap::load_my_swap_from_db(&ctx, uuid).await {
+        Ok(Some(status)) => status,
+        Ok(None) => return Err("swap data is not found".to_owned()),
+        Err(e) => return ERR!("{}", e),
+    };
 
-    rpc_response(
-        200,
-        json!({ "result": MySwapStatusResponse::from(&status) }).to_string(),
-    )
+    let res_js = json!({ "result": MySwapStatusResponse::from(status) });
+    let res = try_s!(json::to_vec(&res_js));
+    Ok(try_s!(Response::builder().body(res)))
+}
+
+#[cfg(target_arch = "wasm32")]
+pub async fn stats_swap_status(_ctx: MmArc, _req: Json) -> Result<Response<Vec<u8>>, String> {
+    ERR!("'stats_swap_status' is only supported in native mode")
 }
 
 /// Returns the status of requested swap, typically performed by other nodes and saved by `save_stats_swap_status`
-pub fn stats_swap_status(ctx: MmArc, req: Json) -> HyRes {
-    let uuid: Uuid = try_h!(json::from_value(req["params"]["uuid"].clone()));
-    let maker_path = stats_maker_swap_file_path(&ctx, &uuid);
-    let taker_path = stats_taker_swap_file_path(&ctx, &uuid);
-    let maker_content = try_h!(slurp(&maker_path));
-    let taker_content = try_h!(slurp(&taker_path));
-    let maker_status: Option<MakerSavedSwap> = if maker_content.is_empty() {
-        None
-    } else {
-        Some(try_h!(json::from_slice(&maker_content)))
-    };
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn stats_swap_status(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let uuid: Uuid = try_s!(json::from_value(req["params"]["uuid"].clone()));
 
-    let taker_status: Option<TakerSavedSwap> = if taker_content.is_empty() {
-        None
-    } else {
-        Some(try_h!(json::from_slice(&taker_content)))
-    };
+    let maker_status = try_s!(SavedSwap::load_from_maker_stats_db(&ctx, uuid).await);
+    let taker_status = try_s!(SavedSwap::load_from_taker_stats_db(&ctx, uuid).await);
 
     if maker_status.is_none() && taker_status.is_none() {
-        return rpc_response(
-            404,
-            json!({
-                "error": "swap data is not found"
-            })
-            .to_string(),
-        );
+        return ERR!("swap data is not found");
     }
 
-    rpc_response(
-        200,
-        json!({
-            "result": {
-                "maker": maker_status,
-                "taker": taker_status,
-            }
-        })
-        .to_string(),
-    )
+    let res_js = json!({
+        "result": {
+            "maker": maker_status,
+            "taker": taker_status,
+        }
+    });
+    let res = try_s!(json::to_vec(&res_js));
+    Ok(try_s!(Response::builder().body(res)))
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -884,21 +855,22 @@ struct SwapStatus {
 }
 
 /// Broadcasts `my` swap status to P2P network
-fn broadcast_my_swap_status(uuid: &Uuid, ctx: &MmArc) -> Result<(), String> {
-    let path = my_swap_file_path(ctx, uuid);
-    let content = try_s!(slurp(&path));
-    let mut status: SavedSwap = try_s!(json::from_slice(&content));
-    match &mut status {
-        SavedSwap::Taker(_) => (), // do nothing for taker
-        SavedSwap::Maker(ref mut swap) => swap.hide_secret(),
+async fn broadcast_my_swap_status(ctx: &MmArc, uuid: Uuid) -> Result<(), String> {
+    let mut status = match try_s!(SavedSwap::load_my_swap_from_db(ctx, uuid).await) {
+        Some(status) => status,
+        None => return ERR!("swap data is not found"),
     };
-    try_s!(save_stats_swap(ctx, &status));
+    status.hide_secrets();
+
+    #[cfg(not(target_arch = "wasm32"))]
+    try_s!(save_stats_swap(ctx, &status).await);
+
     let status = SwapStatus {
         method: "swapstatus".into(),
         data: status,
     };
     let msg = json::to_vec(&status).expect("Swap status ser should never fail");
-    broadcast_p2p_msg(ctx, vec![swap_topic(uuid)], msg);
+    broadcast_p2p_msg(ctx, vec![swap_topic(&uuid)], msg, None);
     Ok(())
 }
 
@@ -910,203 +882,249 @@ pub struct MySwapsFilter {
     pub to_timestamp: Option<u64>,
 }
 
-#[cfg(target_arch = "wasm32")]
-pub fn all_swaps_uuids_by_filter(_ctx: MmArc, _req: Json) -> HyRes {
-    Box::new(futures01::future::err::<Response<Vec<u8>>, String>(ERRL!(
-        "'all_swaps_uuids_by_filter' is only supported in native mode yet"
-    )))
-}
-
 // TODO: Should return the result from SQL like in order history. So it can be clear the exact started_at time
 // and the coins if they are not included in the filter request
 /// Returns *all* uuids of swaps, which match the selected filter.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn all_swaps_uuids_by_filter(ctx: MmArc, req: Json) -> HyRes {
-    use crate::mm2::database::my_swaps::select_uuids_by_my_swaps_filter;
-
-    let filter: MySwapsFilter = try_h!(json::from_value(req));
-    let db_result = try_h!(select_uuids_by_my_swaps_filter(&ctx.sqlite_connection(), &filter, None));
-
-    rpc_response(
-        200,
-        json!({
-            "result": {
-                "uuids": db_result.uuids,
-                "my_coin": filter.my_coin,
-                "other_coin": filter.other_coin,
-                "from_timestamp": filter.from_timestamp,
-                "to_timestamp": filter.to_timestamp,
-                "found_records": db_result.uuids.len(),
-            },
-        })
-        .to_string(),
-    )
+pub async fn all_swaps_uuids_by_filter(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let filter: MySwapsFilter = try_s!(json::from_value(req));
+    let db_result = try_s!(
+        MySwapsStorage::new(ctx)
+            .my_recent_swaps_with_filters(&filter, None)
+            .await
+    );
+
+    let res_js = json!({
+        "result": {
+            "uuids": db_result.uuids,
+            "my_coin": filter.my_coin,
+            "other_coin": filter.other_coin,
+            "from_timestamp": filter.from_timestamp,
+            "to_timestamp": filter.to_timestamp,
+            "found_records": db_result.uuids.len(),
+        },
+    });
+    let res = try_s!(json::to_vec(&res_js));
+    Ok(try_s!(Response::builder().body(res)))
 }
 
-#[cfg(not(target_arch = "wasm32"))]
 #[derive(Debug, Deserialize)]
 pub struct MyRecentSwapsReq {
     #[serde(flatten)]
-    paging_options: PagingOptions,
+    pub paging_options: PagingOptions,
     #[serde(flatten)]
-    filter: MySwapsFilter,
+    pub filter: MySwapsFilter,
 }
 
-#[cfg(target_arch = "wasm32")]
-pub fn my_recent_swaps(_ctx: MmArc, _req: Json) -> HyRes {
-    Box::new(futures01::future::err::<Response<Vec<u8>>, String>(ERRL!(
-        "'my_recent_swaps' is only supported in native mode yet"
-    )))
+#[derive(Debug, Default, PartialEq)]
+pub struct MyRecentSwapsUuids {
+    /// UUIDs of swaps matching the query
+    pub uuids: Vec<Uuid>,
+    /// Total count of swaps matching the query
+    pub total_count: usize,
+    /// The number of skipped UUIDs
+    pub skipped: usize,
 }
 
-/// Returns the data of recent swaps of `my` node.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn my_recent_swaps(ctx: MmArc, req: Json) -> HyRes {
-    use crate::mm2::database::my_swaps::select_uuids_by_my_swaps_filter;
+#[derive(Debug, Display, Deserialize, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum LatestSwapsErr {
+    #[display(fmt = "No such swap with the uuid '{}'", _0)]
+    UUIDNotPresentInDb(Uuid),
+    UnableToLoadSavedSwaps(SavedSwapError),
+    #[display(fmt = "Unable to query swaps storage")]
+    UnableToQuerySwapStorage,
+}
+
+pub async fn latest_swaps_for_pair(
+    ctx: MmArc,
+    my_coin: String,
+    other_coin: String,
+    limit: usize,
+) -> Result<Vec<SavedSwap>, MmError<LatestSwapsErr>> {
+    let filter = MySwapsFilter {
+        my_coin: Some(my_coin),
+        other_coin: Some(other_coin),
+        from_timestamp: None,
+        to_timestamp: None,
+    };
 
-    let req: MyRecentSwapsReq = try_h!(json::from_value(req));
-    let db_result = try_h!(select_uuids_by_my_swaps_filter(
-        &ctx.sqlite_connection(),
-        &req.filter,
-        Some(&req.paging_options),
-    ));
+    let paging_options = PagingOptions {
+        limit,
+        page_number: NonZeroUsize::new(1).expect("1 > 0"),
+        from_uuid: None,
+    };
+
+    let db_result = match MySwapsStorage::new(ctx.clone())
+        .my_recent_swaps_with_filters(&filter, Some(&paging_options))
+        .await
+    {
+        Ok(x) => x,
+        Err(_) => return Err(MmError::new(LatestSwapsErr::UnableToQuerySwapStorage)),
+    };
+
+    let mut swaps = Vec::with_capacity(db_result.uuids.len());
+    for uuid in db_result.uuids.iter() {
+        let swap = match SavedSwap::load_my_swap_from_db(&ctx, *uuid).await {
+            Ok(Some(swap)) => swap,
+            Ok(None) => {
+                error!("No such swap with the uuid '{}'", uuid);
+                continue;
+            },
+            Err(e) => return Err(MmError::new(LatestSwapsErr::UnableToLoadSavedSwaps(e.into_inner()))),
+        };
+        swaps.push(swap);
+    }
+
+    Ok(swaps)
+}
+
+/// Returns the data of recent swaps of `my` node.
+pub async fn my_recent_swaps_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
+    let req: MyRecentSwapsReq = try_s!(json::from_value(req));
+    let db_result = try_s!(
+        MySwapsStorage::new(ctx.clone())
+            .my_recent_swaps_with_filters(&req.filter, Some(&req.paging_options))
+            .await
+    );
 
     // iterate over uuids trying to parse the corresponding files content and add to result vector
-    let swaps: Vec<Json> = db_result
-        .uuids
-        .iter()
-        .map(|uuid| {
-            let path = my_swap_file_path(&ctx, uuid);
-            match json::from_slice::<SavedSwap>(&slurp(&path).unwrap()) {
-                Ok(swap) => json::to_value(MySwapStatusResponse::from(&swap)).unwrap(),
-                Err(e) => {
-                    error!("Error {} parsing JSON from {}", e, path.display());
-                    Json::Null
-                },
-            }
-        })
-        .collect();
-
-    rpc_response(
-        200,
-        json!({
-            "result": {
-                "swaps": swaps,
-                "from_uuid": req.paging_options.from_uuid,
-                "skipped": db_result.skipped,
-                "limit": req.paging_options.limit,
-                "total": db_result.total_count,
-                "page_number": req.paging_options.page_number,
-                "total_pages": calc_total_pages(db_result.total_count, req.paging_options.limit),
-                "found_records": db_result.uuids.len(),
+    let mut swaps = Vec::with_capacity(db_result.uuids.len());
+    for uuid in db_result.uuids.iter() {
+        match SavedSwap::load_my_swap_from_db(&ctx, *uuid).await {
+            Ok(Some(swap)) => {
+                let swap_json = json::to_value(MySwapStatusResponse::from(swap)).unwrap();
+                swaps.push(swap_json)
             },
-        })
-        .to_string(),
-    )
+            Ok(None) => error!("No such swap with the uuid '{}'", uuid),
+            Err(e) => error!("Error loading a swap with the uuid '{}': {}", uuid, e),
+        }
+    }
+
+    let res_js = json!({
+        "result": {
+            "swaps": swaps,
+            "from_uuid": req.paging_options.from_uuid,
+            "skipped": db_result.skipped,
+            "limit": req.paging_options.limit,
+            "total": db_result.total_count,
+            "page_number": req.paging_options.page_number,
+            "total_pages": calc_total_pages(db_result.total_count, req.paging_options.limit),
+            "found_records": db_result.uuids.len(),
+        },
+    });
+    let res = try_s!(json::to_vec(&res_js));
+    Ok(try_s!(Response::builder().body(res)))
 }
 
 /// Find out the swaps that need to be kick-started, continue from the point where swap was interrupted
 /// Return the tickers of coins that must be enabled for swaps to continue
-pub fn swap_kick_starts(ctx: MmArc) -> HashSet<String> {
+pub async fn swap_kick_starts(ctx: MmArc) -> Result<HashSet<String>, String> {
     let mut coins = HashSet::new();
-    let entries: Vec<PathBuf> = read_dir(&my_swaps_dir(&ctx))
-        .unwrap()
-        .into_iter()
-        .filter_map(|(_lm, path)| {
-            if path.extension() == Some(OsStr::new("json")) {
-                Some(path)
-            } else {
-                None
-            }
-        })
-        .collect();
-
-    entries.iter().for_each(|path| {
-        if let Ok(swap) = json::from_slice::<SavedSwap>(&slurp(&path).unwrap()) {
-            if !swap.is_finished() {
-                info!("Kick starting the swap {}", swap.uuid());
-                let maker_coin_ticker = match swap.maker_coin_ticker() {
-                    Ok(t) => t,
-                    Err(e) => {
-                        error!("Error {} getting maker coin of swap: {}", e, swap.uuid());
-                        return;
-                    },
-                };
-                let taker_coin_ticker = match swap.taker_coin_ticker() {
-                    Ok(t) => t,
-                    Err(e) => {
-                        error!("Error {} getting taker coin of swap {}", e, swap.uuid());
-                        return;
-                    },
-                };
-                coins.insert(maker_coin_ticker.clone());
-                coins.insert(taker_coin_ticker.clone());
-                thread::spawn({
-                    let ctx = ctx.clone();
-                    move || {
-                        let taker_coin = loop {
-                            match block_on(lp_coinfind(&ctx, &taker_coin_ticker)) {
-                                Ok(Some(c)) => break c,
-                                Ok(None) => {
-                                    info!(
-                                        "Can't kickstart the swap {} until the coin {} is activated",
-                                        swap.uuid(),
-                                        taker_coin_ticker
-                                    );
-                                    thread::sleep(Duration::from_secs(5));
-                                },
-                                Err(e) => {
-                                    error!("Error {} on {} find attempt", e, taker_coin_ticker);
-                                    return;
-                                },
-                            };
-                        };
-
-                        let maker_coin = loop {
-                            match block_on(lp_coinfind(&ctx, &maker_coin_ticker)) {
-                                Ok(Some(c)) => break c,
-                                Ok(None) => {
-                                    info!(
-                                        "Can't kickstart the swap {} until the coin {} is activated",
-                                        swap.uuid(),
-                                        maker_coin_ticker
-                                    );
-                                    thread::sleep(Duration::from_secs(5));
-                                },
-                                Err(e) => {
-                                    error!("Error {} on {} find attempt", e, maker_coin_ticker);
-                                    return;
-                                },
-                            };
-                        };
-                        match swap {
-                            SavedSwap::Maker(saved_swap) => {
-                                block_on(run_maker_swap(
-                                    RunMakerSwapInput::KickStart {
-                                        maker_coin,
-                                        taker_coin,
-                                        swap_uuid: saved_swap.uuid,
-                                    },
-                                    ctx,
-                                ));
-                            },
-                            SavedSwap::Taker(saved_swap) => {
-                                block_on(run_taker_swap(
-                                    RunTakerSwapInput::KickStart {
-                                        maker_coin,
-                                        taker_coin,
-                                        swap_uuid: saved_swap.uuid,
-                                    },
-                                    ctx,
-                                ));
-                            },
-                        }
-                    }
-                });
-            }
+    let swaps = try_s!(SavedSwap::load_all_my_swaps_from_db(&ctx).await);
+    for swap in swaps {
+        if swap.is_finished() {
+            continue;
         }
-    });
-    coins
+
+        info!("Kick starting the swap {}", swap.uuid());
+        let maker_coin_ticker = match swap.maker_coin_ticker() {
+            Ok(t) => t,
+            Err(e) => {
+                error!("Error {} getting maker coin of swap: {}", e, swap.uuid());
+                continue;
+            },
+        };
+        let taker_coin_ticker = match swap.taker_coin_ticker() {
+            Ok(t) => t,
+            Err(e) => {
+                error!("Error {} getting taker coin of swap {}", e, swap.uuid());
+                continue;
+            },
+        };
+        coins.insert(maker_coin_ticker.clone());
+        coins.insert(taker_coin_ticker.clone());
+
+        let ctx = ctx.clone();
+
+        // kick-start the swap in a separate thread.
+        #[cfg(not(target_arch = "wasm32"))]
+        std::thread::spawn(move || {
+            common::block_on(kickstart_thread_handler(
+                ctx.clone(),
+                swap,
+                maker_coin_ticker,
+                taker_coin_ticker,
+            ))
+        });
+
+        #[cfg(target_arch = "wasm32")]
+        common::executor::spawn(async move {
+            kickstart_thread_handler(ctx, swap, maker_coin_ticker, taker_coin_ticker).await
+        });
+    }
+    Ok(coins)
+}
+
+async fn kickstart_thread_handler(ctx: MmArc, swap: SavedSwap, maker_coin_ticker: String, taker_coin_ticker: String) {
+    let taker_coin = loop {
+        match lp_coinfind(&ctx, &taker_coin_ticker).await {
+            Ok(Some(c)) => break c,
+            Ok(None) => {
+                info!(
+                    "Can't kickstart the swap {} until the coin {} is activated",
+                    swap.uuid(),
+                    taker_coin_ticker
+                );
+                Timer::sleep(5.).await;
+            },
+            Err(e) => {
+                error!("Error {} on {} find attempt", e, taker_coin_ticker);
+                return;
+            },
+        };
+    };
+
+    let maker_coin = loop {
+        match lp_coinfind(&ctx, &maker_coin_ticker).await {
+            Ok(Some(c)) => break c,
+            Ok(None) => {
+                info!(
+                    "Can't kickstart the swap {} until the coin {} is activated",
+                    swap.uuid(),
+                    maker_coin_ticker
+                );
+                Timer::sleep(5.).await;
+            },
+            Err(e) => {
+                error!("Error {} on {} find attempt", e, maker_coin_ticker);
+                return;
+            },
+        };
+    };
+    match swap {
+        SavedSwap::Maker(saved_swap) => {
+            run_maker_swap(
+                RunMakerSwapInput::KickStart {
+                    maker_coin,
+                    taker_coin,
+                    swap_uuid: saved_swap.uuid,
+                },
+                ctx,
+            )
+            .await;
+        },
+        SavedSwap::Taker(saved_swap) => {
+            run_taker_swap(
+                RunTakerSwapInput::KickStart {
+                    maker_coin,
+                    taker_coin,
+                    swap_uuid: saved_swap.uuid,
+                },
+                ctx,
+            )
+            .await;
+        },
+    }
 }
 
 pub async fn coins_needed_for_kick_start(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
@@ -1118,15 +1136,13 @@ pub async fn coins_needed_for_kick_start(ctx: MmArc) -> Result<Response<Vec<u8>>
 
 pub async fn recover_funds_of_swap(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
     let uuid: Uuid = try_s!(json::from_value(req["params"]["uuid"].clone()));
-    let path = my_swap_file_path(&ctx, &uuid);
-    let content = try_s!(slurp(&path));
-    if content.is_empty() {
-        return ERR!("swap data is not found");
-    }
-
-    let swap: SavedSwap = try_s!(json::from_slice(&content));
+    let swap = match SavedSwap::load_my_swap_from_db(&ctx, uuid).await {
+        Ok(Some(swap)) => swap,
+        Ok(None) => return ERR!("swap data is not found"),
+        Err(e) => return ERR!("{}", e),
+    };
 
-    let recover_data = try_s!(swap.recover_funds(ctx));
+    let recover_data = try_s!(swap.recover_funds(ctx).await);
     let res = try_s!(json::to_vec(&json!({
         "result": {
             "action": recover_data.action,
@@ -1143,23 +1159,25 @@ pub async fn import_swaps(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, St
     let mut imported = vec![];
     let mut skipped = HashMap::new();
     for swap in swaps {
-        match swap.save_to_db(&ctx) {
+        match swap.save_to_db(&ctx).await {
             Ok(_) => {
                 if let Some(info) = swap.get_my_info() {
                     if let Err(e) = insert_new_swap_to_db(
-                        &ctx,
+                        ctx.clone(),
                         &info.my_coin,
                         &info.other_coin,
-                        &swap.uuid().to_string(),
-                        &info.started_at.to_string(),
-                    ) {
+                        *swap.uuid(),
+                        info.started_at,
+                    )
+                    .await
+                    {
                         error!("Error {} on new swap insertion", e);
                     }
                 }
                 imported.push(swap.uuid().to_owned());
             },
             Err(e) => {
-                skipped.insert(swap.uuid().to_owned(), e);
+                skipped.insert(swap.uuid().to_owned(), ERRL!("{}", e));
             },
         }
     }
@@ -1190,21 +1208,11 @@ pub async fn active_swaps_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>
     let statuses = if req.include_status {
         let mut map = HashMap::new();
         for uuid in uuids.iter() {
-            let path = my_swap_file_path(&ctx, uuid);
-            let content = match slurp(&path) {
-                Ok(c) => c,
+            let status = match SavedSwap::load_my_swap_from_db(&ctx, *uuid).await {
+                Ok(Some(status)) => status,
+                Ok(None) => continue,
                 Err(e) => {
-                    error!("Error {} on slurp({})", e, path.display());
-                    continue;
-                },
-            };
-            if content.is_empty() {
-                continue;
-            }
-            let status: SavedSwap = match json::from_slice(&content) {
-                Ok(s) => s,
-                Err(e) => {
-                    error!("Error {} on deserializing the content {:?}", e, content);
+                    error!("Error on loading_from_db: {}", e);
                     continue;
                 },
             };
@@ -1281,7 +1289,7 @@ mod lp_swap_tests {
             taker_coin_confs: 1,
             taker_coin_nota: false,
         };
-        let expected = PAYMENT_LOCKTIME * 4;
+        let expected = get_payment_locktime() * 4;
         let version = AtomicLocktimeVersion::V2 {
             my_conf_settings,
             other_conf_settings,
@@ -1303,7 +1311,7 @@ mod lp_swap_tests {
             taker_coin_confs: 1,
             taker_coin_nota: false,
         };
-        let expected = PAYMENT_LOCKTIME * 4;
+        let expected = get_payment_locktime() * 4;
         let version = AtomicLocktimeVersion::V2 {
             my_conf_settings,
             other_conf_settings,
@@ -1325,7 +1333,7 @@ mod lp_swap_tests {
             taker_coin_confs: 1,
             taker_coin_nota: false,
         };
-        let expected = PAYMENT_LOCKTIME * 4;
+        let expected = get_payment_locktime() * 4;
         let version = AtomicLocktimeVersion::V2 {
             my_conf_settings,
             other_conf_settings,
@@ -1347,7 +1355,7 @@ mod lp_swap_tests {
             taker_coin_confs: 1,
             taker_coin_nota: false,
         };
-        let expected = PAYMENT_LOCKTIME;
+        let expected = get_payment_locktime();
         let version = AtomicLocktimeVersion::V2 {
             my_conf_settings,
             other_conf_settings,
@@ -1369,7 +1377,7 @@ mod lp_swap_tests {
             taker_coin_confs: 1,
             taker_coin_nota: false,
         };
-        let expected = PAYMENT_LOCKTIME * 4;
+        let expected = get_payment_locktime() * 4;
         let version = AtomicLocktimeVersion::V2 {
             my_conf_settings,
             other_conf_settings,
@@ -1391,7 +1399,7 @@ mod lp_swap_tests {
             taker_coin_confs: 1,
             taker_coin_nota: false,
         };
-        let expected = PAYMENT_LOCKTIME * 4;
+        let expected = get_payment_locktime() * 4;
         let version = AtomicLocktimeVersion::V2 {
             my_conf_settings,
             other_conf_settings,
@@ -1401,37 +1409,37 @@ mod lp_swap_tests {
 
         let maker_coin = "KMD";
         let taker_coin = "DEX";
-        let expected = PAYMENT_LOCKTIME;
+        let expected = get_payment_locktime();
         let actual = lp_atomic_locktime(maker_coin, taker_coin, AtomicLocktimeVersion::V1);
         assert_eq!(expected, actual);
 
         let maker_coin = "KMD";
         let taker_coin = "DEX";
-        let expected = PAYMENT_LOCKTIME;
+        let expected = get_payment_locktime();
         let actual = lp_atomic_locktime(maker_coin, taker_coin, AtomicLocktimeVersion::V1);
         assert_eq!(expected, actual);
 
         let maker_coin = "KMD";
         let taker_coin = "DEX";
-        let expected = PAYMENT_LOCKTIME;
+        let expected = get_payment_locktime();
         let actual = lp_atomic_locktime(maker_coin, taker_coin, AtomicLocktimeVersion::V1);
         assert_eq!(expected, actual);
 
         let maker_coin = "KMD";
         let taker_coin = "DEX";
-        let expected = PAYMENT_LOCKTIME;
+        let expected = get_payment_locktime();
         let actual = lp_atomic_locktime(maker_coin, taker_coin, AtomicLocktimeVersion::V1);
         assert_eq!(expected, actual);
 
         let maker_coin = "BTC";
         let taker_coin = "DEX";
-        let expected = PAYMENT_LOCKTIME * 10;
+        let expected = get_payment_locktime() * 10;
         let actual = lp_atomic_locktime(maker_coin, taker_coin, AtomicLocktimeVersion::V1);
         assert_eq!(expected, actual);
 
         let maker_coin = "KMD";
         let taker_coin = "BTC";
-        let expected = PAYMENT_LOCKTIME * 10;
+        let expected = get_payment_locktime() * 10;
         let actual = lp_atomic_locktime(maker_coin, taker_coin, AtomicLocktimeVersion::V1);
         assert_eq!(expected, actual);
     }
@@ -1497,5 +1505,22 @@ mod lp_swap_tests {
         let deserialized: NegotiationDataMsg = rmp_serde::from_read_ref(serialized.as_slice()).unwrap();
 
         assert_eq!(deserialized, v2);
+
+        let v3 = NegotiationDataMsg::V3(NegotiationDataV3 {
+            started_at: 0,
+            payment_locktime: 0,
+            secret_hash: vec![0; 20],
+            maker_coin_swap_contract: vec![1; 20],
+            taker_coin_swap_contract: vec![1; 20],
+            maker_coin_htlc_pub: vec![1; 33],
+            taker_coin_htlc_pub: vec![1; 33],
+        });
+
+        // v3 must be deserialized to v3, backward compatibility is not required
+        let serialized = rmp_serde::to_vec(&v3).unwrap();
+
+        let deserialized: NegotiationDataMsg = rmp_serde::from_read_ref(serialized.as_slice()).unwrap();
+
+        assert_eq!(deserialized, v3);
     }
 }
diff --git a/mm2src/lp_swap/check_balance.rs b/mm2src/mm2_main/src/lp_swap/check_balance.rs
similarity index 96%
rename from mm2src/lp_swap/check_balance.rs
rename to mm2src/mm2_main/src/lp_swap/check_balance.rs
index 2014ebfc00..6034769dd0 100644
--- a/mm2src/lp_swap/check_balance.rs
+++ b/mm2src/mm2_main/src/lp_swap/check_balance.rs
@@ -1,13 +1,12 @@
 use super::taker_swap::MaxTakerVolumeLessThanDust;
 use super::{get_locked_amount, get_locked_amount_by_other_swaps};
-use bigdecimal::BigDecimal;
 use coins::{BalanceError, MmCoinEnum, TradeFee, TradePreimageError};
 use common::log::debug;
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
-use common::mm_number::MmNumber;
 use derive_more::Display;
 use futures::compat::Future01CompatExt;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
 use uuid::Uuid;
 
 pub type CheckBalanceResult<T> = Result<T, MmError<CheckBalanceError>>;
@@ -22,7 +21,7 @@ pub async fn check_my_coin_balance_for_swap(
     volume: MmNumber,
     mut trade_fee: TradeFee,
     taker_fee: Option<TakerFeeAdditionalInfo>,
-) -> CheckBalanceResult<()> {
+) -> CheckBalanceResult<BigDecimal> {
     let ticker = coin.ticker();
     debug!("Check my_coin '{}' balance for swap", ticker);
     let balance: MmNumber = coin.my_spendable_balance().compat().await?.into();
@@ -81,7 +80,7 @@ pub async fn check_my_coin_balance_for_swap(
         });
     }
 
-    Ok(())
+    Ok(balance.into())
 }
 
 pub async fn check_other_coin_balance_for_swap(
@@ -222,6 +221,9 @@ impl From<BalanceError> for CheckBalanceError {
             BalanceError::Transport(transport) | BalanceError::InvalidResponse(transport) => {
                 CheckBalanceError::Transport(transport)
             },
+            e @ BalanceError::UnexpectedDerivationMethod(_) | e @ BalanceError::WalletStorageError(_) => {
+                CheckBalanceError::InternalError(e.to_string())
+            },
             BalanceError::Internal(internal) => CheckBalanceError::InternalError(internal),
         }
     }
diff --git a/mm2src/lp_swap/maker_swap.rs b/mm2src/mm2_main/src/lp_swap/maker_swap.rs
similarity index 84%
rename from mm2src/lp_swap/maker_swap.rs
rename to mm2src/mm2_main/src/lp_swap/maker_swap.rs
index 7b770c4618..caafef90e7 100644
--- a/mm2src/lp_swap/maker_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap/maker_swap.rs
@@ -1,95 +1,107 @@
 use super::check_balance::{check_base_coin_balance_for_swap, check_my_coin_balance_for_swap, CheckBalanceError,
                            CheckBalanceResult};
 use super::pubkey_banning::ban_pubkey_on_failed_swap;
+use super::swap_lock::{SwapLock, SwapLockOps};
 use super::trade_preimage::{TradePreimageRequest, TradePreimageRpcError, TradePreimageRpcResult};
 use super::{broadcast_my_swap_status, broadcast_swap_message_every, check_other_coin_balance_for_swap,
-            dex_fee_amount_from_taker_coin, get_locked_amount, my_swap_file_path, my_swaps_dir, recv_swap_msg,
-            swap_topic, AtomicSwap, LockedAmount, MySwapInfo, NegotiationDataMsg, NegotiationDataV2, RecoveredSwap,
-            RecoveredSwapAction, SavedSwap, SavedTradeFee, SwapConfirmationsSettings, SwapError, SwapMsg,
-            SwapsContext, TransactionIdentifier, WAIT_CONFIRM_INTERVAL};
-
+            dex_fee_amount_from_taker_coin, get_locked_amount, recv_swap_msg, swap_topic, AtomicSwap, LockedAmount,
+            MySwapInfo, NegotiationDataMsg, NegotiationDataV2, NegotiationDataV3, RecoveredSwap, RecoveredSwapAction,
+            SavedSwap, SavedSwapIo, SavedTradeFee, SwapConfirmationsSettings, SwapError, SwapMsg, SwapsContext,
+            TransactionIdentifier, WAIT_CONFIRM_INTERVAL};
+use crate::mm2::lp_dispatcher::{DispatcherContext, LpEvents};
 use crate::mm2::lp_network::subscribe_to_topic;
 use crate::mm2::lp_ordermatch::{MakerOrderBuilder, OrderConfirmationsSettings};
+use crate::mm2::lp_price::fetch_swap_coins_price;
+use crate::mm2::lp_swap::{broadcast_p2p_tx_msg, tx_helper_topic};
 use crate::mm2::MM_VERSION;
-use bigdecimal::BigDecimal;
 use bitcrypto::dhash160;
-use coins::{CanRefundHtlc, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum, TradeFee, TradePreimageValue, TransactionEnum};
-use common::mm_error::prelude::*;
-use common::{bits256, executor::Timer, file_lock::FileLock, log::error, mm_ctx::MmArc, mm_number::MmNumber, now_ms,
-             slurp, write, DEX_FEE_ADDR_RAW_PUBKEY};
+use coins::{CanRefundHtlc, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum, SearchForSwapTxSpendInput, TradeFee,
+            TradePreimageValue, TransactionEnum, ValidatePaymentInput};
+use common::log::{debug, error, info, warn};
+use common::{bits256, executor::Timer, now_ms, DEX_FEE_ADDR_RAW_PUBKEY};
+use crypto::privkey::SerializableSecp256k1Keypair;
 use futures::{compat::Future01CompatExt, select, FutureExt};
-use futures01::Future;
+use keys::KeyPair;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
 use parking_lot::Mutex as PaMutex;
-use primitives::hash::H264;
+use primitives::hash::{H160, H256, H264};
 use rand::Rng;
 use rpc::v1::types::{Bytes as BytesJson, H160 as H160Json, H256 as H256Json, H264 as H264Json};
-use serde_json as json;
+use std::any::TypeId;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use uuid::Uuid;
 
+pub const MAKER_SUCCESS_EVENTS: [&str; 11] = [
+    "Started",
+    "Negotiated",
+    "TakerFeeValidated",
+    "MakerPaymentSent",
+    "TakerPaymentReceived",
+    "TakerPaymentWaitConfirmStarted",
+    "TakerPaymentValidatedAndConfirmed",
+    "TakerPaymentSpent",
+    "TakerPaymentSpendConfirmStarted",
+    "TakerPaymentSpendConfirmed",
+    "Finished",
+];
+
+pub const MAKER_ERROR_EVENTS: [&str; 13] = [
+    "StartFailed",
+    "NegotiateFailed",
+    "TakerFeeValidateFailed",
+    "MakerPaymentTransactionFailed",
+    "MakerPaymentDataSendFailed",
+    "MakerPaymentWaitConfirmFailed",
+    "TakerPaymentValidateFailed",
+    "TakerPaymentWaitConfirmFailed",
+    "TakerPaymentSpendFailed",
+    "TakerPaymentSpendConfirmFailed",
+    "MakerPaymentWaitRefundStarted",
+    "MakerPaymentRefunded",
+    "MakerPaymentRefundFailed",
+];
+
 pub fn stats_maker_swap_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("SWAPS").join("STATS").join("MAKER") }
 
 pub fn stats_maker_swap_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     stats_maker_swap_dir(ctx).join(format!("{}.json", uuid))
 }
 
-fn save_my_maker_swap_event(ctx: &MmArc, swap: &MakerSwap, event: MakerSavedEvent) -> Result<(), String> {
-    let path = my_swap_file_path(ctx, &swap.uuid);
-    let content = try_s!(slurp(&path));
-    let swap: SavedSwap = if content.is_empty() {
-        SavedSwap::Maker(MakerSavedSwap {
+async fn save_my_maker_swap_event(ctx: &MmArc, swap: &MakerSwap, event: MakerSavedEvent) -> Result<(), String> {
+    let swap = match SavedSwap::load_my_swap_from_db(ctx, swap.uuid).await {
+        Ok(Some(swap)) => swap,
+        Ok(None) => SavedSwap::Maker(MakerSavedSwap {
             uuid: swap.uuid,
             my_order_uuid: swap.my_order_uuid,
             maker_amount: Some(swap.maker_amount.clone()),
             maker_coin: Some(swap.maker_coin.ticker().to_owned()),
+            maker_coin_usd_price: None,
             taker_amount: Some(swap.taker_amount.clone()),
             taker_coin: Some(swap.taker_coin.ticker().to_owned()),
+            taker_coin_usd_price: None,
             gui: ctx.gui().map(|g| g.to_owned()),
             mm_version: Some(MM_VERSION.to_owned()),
             events: vec![],
-            success_events: vec![
-                "Started".into(),
-                "Negotiated".into(),
-                "TakerFeeValidated".into(),
-                "MakerPaymentSent".into(),
-                "TakerPaymentReceived".into(),
-                "TakerPaymentWaitConfirmStarted".into(),
-                "TakerPaymentValidatedAndConfirmed".into(),
-                "TakerPaymentSpent".into(),
-                "TakerPaymentSpendConfirmStarted".into(),
-                "TakerPaymentSpendConfirmed".into(),
-                "Finished".into(),
-            ],
-            error_events: vec![
-                "StartFailed".into(),
-                "NegotiateFailed".into(),
-                "TakerFeeValidateFailed".into(),
-                "MakerPaymentTransactionFailed".into(),
-                "MakerPaymentDataSendFailed".into(),
-                "MakerPaymentWaitConfirmFailed".into(),
-                "TakerPaymentValidateFailed".into(),
-                "TakerPaymentWaitConfirmFailed".into(),
-                "TakerPaymentSpendFailed".into(),
-                "TakerPaymentSpendConfirmFailed".into(),
-                "MakerPaymentWaitRefundStarted".into(),
-                "MakerPaymentRefunded".into(),
-                "MakerPaymentRefundFailed".into(),
-            ],
-        })
-    } else {
-        try_s!(json::from_slice(&content))
+            success_events: MAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
+            error_events: MAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
+        }),
+        Err(e) => return ERR!("{}", e),
     };
 
     if let SavedSwap::Maker(mut maker_swap) = swap {
         maker_swap.events.push(event);
+        if maker_swap.is_success().unwrap_or(false) {
+            maker_swap.fetch_and_set_usd_prices().await;
+        }
         let new_swap = SavedSwap::Maker(maker_swap);
-        let new_content = try_s!(json::to_vec(&new_swap));
-        try_s!(write(&path, &new_content));
+        try_s!(new_swap.save_to_db(ctx).await);
         Ok(())
     } else {
-        ERR!("Expected SavedSwap::Maker at {}, got {:?}", path.display(), swap)
+        ERR!("Expected SavedSwap::Maker, got {:?}", swap)
     }
 }
 
@@ -99,44 +111,61 @@ pub struct TakerNegotiationData {
     pub taker_pubkey: H264Json,
     pub maker_coin_swap_contract_addr: Option<BytesJson>,
     pub taker_coin_swap_contract_addr: Option<BytesJson>,
+    pub maker_coin_htlc_pubkey: Option<H264Json>,
+    pub taker_coin_htlc_pubkey: Option<H264Json>,
+}
+
+impl TakerNegotiationData {
+    #[inline]
+    fn other_maker_coin_htlc_pub(&self) -> H264 { self.maker_coin_htlc_pubkey.unwrap_or(self.taker_pubkey).into() }
+
+    #[inline]
+    fn other_taker_coin_htlc_pub(&self) -> H264 { self.taker_coin_htlc_pubkey.unwrap_or(self.taker_pubkey).into() }
 }
 
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
 pub struct MakerSwapData {
     pub taker_coin: String,
     pub maker_coin: String,
-    taker: H256Json,
-    secret: H256Json,
-    secret_hash: Option<H160Json>,
-    my_persistent_pub: H264Json,
-    lock_duration: u64,
+    pub taker: H256Json,
+    pub secret: H256Json,
+    pub secret_hash: Option<H160Json>,
+    pub my_persistent_pub: H264Json,
+    pub lock_duration: u64,
     pub maker_amount: BigDecimal,
     pub taker_amount: BigDecimal,
-    maker_payment_confirmations: u64,
-    maker_payment_requires_nota: Option<bool>,
-    taker_payment_confirmations: u64,
-    taker_payment_requires_nota: Option<bool>,
-    maker_payment_lock: u64,
+    pub maker_payment_confirmations: u64,
+    pub maker_payment_requires_nota: Option<bool>,
+    pub taker_payment_confirmations: u64,
+    pub taker_payment_requires_nota: Option<bool>,
+    pub maker_payment_lock: u64,
     /// Allows to recognize one SWAP from the other in the logs. #274.
-    uuid: Uuid,
+    pub uuid: Uuid,
     pub started_at: u64,
-    maker_coin_start_block: u64,
-    taker_coin_start_block: u64,
+    pub maker_coin_start_block: u64,
+    pub taker_coin_start_block: u64,
     /// A `MakerPayment` transaction fee.
     /// Note this value is used to calculate locked amount only.
-    maker_payment_trade_fee: Option<SavedTradeFee>,
+    pub maker_payment_trade_fee: Option<SavedTradeFee>,
     /// A transaction fee that should be paid to spend a `TakerPayment`.
     /// Note this value is used to calculate locked amount only.
-    taker_payment_spend_trade_fee: Option<SavedTradeFee>,
+    pub taker_payment_spend_trade_fee: Option<SavedTradeFee>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    maker_coin_swap_contract_address: Option<BytesJson>,
+    pub maker_coin_swap_contract_address: Option<BytesJson>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    taker_coin_swap_contract_address: Option<BytesJson>,
+    pub taker_coin_swap_contract_address: Option<BytesJson>,
+    /// Temporary pubkey used in HTLC redeem script when applicable for maker coin
+    pub maker_coin_htlc_pubkey: Option<H264Json>,
+    /// Temporary pubkey used in HTLC redeem script when applicable for taker coin
+    pub taker_coin_htlc_pubkey: Option<H264Json>,
+    /// Temporary privkey used to sign P2P messages when applicable
+    pub p2p_privkey: Option<SerializableSecp256k1Keypair>,
 }
 
 pub struct MakerSwapMut {
     data: MakerSwapData,
-    other_persistent_pub: H264,
+    other_maker_coin_htlc_pub: H264,
+    other_taker_coin_htlc_pub: H264,
     #[allow(dead_code)]
     taker_fee: Option<TransactionIdentifier>,
     maker_payment: Option<TransactionIdentifier>,
@@ -163,27 +192,59 @@ pub struct MakerSwap {
     mutable: RwLock<MakerSwapMut>,
     conf_settings: SwapConfirmationsSettings,
     payment_locktime: u64,
+    /// Temporary privkey used to sign P2P messages when applicable
+    p2p_privkey: Option<KeyPair>,
+    secret: H256,
 }
 
 impl MakerSwap {
+    #[inline]
     fn w(&self) -> RwLockWriteGuard<MakerSwapMut> { self.mutable.write().unwrap() }
+
+    #[inline]
     fn r(&self) -> RwLockReadGuard<MakerSwapMut> { self.mutable.read().unwrap() }
 
-    fn generate_secret(&self) -> [u8; 32] {
-        let mut rng = rand::thread_rng();
-        rng.gen()
+    #[inline]
+    pub fn generate_secret() -> [u8; 32] { rand::thread_rng().gen() }
+
+    #[inline]
+    fn secret_hash(&self) -> H160 {
+        self.r()
+            .data
+            .secret_hash
+            .map(H160Json::into)
+            .unwrap_or_else(|| dhash160(self.secret.as_slice()))
+    }
+
+    #[inline]
+    fn my_maker_coin_htlc_pub(&self) -> H264Json {
+        self.r()
+            .data
+            .maker_coin_htlc_pubkey
+            .unwrap_or_else(|| self.my_persistent_pub.into())
+    }
+
+    #[inline]
+    fn my_taker_coin_htlc_pub(&self) -> H264Json {
+        self.r()
+            .data
+            .taker_coin_htlc_pubkey
+            .unwrap_or_else(|| self.my_persistent_pub.into())
     }
 
     fn wait_refund_until(&self) -> u64 { self.r().data.maker_payment_lock + 3700 }
 
     fn apply_event(&self, event: MakerSwapEvent) {
         match event {
-            MakerSwapEvent::Started(data) => self.w().data = data,
+            MakerSwapEvent::Started(data) => {
+                self.w().data = data;
+            },
             MakerSwapEvent::StartFailed(err) => self.errors.lock().push(err),
             MakerSwapEvent::Negotiated(data) => {
                 self.taker_payment_lock
                     .store(data.taker_payment_locktime, Ordering::Relaxed);
-                self.w().other_persistent_pub = data.taker_pubkey.into();
+                self.w().other_maker_coin_htlc_pub = data.other_maker_coin_htlc_pub();
+                self.w().other_taker_coin_htlc_pub = data.other_taker_coin_htlc_pub();
                 if data.maker_coin_swap_contract_addr.is_some() {
                     self.w().data.maker_coin_swap_contract_address = data.maker_coin_swap_contract_addr;
                 }
@@ -249,9 +310,10 @@ impl MakerSwap {
         maker_coin: MmCoinEnum,
         taker_coin: MmCoinEnum,
         payment_locktime: u64,
+        p2p_privkey: Option<KeyPair>,
+        secret: H256,
     ) -> Self {
         MakerSwap {
-            ctx,
             maker_coin,
             taker_coin,
             maker_amount,
@@ -266,9 +328,11 @@ impl MakerSwap {
             taker_payment_confirmed: AtomicBool::new(false),
             conf_settings,
             payment_locktime,
+            p2p_privkey,
             mutable: RwLock::new(MakerSwapMut {
                 data: MakerSwapData::default(),
-                other_persistent_pub: H264::default(),
+                other_maker_coin_htlc_pub: H264::default(),
+                other_taker_coin_htlc_pub: H264::default(),
                 taker_fee: None,
                 maker_payment: None,
                 taker_payment: None,
@@ -276,6 +340,42 @@ impl MakerSwap {
                 maker_payment_refund: None,
                 taker_payment_spend_confirmed: false,
             }),
+            ctx,
+            secret,
+        }
+    }
+
+    fn get_my_negotiation_data(&self) -> NegotiationDataMsg {
+        let r = self.r();
+        let secret_hash = self.secret_hash().to_vec();
+        let maker_coin_swap_contract = self
+            .maker_coin
+            .swap_contract_address()
+            .map_or_else(Vec::new, |addr| addr.0);
+        let taker_coin_swap_contract = self
+            .taker_coin
+            .swap_contract_address()
+            .map_or_else(Vec::new, |addr| addr.0);
+
+        if r.data.maker_coin_htlc_pubkey != r.data.taker_coin_htlc_pubkey {
+            NegotiationDataMsg::V3(NegotiationDataV3 {
+                started_at: r.data.started_at,
+                payment_locktime: r.data.maker_payment_lock,
+                secret_hash,
+                maker_coin_swap_contract,
+                taker_coin_swap_contract,
+                maker_coin_htlc_pub: self.my_maker_coin_htlc_pub().into(),
+                taker_coin_htlc_pub: self.my_taker_coin_htlc_pub().into(),
+            })
+        } else {
+            NegotiationDataMsg::V2(NegotiationDataV2 {
+                started_at: r.data.started_at,
+                payment_locktime: r.data.maker_payment_lock,
+                persistent_pubkey: r.data.my_persistent_pub.0.to_vec(),
+                secret_hash,
+                maker_coin_swap_contract,
+                taker_coin_swap_contract,
+            })
         }
     }
 
@@ -284,7 +384,7 @@ impl MakerSwap {
         let preimage_value = TradePreimageValue::Exact(self.maker_amount.clone());
         let stage = FeeApproxStage::StartSwap;
         let get_sender_trade_fee_fut = self.maker_coin.get_sender_trade_fee(preimage_value, stage.clone());
-        let maker_payment_trade_fee = match get_sender_trade_fee_fut.compat().await {
+        let maker_payment_trade_fee = match get_sender_trade_fee_fut.await {
             Ok(fee) => fee,
             Err(e) => {
                 return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::StartFailed(
@@ -325,7 +425,6 @@ impl MakerSwap {
             },
         };
 
-        let secret = self.generate_secret();
         let started_at = now_ms() / 1000;
         let maker_coin_start_block = match self.maker_coin.current_block().compat().await {
             Ok(b) => b,
@@ -348,12 +447,16 @@ impl MakerSwap {
         let maker_coin_swap_contract_address = self.maker_coin.swap_contract_address();
         let taker_coin_swap_contract_address = self.taker_coin.swap_contract_address();
 
+        let unique_data = self.unique_swap_data();
+        let maker_coin_htlc_key_pair = self.maker_coin.derive_htlc_key_pair(&unique_data);
+        let taker_coin_htlc_key_pair = self.taker_coin.derive_htlc_key_pair(&unique_data);
+
         let data = MakerSwapData {
             taker_coin: self.taker_coin.ticker().to_owned(),
             maker_coin: self.maker_coin.ticker().to_owned(),
             taker: self.taker.bytes.into(),
-            secret_hash: Some(dhash160(&secret).into()),
-            secret: secret.into(),
+            secret: self.secret.into(),
+            secret_hash: Some(self.secret_hash().into()),
             started_at,
             lock_duration: self.payment_locktime,
             maker_amount: self.maker_amount.clone(),
@@ -363,7 +466,7 @@ impl MakerSwap {
             taker_payment_confirmations: self.conf_settings.taker_coin_confs,
             taker_payment_requires_nota: Some(self.conf_settings.taker_coin_nota),
             maker_payment_lock: started_at + self.payment_locktime * 2,
-            my_persistent_pub: self.my_persistent_pub.clone().into(),
+            my_persistent_pub: self.my_persistent_pub.into(),
             uuid: self.uuid,
             maker_coin_start_block,
             taker_coin_start_block,
@@ -371,27 +474,27 @@ impl MakerSwap {
             taker_payment_spend_trade_fee: Some(SavedTradeFee::from(taker_payment_spend_trade_fee)),
             maker_coin_swap_contract_address,
             taker_coin_swap_contract_address,
+            maker_coin_htlc_pubkey: Some(maker_coin_htlc_key_pair.public_slice().into()),
+            taker_coin_htlc_pubkey: Some(taker_coin_htlc_key_pair.public_slice().into()),
+            p2p_privkey: self.p2p_privkey.map(SerializableSecp256k1Keypair::from),
         };
 
         Ok((Some(MakerSwapCommand::Negotiate), vec![MakerSwapEvent::Started(data)]))
     }
 
     async fn negotiate(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
-        let maker_negotiation_data = SwapMsg::Negotiation(NegotiationDataMsg::V2(NegotiationDataV2 {
-            started_at: self.r().data.started_at,
-            payment_locktime: self.r().data.maker_payment_lock,
-            secret_hash: dhash160(&self.r().data.secret.0).take().to_vec(),
-            persistent_pubkey: self.my_persistent_pub.to_vec(),
-            maker_coin_swap_contract: self.maker_coin.swap_contract_address().map_or(vec![], |addr| addr.0),
-            taker_coin_swap_contract: self.taker_coin.swap_contract_address().map_or(vec![], |addr| addr.0),
-        }));
+        let negotiation_data = self.get_my_negotiation_data();
+
+        let maker_negotiation_data = SwapMsg::Negotiation(negotiation_data);
         const NEGOTIATION_TIMEOUT: u64 = 90;
 
+        debug!("Sending maker negotiation data {:?}", maker_negotiation_data);
         let send_abort_handle = broadcast_swap_message_every(
             self.ctx.clone(),
             swap_topic(&self.uuid),
             maker_negotiation_data,
             NEGOTIATION_TIMEOUT as f64 / 6.,
+            self.p2p_privkey,
         );
         let recv_fut = recv_swap_msg(
             self.ctx.clone(),
@@ -454,21 +557,26 @@ impl MakerSwap {
         Ok((Some(MakerSwapCommand::WaitForTakerFee), vec![
             MakerSwapEvent::Negotiated(TakerNegotiationData {
                 taker_payment_locktime: taker_data.payment_locktime(),
-                taker_pubkey: taker_data.persistent_pubkey().into(),
+                // using default to avoid misuse of this field
+                // maker_coin_htlc_pubkey and taker_coin_htlc_pubkey must be used instead
+                taker_pubkey: H264Json::default(),
                 maker_coin_swap_contract_addr,
                 taker_coin_swap_contract_addr,
+                maker_coin_htlc_pubkey: Some(taker_data.maker_coin_htlc_pub().into()),
+                taker_coin_htlc_pubkey: Some(taker_data.taker_coin_htlc_pub().into()),
             }),
         ]))
     }
 
     async fn wait_taker_fee(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
-        const TAKER_FEE_RECV_TIMEOUT: u64 = 180;
+        const TAKER_FEE_RECV_TIMEOUT: u64 = 600;
         let negotiated = SwapMsg::Negotiated(true);
         let send_abort_handle = broadcast_swap_message_every(
             self.ctx.clone(),
             swap_topic(&self.uuid),
             negotiated,
             TAKER_FEE_RECV_TIMEOUT as f64 / 6.,
+            self.p2p_privkey,
         );
 
         let recv_fut = recv_swap_msg(
@@ -496,11 +604,11 @@ impl MakerSwap {
         };
 
         let hash = taker_fee.tx_hash();
-        log!({ "Taker fee tx {:02x}", hash });
+        info!("Taker fee tx {:02x}", hash);
 
         let taker_amount = MmNumber::from(self.taker_amount.clone());
         let fee_amount = dex_fee_amount_from_taker_coin(&self.taker_coin, &self.r().data.maker_coin, &taker_amount);
-        let other_pub = self.r().other_persistent_pub.clone();
+        let other_taker_coin_htlc_pub = self.r().other_taker_coin_htlc_pub;
         let taker_coin_start_block = self.r().data.taker_coin_start_block;
 
         let mut attempts = 0;
@@ -509,10 +617,11 @@ impl MakerSwap {
                 .taker_coin
                 .validate_fee(
                     &taker_fee,
-                    &*other_pub,
+                    &*other_taker_coin_htlc_pub,
                     &DEX_FEE_ADDR_RAW_PUBKEY,
                     &fee_amount.clone().into(),
                     taker_coin_start_block,
+                    self.uuid.as_bytes(),
                 )
                 .compat()
                 .await
@@ -550,47 +659,41 @@ impl MakerSwap {
             ]));
         }
 
-        let before_check_my_payment = now_ms();
+        let secret_hash = self.secret_hash();
+        let unique_data = self.unique_swap_data();
         let transaction_f = self
             .maker_coin
             .check_if_my_payment_sent(
                 self.r().data.maker_payment_lock as u32,
-                &*self.r().other_persistent_pub,
-                &*dhash160(&self.r().data.secret.0),
+                &*self.r().other_maker_coin_htlc_pub,
+                secret_hash.as_slice(),
                 self.r().data.maker_coin_start_block,
                 &self.r().data.maker_coin_swap_contract_address,
+                &unique_data,
             )
             .compat();
+
         let transaction = match transaction_f.await {
             Ok(res) => match res {
                 Some(tx) => tx,
                 None => {
-                    let after_check_my_payment = now_ms();
-                    log!("check_if_my_payment_sent took "(
-                        after_check_my_payment - before_check_my_payment
-                    ));
-
-                    let before_send_maker_payment = now_ms();
                     let payment_fut = self.maker_coin.send_maker_payment(
                         self.r().data.maker_payment_lock as u32,
-                        &*self.r().other_persistent_pub,
-                        &*dhash160(&self.r().data.secret.0),
+                        &*self.r().other_maker_coin_htlc_pub,
+                        secret_hash.as_slice(),
                         self.maker_amount.clone(),
                         &self.r().data.maker_coin_swap_contract_address,
+                        &unique_data,
                     );
 
                     match payment_fut.compat().await {
-                        Ok(t) => {
-                            let after_send_maker_payment = now_ms();
-                            log!("send_maker_payment took "(
-                                after_send_maker_payment - before_send_maker_payment
-                            ));
-                            t
-                        },
+                        Ok(t) => t,
                         Err(err) => {
                             return Ok((Some(MakerSwapCommand::Finish), vec![
-                                MakerSwapEvent::MakerPaymentTransactionFailed(ERRL!("{}", err).into()),
-                            ]))
+                                MakerSwapEvent::MakerPaymentTransactionFailed(
+                                    ERRL!("{}", err.get_plain_text_format()).into(),
+                                ),
+                            ]));
                         },
                     }
                 },
@@ -603,7 +706,7 @@ impl MakerSwap {
         };
 
         let tx_hash = transaction.tx_hash();
-        log!({ "Maker payment tx {:02x}", tx_hash });
+        info!("Maker payment tx {:02x}", tx_hash);
 
         let tx_ident = TransactionIdentifier {
             tx_hex: transaction.tx_hex().into(),
@@ -618,7 +721,8 @@ impl MakerSwap {
     async fn wait_for_taker_payment(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
         let maker_payment_hex = self.r().maker_payment.as_ref().unwrap().tx_hex.0.clone();
         let msg = SwapMsg::MakerPayment(maker_payment_hex);
-        let abort_send_handle = broadcast_swap_message_every(self.ctx.clone(), swap_topic(&self.uuid), msg, 600.);
+        let abort_send_handle =
+            broadcast_swap_message_every(self.ctx.clone(), swap_topic(&self.uuid), msg, 600., self.p2p_privkey);
 
         let maker_payment_wait_confirm = self.r().data.started_at + (self.r().data.lock_duration * 2) / 5;
         let f = self.maker_coin.wait_for_confirmations(
@@ -673,7 +777,7 @@ impl MakerSwap {
         };
 
         let tx_hash = taker_payment.tx_hash();
-        log!({ "Taker payment tx {:02x}", tx_hash });
+        info!("Taker payment tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: taker_payment.tx_hex().into(),
             tx_hash,
@@ -688,12 +792,13 @@ impl MakerSwap {
     async fn validate_taker_payment(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
         let wait_duration = (self.r().data.lock_duration * 4) / 5;
         let wait_taker_payment = self.r().data.started_at + wait_duration;
+        let confirmations = self.r().data.taker_payment_confirmations;
 
         let wait_f = self
             .taker_coin
             .wait_for_confirmations(
                 &self.r().taker_payment.clone().unwrap().tx_hex,
-                self.r().data.taker_payment_confirmations,
+                confirmations,
                 self.r().data.taker_payment_requires_nota.unwrap_or(false),
                 wait_taker_payment,
                 WAIT_CONFIRM_INTERVAL,
@@ -710,17 +815,18 @@ impl MakerSwap {
             ]));
         }
 
-        let validated_f = self
-            .taker_coin
-            .validate_taker_payment(
-                &self.r().taker_payment.clone().unwrap().tx_hex,
-                self.taker_payment_lock.load(Ordering::Relaxed) as u32,
-                &*self.r().other_persistent_pub,
-                &*dhash160(&self.r().data.secret.0),
-                self.taker_amount.clone(),
-                &self.r().data.taker_coin_swap_contract_address,
-            )
-            .compat();
+        let validate_input = ValidatePaymentInput {
+            payment_tx: self.r().taker_payment.clone().unwrap().tx_hex.0,
+            time_lock: self.taker_payment_lock.load(Ordering::Relaxed) as u32,
+            other_pub: self.r().other_taker_coin_htlc_pub.to_vec(),
+            unique_swap_data: self.unique_swap_data(),
+            secret_hash: self.secret_hash().to_vec(),
+            amount: self.taker_amount.clone(),
+            swap_contract_address: self.r().data.taker_coin_swap_contract_address.clone(),
+            try_spv_proof_until: wait_taker_payment,
+            confirmations,
+        };
+        let validated_f = self.taker_coin.validate_taker_payment(validate_input).compat();
 
         if let Err(e) = validated_f.await {
             return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
@@ -753,27 +859,48 @@ impl MakerSwap {
         let spend_fut = self.taker_coin.send_maker_spends_taker_payment(
             &self.r().taker_payment.clone().unwrap().tx_hex,
             self.taker_payment_lock.load(Ordering::Relaxed) as u32,
-            &*self.r().other_persistent_pub,
+            &*self.r().other_taker_coin_htlc_pub,
             &self.r().data.secret.0,
             &self.r().data.taker_coin_swap_contract_address,
+            &self.unique_swap_data(),
         );
 
         let transaction = match spend_fut.compat().await {
             Ok(t) => t,
             Err(err) => {
+                if let Some(tx) = err.get_tx() {
+                    broadcast_p2p_tx_msg(
+                        &self.ctx,
+                        tx_helper_topic(self.taker_coin.ticker()),
+                        &tx,
+                        &self.p2p_privkey,
+                    );
+                }
+
                 return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
                     MakerSwapEvent::TakerPaymentSpendFailed(
-                        ERRL!("!taker_coin.send_maker_spends_taker_payment: {}", err).into(),
+                        ERRL!(
+                            "!taker_coin.send_maker_spends_taker_payment: {}",
+                            err.get_plain_text_format()
+                        )
+                        .into(),
                     ),
                     MakerSwapEvent::MakerPaymentWaitRefundStarted {
                         wait_until: self.wait_refund_until(),
                     },
-                ]))
+                ]));
             },
         };
 
+        broadcast_p2p_tx_msg(
+            &self.ctx,
+            tx_helper_topic(self.taker_coin.ticker()),
+            &transaction,
+            &self.p2p_privkey,
+        );
+
         let tx_hash = transaction.tx_hash();
-        log!({ "Taker payment spend tx {:02x}", tx_hash });
+        info!("Taker payment spend tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: transaction.tx_hex().into(),
             tx_hash,
@@ -828,23 +955,45 @@ impl MakerSwap {
         let spend_fut = self.maker_coin.send_maker_refunds_payment(
             &self.r().maker_payment.clone().unwrap().tx_hex,
             self.r().data.maker_payment_lock as u32,
-            &*self.r().other_persistent_pub,
-            &*dhash160(&self.r().data.secret.0),
+            &*self.r().other_maker_coin_htlc_pub,
+            self.secret_hash().as_slice(),
             &self.r().data.maker_coin_swap_contract_address,
+            &self.unique_swap_data(),
         );
 
         let transaction = match spend_fut.compat().await {
             Ok(t) => t,
             Err(err) => {
+                if let Some(tx) = err.get_tx() {
+                    broadcast_p2p_tx_msg(
+                        &self.ctx,
+                        tx_helper_topic(self.maker_coin.ticker()),
+                        &tx,
+                        &self.p2p_privkey,
+                    );
+                }
+
                 return Ok((Some(MakerSwapCommand::Finish), vec![
                     MakerSwapEvent::MakerPaymentRefundFailed(
-                        ERRL!("!maker_coin.send_maker_refunds_payment: {}", err).into(),
+                        ERRL!(
+                            "!maker_coin.send_maker_refunds_payment: {}",
+                            err.get_plain_text_format()
+                        )
+                        .into(),
                     ),
-                ]))
+                ]));
             },
         };
+
+        broadcast_p2p_tx_msg(
+            &self.ctx,
+            tx_helper_topic(self.maker_coin.ticker()),
+            &transaction,
+            &self.p2p_privkey,
+        );
+
         let tx_hash = transaction.tx_hash();
-        log!({ "Maker payment refund tx {:02x}", tx_hash });
+        info!("Maker payment refund tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: transaction.tx_hex().into(),
             tx_hash,
@@ -855,14 +1004,17 @@ impl MakerSwap {
         ]))
     }
 
-    pub fn load_from_db_by_uuid(
+    pub async fn load_from_db_by_uuid(
         ctx: MmArc,
         maker_coin: MmCoinEnum,
         taker_coin: MmCoinEnum,
         swap_uuid: &Uuid,
     ) -> Result<(Self, Option<MakerSwapCommand>), String> {
-        let path = my_swap_file_path(&ctx, swap_uuid);
-        let saved: SavedSwap = try_s!(json::from_slice(&try_s!(slurp(&path))));
+        let saved = match SavedSwap::load_my_swap_from_db(&ctx, *swap_uuid).await {
+            Ok(Some(saved)) => saved,
+            Ok(None) => return ERR!("Couldn't find a swap with the uuid '{}'", swap_uuid),
+            Err(e) => return ERR!("{}", e),
+        };
         let saved = match saved {
             SavedSwap::Maker(swap) => swap,
             SavedSwap::Taker(_) => return ERR!("Can not load MakerSwap from SavedSwap::Taker uuid: {}", swap_uuid),
@@ -918,6 +1070,8 @@ impl MakerSwap {
             maker_coin,
             taker_coin,
             data.lock_duration,
+            data.p2p_privkey.map(SerializableSecp256k1Keypair::into_inner),
+            data.secret.into(),
         );
         let command = saved.events.last().unwrap().get_command();
         for saved_event in saved.events {
@@ -926,8 +1080,8 @@ impl MakerSwap {
         Ok((swap, command))
     }
 
-    pub fn recover_funds(&self) -> Result<RecoveredSwap, String> {
-        fn try_spend_taker_payment(selfi: &MakerSwap, secret_hash: &[u8]) -> Result<TransactionEnum, String> {
+    pub async fn recover_funds(&self) -> Result<RecoveredSwap, String> {
+        async fn try_spend_taker_payment(selfi: &MakerSwap, secret_hash: &[u8]) -> Result<TransactionEnum, String> {
             let taker_payment_hex = &selfi
                 .r()
                 .taker_payment
@@ -935,17 +1089,28 @@ impl MakerSwap {
                 .ok_or(ERRL!("No info about taker payment, swap is not recoverable"))?
                 .tx_hex;
 
+            // have to do this because std::sync::RwLockReadGuard returned by r() is not Send,
+            // so it can't be used across await
             let timelock = selfi.taker_payment_lock.load(Ordering::Relaxed) as u32;
-            let other_pub = &*selfi.r().other_persistent_pub;
-            // check if the taker payment is not spent yet
-            match selfi.taker_coin.search_for_swap_tx_spend_other(
-                timelock,
-                other_pub,
+            let other_taker_coin_htlc_pub = selfi.r().other_taker_coin_htlc_pub;
+
+            let taker_coin_start_block = selfi.r().data.taker_coin_start_block;
+            let taker_coin_swap_contract_address = selfi.r().data.taker_coin_swap_contract_address.clone();
+
+            let secret = selfi.r().data.secret.0;
+            let unique_data = selfi.unique_swap_data();
+
+            let search_input = SearchForSwapTxSpendInput {
+                time_lock: timelock,
+                other_pub: other_taker_coin_htlc_pub.as_slice(),
                 secret_hash,
-                taker_payment_hex,
-                selfi.r().data.taker_coin_start_block,
-                &selfi.r().data.taker_coin_swap_contract_address,
-            ) {
+                tx: taker_payment_hex,
+                search_from_block: taker_coin_start_block,
+                swap_contract_address: &taker_coin_swap_contract_address,
+                swap_unique_data: &unique_data,
+            };
+            // check if the taker payment is not spent yet
+            match selfi.taker_coin.search_for_swap_tx_spend_other(search_input).await {
                 Ok(Some(FoundSwapTxSpend::Spent(tx))) => {
                     return ERR!(
                         "Taker payment was already spent by {} tx {:02x}",
@@ -969,12 +1134,14 @@ impl MakerSwap {
                 .send_maker_spends_taker_payment(
                     taker_payment_hex,
                     timelock,
-                    other_pub,
-                    &selfi.r().data.secret.0,
-                    &selfi.r().data.taker_coin_swap_contract_address,
+                    other_taker_coin_htlc_pub.as_slice(),
+                    &secret,
+                    &taker_coin_swap_contract_address,
+                    &selfi.unique_swap_data(),
                 )
-                .wait()
-                .map_err(|e| ERRL!("{}", e))
+                .compat()
+                .await
+                .map_err(|e| ERRL!("{:?}", e))
         }
 
         if self.finished_at.load(Ordering::Relaxed) == 0 {
@@ -989,44 +1156,55 @@ impl MakerSwap {
             return ERR!("Taker payment spend transaction has been sent and confirmed");
         }
 
-        let secret_hash = self
-            .r()
-            .data
-            .secret_hash
-            .clone()
-            .unwrap_or_else(|| dhash160(&self.r().data.secret.0).into());
+        let secret_hash = self.secret_hash();
+        let unique_data = self.unique_swap_data();
+
+        // have to do this because std::sync::RwLockReadGuard returned by r() is not Send,
+        // so it can't be used across await
+        let maker_payment_lock = self.r().data.maker_payment_lock as u32;
+        let other_maker_coin_htlc_pub = self.r().other_maker_coin_htlc_pub;
+        let maker_coin_start_block = self.r().data.maker_coin_start_block;
+        let maker_coin_swap_contract_address = self.r().data.maker_coin_swap_contract_address.clone();
 
-        let maker_payment = match &self.r().maker_payment {
+        let maybe_maker_payment = self.r().maker_payment.clone();
+        let maker_payment = match maybe_maker_payment {
             Some(tx) => tx.tx_hex.0.clone(),
             None => {
-                let maybe_maker_payment = try_s!(self
-                    .maker_coin
-                    .check_if_my_payment_sent(
-                        self.r().data.maker_payment_lock as u32,
-                        &*self.r().other_persistent_pub,
-                        &secret_hash.0,
-                        self.r().data.maker_coin_start_block,
-                        &self.r().data.maker_coin_swap_contract_address,
-                    )
-                    .wait());
+                let maybe_maker_payment = try_s!(
+                    self.maker_coin
+                        .check_if_my_payment_sent(
+                            maker_payment_lock,
+                            other_maker_coin_htlc_pub.as_slice(),
+                            secret_hash.as_slice(),
+                            maker_coin_start_block,
+                            &maker_coin_swap_contract_address,
+                            &unique_data,
+                        )
+                        .compat()
+                        .await
+                );
                 match maybe_maker_payment {
                     Some(tx) => tx.tx_hex(),
                     None => return ERR!("Maker payment transaction was not found"),
                 }
             },
         };
+
+        let search_input = SearchForSwapTxSpendInput {
+            time_lock: maker_payment_lock,
+            other_pub: other_maker_coin_htlc_pub.as_slice(),
+            secret_hash: secret_hash.as_slice(),
+            tx: &maker_payment,
+            search_from_block: maker_coin_start_block,
+            swap_contract_address: &maker_coin_swap_contract_address,
+            swap_unique_data: &unique_data,
+        };
         // validate that maker payment is not spent
-        match self.maker_coin.search_for_swap_tx_spend_my(
-            self.r().data.maker_payment_lock as u32,
-            &*self.r().other_persistent_pub,
-            &secret_hash.0,
-            &maker_payment,
-            self.r().data.maker_coin_start_block,
-            &self.r().data.maker_coin_swap_contract_address,
-        ) {
+        match self.maker_coin.search_for_swap_tx_spend_my(search_input).await {
             Ok(Some(FoundSwapTxSpend::Spent(_))) => {
-                log!("Warning: MakerPayment spent, but TakerPayment is not yet. Trying to spend TakerPayment");
-                let transaction = try_s!(try_spend_taker_payment(self, &secret_hash.0));
+                warn!("MakerPayment spent, but TakerPayment is not yet. Trying to spend TakerPayment");
+                let transaction = try_s!(try_spend_taker_payment(self, secret_hash.as_slice()).await);
+
                 Ok(RecoveredSwap {
                     action: RecoveredSwapAction::SpentOtherPayment,
                     coin: self.taker_coin.ticker().to_string(),
@@ -1041,23 +1219,37 @@ impl MakerSwap {
             Err(e) => ERR!("Error {} when trying to find maker payment spend", e),
             Ok(None) => {
                 // our payment is not spent, try to refund
-                log!("Trying to refund MakerPayment");
+                info!("Trying to refund MakerPayment");
                 if now_ms() / 1000 < self.r().data.maker_payment_lock + 3700 {
                     return ERR!(
                         "Too early to refund, wait until {}",
                         self.r().data.maker_payment_lock + 3700
                     );
                 }
-                let transaction = try_s!(self
-                    .maker_coin
-                    .send_maker_refunds_payment(
-                        &maker_payment,
-                        self.r().data.maker_payment_lock as u32,
-                        &*self.r().other_persistent_pub,
-                        &secret_hash.0,
-                        &self.r().data.maker_coin_swap_contract_address,
-                    )
-                    .wait());
+                let fut = self.maker_coin.send_maker_refunds_payment(
+                    &maker_payment,
+                    maker_payment_lock,
+                    other_maker_coin_htlc_pub.as_slice(),
+                    secret_hash.as_slice(),
+                    &maker_coin_swap_contract_address,
+                    &unique_data,
+                );
+
+                let transaction = match fut.compat().await {
+                    Ok(t) => t,
+                    Err(err) => {
+                        if let Some(tx) = err.get_tx() {
+                            broadcast_p2p_tx_msg(
+                                &self.ctx,
+                                tx_helper_topic(self.maker_coin.ticker()),
+                                &tx,
+                                &self.p2p_privkey,
+                            );
+                        }
+
+                        return ERR!("{}", err.get_plain_text_format());
+                    },
+                };
 
                 Ok(RecoveredSwap {
                     action: RecoveredSwapAction::RefundedMyPayment,
@@ -1096,11 +1288,17 @@ impl AtomicSwap for MakerSwap {
         result
     }
 
+    #[inline]
     fn uuid(&self) -> &Uuid { &self.uuid }
 
+    #[inline]
     fn maker_coin(&self) -> &str { self.maker_coin.ticker() }
 
+    #[inline]
     fn taker_coin(&self) -> &str { self.taker_coin.ticker() }
+
+    #[inline]
+    fn unique_swap_data(&self) -> Vec<u8> { self.secret_hash().to_vec() }
 }
 
 #[derive(Debug)]
@@ -1148,7 +1346,7 @@ pub enum MakerSwapEvent {
 }
 
 impl MakerSwapEvent {
-    fn status_str(&self) -> String {
+    pub fn status_str(&self) -> String {
         match self {
             MakerSwapEvent::Started(_) => "Started...".to_owned(),
             MakerSwapEvent::StartFailed(_) => "Start failed...".to_owned(),
@@ -1210,10 +1408,10 @@ impl MakerSwapEvent {
     fn is_error(&self) -> bool { !self.is_success() }
 }
 
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-struct MakerSavedEvent {
-    timestamp: u64,
-    event: MakerSwapEvent,
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct MakerSavedEvent {
+    pub timestamp: u64,
+    pub event: MakerSwapEvent,
 }
 
 impl MakerSavedEvent {
@@ -1248,19 +1446,104 @@ impl MakerSavedEvent {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Clone)]
+pub struct MakerSwapStatusChanged {
+    pub uuid: Uuid,
+    pub taker_coin: String,
+    pub maker_coin: String,
+    pub taker_amount: BigDecimal,
+    pub maker_amount: BigDecimal,
+    pub event_status: String,
+}
+
+impl MakerSwapStatusChanged {
+    pub fn event_id() -> TypeId { TypeId::of::<MakerSwapStatusChanged>() }
+}
+
+impl MakerSwapStatusChanged {
+    fn from_maker_swap(maker_swap: &MakerSwap, saved_swap: &MakerSavedEvent) -> Self {
+        MakerSwapStatusChanged {
+            uuid: maker_swap.uuid,
+            taker_coin: maker_swap.taker_coin.ticker().to_string(),
+            maker_coin: maker_swap.maker_coin.ticker().to_string(),
+            taker_amount: maker_swap.taker_amount.clone(),
+            maker_amount: maker_swap.maker_amount.clone(),
+            event_status: saved_swap.event.status_str(),
+        }
+    }
+}
+
+#[derive(Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct MakerSavedSwap {
     pub uuid: Uuid,
-    my_order_uuid: Option<Uuid>,
-    events: Vec<MakerSavedEvent>,
-    maker_amount: Option<BigDecimal>,
-    maker_coin: Option<String>,
-    taker_amount: Option<BigDecimal>,
-    taker_coin: Option<String>,
-    gui: Option<String>,
-    mm_version: Option<String>,
-    success_events: Vec<String>,
-    error_events: Vec<String>,
+    pub my_order_uuid: Option<Uuid>,
+    pub events: Vec<MakerSavedEvent>,
+    pub maker_amount: Option<BigDecimal>,
+    pub maker_coin: Option<String>,
+    pub maker_coin_usd_price: Option<BigDecimal>,
+    pub taker_amount: Option<BigDecimal>,
+    pub taker_coin: Option<String>,
+    pub taker_coin_usd_price: Option<BigDecimal>,
+    pub gui: Option<String>,
+    pub mm_version: Option<String>,
+    pub success_events: Vec<String>,
+    pub error_events: Vec<String>,
+}
+
+#[cfg(test)]
+impl MakerSavedSwap {
+    pub fn new(maker_amount: &MmNumber, taker_amount: &MmNumber) -> MakerSavedSwap {
+        let mut events: Vec<MakerSavedEvent> = Vec::new();
+        events.push(MakerSavedEvent {
+            timestamp: 0,
+            event: MakerSwapEvent::Started(MakerSwapData {
+                taker_coin: "".to_string(),
+                maker_coin: "".to_string(),
+                taker: Default::default(),
+                secret: Default::default(),
+                secret_hash: None,
+                my_persistent_pub: Default::default(),
+                lock_duration: 0,
+                maker_amount: maker_amount.to_decimal(),
+                taker_amount: taker_amount.to_decimal(),
+                maker_payment_confirmations: 0,
+                maker_payment_requires_nota: None,
+                taker_payment_confirmations: 0,
+                taker_payment_requires_nota: None,
+                maker_payment_lock: 0,
+                uuid: Default::default(),
+                started_at: 0,
+                maker_coin_start_block: 0,
+                taker_coin_start_block: 0,
+                maker_payment_trade_fee: None,
+                taker_payment_spend_trade_fee: None,
+                maker_coin_swap_contract_address: None,
+                taker_coin_swap_contract_address: None,
+                maker_coin_htlc_pubkey: None,
+                taker_coin_htlc_pubkey: None,
+                p2p_privkey: None,
+            }),
+        });
+        events.push(MakerSavedEvent {
+            timestamp: 0,
+            event: MakerSwapEvent::Finished,
+        });
+        MakerSavedSwap {
+            uuid: Default::default(),
+            my_order_uuid: None,
+            events,
+            maker_amount: Some(maker_amount.to_decimal()),
+            maker_coin: None,
+            maker_coin_usd_price: None,
+            taker_amount: Some(taker_amount.to_decimal()),
+            taker_coin: None,
+            taker_coin_usd_price: None,
+            gui: None,
+            mm_version: None,
+            success_events: vec![],
+            error_events: vec![],
+        }
+    }
 }
 
 impl MakerSavedSwap {
@@ -1307,14 +1590,6 @@ impl MakerSavedSwap {
         }
     }
 
-    pub fn hide_secret(&mut self) {
-        if let Some(ref mut event) = self.events.first_mut() {
-            if let MakerSwapEvent::Started(ref mut data) = event.event {
-                data.secret = H256Json::default();
-            }
-        }
-    }
-
     pub fn is_recoverable(&self) -> bool {
         if !self.is_finished() {
             return false;
@@ -1367,6 +1642,13 @@ impl MakerSavedSwap {
 
         Ok(true)
     }
+
+    pub async fn fetch_and_set_usd_prices(&mut self) {
+        if let Some(rates) = fetch_swap_coins_price(self.maker_coin.clone(), self.taker_coin.clone()).await {
+            self.maker_coin_usd_price = Some(rates.base);
+            self.taker_coin_usd_price = Some(rates.rel);
+        }
+    }
 }
 
 #[allow(clippy::large_enum_variant)]
@@ -1394,14 +1676,16 @@ impl RunMakerSwapInput {
 /// Every produced event is saved to local DB. Swap status is broadcasted to P2P network after completion.
 pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
     let uuid = swap.uuid().to_owned();
-    let lock_path = my_swaps_dir(&ctx).join(fomat!((uuid) ".lock"));
     let mut attempts = 0;
-    let file_lock = loop {
-        match FileLock::lock(&lock_path, 40.) {
+    let swap_lock = loop {
+        match SwapLock::lock(&ctx, uuid, 40.).await {
             Ok(Some(l)) => break l,
             Ok(None) => {
                 if attempts >= 1 {
-                    log!("Swap " (uuid) " file lock is acquired by another process/thread, aborting");
+                    warn!(
+                        "Swap {} file lock is acquired by another process/thread, aborting",
+                        uuid
+                    );
                     return;
                 } else {
                     attempts += 1;
@@ -1409,7 +1693,7 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
                 }
             },
             Err(e) => {
-                log!("Swap " (uuid) " file lock error " (e));
+                error!("Swap {} file lock error: {}", uuid, e);
                 return;
             },
         };
@@ -1421,19 +1705,19 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
             maker_coin,
             taker_coin,
             swap_uuid,
-        } => match MakerSwap::load_from_db_by_uuid(ctx, maker_coin, taker_coin, &swap_uuid) {
+        } => match MakerSwap::load_from_db_by_uuid(ctx, maker_coin, taker_coin, &swap_uuid).await {
             Ok((swap, command)) => match command {
                 Some(c) => {
-                    log!("Swap " (uuid) " kick started.");
+                    info!("Swap {} kick started.", uuid);
                     (swap, c)
                 },
                 None => {
-                    log!("Swap " (uuid) " has been finished already, aborting.");
+                    warn!("Swap {} has been finished already, aborting.", uuid);
                     return;
                 },
             },
             Err(e) => {
-                log!("Error " (e) " loading swap " (uuid));
+                error!("Error loading swap {}: {}", uuid, e);
                 return;
             },
         },
@@ -1442,9 +1726,9 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
     let mut touch_loop = Box::pin(
         async move {
             loop {
-                match file_lock.touch() {
+                match swap_lock.touch().await {
                     Ok(_) => (),
-                    Err(e) => log!("Warning, touch error " (e) " for swap " (uuid)),
+                    Err(e) => warn!("Swap {} file lock error: {}", uuid, e),
                 };
                 Timer::sleep(30.).await;
             }
@@ -1453,9 +1737,10 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
     );
 
     let ctx = swap.ctx.clone();
-    subscribe_to_topic(&ctx, swap_topic(&swap.uuid)).await;
+    subscribe_to_topic(&ctx, swap_topic(&swap.uuid));
     let mut status = ctx.log.status_handle();
     let uuid_str = swap.uuid.to_string();
+    let to_broadcast = !(swap.maker_coin.is_privacy() || swap.taker_coin.is_privacy());
     macro_rules! swap_tags {
         () => {
             &[&"swap", &("uuid", uuid_str.as_str())]
@@ -1480,7 +1765,16 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
                         event: event.clone(),
                     };
 
-                    save_my_maker_swap_event(&ctx, &running_swap, to_save).expect("!save_my_maker_swap_event");
+                    let dispatcher_ctx = DispatcherContext::from_ctx(&ctx).unwrap();
+                    let dispatcher = dispatcher_ctx.dispatcher.read().await;
+                    let event_to_send = MakerSwapStatusChanged::from_maker_swap(&running_swap, &to_save);
+                    dispatcher
+                        .dispatch_async(ctx.clone(), LpEvents::MakerSwapStatusChanged(event_to_send))
+                        .await;
+                    drop(dispatcher);
+                    save_my_maker_swap_event(&ctx, &running_swap, to_save)
+                        .await
+                        .expect("!save_my_maker_swap_event");
                     if event.should_ban_taker() {
                         ban_pubkey_on_failed_swap(
                             &ctx,
@@ -1497,8 +1791,10 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
                         command = c;
                     },
                     None => {
-                        if let Err(e) = broadcast_my_swap_status(&uuid, &ctx) {
-                            log!("!broadcast_my_swap_status(" (uuid) "): " (e));
+                        if to_broadcast {
+                            if let Err(e) = broadcast_my_swap_status(&ctx, uuid).await {
+                                error!("!broadcast_my_swap_status({}): {}", uuid, e);
+                            }
                         }
                         break;
                     },
@@ -1511,7 +1807,7 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
     let do_nothing = (); // to fix https://rust-lang.github.io/rust-clippy/master/index.html#unused_unit
     select! {
         _swap = swap_fut => do_nothing, // swap finished normally
-        _shutdown = shutdown_fut => log!("on_stop] swap " (swap_for_log.uuid) " stopped!"),
+        _shutdown = shutdown_fut => info!("swap {} stopped!", swap_for_log.uuid),
         _touch = touch_loop => unreachable!("Touch loop can not stop!"),
     };
 }
@@ -1529,7 +1825,7 @@ pub async fn check_balance_for_maker_swap(
     swap_uuid: Option<&Uuid>,
     prepared_params: Option<MakerSwapPreparedParams>,
     stage: FeeApproxStage,
-) -> CheckBalanceResult<()> {
+) -> CheckBalanceResult<BigDecimal> {
     let (maker_payment_trade_fee, taker_payment_spend_trade_fee) = match prepared_params {
         Some(MakerSwapPreparedParams {
             maker_payment_trade_fee,
@@ -1539,7 +1835,6 @@ pub async fn check_balance_for_maker_swap(
             let preimage_value = TradePreimageValue::Exact(volume.to_decimal());
             let maker_payment_trade_fee = my_coin
                 .get_sender_trade_fee(preimage_value, stage.clone())
-                .compat()
                 .await
                 .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, my_coin.ticker()))?;
             let taker_payment_spend_trade_fee = other_coin
@@ -1551,9 +1846,10 @@ pub async fn check_balance_for_maker_swap(
         },
     };
 
-    check_my_coin_balance_for_swap(ctx, my_coin, swap_uuid, volume, maker_payment_trade_fee, None).await?;
+    let balance =
+        check_my_coin_balance_for_swap(ctx, my_coin, swap_uuid, volume, maker_payment_trade_fee, None).await?;
     check_other_coin_balance_for_swap(ctx, other_coin, swap_uuid, taker_payment_spend_trade_fee).await?;
-    Ok(())
+    Ok(balance)
 }
 
 pub struct MakerTradePreimage {
@@ -1591,7 +1887,6 @@ pub async fn maker_swap_trade_preimage(
     let preimage_value = TradePreimageValue::Exact(volume.to_decimal());
     let base_coin_fee = base_coin
         .get_sender_trade_fee(preimage_value, FeeApproxStage::TradePreimage)
-        .compat()
         .await
         .mm_err(|e| TradePreimageRpcError::from_trade_preimage_error(e, base_coin_ticker))?;
     let rel_coin_fee = rel_coin
@@ -1618,7 +1913,7 @@ pub async fn maker_swap_trade_preimage(
             Some(prepared_params),
             FeeApproxStage::TradePreimage,
         )
-        .await?
+        .await?;
     }
 
     let conf_settings = OrderConfirmationsSettings {
@@ -1661,10 +1956,10 @@ pub async fn calc_max_maker_vol(
     let preimage_value = TradePreimageValue::UpperBound(vol.to_decimal());
     let trade_fee = coin
         .get_sender_trade_fee(preimage_value, stage)
-        .compat()
         .await
         .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, ticker))?;
 
+    debug!("{} trade fee {}", trade_fee.coin, trade_fee.amount.to_decimal());
     let mut required_to_pay_fee = MmNumber::from(0);
     if trade_fee.coin == ticker {
         vol = &vol - &trade_fee.amount;
@@ -1686,14 +1981,16 @@ pub async fn calc_max_maker_vol(
     Ok(vol)
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_arch = "wasm32")))]
 mod maker_swap_tests {
     use super::*;
     use coins::eth::{addr_from_str, signed_eth_tx_from_bytes, SignedEthTx};
     use coins::{MarketCoinOps, MmCoin, SwapOps, TestCoin};
-    use common::mm_ctx::MmCtxBuilder;
-    use common::privkey::key_pair_from_seed;
+    use common::block_on;
+    use crypto::privkey::key_pair_from_seed;
+    use mm2_core::mm_ctx::MmCtxBuilder;
     use mocktopus::mocking::*;
+    use serde_json as json;
 
     fn eth_tx_for_test() -> SignedEthTx {
         // raw transaction bytes of https://etherscan.io/tx/0x0869be3e5d4456a29d488a533ad6c118620fef450f36778aecf31d356ff8b41f
@@ -1727,21 +2024,22 @@ mod maker_swap_tests {
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
         static mut MY_PAYMENT_SENT_CALLED: bool = false;
-        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MY_PAYMENT_SENT_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(Some(eth_tx_for_test().into()))))
         });
 
         static mut MAKER_REFUND_CALLED: bool = false;
-        TestCoin::send_maker_refunds_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_maker_refunds_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MAKER_REFUND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| MockResult::Return(Ok(None)));
+        TestCoin::search_for_swap_tx_spend_my
+            .mock_safe(|_, _| MockResult::Return(Box::pin(futures::future::ready(Ok(None)))));
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        let actual = maker_swap.recover_funds().unwrap();
+        let actual = block_on(maker_swap.recover_funds()).unwrap();
         let expected = RecoveredSwap {
             action: RecoveredSwapAction::RefundedMyPayment,
             coin: "ticker".to_string(),
@@ -1766,16 +2064,17 @@ mod maker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
         static mut MAKER_REFUND_CALLED: bool = false;
 
-        TestCoin::send_maker_refunds_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_maker_refunds_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MAKER_REFUND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
 
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| MockResult::Return(Ok(None)));
+        TestCoin::search_for_swap_tx_spend_my
+            .mock_safe(|_, _| MockResult::Return(Box::pin(futures::future::ready(Ok(None)))));
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        let actual = maker_swap.recover_funds().unwrap();
+        let actual = block_on(maker_swap.recover_funds()).unwrap();
         let expected = RecoveredSwap {
             action: RecoveredSwapAction::RefundedMyPayment,
             coin: "ticker".to_string(),
@@ -1798,13 +2097,15 @@ mod maker_swap_tests {
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Refunded(eth_tx_for_test().into()))))
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Refunded(
+                eth_tx_for_test().into(),
+            ))))))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        assert!(maker_swap.recover_funds().is_err());
+        assert!(block_on(maker_swap.recover_funds()).is_err());
     }
 
     #[test]
@@ -1821,21 +2122,25 @@ mod maker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED: bool = true;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED = true }
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Spent(eth_tx_for_test().into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Spent(
+                eth_tx_for_test().into(),
+            ))))))
         });
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED: bool = true;
-        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED = true }
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Refunded(eth_tx_for_test().into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Refunded(
+                eth_tx_for_test().into(),
+            ))))))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        let err = maker_swap.recover_funds().expect_err("Expected an error");
-        log!("Error: "(err));
+        let err = block_on(maker_swap.recover_funds()).expect_err("Expected an error");
+        println!("{}", err);
         assert!(err.contains("Taker payment was already refunded"));
         assert!(unsafe { SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED });
         assert!(unsafe { SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED });
@@ -1856,16 +2161,17 @@ mod maker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut MY_PAYMENT_SENT_CALLED: bool = false;
-        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MY_PAYMENT_SENT_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(Some(eth_tx_for_test().into()))))
         });
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| MockResult::Return(Ok(None)));
+        TestCoin::search_for_swap_tx_spend_my
+            .mock_safe(|_, _| MockResult::Return(Box::pin(futures::future::ready(Ok(None)))));
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
         maker_swap.w().data.maker_payment_lock = (now_ms() / 1000) - 3690;
-        assert!(maker_swap.recover_funds().is_err());
+        assert!(block_on(maker_swap.recover_funds()).is_err());
         assert!(unsafe { MY_PAYMENT_SENT_CALLED });
     }
 
@@ -1884,14 +2190,14 @@ mod maker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut MY_PAYMENT_SENT_CALLED: bool = false;
-        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MY_PAYMENT_SENT_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(None)))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        assert!(maker_swap.recover_funds().is_err());
+        assert!(block_on(maker_swap.recover_funds()).is_err());
         assert!(unsafe { MY_PAYMENT_SENT_CALLED });
     }
 
@@ -1910,7 +2216,7 @@ mod maker_swap_tests {
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        assert!(maker_swap.recover_funds().is_err());
+        assert!(block_on(maker_swap.recover_funds()).is_err());
     }
 
     #[test]
@@ -1927,22 +2233,26 @@ mod maker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED: bool = true;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED = true }
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Spent(eth_tx_for_test().into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Spent(
+                eth_tx_for_test().into(),
+            ))))))
         });
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED: bool = true;
-        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED = true }
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Spent(eth_tx_for_test().into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Spent(
+                eth_tx_for_test().into(),
+            ))))))
         });
 
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        let err = maker_swap.recover_funds().expect_err("Expected an error");
-        log!("Error: "(err));
+        let err = block_on(maker_swap.recover_funds()).expect_err("Expected an error");
+        println!("{}", err);
         assert!(err.contains("Taker payment was already spent"));
         assert!(unsafe { SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED });
         assert!(unsafe { SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED });
@@ -1963,7 +2273,7 @@ mod maker_swap_tests {
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        assert!(maker_swap.recover_funds().is_err());
+        assert!(block_on(maker_swap.recover_funds()).is_err());
     }
 
     #[test]
@@ -1982,19 +2292,21 @@ mod maker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED = true }
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Spent(eth_tx_for_test().into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Spent(
+                eth_tx_for_test().into(),
+            ))))))
         });
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED = true }
-            MockResult::Return(Ok(None))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(None))))
         });
 
         static mut SEND_MAKER_SPENDS_TAKER_PAYMENT_CALLED: bool = false;
-        TestCoin::send_maker_spends_taker_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_maker_spends_taker_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { SEND_MAKER_SPENDS_TAKER_PAYMENT_CALLED = true }
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
@@ -2007,7 +2319,7 @@ mod maker_swap_tests {
             action: RecoveredSwapAction::SpentOtherPayment,
             transaction: eth_tx_for_test().into(),
         });
-        assert_eq!(maker_swap.recover_funds(), expected);
+        assert_eq!(block_on(maker_swap.recover_funds()), expected);
         assert!(unsafe { SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED });
         assert!(unsafe { SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED });
         assert!(unsafe { SEND_MAKER_SPENDS_TAKER_PAYMENT_CALLED });
@@ -2026,19 +2338,21 @@ mod maker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED = true }
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Spent(eth_tx_for_test().into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Spent(
+                eth_tx_for_test().into(),
+            ))))))
         });
 
         static mut SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _| {
             unsafe { SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED = true }
-            MockResult::Return(Ok(None))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(None))))
         });
 
         static mut SEND_MAKER_REFUNDS_PAYMENT_CALLED: bool = false;
-        TestCoin::send_maker_refunds_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_maker_refunds_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { SEND_MAKER_REFUNDS_PAYMENT_CALLED = true }
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
@@ -2046,7 +2360,7 @@ mod maker_swap_tests {
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (maker_swap, _) = MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, maker_saved_swap).unwrap();
-        let err = maker_swap.recover_funds().unwrap_err();
+        let err = block_on(maker_swap.recover_funds()).unwrap_err();
         assert!(err.contains("Taker payment spend transaction has been sent and confirmed"));
         assert!(unsafe { !SEARCH_FOR_SWAP_TX_SPEND_MY_CALLED });
         assert!(unsafe { !SEARCH_FOR_SWAP_TX_SPEND_OTHER_CALLED });
diff --git a/mm2src/mm2_main/src/lp_swap/my_swaps_storage.rs b/mm2src/mm2_main/src/lp_swap/my_swaps_storage.rs
new file mode 100644
index 0000000000..6d2dc630bb
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_swap/my_swaps_storage.rs
@@ -0,0 +1,501 @@
+use super::{MyRecentSwapsUuids, MySwapsFilter};
+use async_trait::async_trait;
+use common::PagingOptions;
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+pub type MySwapsResult<T> = Result<T, MmError<MySwapsError>>;
+
+use uuid::Uuid;
+
+#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+#[derive(Debug, Display, PartialEq)]
+pub enum MySwapsError {
+    #[display(fmt = "Error serializing swap: {}", _0)]
+    ErrorSerializingItem(String),
+    #[display(fmt = "Error deserializing swap: {}", _0)]
+    ErrorDeserializingItem(String),
+    #[display(fmt = "Invalid timestamp range")]
+    InvalidTimestampRange,
+    #[display(fmt = "Error saving swap: {}", _0)]
+    ErrorSavingSwap(String),
+    #[display(fmt = "'from_uuid' not found: {}", _0)]
+    FromUuidNotFound(Uuid),
+    #[display(fmt = "Error parsing uuid: {}", _0)]
+    UuidParse(uuid::parser::ParseError),
+    #[display(fmt = "Unknown SQL error: {}", _0)]
+    UnknownSqlError(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+#[async_trait]
+pub trait MySwapsOps {
+    async fn save_new_swap(&self, my_coin: &str, other_coin: &str, uuid: Uuid, started_at: u64) -> MySwapsResult<()>;
+
+    async fn my_recent_swaps_with_filters(
+        &self,
+        filter: &MySwapsFilter,
+        paging_options: Option<&PagingOptions>,
+    ) -> MySwapsResult<MyRecentSwapsUuids>;
+}
+
+pub struct MySwapsStorage {
+    ctx: MmArc,
+}
+
+impl MySwapsStorage {
+    pub fn new(ctx: MmArc) -> MySwapsStorage { MySwapsStorage { ctx } }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+mod native_impl {
+    use super::*;
+    use crate::mm2::database::my_swaps::{insert_new_swap, select_uuids_by_my_swaps_filter, SelectRecentSwapsUuidsErr};
+    use db_common::sqlite::rusqlite::Error as SqlError;
+
+    impl From<SelectRecentSwapsUuidsErr> for MySwapsError {
+        fn from(e: SelectRecentSwapsUuidsErr) -> Self {
+            match e {
+                SelectRecentSwapsUuidsErr::Sql(db) => MySwapsError::UnknownSqlError(db.to_string()),
+                SelectRecentSwapsUuidsErr::Parse(uuid) => MySwapsError::UuidParse(uuid),
+            }
+        }
+    }
+
+    impl From<SqlError> for MySwapsError {
+        fn from(e: SqlError) -> Self { MySwapsError::UnknownSqlError(e.to_string()) }
+    }
+
+    #[async_trait]
+    impl MySwapsOps for MySwapsStorage {
+        async fn save_new_swap(
+            &self,
+            my_coin: &str,
+            other_coin: &str,
+            uuid: Uuid,
+            started_at: u64,
+        ) -> MySwapsResult<()> {
+            Ok(insert_new_swap(
+                &self.ctx,
+                my_coin,
+                other_coin,
+                &uuid.to_string(),
+                &started_at.to_string(),
+            )?)
+        }
+
+        async fn my_recent_swaps_with_filters(
+            &self,
+            filter: &MySwapsFilter,
+            paging_options: Option<&PagingOptions>,
+        ) -> MySwapsResult<MyRecentSwapsUuids> {
+            Ok(select_uuids_by_my_swaps_filter(
+                &self.ctx.sqlite_connection(),
+                filter,
+                paging_options,
+            )?)
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_impl {
+    use super::*;
+    use crate::mm2::lp_swap::swap_wasm_db::cursor_prelude::*;
+    use crate::mm2::lp_swap::swap_wasm_db::{DbTransactionError, InitDbError, MySwapsFiltersTable};
+    use crate::mm2::lp_swap::SwapsContext;
+    use std::collections::BTreeSet;
+    use uuid::Uuid;
+
+    impl From<DbTransactionError> for MySwapsError {
+        fn from(e: DbTransactionError) -> Self {
+            let stringified_error = e.to_string();
+            match e {
+                DbTransactionError::NoSuchTable { .. }
+                | DbTransactionError::ErrorCreatingTransaction(_)
+                | DbTransactionError::ErrorOpeningTable { .. }
+                // We don't expect that the `String` and `u32` types serialization to fail.
+                | DbTransactionError::ErrorSerializingIndex { .. }
+                | DbTransactionError::ErrorGettingItems(_)
+                | DbTransactionError::ErrorCountingItems(_)
+                // We don't delete items from the `my_swaps` table
+                | DbTransactionError::ErrorDeletingItems(_)
+                | DbTransactionError::MultipleItemsByUniqueIndex { .. }
+                | DbTransactionError::NoSuchIndex { .. }
+                | DbTransactionError::InvalidIndex { .. }
+                | DbTransactionError::UnexpectedState(_)
+                | DbTransactionError::TransactionAborted => MySwapsError::InternalError(stringified_error),
+                DbTransactionError::ErrorSerializingItem(_) => MySwapsError::ErrorSerializingItem(stringified_error),
+                DbTransactionError::ErrorDeserializingItem(_) => MySwapsError::ErrorDeserializingItem(stringified_error),
+                DbTransactionError::ErrorUploadingItem(_) => MySwapsError::ErrorSavingSwap(stringified_error),
+            }
+        }
+    }
+
+    impl From<CursorError> for MySwapsError {
+        fn from(e: CursorError) -> Self {
+            let stringified_error = e.to_string();
+            match e {
+                // We don't expect that the `String` and `u32` types serialization to fail.
+                CursorError::ErrorSerializingIndexFieldValue {..}
+                // We don't expect that the `String` and `u32` types deserialization to fail.
+                | CursorError::ErrorDeserializingIndexValue {..}
+                | CursorError::ErrorOpeningCursor {..}
+                | CursorError::AdvanceError {..}
+                | CursorError::InvalidKeyRange {..}
+                | CursorError::TypeMismatch {..}
+                | CursorError::IncorrectNumberOfKeysPerIndex {..}
+                | CursorError::UnexpectedState(..)
+                | CursorError::IncorrectUsage {..} => MySwapsError::InternalError(stringified_error),
+                CursorError::ErrorDeserializingItem {..} => MySwapsError::ErrorDeserializingItem(stringified_error),
+            }
+        }
+    }
+
+    impl From<InitDbError> for MySwapsError {
+        fn from(e: InitDbError) -> Self { MySwapsError::InternalError(e.to_string()) }
+    }
+
+    #[async_trait]
+    impl MySwapsOps for MySwapsStorage {
+        async fn save_new_swap(
+            &self,
+            my_coin: &str,
+            other_coin: &str,
+            uuid: Uuid,
+            started_at: u64,
+        ) -> MySwapsResult<()> {
+            let swap_ctx = SwapsContext::from_ctx(&self.ctx).map_to_mm(MySwapsError::InternalError)?;
+            let db = swap_ctx.swap_db().await?;
+            let transaction = db.transaction().await?;
+            let my_swaps_table = transaction.table::<MySwapsFiltersTable>().await?;
+
+            let item = MySwapsFiltersTable {
+                uuid,
+                my_coin: my_coin.to_owned(),
+                other_coin: other_coin.to_owned(),
+                started_at: started_at as u32,
+            };
+            my_swaps_table.add_item(&item).await?;
+            Ok(())
+        }
+
+        async fn my_recent_swaps_with_filters(
+            &self,
+            filter: &MySwapsFilter,
+            paging_options: Option<&PagingOptions>,
+        ) -> MySwapsResult<MyRecentSwapsUuids> {
+            let swap_ctx = SwapsContext::from_ctx(&self.ctx).map_to_mm(MySwapsError::InternalError)?;
+            let db = swap_ctx.swap_db().await?;
+            let transaction = db.transaction().await?;
+            let my_swaps_table = transaction.table::<MySwapsFiltersTable>().await?;
+
+            let from_timestamp = filter.from_timestamp.map(|t| t as u32).unwrap_or_default();
+            let to_timestamp = filter.to_timestamp.map(|t| t as u32).unwrap_or(u32::MAX);
+            if from_timestamp > to_timestamp {
+                return MmError::err(MySwapsError::InvalidTimestampRange);
+            }
+
+            let items = match (&filter.my_coin, &filter.other_coin) {
+                (Some(my_coin), Some(other_coin)) => {
+                    my_swaps_table
+                        .open_cursor("with_my_other_coins")
+                        .await?
+                        .only("my_coin", my_coin)?
+                        .only("other_coin", other_coin)?
+                        .bound("started_at", from_timestamp, to_timestamp)
+                        .collect()
+                        .await?
+                },
+                (Some(my_coin), None) => {
+                    my_swaps_table
+                        .open_cursor("with_my_coin")
+                        .await?
+                        .only("my_coin", my_coin)?
+                        .bound("started_at", from_timestamp, to_timestamp)
+                        .collect()
+                        .await?
+                },
+                (None, Some(other_coin)) => {
+                    my_swaps_table
+                        .open_cursor("with_other_coin")
+                        .await?
+                        .only("other_coin", other_coin)?
+                        .bound("started_at", from_timestamp, to_timestamp)
+                        .collect()
+                        .await?
+                },
+                (None, None) => {
+                    my_swaps_table
+                        .open_cursor("started_at")
+                        .await?
+                        .bound("started_at", from_timestamp, to_timestamp)
+                        .collect()
+                        .await?
+                },
+            };
+
+            let uuids: BTreeSet<OrderedUuid> = items
+                .into_iter()
+                .map(|(_item_id, item)| OrderedUuid::from(item))
+                .collect();
+            match paging_options {
+                Some(paging) => take_according_to_paging_opts(uuids, paging),
+                None => {
+                    let total_count = uuids.len();
+                    Ok(MyRecentSwapsUuids {
+                        uuids: uuids.into_iter().map(|ordered| ordered.uuid).collect(),
+                        total_count,
+                        skipped: 0,
+                    })
+                },
+            }
+        }
+    }
+
+    pub(super) fn take_according_to_paging_opts(
+        uuids: BTreeSet<OrderedUuid>,
+        paging: &PagingOptions,
+    ) -> MySwapsResult<MyRecentSwapsUuids> {
+        let total_count = uuids.len();
+
+        let skip = match paging.from_uuid {
+            // `page_number` is ignored if from_uuid is set
+            Some(expected_uuid) => {
+                uuids
+                    .iter()
+                    .position(|ordered_uuid| ordered_uuid.uuid == expected_uuid)
+                    .or_mm_err(|| MySwapsError::FromUuidNotFound(expected_uuid))?
+                    + 1
+            },
+            None => (paging.page_number.get() - 1) * paging.limit,
+        };
+
+        let uuids = uuids
+            .into_iter()
+            .map(|ordered| ordered.uuid)
+            .skip(skip)
+            .take(paging.limit)
+            .collect();
+
+        Ok(MyRecentSwapsUuids {
+            uuids,
+            total_count,
+            skipped: skip,
+        })
+    }
+
+    /// A swap identifier is ordered first by `started_at` and then by `uuid`.
+    #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+    pub(super) struct OrderedUuid {
+        pub started_at: u32,
+        pub uuid: Uuid,
+    }
+
+    impl From<MySwapsFiltersTable> for OrderedUuid {
+        fn from(item: MySwapsFiltersTable) -> OrderedUuid {
+            OrderedUuid {
+                started_at: item.started_at,
+                uuid: item.uuid,
+            }
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_tests {
+    use super::wasm_impl::*;
+    use super::*;
+    use common::log::wasm_log::register_wasm_log;
+    use common::new_uuid;
+    use mm2_core::mm_ctx::MmCtxBuilder;
+    use rand::seq::SliceRandom;
+    use rand::Rng;
+    use std::collections::BTreeSet;
+    use std::num::NonZeroUsize;
+    use std::ops::Range;
+    use uuid::Uuid;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    fn is_applied(filters: &MySwapsFilter, my_coin: &str, other_coin: &str, started_at: u64) -> bool {
+        if let Some(ref expected_my_coin) = filters.my_coin {
+            if expected_my_coin != my_coin {
+                return false;
+            }
+        }
+        if let Some(ref expected_other_coin) = filters.other_coin {
+            if expected_other_coin != other_coin {
+                return false;
+            }
+        }
+        let from_timestamp = filters.from_timestamp.unwrap_or_default();
+        let to_timestamp = filters.to_timestamp.unwrap_or(u64::MAX);
+        from_timestamp <= started_at && started_at <= to_timestamp
+    }
+
+    async fn test_my_recent_swaps_impl(
+        total_count: usize,
+        coins: &[&str],
+        timestamp_range: Range<u64>,
+        filters: MySwapsFilter,
+    ) {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let my_swaps = MySwapsStorage::new(ctx);
+
+        let mut expected_uuids = BTreeSet::new();
+        let mut rng = rand::thread_rng();
+
+        for _ in 0..total_count {
+            let uuid = new_uuid();
+            let my_coin = *coins.choose(&mut rng).unwrap();
+            let other_coin = *coins.choose(&mut rng).unwrap();
+            let started_at = rng.gen_range(timestamp_range.start, timestamp_range.end);
+
+            if is_applied(&filters, my_coin, other_coin, started_at) {
+                expected_uuids.insert(OrderedUuid {
+                    started_at: started_at as u32,
+                    uuid,
+                });
+            }
+            my_swaps
+                .save_new_swap(my_coin, other_coin, uuid, started_at)
+                .await
+                .expect("!MySwapsStorage::save_new_swap");
+        }
+
+        let actual = my_swaps
+            .my_recent_swaps_with_filters(&filters, None)
+            .await
+            .expect("!MySwapsStorage::my_recent_swaps_with_filters");
+
+        let expected_total_count = expected_uuids.len();
+        let expected = MyRecentSwapsUuids {
+            uuids: expected_uuids.into_iter().map(|ordered| ordered.uuid).collect(),
+            total_count: expected_total_count,
+            skipped: 0,
+        };
+        assert_eq!(actual, expected);
+    }
+
+    #[wasm_bindgen_test]
+    fn test_take_according_to_paging_opts() {
+        register_wasm_log();
+
+        let uuids: BTreeSet<OrderedUuid> = [
+            (1, "49c79ea4-e1eb-4fb2-a0ef-265bded0b77f"),
+            (2, "2f9afe84-7a89-4194-8947-45fba563118f"),
+            (3, "41383f43-46a5-478c-9386-3b2cce0aca20"),
+            (4, "5acb0e63-8b26-469e-81df-7dd9e4a9ad15"),
+            (5, "3447b727-fe93-4357-8e5a-8cf2699b7e86"),
+            // ordered by uuid
+            (6, "8f5b267a-efa8-49d6-a92d-ec0523cca891"),
+            (6, "983ce732-62a8-4a44-b4ac-7e4271adc977"),
+            (7, "c52659d7-4e13-41f5-9c1a-30cc2f646033"),
+            (8, "af5e0383-97f6-4408-8c03-a8eb8d17e46d"),
+        ]
+        .iter()
+        .map(|(started_at, uuid)| OrderedUuid {
+            started_at: *started_at,
+            uuid: Uuid::parse_str(uuid).unwrap(),
+        })
+        .collect();
+
+        let paging = PagingOptions {
+            limit: 2,
+            // has to be ignored
+            page_number: NonZeroUsize::new(10).unwrap(),
+            from_uuid: Some(Uuid::parse_str("8f5b267a-efa8-49d6-a92d-ec0523cca891").unwrap()),
+        };
+        let actual = take_according_to_paging_opts(uuids.clone(), &paging).unwrap();
+        let expected = MyRecentSwapsUuids {
+            uuids: vec![
+                "983ce732-62a8-4a44-b4ac-7e4271adc977".parse().unwrap(),
+                "c52659d7-4e13-41f5-9c1a-30cc2f646033".parse().unwrap(),
+            ],
+            total_count: uuids.len(),
+            skipped: 6,
+        };
+        assert_eq!(actual, expected);
+
+        let paging = PagingOptions {
+            limit: 3,
+            page_number: NonZeroUsize::new(2).unwrap(),
+            from_uuid: None,
+        };
+        let actual = take_according_to_paging_opts(uuids.clone(), &paging).unwrap();
+        let expected = MyRecentSwapsUuids {
+            uuids: vec![
+                "5acb0e63-8b26-469e-81df-7dd9e4a9ad15".parse().unwrap(),
+                "3447b727-fe93-4357-8e5a-8cf2699b7e86".parse().unwrap(),
+                "8f5b267a-efa8-49d6-a92d-ec0523cca891".parse().unwrap(),
+            ],
+            total_count: uuids.len(),
+            skipped: 3,
+        };
+
+        assert_eq!(actual, expected);
+
+        let from_uuid = Uuid::parse_str("f87fa9ce-0820-4675-b85d-db18c7bc9fb4").unwrap();
+        let paging = PagingOptions {
+            limit: 3,
+            // has to be ignored
+            page_number: NonZeroUsize::new(10).unwrap(),
+            // unknown UUID
+            from_uuid: Some(from_uuid),
+        };
+        let actual = take_according_to_paging_opts(uuids.clone(), &paging)
+            .expect_err("'take_according_to_paging_opts' must return an error");
+        assert_eq!(actual.into_inner(), MySwapsError::FromUuidNotFound(from_uuid));
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_my_recent_swaps() {
+        const COINS: [&str; 3] = ["RICK", "MORTY", "KMD"];
+
+        register_wasm_log();
+
+        let filters = MySwapsFilter {
+            my_coin: Some("RICK".to_owned()),
+            other_coin: Some("MORTY".to_owned()),
+            from_timestamp: Some(2000),
+            to_timestamp: Some(3000),
+        };
+        test_my_recent_swaps_impl(1000, &COINS, 1000..5000, filters).await;
+
+        let filters = MySwapsFilter {
+            my_coin: Some("RICK".to_owned()),
+            other_coin: None,
+            from_timestamp: Some(2000),
+            to_timestamp: Some(3000),
+        };
+        test_my_recent_swaps_impl(100, &COINS, 1000..5000, filters).await;
+
+        let filters = MySwapsFilter {
+            my_coin: Some("RICK".to_owned()),
+            other_coin: None,
+            from_timestamp: Some(2000),
+            to_timestamp: None,
+        };
+        test_my_recent_swaps_impl(100, &COINS, 1000..5000, filters).await;
+
+        let filters = MySwapsFilter {
+            my_coin: None,
+            other_coin: None,
+            from_timestamp: None,
+            to_timestamp: Some(1000),
+        };
+        test_my_recent_swaps_impl(10, &COINS, 1001..3000, filters).await;
+
+        let filters = MySwapsFilter {
+            my_coin: None,
+            other_coin: None,
+            from_timestamp: Some(3000),
+            to_timestamp: None,
+        };
+        test_my_recent_swaps_impl(10, &COINS, 1000..2000, filters).await;
+    }
+}
diff --git a/mm2src/lp_swap/pubkey_banning.rs b/mm2src/mm2_main/src/lp_swap/pubkey_banning.rs
similarity index 99%
rename from mm2src/lp_swap/pubkey_banning.rs
rename to mm2src/mm2_main/src/lp_swap/pubkey_banning.rs
index 79af7c4efa..5aa8f94103 100644
--- a/mm2src/lp_swap/pubkey_banning.rs
+++ b/mm2src/mm2_main/src/lp_swap/pubkey_banning.rs
@@ -1,7 +1,7 @@
 use super::{SwapEvent, SwapsContext};
 use chain::hash::H256;
-use common::mm_ctx::MmArc;
 use http::Response;
+use mm2_core::mm_ctx::MmArc;
 use rpc::v1::types::H256 as H256Json;
 use serde_json::{self as json, Value as Json};
 use std::collections::hash_map::{Entry, HashMap};
diff --git a/mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs b/mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs
new file mode 100644
index 0000000000..ecb3cd8db9
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs
@@ -0,0 +1,561 @@
+use crate::mm2::lp_swap::maker_swap::{MakerSwapData, MakerSwapEvent, TakerNegotiationData, MAKER_ERROR_EVENTS,
+                                      MAKER_SUCCESS_EVENTS};
+use crate::mm2::lp_swap::taker_swap::{maker_payment_wait, MakerNegotiationData, TakerPaymentSpentData,
+                                      TakerSavedEvent, TakerSwapData, TakerSwapEvent, TAKER_ERROR_EVENTS,
+                                      TAKER_SUCCESS_EVENTS};
+use crate::mm2::lp_swap::{MakerSavedEvent, MakerSavedSwap, SavedSwap, SwapError, TakerSavedSwap};
+use coins::{lp_coinfind, MmCoinEnum};
+use common::{HttpStatusCode, StatusCode};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::{H160 as H160Json, H256 as H256Json};
+
+pub type RecreateSwapResult<T> = Result<T, MmError<RecreateSwapError>>;
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum RecreateSwapError {
+    #[display(fmt = "Swap hasn't been started. Swap not recoverable")]
+    SwapIsNotStarted,
+    #[display(fmt = "Swap hasn't been negotiated. Swap not recoverable")]
+    SwapIsNotNegotiated,
+    #[display(fmt = "Expected '{}' event, found '{}'", expected, found)]
+    UnexpectedEvent { expected: String, found: String },
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "'secret_hash' not found in swap data")]
+    NoSecretHash,
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl HttpStatusCode for RecreateSwapError {
+    fn status_code(&self) -> StatusCode { StatusCode::BAD_REQUEST }
+}
+
+impl RecreateSwapError {
+    fn unexpected_event(found: String, expected: &str) -> RecreateSwapError {
+        RecreateSwapError::UnexpectedEvent {
+            expected: expected.to_owned(),
+            found,
+        }
+    }
+}
+
+/// The input swap can be either tagged by `type` or not.
+#[derive(Deserialize)]
+#[serde(untagged)]
+#[allow(clippy::enum_variant_names)]
+pub enum InputSwap {
+    SavedSwap(SavedSwap),
+    MakerSavedSwap(MakerSavedSwap),
+    TakerSavedSwap(TakerSavedSwap),
+}
+
+#[derive(Deserialize)]
+pub struct RecreateSwapRequest {
+    swap: InputSwap,
+}
+
+#[derive(Serialize)]
+pub struct RecreateSwapResponse {
+    swap: SavedSwap,
+}
+
+pub async fn recreate_swap_data(ctx: MmArc, args: RecreateSwapRequest) -> RecreateSwapResult<RecreateSwapResponse> {
+    match args.swap {
+        InputSwap::SavedSwap(SavedSwap::Maker(maker_swap)) | InputSwap::MakerSavedSwap(maker_swap) => {
+            recreate_taker_swap(ctx, maker_swap)
+                .await
+                .map(SavedSwap::from)
+                .map(|swap| RecreateSwapResponse { swap })
+        },
+        InputSwap::SavedSwap(SavedSwap::Taker(taker_swap)) | InputSwap::TakerSavedSwap(taker_swap) => {
+            recreate_maker_swap(ctx, taker_swap)
+                .map(SavedSwap::from)
+                .map(|swap| RecreateSwapResponse { swap })
+        },
+    }
+}
+
+fn recreate_maker_swap(ctx: MmArc, taker_swap: TakerSavedSwap) -> RecreateSwapResult<MakerSavedSwap> {
+    let mut maker_swap = MakerSavedSwap {
+        uuid: taker_swap.uuid,
+        my_order_uuid: taker_swap.my_order_uuid,
+        events: Vec::new(),
+        maker_amount: taker_swap.maker_amount,
+        maker_coin: taker_swap.maker_coin,
+        maker_coin_usd_price: taker_swap.maker_coin_usd_price,
+        taker_amount: taker_swap.taker_amount,
+        taker_coin: taker_swap.taker_coin,
+        taker_coin_usd_price: taker_swap.taker_coin_usd_price,
+        gui: ctx.gui().map(|s| s.to_owned()),
+        mm_version: Some(ctx.mm_version.clone()),
+        success_events: MAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
+        error_events: MAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
+    };
+
+    let mut event_it = taker_swap.events.into_iter();
+
+    let (started_event_timestamp, started_event) = {
+        let TakerSavedEvent { event, timestamp } = event_it.next().or_mm_err(|| RecreateSwapError::SwapIsNotStarted)?;
+        match event {
+            TakerSwapEvent::Started(started) => (timestamp, started),
+            event => return MmError::err(RecreateSwapError::unexpected_event(event.status_str(), "Started")),
+        }
+    };
+
+    let (negotiated_event_timestamp, negotiated_event) = {
+        let TakerSavedEvent { event, timestamp } =
+            event_it.next().or_mm_err(|| RecreateSwapError::SwapIsNotNegotiated)?;
+        match event {
+            TakerSwapEvent::Negotiated(negotiated) => (timestamp, negotiated),
+            event => return MmError::err(RecreateSwapError::unexpected_event(event.status_str(), "Negotiated")),
+        }
+    };
+
+    // Generate `Started` event
+
+    let mut taker_p2p_pubkey = [0; 32];
+    taker_p2p_pubkey.copy_from_slice(&started_event.my_persistent_pub.0[1..33]);
+    let maker_started_event = MakerSwapEvent::Started(MakerSwapData {
+        taker_coin: started_event.taker_coin,
+        maker_coin: started_event.maker_coin,
+        taker: H256Json::from(taker_p2p_pubkey),
+        // We could parse the `TakerSwapEvent::TakerPaymentSpent` event.
+        // As for now, don't try to find the secret in the events since we can refund without it.
+        secret: H256Json::default(),
+        secret_hash: Some(negotiated_event.secret_hash),
+        my_persistent_pub: negotiated_event.maker_pubkey,
+        lock_duration: started_event.lock_duration,
+        maker_amount: started_event.maker_amount,
+        taker_amount: started_event.taker_amount,
+        maker_payment_confirmations: started_event.maker_payment_confirmations,
+        maker_payment_requires_nota: started_event.maker_payment_requires_nota,
+        taker_payment_confirmations: started_event.taker_payment_confirmations,
+        taker_payment_requires_nota: started_event.taker_payment_requires_nota,
+        maker_payment_lock: negotiated_event.maker_payment_locktime,
+        uuid: started_event.uuid,
+        started_at: started_event.started_at,
+        maker_coin_start_block: started_event.maker_coin_start_block,
+        taker_coin_start_block: started_event.taker_coin_start_block,
+        // Don't set the fee since the value is used when we calculate locked by other swaps amount only.
+        maker_payment_trade_fee: None,
+        // Don't set the fee since the value is used when we calculate locked by other swaps amount only.
+        taker_payment_spend_trade_fee: None,
+        maker_coin_swap_contract_address: negotiated_event.maker_coin_swap_contract_addr.clone(),
+        taker_coin_swap_contract_address: negotiated_event.taker_coin_swap_contract_addr.clone(),
+        maker_coin_htlc_pubkey: negotiated_event.maker_coin_htlc_pubkey,
+        taker_coin_htlc_pubkey: negotiated_event.taker_coin_htlc_pubkey,
+        p2p_privkey: None,
+    });
+    maker_swap.events.push(MakerSavedEvent {
+        timestamp: started_event_timestamp,
+        event: maker_started_event,
+    });
+
+    // Generate `Negotiated` event
+
+    let maker_negotiated_event = MakerSwapEvent::Negotiated(TakerNegotiationData {
+        taker_payment_locktime: started_event.taker_payment_lock,
+        taker_pubkey: started_event.my_persistent_pub,
+        maker_coin_swap_contract_addr: negotiated_event.maker_coin_swap_contract_addr,
+        taker_coin_swap_contract_addr: negotiated_event.taker_coin_swap_contract_addr,
+        maker_coin_htlc_pubkey: started_event.maker_coin_htlc_pubkey,
+        taker_coin_htlc_pubkey: started_event.taker_coin_htlc_pubkey,
+    });
+    maker_swap.events.push(MakerSavedEvent {
+        timestamp: negotiated_event_timestamp,
+        event: maker_negotiated_event,
+    });
+
+    // Then we can continue to process success Taker events.
+    let wait_refund_until = negotiated_event.maker_payment_locktime + 3700;
+    maker_swap
+        .events
+        .extend(convert_taker_to_maker_events(event_it, wait_refund_until));
+
+    Ok(maker_swap)
+}
+
+/// Converts `TakerSwapEvent` to `MakerSwapEvent`.
+/// Please note that this method ignores the [`TakerSwapEvent::Started`] and [`TakerSwapEvent::Negotiated`] events
+/// because they are used outside of this function to generate `MakerSwap` and the initial [`MakerSwapEvent::Started`] and [`MakerSwapEvent::Negotiated`] events.
+fn convert_taker_to_maker_events(
+    event_it: impl Iterator<Item = TakerSavedEvent>,
+    wait_refund_until: u64,
+) -> Vec<MakerSavedEvent> {
+    let mut events = Vec::new();
+    let mut taker_fee_ident = None;
+    for TakerSavedEvent { event, timestamp } in event_it {
+        macro_rules! push_event {
+            ($maker_event:expr) => {
+                events.push(MakerSavedEvent {
+                    timestamp,
+                    event: $maker_event,
+                })
+            };
+        }
+
+        // This is used only if an error occurs.
+        let swap_error = SwapError {
+            error: format!("Origin Taker error event: {:?}", event),
+        };
+        match event {
+            // Even if we considered Taker fee as invalid, then we shouldn't have sent Maker payment.
+            TakerSwapEvent::TakerFeeSent(tx_ident) => taker_fee_ident = Some(tx_ident),
+            TakerSwapEvent::TakerFeeSendFailed(_) => {
+                // Maker shouldn't send MakerPayment in this case.
+                push_event!(MakerSwapEvent::TakerFeeValidateFailed(swap_error));
+                push_event!(MakerSwapEvent::Finished);
+                // Finish processing Taker events.
+                return events;
+            },
+            TakerSwapEvent::MakerPaymentReceived(tx_ident) => {
+                if let Some(taker_fee_ident) = taker_fee_ident.take() {
+                    push_event!(MakerSwapEvent::TakerFeeValidated(taker_fee_ident));
+                }
+                push_event!(MakerSwapEvent::MakerPaymentSent(tx_ident))
+            },
+            TakerSwapEvent::MakerPaymentValidateFailed(_)
+            | TakerSwapEvent::MakerPaymentWaitConfirmFailed(_)
+            | TakerSwapEvent::TakerPaymentTransactionFailed(_)
+            | TakerSwapEvent::TakerPaymentDataSendFailed(_)
+            // We actually could confirm TakerPayment and spend it, but for now we don't know about the transaction.
+            | TakerSwapEvent::TakerPaymentWaitConfirmFailed(_) => {
+                // Maker shouldn't receive an info about TakerPayment.
+                push_event!(MakerSwapEvent::TakerPaymentValidateFailed(swap_error));
+                push_event!(MakerSwapEvent::MakerPaymentWaitRefundStarted {
+                    wait_until: wait_refund_until
+                });
+                // Finish processing Taker events.
+                return events;
+            },
+            TakerSwapEvent::TakerPaymentSent(tx_ident) => {
+                push_event!(MakerSwapEvent::TakerPaymentReceived(tx_ident));
+                // Please note we have not to push `TakerPaymentValidatedAndConfirmed` since we could actually decline it.
+                push_event!(MakerSwapEvent::TakerPaymentWaitConfirmStarted);
+            },
+            TakerSwapEvent::TakerPaymentSpent(payment_spent_data) => {
+                push_event!(MakerSwapEvent::TakerPaymentValidatedAndConfirmed);
+                push_event!(MakerSwapEvent::TakerPaymentSpent(payment_spent_data.transaction));
+                push_event!(MakerSwapEvent::TakerPaymentSpendConfirmStarted);
+                // We can consider the spent transaction validated and confirmed since the taker found it on the blockchain.
+                push_event!(MakerSwapEvent::TakerPaymentSpendConfirmed);
+                push_event!(MakerSwapEvent::Finished);
+                // Finish the function, because we spent TakerPayment
+                return events;
+            },
+            TakerSwapEvent::TakerPaymentWaitForSpendFailed(_) => {
+                // Maker hasn't spent TakerPayment for some reason.
+                push_event!(MakerSwapEvent::TakerPaymentSpendFailed(swap_error));
+                push_event!(MakerSwapEvent::MakerPaymentWaitRefundStarted {
+                    wait_until: wait_refund_until
+                });
+                // Finish processing Taker events.
+                return events;
+            },
+            TakerSwapEvent::Started(_)
+            | TakerSwapEvent::StartFailed(_)
+            | TakerSwapEvent::Negotiated(_)
+            | TakerSwapEvent::NegotiateFailed(_)
+            | TakerSwapEvent::MakerPaymentWaitConfirmStarted
+            | TakerSwapEvent::MakerPaymentValidatedAndConfirmed
+            | TakerSwapEvent::MakerPaymentSpent(_)
+            | TakerSwapEvent::MakerPaymentSpendFailed(_)
+            // We don't know the reason at the moment, so we rely on the errors handling above.
+            | TakerSwapEvent::TakerPaymentWaitRefundStarted { .. }
+            | TakerSwapEvent::TakerPaymentRefunded(_)
+            | TakerSwapEvent::TakerPaymentRefundFailed(_)
+            | TakerSwapEvent::Finished => {}
+        }
+    }
+    events
+}
+
+async fn recreate_taker_swap(ctx: MmArc, maker_swap: MakerSavedSwap) -> RecreateSwapResult<TakerSavedSwap> {
+    let mut taker_swap = TakerSavedSwap {
+        uuid: maker_swap.uuid,
+        my_order_uuid: Some(maker_swap.uuid),
+        events: Vec::new(),
+        maker_amount: maker_swap.maker_amount,
+        maker_coin: maker_swap.maker_coin,
+        maker_coin_usd_price: maker_swap.maker_coin_usd_price,
+        taker_amount: maker_swap.taker_amount,
+        taker_coin: maker_swap.taker_coin,
+        taker_coin_usd_price: maker_swap.taker_coin_usd_price,
+        gui: ctx.gui().map(|s| s.to_owned()),
+        mm_version: Some(ctx.mm_version.clone()),
+        success_events: TAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
+        error_events: TAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
+    };
+
+    let mut event_it = maker_swap.events.into_iter();
+
+    let (started_event_timestamp, started_event) = {
+        let MakerSavedEvent { event, timestamp } = event_it.next().or_mm_err(|| RecreateSwapError::SwapIsNotStarted)?;
+        match event {
+            MakerSwapEvent::Started(started) => (timestamp, started),
+            event => return MmError::err(RecreateSwapError::unexpected_event(event.status_str(), "Started")),
+        }
+    };
+
+    let (negotiated_timestamp, negotiated_event) = {
+        let MakerSavedEvent { event, timestamp } =
+            event_it.next().or_mm_err(|| RecreateSwapError::SwapIsNotNegotiated)?;
+        match event {
+            MakerSwapEvent::Negotiated(negotiated) => (timestamp, negotiated),
+            event => return MmError::err(RecreateSwapError::unexpected_event(event.status_str(), "Negotiated")),
+        }
+    };
+
+    let mut maker_p2p_pubkey = [0; 32];
+    maker_p2p_pubkey.copy_from_slice(&started_event.my_persistent_pub.0[1..33]);
+    let taker_started_event = TakerSwapEvent::Started(TakerSwapData {
+        taker_coin: started_event.taker_coin,
+        maker_coin: started_event.maker_coin.clone(),
+        maker: H256Json::from(maker_p2p_pubkey),
+        my_persistent_pub: negotiated_event.taker_pubkey,
+        lock_duration: started_event.lock_duration,
+        maker_amount: started_event.maker_amount,
+        taker_amount: started_event.taker_amount,
+        maker_payment_confirmations: started_event.maker_payment_confirmations,
+        maker_payment_requires_nota: started_event.maker_payment_requires_nota,
+        taker_payment_confirmations: started_event.taker_payment_confirmations,
+        taker_payment_requires_nota: started_event.taker_payment_requires_nota,
+        taker_payment_lock: negotiated_event.taker_payment_locktime,
+        uuid: started_event.uuid,
+        started_at: started_event.started_at,
+        maker_payment_wait: maker_payment_wait(started_event.started_at, started_event.lock_duration),
+        maker_coin_start_block: started_event.maker_coin_start_block,
+        taker_coin_start_block: started_event.taker_coin_start_block,
+        // Don't set the fee since the value is used when we calculate locked by other swaps amount only.
+        fee_to_send_taker_fee: None,
+        // Don't set the fee since the value is used when we calculate locked by other swaps amount only.
+        taker_payment_trade_fee: None,
+        // Don't set the fee since the value is used when we calculate locked by other swaps amount only.
+        maker_payment_spend_trade_fee: None,
+        maker_coin_swap_contract_address: negotiated_event.maker_coin_swap_contract_addr.clone(),
+        taker_coin_swap_contract_address: negotiated_event.taker_coin_swap_contract_addr.clone(),
+        maker_coin_htlc_pubkey: negotiated_event.maker_coin_htlc_pubkey,
+        taker_coin_htlc_pubkey: negotiated_event.taker_coin_htlc_pubkey,
+        p2p_privkey: None,
+    });
+    taker_swap.events.push(TakerSavedEvent {
+        timestamp: started_event_timestamp,
+        event: taker_started_event,
+    });
+
+    let secret_hash = started_event
+        .secret_hash
+        .or_mm_err(|| RecreateSwapError::NoSecretHash)?;
+
+    let taker_negotiated_event = TakerSwapEvent::Negotiated(MakerNegotiationData {
+        maker_payment_locktime: started_event.maker_payment_lock,
+        maker_pubkey: started_event.my_persistent_pub,
+        secret_hash,
+        maker_coin_swap_contract_addr: negotiated_event.maker_coin_swap_contract_addr,
+        taker_coin_swap_contract_addr: negotiated_event.taker_coin_swap_contract_addr,
+        maker_coin_htlc_pubkey: started_event.maker_coin_htlc_pubkey,
+        taker_coin_htlc_pubkey: started_event.taker_coin_htlc_pubkey,
+    });
+    taker_swap.events.push(TakerSavedEvent {
+        timestamp: negotiated_timestamp,
+        event: taker_negotiated_event,
+    });
+
+    // Can be used to extract a secret from [`MakerSwapEvent::TakerPaymentSpent`].
+    let maker_coin_ticker = started_event.maker_coin;
+    let maker_coin = lp_coinfind(&ctx, &maker_coin_ticker)
+        .await
+        .map_to_mm(RecreateSwapError::Internal)?
+        .or_mm_err(move || RecreateSwapError::NoSuchCoin {
+            coin: maker_coin_ticker,
+        })?;
+
+    // Then we can continue to process success Maker events.
+    let wait_refund_until = negotiated_event.taker_payment_locktime + 3700;
+    taker_swap.events.extend(convert_maker_to_taker_events(
+        event_it,
+        maker_coin,
+        secret_hash,
+        wait_refund_until,
+    ));
+
+    Ok(taker_swap)
+}
+
+/// Converts `MakerSwapEvent` to `TakerSwapEvent`.
+/// Please note that this method ignores the [`MakerSwapEvent::Started`] and [`MakerSwapEvent::Negotiated`] events
+/// since they are used outside of this function to generate `TakerSwap` and the initial [`TakerSwapEvent::Started`] and [`TakerSwapEvent::Negotiated`] events.
+///
+/// The `maker_coin` and `secret_hash` function arguments are used to extract a secret from `TakerPaymentSpent`.
+fn convert_maker_to_taker_events(
+    event_it: impl Iterator<Item = MakerSavedEvent>,
+    maker_coin: MmCoinEnum,
+    secret_hash: H160Json,
+    wait_refund_until: u64,
+) -> Vec<TakerSavedEvent> {
+    let mut events = Vec::new();
+    for MakerSavedEvent { event, timestamp } in event_it {
+        macro_rules! push_event {
+            ($maker_event:expr) => {
+                events.push(TakerSavedEvent {
+                    timestamp,
+                    event: $maker_event,
+                })
+            };
+        }
+
+        // This is used only if an error occurs.
+        let swap_error = SwapError {
+            error: format!("Origin Maker error event: {:?}", event),
+        };
+        match event {
+            MakerSwapEvent::TakerFeeValidated(tx_ident) => push_event!(TakerSwapEvent::TakerFeeSent(tx_ident)),
+            MakerSwapEvent::TakerFeeValidateFailed(_) => {
+                push_event!(TakerSwapEvent::MakerPaymentValidateFailed(swap_error));
+                push_event!(TakerSwapEvent::Finished);
+                // Finish processing Maker events.
+                return events;
+            },
+            MakerSwapEvent::MakerPaymentSent(tx_ident) => {
+                push_event!(TakerSwapEvent::MakerPaymentReceived(tx_ident));
+                // Please note we have not to push `MakerPaymentValidatedAndConfirmed` since we could actually decline it.
+                push_event!(TakerSwapEvent::MakerPaymentWaitConfirmStarted);
+            },
+            MakerSwapEvent::MakerPaymentTransactionFailed(_)
+            | MakerSwapEvent::MakerPaymentDataSendFailed(_)
+            // We actually could confirm MakerPayment and send TakerPayment, but for now we don't know about the transaction.
+            | MakerSwapEvent::MakerPaymentWaitConfirmFailed(_) => {
+                push_event!(TakerSwapEvent::MakerPaymentValidateFailed(swap_error));
+                push_event!(TakerSwapEvent::Finished);
+                // Finish processing Maker events.
+                return events;
+            },
+            MakerSwapEvent::TakerPaymentReceived(tx_ident) => {
+                push_event!(TakerSwapEvent::MakerPaymentValidatedAndConfirmed);
+                push_event!(TakerSwapEvent::TakerPaymentSent(tx_ident.clone()));
+            },
+            MakerSwapEvent::TakerPaymentValidateFailed(_)
+            | MakerSwapEvent::TakerPaymentSpendFailed(_)
+            | MakerSwapEvent::TakerPaymentWaitConfirmFailed(_) => {
+                push_event!(TakerSwapEvent::TakerPaymentWaitForSpendFailed(swap_error));
+                push_event!(TakerSwapEvent::TakerPaymentWaitRefundStarted { wait_until: wait_refund_until });
+                // Finish processing Maker events.
+                return events;
+            },
+            MakerSwapEvent::TakerPaymentSpent(tx_ident) => {
+                let secret = match maker_coin.extract_secret(&secret_hash.0, &tx_ident.tx_hex) {
+                    Ok(secret) => H256Json::from(secret.as_slice()),
+                    Err(e) => {
+                        push_event!(TakerSwapEvent::TakerPaymentWaitForSpendFailed(ERRL!("{}", e).into()));
+                        push_event!(TakerSwapEvent::TakerPaymentWaitRefundStarted { wait_until: wait_refund_until });
+                        return events;
+                    },
+                };
+                push_event!(TakerSwapEvent::TakerPaymentSpent(TakerPaymentSpentData {
+                    secret,
+                    transaction: tx_ident,
+                }));
+                return events;
+            },
+            MakerSwapEvent::Started(_)
+            | MakerSwapEvent::StartFailed(_)
+            | MakerSwapEvent::Negotiated(_)
+            | MakerSwapEvent::NegotiateFailed(_)
+            | MakerSwapEvent::TakerPaymentWaitConfirmStarted
+            | MakerSwapEvent::TakerPaymentValidatedAndConfirmed
+            | MakerSwapEvent::TakerPaymentSpendConfirmStarted
+            | MakerSwapEvent::TakerPaymentSpendConfirmed
+            // I think we can't be sure if the spend transaction is declined by the network.
+            | MakerSwapEvent::TakerPaymentSpendConfirmFailed(_)
+            // We don't know the reason at the moment, so we rely on the errors handling above.
+            | MakerSwapEvent::MakerPaymentWaitRefundStarted { .. }
+            | MakerSwapEvent::MakerPaymentRefunded(_)
+            | MakerSwapEvent::MakerPaymentRefundFailed(_)
+            | MakerSwapEvent::Finished => {}
+        }
+    }
+    events
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use coins::{CoinsContext, SwapOps, TestCoin};
+    use common::block_on;
+    use mm2_core::mm_ctx::MmCtxBuilder;
+    use mocktopus::mocking::{MockResult, Mockable};
+    use serde_json as json;
+
+    #[test]
+    fn test_recreate_maker_swap() {
+        let taker_saved_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","events":[{"timestamp":1638984440546,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","maker":"15d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","my_persistent_pub":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"taker_payment_lock":1638992240,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_payment_wait":1638987560,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"fee_to_send_taker_fee":{"coin":"MORTY","amount":"0.00001","paid_from_trading_vol":false},"taker_payment_trade_fee":{"coin":"MORTY","amount":"0.00001","paid_from_trading_vol":false},"maker_payment_spend_trade_fee":{"coin":"RICK","amount":"0.00001","paid_from_trading_vol":true}}}},{"timestamp":1638984456603,"event":{"type":"Negotiated","data":{"maker_payment_locktime":1639000040,"maker_pubkey":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984456814,"event":{"type":"TakerFeeSent","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457822,"event":{"type":"MakerPaymentReceived","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984457826,"event":{"type":"MakerPaymentWaitConfirmStarted"}},{"timestamp":1638984503611,"event":{"type":"MakerPaymentValidatedAndConfirmed"}},{"timestamp":1638984503974,"event":{"type":"TakerPaymentSent","data":{"tx_hex":"0400008085202f8901bcb570da43050193f6dca5c5260be8f7668887943b644341018e9ec76791b4fc010000006b483045022100fe6c90568a256b531bcd18321c15b3ce68c2d5d603768dea6aba68dcc170b801022076a34c006a92786bcdee6a1dcb46947fb49911e4f51ec27e880c3396d64d59b2012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff0300e1f5050000000017a9145a6125d597d2ce37bde9983d4d9d481335139bc4870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30b8cdef305000000001976a91483762a373935ca241d557dfce89171d582b486de88ac37ebb061000000000000000000000000000000","tx_hash":"667dea45dbd36e1f15ee8170e73e2afefd0a15d47d3bcd65655ca71d838445a2"}}},{"timestamp":1638984600390,"event":{"type":"TakerPaymentSpent","data":{"transaction":{"tx_hex":"0400008085202f8901a24584831da75c6565cd3b7dd4150afdfe2a3ee77081ee151f6ed3db45ea7d6600000000d74730440220422edb8ef5cd3991eb309c3a4fa5fe5d9ffe08d3d6b4b789c5587061d7993864022049cd082398f5a37a9e7411d56976e61bcce9162d0f5f1fb24e40bcf2f4ec0052012023a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4004c6b63047009b161b1752103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddac6782012088a9144da9e7080175e8e10842e0e161b33cd298cab30b88210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ac68ffffffff0118ddf505000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac7009b161000000000000000000000000000000","tx_hash":"ab1eb5b65a302370af2607e0b64b60fc04360de33a87799bca1dcf337344b616"},"secret":"23a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4"}}},{"timestamp":1638984600829,"event":{"type":"MakerPaymentSpent","data":{"tx_hex":"0400008085202f89013d20d0bf4318dfd61fe6b2fe5fe796759f40e5b17e83fb9b85cd5109d3e0876200000000d747304402200a57f752b760a8dcb932244dde0a46112a4d08bd5d31704c9138dc52b02a57e602204f0406dd354271e9850862e2e8c1feec57380e858952ab6cfedc8e7725196c94012023a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4004c6b6304e827b161b175210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ac6782012088a9144da9e7080175e8e10842e0e161b33cd298cab30b882103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddac68ffffffff01ba256b05000000001976a91483762a373935ca241d557dfce89171d582b486de88ace827b161000000000000000000000000000000","tx_hash":"ca0721b69657c0ea2dcb848cc9e44e66d719ae10477097bf0fec57866a4f66aa"}}},{"timestamp":1638984600832,"event":{"type":"Finished"}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":"atomicDEX 0.5.1 iOS","mm_version":"1b065636a","success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed"]}"#;
+        let maker_expected_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","events":[{"timestamp":1638984440546,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","taker":"b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","my_persistent_pub":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1639000040,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"maker_payment_trade_fee":null,"taker_payment_spend_trade_fee":null}}},{"timestamp":1638984456603,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1638992240,"taker_pubkey":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984457822,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457822,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984503974,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8901bcb570da43050193f6dca5c5260be8f7668887943b644341018e9ec76791b4fc010000006b483045022100fe6c90568a256b531bcd18321c15b3ce68c2d5d603768dea6aba68dcc170b801022076a34c006a92786bcdee6a1dcb46947fb49911e4f51ec27e880c3396d64d59b2012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff0300e1f5050000000017a9145a6125d597d2ce37bde9983d4d9d481335139bc4870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30b8cdef305000000001976a91483762a373935ca241d557dfce89171d582b486de88ac37ebb061000000000000000000000000000000","tx_hash":"667dea45dbd36e1f15ee8170e73e2afefd0a15d47d3bcd65655ca71d838445a2"}}},{"timestamp":1638984503974,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1638984600390,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1638984600390,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"0400008085202f8901a24584831da75c6565cd3b7dd4150afdfe2a3ee77081ee151f6ed3db45ea7d6600000000d74730440220422edb8ef5cd3991eb309c3a4fa5fe5d9ffe08d3d6b4b789c5587061d7993864022049cd082398f5a37a9e7411d56976e61bcce9162d0f5f1fb24e40bcf2f4ec0052012023a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4004c6b63047009b161b1752103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddac6782012088a9144da9e7080175e8e10842e0e161b33cd298cab30b88210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ac68ffffffff0118ddf505000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac7009b161000000000000000000000000000000","tx_hash":"ab1eb5b65a302370af2607e0b64b60fc04360de33a87799bca1dcf337344b616"}}},{"timestamp":1638984600390,"event":{"type":"TakerPaymentSpendConfirmStarted"}},{"timestamp":1638984600390,"event":{"type":"TakerPaymentSpendConfirmed"}},{"timestamp":1638984600390,"event":{"type":"Finished"}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":null,"mm_version":"","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
+
+        let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
+        let maker_expected_swap: MakerSavedSwap = json::from_str(maker_expected_json).unwrap();
+
+        let ctx = MmCtxBuilder::default().into_mm_arc();
+
+        let maker_actual_swap = recreate_maker_swap(ctx, taker_saved_swap).expect("!recreate_maker_swap");
+        println!("{}", json::to_string(&maker_actual_swap).unwrap());
+        assert_eq!(maker_actual_swap, maker_expected_swap);
+    }
+
+    #[test]
+    fn test_recreate_maker_swap_maker_payment_wait_confirm_failed() {
+        let taker_saved_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","events":[{"timestamp":1638984440546,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","maker":"15d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","my_persistent_pub":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"taker_payment_lock":1638992240,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_payment_wait":1638987560,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"fee_to_send_taker_fee":{"coin":"MORTY","amount":"0.00001","paid_from_trading_vol":false},"taker_payment_trade_fee":{"coin":"MORTY","amount":"0.00001","paid_from_trading_vol":false},"maker_payment_spend_trade_fee":{"coin":"RICK","amount":"0.00001","paid_from_trading_vol":true}}}},{"timestamp":1638984456603,"event":{"type":"Negotiated","data":{"maker_payment_locktime":1639000040,"maker_pubkey":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984456814,"event":{"type":"TakerFeeSent","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457822,"event":{"type":"MakerPaymentReceived","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984457826,"event":{"type":"MakerPaymentWaitConfirmStarted"}},{"timestamp":1638984503611,"event":{"type":"MakerPaymentWaitConfirmFailed","data":{"error":"An error"}}},{"timestamp":1638984503615,"event":{"type":"Finished"}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":"atomicDEX 0.5.1 iOS","mm_version":"1b065636a","success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed"]}"#;
+        let maker_expected_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","events":[{"timestamp":1638984440546,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","taker":"b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","my_persistent_pub":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1639000040,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"maker_payment_trade_fee":null,"taker_payment_spend_trade_fee":null}}},{"timestamp":1638984456603,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1638992240,"taker_pubkey":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984457822,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457822,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984503611,"event":{"type":"TakerPaymentValidateFailed","data":{"error":"Origin Taker error event: MakerPaymentWaitConfirmFailed(SwapError { error: \"An error\" })"}}},{"timestamp":1638984503611,"event":{"type":"MakerPaymentWaitRefundStarted","data":{"wait_until":1639003740}}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":null,"mm_version":"","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
+
+        let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
+        let maker_expected_swap: MakerSavedSwap = json::from_str(maker_expected_json).unwrap();
+
+        let ctx = MmCtxBuilder::default().into_mm_arc();
+
+        let maker_actual_swap = recreate_maker_swap(ctx, taker_saved_swap).expect("!recreate_maker_swap");
+        println!("{}", json::to_string(&maker_actual_swap).unwrap());
+        assert_eq!(maker_actual_swap, maker_expected_swap);
+    }
+
+    #[test]
+    fn test_recreate_taker_swap() {
+        TestCoin::extract_secret.mock_safe(|_coin, _secret_hash, _spend_tx| {
+            let secret = hex::decode("23a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4").unwrap();
+            MockResult::Return(Ok(secret))
+        });
+
+        let maker_saved_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"15d007fa-9237-489c-82a7-df061deba95f","events":[{"timestamp":1638984440198,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","taker":"b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","my_persistent_pub":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1639000040,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"maker_payment_trade_fee":{"coin":"RICK","amount":"0.00001","paid_from_trading_vol":false},"taker_payment_spend_trade_fee":{"coin":"MORTY","amount":"0.00001","paid_from_trading_vol":true}}}},{"timestamp":1638984456204,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1638992240,"taker_pubkey":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984457215,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457230,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984504262,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8901bcb570da43050193f6dca5c5260be8f7668887943b644341018e9ec76791b4fc010000006b483045022100fe6c90568a256b531bcd18321c15b3ce68c2d5d603768dea6aba68dcc170b801022076a34c006a92786bcdee6a1dcb46947fb49911e4f51ec27e880c3396d64d59b2012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff0300e1f5050000000017a9145a6125d597d2ce37bde9983d4d9d481335139bc4870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30b8cdef305000000001976a91483762a373935ca241d557dfce89171d582b486de88ac37ebb061000000000000000000000000000000","tx_hash":"667dea45dbd36e1f15ee8170e73e2afefd0a15d47d3bcd65655ca71d838445a2"}}},{"timestamp":1638984504263,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1638984594319,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1638984594337,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"0400008085202f8901a24584831da75c6565cd3b7dd4150afdfe2a3ee77081ee151f6ed3db45ea7d6600000000d74730440220422edb8ef5cd3991eb309c3a4fa5fe5d9ffe08d3d6b4b789c5587061d7993864022049cd082398f5a37a9e7411d56976e61bcce9162d0f5f1fb24e40bcf2f4ec0052012023a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4004c6b63047009b161b1752103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddac6782012088a9144da9e7080175e8e10842e0e161b33cd298cab30b88210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ac68ffffffff0118ddf505000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac7009b161000000000000000000000000000000","tx_hash":"ab1eb5b65a302370af2607e0b64b60fc04360de33a87799bca1dcf337344b616"}}},{"timestamp":1638984594338,"event":{"type":"TakerPaymentSpendConfirmStarted"}},{"timestamp":1638984699392,"event":{"type":"TakerPaymentSpendConfirmed"}},{"timestamp":1638984699393,"event":{"type":"Finished"}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":"mpm","mm_version":"213bfddd5","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
+        let taker_expected_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","events":[{"timestamp":1638984440198,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","maker":"15d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","my_persistent_pub":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"taker_payment_lock":1638992240,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_payment_wait":1638987560,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"fee_to_send_taker_fee":null,"taker_payment_trade_fee":null,"maker_payment_spend_trade_fee":null}}},{"timestamp":1638984456204,"event":{"type":"Negotiated","data":{"maker_payment_locktime":1639000040,"maker_pubkey":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984457215,"event":{"type":"TakerFeeSent","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457230,"event":{"type":"MakerPaymentReceived","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984457230,"event":{"type":"MakerPaymentWaitConfirmStarted"}},{"timestamp":1638984504262,"event":{"type":"MakerPaymentValidatedAndConfirmed"}},{"timestamp":1638984504262,"event":{"type":"TakerPaymentSent","data":{"tx_hex":"0400008085202f8901bcb570da43050193f6dca5c5260be8f7668887943b644341018e9ec76791b4fc010000006b483045022100fe6c90568a256b531bcd18321c15b3ce68c2d5d603768dea6aba68dcc170b801022076a34c006a92786bcdee6a1dcb46947fb49911e4f51ec27e880c3396d64d59b2012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff0300e1f5050000000017a9145a6125d597d2ce37bde9983d4d9d481335139bc4870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30b8cdef305000000001976a91483762a373935ca241d557dfce89171d582b486de88ac37ebb061000000000000000000000000000000","tx_hash":"667dea45dbd36e1f15ee8170e73e2afefd0a15d47d3bcd65655ca71d838445a2"}}},{"timestamp":1638984594337,"event":{"type":"TakerPaymentSpent","data":{"transaction":{"tx_hex":"0400008085202f8901a24584831da75c6565cd3b7dd4150afdfe2a3ee77081ee151f6ed3db45ea7d6600000000d74730440220422edb8ef5cd3991eb309c3a4fa5fe5d9ffe08d3d6b4b789c5587061d7993864022049cd082398f5a37a9e7411d56976e61bcce9162d0f5f1fb24e40bcf2f4ec0052012023a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4004c6b63047009b161b1752103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddac6782012088a9144da9e7080175e8e10842e0e161b33cd298cab30b88210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ac68ffffffff0118ddf505000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac7009b161000000000000000000000000000000","tx_hash":"ab1eb5b65a302370af2607e0b64b60fc04360de33a87799bca1dcf337344b616"},"secret":"23a6bb64bc0ab2cc14cb84277d8d25134b814e5f999c66e578c9bba3c5e2d3a4"}}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":null,"mm_version":"","success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed"]}"#;
+
+        let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
+        let taker_expected_swap: TakerSavedSwap = json::from_str(taker_expected_json).unwrap();
+
+        let ctx = MmCtxBuilder::default().into_mm_arc();
+        let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+        block_on(coins_ctx.add_coin(MmCoinEnum::Test(TestCoin::new("RICK")))).unwrap();
+
+        let taker_actual_swap = block_on(recreate_taker_swap(ctx, maker_saved_swap)).expect("!recreate_maker_swap");
+        println!("{}", json::to_string(&taker_actual_swap).unwrap());
+        assert_eq!(taker_actual_swap, taker_expected_swap);
+    }
+
+    #[test]
+    fn test_recreate_taker_swap_taker_payment_wait_confirm_failed() {
+        let maker_saved_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"15d007fa-9237-489c-82a7-df061deba95f","events":[{"timestamp":1638984440198,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","taker":"b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","my_persistent_pub":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1639000040,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"maker_payment_trade_fee":{"coin":"RICK","amount":"0.00001","paid_from_trading_vol":false},"taker_payment_spend_trade_fee":{"coin":"MORTY","amount":"0.00001","paid_from_trading_vol":true}}}},{"timestamp":1638984456204,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1638992240,"taker_pubkey":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984457215,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457230,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984504262,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8901bcb570da43050193f6dca5c5260be8f7668887943b644341018e9ec76791b4fc010000006b483045022100fe6c90568a256b531bcd18321c15b3ce68c2d5d603768dea6aba68dcc170b801022076a34c006a92786bcdee6a1dcb46947fb49911e4f51ec27e880c3396d64d59b2012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff0300e1f5050000000017a9145a6125d597d2ce37bde9983d4d9d481335139bc4870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30b8cdef305000000001976a91483762a373935ca241d557dfce89171d582b486de88ac37ebb061000000000000000000000000000000","tx_hash":"667dea45dbd36e1f15ee8170e73e2afefd0a15d47d3bcd65655ca71d838445a2"}}},{"timestamp":1638984504263,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1638984594319,"event":{"type":"TakerPaymentWaitConfirmFailed","data":{"error":"An error"}}},{"timestamp":1638984594338,"event":{"type":"MakerPaymentWaitRefundStarted","data":{"wait_until":1639003740}}},{"timestamp":1639003740392,"event":{"type":"MakerPaymentRefunded","data":{"tx_hex":"0400008085202f8901bcb570da43050193f6dca5c5260be8f7668887943b644341018e9ec76791b4fc010000006b483045022100fe6c90568a256b531bcd18321c15b3ce68c2d5d603768dea6aba68dcc170b801022076a34c006a92786bcdee6a1dcb46947fb49911e4f51ec27e880c3396d64d59b2012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff0300e1f5050000000017a9145a6125d597d2ce37bde9983d4d9d481335139bc4870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30b8cdef305000000001976a91483762a373935ca241d557dfce89171d582b486de88ac37ebb061000000000000000000000000000000","tx_hash":"667dea45dbd36e1f15ee8170e73e2afefd0a15d47d3bcd65655ca71d838445a2"}}},{"timestamp":1639003740398,"event":{"type":"Finished"}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":"mpm","mm_version":"213bfddd5","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
+        let taker_expected_json = r#"{"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","my_order_uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","events":[{"timestamp":1638984440198,"event":{"type":"Started","data":{"taker_coin":"MORTY","maker_coin":"RICK","maker":"15d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","my_persistent_pub":"03b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58addd","lock_duration":7800,"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"taker_payment_lock":1638992240,"uuid":"f87fa9ce-0820-4675-b85d-db18c7bc9fb4","started_at":1638984440,"maker_payment_wait":1638987560,"maker_coin_start_block":1207822,"taker_coin_start_block":1222573,"fee_to_send_taker_fee":null,"taker_payment_trade_fee":null,"maker_payment_spend_trade_fee":null}}},{"timestamp":1638984456204,"event":{"type":"Negotiated","data":{"maker_payment_locktime":1639000040,"maker_pubkey":"0315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732","secret_hash":"4da9e7080175e8e10842e0e161b33cd298cab30b","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1638984457215,"event":{"type":"TakerFeeSent","data":{"tx_hex":"0400008085202f89016383e8aced2256378bb126a1ca1a41e2f344d9295f65b3ea4b99055c5eb4a6cb000000006a47304402201c7e661e0dbeb9b3eb6e4e9e3194010e5772227017772b2e48c1b8d48ed3b21f02201c2eda64e74455fa1878a5c221f25d22fe626abd0078a26a9fc0f829e0921639012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac74c3e90b000000001976a91483762a373935ca241d557dfce89171d582b486de88ac08ebb061000000000000000000000000000000","tx_hash":"fcb49167c79e8e014143643b94878866f7e80b26c5a5dcf693010543da70b5bc"}}},{"timestamp":1638984457230,"event":{"type":"MakerPaymentReceived","data":{"tx_hex":"0400008085202f8901c41fdf6b9d8aea4b472f83e4fa0d99dfafc245e897d681fd2ca7df30707fbf48020000006b483045022100c7b294bd46cbf3b13530879a43c5cf67414047266d8b64c3c7263b5e75b989ba02201974f38d688b184bc44e628806c6ab2ac9092f394729d0ce838f14e1e76117c001210315d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732ffffffff03a2296b050000000017a91491c45f69e1760c12a1f90fb2a811f6dfde35cc35870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30bac503d64000000001976a9141462c3dd3f936d595c9af55978003b27c250441f88ac09ebb061000000000000000000000000000000","tx_hash":"6287e0d30951cd859bfb837eb1e5409f7596e75ffeb2e61fd6df1843bfd0203d"}}},{"timestamp":1638984457230,"event":{"type":"MakerPaymentWaitConfirmStarted"}},{"timestamp":1638984504262,"event":{"type":"MakerPaymentValidatedAndConfirmed"}},{"timestamp":1638984504262,"event":{"type":"TakerPaymentSent","data":{"tx_hex":"0400008085202f8901bcb570da43050193f6dca5c5260be8f7668887943b644341018e9ec76791b4fc010000006b483045022100fe6c90568a256b531bcd18321c15b3ce68c2d5d603768dea6aba68dcc170b801022076a34c006a92786bcdee6a1dcb46947fb49911e4f51ec27e880c3396d64d59b2012103b1e544ce2d860219bc91314b5483421a553a7b33044659eff0be9214ed58adddffffffff0300e1f5050000000017a9145a6125d597d2ce37bde9983d4d9d481335139bc4870000000000000000166a144da9e7080175e8e10842e0e161b33cd298cab30b8cdef305000000001976a91483762a373935ca241d557dfce89171d582b486de88ac37ebb061000000000000000000000000000000","tx_hash":"667dea45dbd36e1f15ee8170e73e2afefd0a15d47d3bcd65655ca71d838445a2"}}},{"timestamp":1638984594319,"event":{"type":"TakerPaymentWaitForSpendFailed","data":{"error":"Origin Maker error event: TakerPaymentWaitConfirmFailed(SwapError { error: \"An error\" })"}}},{"timestamp":1638984594319,"event":{"type":"TakerPaymentWaitRefundStarted","data":{"wait_until":1638995940}}}],"maker_amount":"0.9090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909091","maker_coin":"RICK","taker_amount":"1","taker_coin":"MORTY","gui":null,"mm_version":"","success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed"]}"#;
+
+        let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
+        let taker_expected_swap: TakerSavedSwap = json::from_str(taker_expected_json).unwrap();
+
+        let ctx = MmCtxBuilder::default().into_mm_arc();
+        let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
+        block_on(coins_ctx.add_coin(MmCoinEnum::Test(TestCoin::new("RICK")))).unwrap();
+
+        let taker_actual_swap = block_on(recreate_taker_swap(ctx, maker_saved_swap)).expect("!recreate_maker_swap");
+        println!("{}", json::to_string(&taker_actual_swap).unwrap());
+        assert_eq!(taker_actual_swap, taker_expected_swap);
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_swap/saved_swap.rs b/mm2src/mm2_main/src/lp_swap/saved_swap.rs
new file mode 100644
index 0000000000..a4afb8dafe
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_swap/saved_swap.rs
@@ -0,0 +1,410 @@
+use crate::mm2::lp_swap::maker_swap::{MakerSavedSwap, MakerSwap, MakerSwapEvent};
+use crate::mm2::lp_swap::taker_swap::{TakerSavedSwap, TakerSwap, TakerSwapEvent};
+use crate::mm2::lp_swap::{MySwapInfo, RecoveredSwap};
+use async_trait::async_trait;
+use coins::lp_coinfind;
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::H256 as H256Json;
+use uuid::Uuid;
+
+pub type SavedSwapResult<T> = Result<T, MmError<SavedSwapError>>;
+
+#[derive(Debug, Display, Deserialize, Serialize)]
+pub enum SavedSwapError {
+    #[display(fmt = "Error saving the a swap: {}", _0)]
+    ErrorSaving(String),
+    #[display(fmt = "Error loading a swap: {}", _0)]
+    ErrorLoading(String),
+    #[display(fmt = "Error deserializing a swap: {}", _0)]
+    ErrorDeserializing(String),
+    #[display(fmt = "Error serializing a swap: {}", _0)]
+    ErrorSerializing(String),
+    #[allow(dead_code)]
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum SavedSwap {
+    Maker(MakerSavedSwap),
+    Taker(TakerSavedSwap),
+}
+
+impl From<MakerSavedSwap> for SavedSwap {
+    fn from(maker: MakerSavedSwap) -> Self { SavedSwap::Maker(maker) }
+}
+
+impl From<TakerSavedSwap> for SavedSwap {
+    fn from(taker: TakerSavedSwap) -> Self { SavedSwap::Taker(taker) }
+}
+
+impl SavedSwap {
+    pub fn is_finished_and_success(&self) -> bool {
+        match self {
+            SavedSwap::Maker(swap) => swap.is_success().unwrap_or(false),
+            SavedSwap::Taker(swap) => swap.is_success().unwrap_or(false),
+        }
+    }
+
+    pub fn is_finished(&self) -> bool {
+        match self {
+            SavedSwap::Maker(swap) => swap.is_finished(),
+            SavedSwap::Taker(swap) => swap.is_finished(),
+        }
+    }
+
+    pub fn uuid(&self) -> &Uuid {
+        match self {
+            SavedSwap::Maker(swap) => &swap.uuid,
+            SavedSwap::Taker(swap) => &swap.uuid,
+        }
+    }
+
+    pub fn maker_coin_ticker(&self) -> Result<String, String> {
+        match self {
+            SavedSwap::Maker(swap) => swap.maker_coin(),
+            SavedSwap::Taker(swap) => swap.maker_coin(),
+        }
+    }
+
+    pub fn taker_coin_ticker(&self) -> Result<String, String> {
+        match self {
+            SavedSwap::Maker(swap) => swap.taker_coin(),
+            SavedSwap::Taker(swap) => swap.taker_coin(),
+        }
+    }
+
+    pub fn get_my_info(&self) -> Option<MySwapInfo> {
+        match self {
+            SavedSwap::Maker(swap) => swap.get_my_info(),
+            SavedSwap::Taker(swap) => swap.get_my_info(),
+        }
+    }
+
+    pub async fn recover_funds(self, ctx: MmArc) -> Result<RecoveredSwap, String> {
+        let maker_ticker = try_s!(self.maker_coin_ticker());
+        let maker_coin = match lp_coinfind(&ctx, &maker_ticker).await {
+            Ok(Some(c)) => c,
+            Ok(None) => return ERR!("Coin {} is not activated", maker_ticker),
+            Err(e) => return ERR!("Error {} on {} coin find attempt", e, maker_ticker),
+        };
+
+        let taker_ticker = try_s!(self.taker_coin_ticker());
+        let taker_coin = match lp_coinfind(&ctx, &taker_ticker).await {
+            Ok(Some(c)) => c,
+            Ok(None) => return ERR!("Coin {} is not activated", taker_ticker),
+            Err(e) => return ERR!("Error {} on {} coin find attempt", e, taker_ticker),
+        };
+        match self {
+            SavedSwap::Maker(saved) => {
+                let (maker_swap, _) = try_s!(MakerSwap::load_from_saved(ctx, maker_coin, taker_coin, saved));
+                Ok(try_s!(maker_swap.recover_funds().await))
+            },
+            SavedSwap::Taker(saved) => {
+                let (taker_swap, _) = try_s!(TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, saved));
+                Ok(try_s!(taker_swap.recover_funds().await))
+            },
+        }
+    }
+
+    pub fn is_recoverable(&self) -> bool {
+        match self {
+            SavedSwap::Maker(saved) => saved.is_recoverable(),
+            SavedSwap::Taker(saved) => saved.is_recoverable(),
+        }
+    }
+
+    pub fn hide_secrets(&mut self) {
+        match self {
+            SavedSwap::Maker(swap) => {
+                if let Some(ref mut event) = swap.events.first_mut() {
+                    if let MakerSwapEvent::Started(ref mut data) = event.event {
+                        data.secret = H256Json::default();
+                        data.p2p_privkey = None;
+                    }
+                }
+            },
+            SavedSwap::Taker(swap) => {
+                if let Some(ref mut event) = swap.events.first_mut() {
+                    if let TakerSwapEvent::Started(ref mut data) = event.event {
+                        data.p2p_privkey = None;
+                    }
+                }
+            },
+        };
+    }
+
+    pub async fn fetch_and_set_usd_prices(&mut self) {
+        match self {
+            SavedSwap::Maker(maker) => maker.fetch_and_set_usd_prices().await,
+            SavedSwap::Taker(taker) => taker.fetch_and_set_usd_prices().await,
+        }
+    }
+}
+
+#[async_trait]
+pub trait SavedSwapIo {
+    async fn load_my_swap_from_db(ctx: &MmArc, uuid: Uuid) -> SavedSwapResult<Option<SavedSwap>>;
+
+    async fn load_all_my_swaps_from_db(ctx: &MmArc) -> SavedSwapResult<Vec<SavedSwap>>;
+
+    #[cfg(not(target_arch = "wasm32"))]
+    async fn load_from_maker_stats_db(ctx: &MmArc, uuid: Uuid) -> SavedSwapResult<Option<MakerSavedSwap>>;
+
+    #[cfg(not(target_arch = "wasm32"))]
+    async fn load_all_from_maker_stats_db(ctx: &MmArc) -> SavedSwapResult<Vec<MakerSavedSwap>>;
+
+    #[cfg(not(target_arch = "wasm32"))]
+    async fn load_from_taker_stats_db(ctx: &MmArc, uuid: Uuid) -> SavedSwapResult<Option<TakerSavedSwap>>;
+
+    #[cfg(not(target_arch = "wasm32"))]
+    async fn load_all_from_taker_stats_db(ctx: &MmArc) -> SavedSwapResult<Vec<TakerSavedSwap>>;
+
+    /// Save the serialized `SavedSwap` to the swaps db.
+    async fn save_to_db(&self, ctx: &MmArc) -> SavedSwapResult<()>;
+
+    /// Save the inner maker/taker swap to the corresponding stats db.
+    #[cfg(not(target_arch = "wasm32"))]
+    async fn save_to_stats_db(&self, ctx: &MmArc) -> SavedSwapResult<()>;
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+mod native_impl {
+    use super::*;
+    use crate::mm2::lp_swap::maker_swap::{stats_maker_swap_dir, stats_maker_swap_file_path};
+    use crate::mm2::lp_swap::taker_swap::{stats_taker_swap_dir, stats_taker_swap_file_path};
+    use crate::mm2::lp_swap::{my_swap_file_path, my_swaps_dir};
+    use mm2_io::fs::{read_dir_json, read_json, write_json, FsJsonError};
+
+    const USE_TMP_FILE: bool = false;
+
+    impl From<FsJsonError> for SavedSwapError {
+        fn from(fs: FsJsonError) -> Self {
+            match fs {
+                FsJsonError::IoReading(reading) => SavedSwapError::ErrorLoading(reading.to_string()),
+                FsJsonError::IoWriting(writing) => SavedSwapError::ErrorSaving(writing.to_string()),
+                FsJsonError::Serializing(serializing) => SavedSwapError::ErrorSerializing(serializing.to_string()),
+                FsJsonError::Deserializing(deserializing) => {
+                    SavedSwapError::ErrorDeserializing(deserializing.to_string())
+                },
+            }
+        }
+    }
+
+    #[async_trait]
+    impl SavedSwapIo for SavedSwap {
+        async fn load_my_swap_from_db(ctx: &MmArc, uuid: Uuid) -> SavedSwapResult<Option<SavedSwap>> {
+            let path = my_swap_file_path(ctx, &uuid);
+            Ok(read_json(&path).await?)
+        }
+
+        async fn load_all_my_swaps_from_db(ctx: &MmArc) -> SavedSwapResult<Vec<SavedSwap>> {
+            let path = my_swaps_dir(ctx);
+            Ok(read_dir_json(&path).await?)
+        }
+
+        async fn load_from_maker_stats_db(ctx: &MmArc, uuid: Uuid) -> SavedSwapResult<Option<MakerSavedSwap>> {
+            let path = stats_maker_swap_file_path(ctx, &uuid);
+            Ok(read_json(&path).await?)
+        }
+
+        async fn load_all_from_maker_stats_db(ctx: &MmArc) -> SavedSwapResult<Vec<MakerSavedSwap>> {
+            let path = stats_maker_swap_dir(ctx);
+            Ok(read_dir_json(&path).await?)
+        }
+
+        async fn load_from_taker_stats_db(ctx: &MmArc, uuid: Uuid) -> SavedSwapResult<Option<TakerSavedSwap>> {
+            let path = stats_taker_swap_file_path(ctx, &uuid);
+            Ok(read_json(&path).await?)
+        }
+
+        async fn load_all_from_taker_stats_db(ctx: &MmArc) -> SavedSwapResult<Vec<TakerSavedSwap>> {
+            let path = stats_taker_swap_dir(ctx);
+            Ok(read_dir_json(&path).await?)
+        }
+
+        async fn save_to_db(&self, ctx: &MmArc) -> SavedSwapResult<()> {
+            let path = my_swap_file_path(ctx, self.uuid());
+            write_json(self, &path, USE_TMP_FILE).await?;
+            Ok(())
+        }
+
+        /// Save the inner maker/taker swap to the corresponding stats db.
+        async fn save_to_stats_db(&self, ctx: &MmArc) -> SavedSwapResult<()> {
+            match self {
+                SavedSwap::Maker(maker) => {
+                    let path = stats_maker_swap_file_path(ctx, &maker.uuid);
+                    write_json(self, &path, USE_TMP_FILE).await?;
+                },
+                SavedSwap::Taker(taker) => {
+                    let path = stats_taker_swap_file_path(ctx, &taker.uuid);
+                    write_json(self, &path, USE_TMP_FILE).await?;
+                },
+            }
+            Ok(())
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_impl {
+    use super::*;
+    use crate::mm2::lp_swap::swap_wasm_db::{DbTransactionError, InitDbError, SavedSwapTable};
+    use crate::mm2::lp_swap::SwapsContext;
+    use serde_json as json;
+
+    impl From<DbTransactionError> for SavedSwapError {
+        fn from(e: DbTransactionError) -> Self {
+            let desc = e.to_string();
+            match e {
+                DbTransactionError::NoSuchTable { .. }
+                | DbTransactionError::ErrorCreatingTransaction(_)
+                | DbTransactionError::ErrorOpeningTable { .. }
+                | DbTransactionError::ErrorSerializingIndex { .. }
+                | DbTransactionError::MultipleItemsByUniqueIndex { .. }
+                | DbTransactionError::NoSuchIndex { .. }
+                | DbTransactionError::InvalidIndex { .. }
+                | DbTransactionError::UnexpectedState(_)
+                | DbTransactionError::TransactionAborted => SavedSwapError::InternalError(desc),
+                DbTransactionError::ErrorDeserializingItem(_) => SavedSwapError::ErrorDeserializing(desc),
+                DbTransactionError::ErrorSerializingItem(_) => SavedSwapError::ErrorSerializing(desc),
+                DbTransactionError::ErrorGettingItems(_) | DbTransactionError::ErrorCountingItems(_) => {
+                    SavedSwapError::ErrorLoading(desc)
+                },
+                DbTransactionError::ErrorUploadingItem(_) | DbTransactionError::ErrorDeletingItems(_) => {
+                    SavedSwapError::ErrorSaving(desc)
+                },
+            }
+        }
+    }
+
+    impl From<InitDbError> for SavedSwapError {
+        fn from(e: InitDbError) -> Self { SavedSwapError::InternalError(e.to_string()) }
+    }
+
+    #[async_trait]
+    impl SavedSwapIo for SavedSwap {
+        async fn load_my_swap_from_db(ctx: &MmArc, uuid: Uuid) -> SavedSwapResult<Option<SavedSwap>> {
+            let swaps_ctx = SwapsContext::from_ctx(ctx).map_to_mm(SavedSwapError::InternalError)?;
+            let db = swaps_ctx.swap_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<SavedSwapTable>().await?;
+
+            let saved_swap_json = match table.get_item_by_unique_index("uuid", uuid).await? {
+                Some((_item_id, SavedSwapTable { saved_swap, .. })) => saved_swap,
+                None => return Ok(None),
+            };
+
+            json::from_value(saved_swap_json).map_to_mm(|e| SavedSwapError::ErrorDeserializing(e.to_string()))
+        }
+
+        async fn load_all_my_swaps_from_db(ctx: &MmArc) -> SavedSwapResult<Vec<SavedSwap>> {
+            let swaps_ctx = SwapsContext::from_ctx(ctx).map_to_mm(SavedSwapError::InternalError)?;
+            let db = swaps_ctx.swap_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<SavedSwapTable>().await?;
+
+            let swaps = table.get_all_items().await?;
+            swaps
+                .into_iter()
+                .map(|(_item_id, SavedSwapTable { saved_swap, .. })| saved_swap)
+                .map(json::from_value)
+                .map(|res: Result<SavedSwap, _>| res.map_to_mm(|e| SavedSwapError::ErrorDeserializing(e.to_string())))
+                .collect()
+        }
+
+        async fn save_to_db(&self, ctx: &MmArc) -> SavedSwapResult<()> {
+            let saved_swap = json::to_value(self).map_to_mm(|e| SavedSwapError::ErrorSerializing(e.to_string()))?;
+            let saved_swap_item = SavedSwapTable {
+                uuid: *self.uuid(),
+                saved_swap,
+            };
+
+            let swaps_ctx = SwapsContext::from_ctx(ctx).map_to_mm(SavedSwapError::InternalError)?;
+            let db = swaps_ctx.swap_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<SavedSwapTable>().await?;
+
+            table
+                .replace_item_by_unique_index("uuid", *self.uuid(), &saved_swap_item)
+                .await?;
+            Ok(())
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod tests {
+    use super::*;
+    use crate::mm2::lp_swap::swap_wasm_db::{ItemId, SavedSwapTable};
+    use crate::mm2::lp_swap::SwapsContext;
+    use mm2_core::mm_ctx::MmCtxBuilder;
+    use serde_json as json;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    async fn get_all_items(ctx: &MmArc) -> Vec<(ItemId, SavedSwapTable)> {
+        let swaps_ctx = SwapsContext::from_ctx(&ctx).unwrap();
+        let db = swaps_ctx.swap_db().await.expect("Error getting SwapDb");
+        let transaction = db.transaction().await.expect("Error creating transaction");
+        let table = transaction
+            .table::<SavedSwapTable>()
+            .await
+            .expect("Error opening table");
+        table.get_all_items().await.expect("Error getting items")
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_saved_swap_table() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+
+        let saved_swap_str = r#"{"type":"Maker","error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","TakerPaymentValidateFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentRefunded","MakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker_amount":"3.54932734","maker_coin":"KMD","maker_coin_start_block":1452970,"maker_payment_confirmations":1,"maker_payment_lock":1563759539,"my_persistent_pub":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret":"e1c9bd12a83f810813dc078ac398069b63d56bf1e94657def995c43cd1975302","started_at":1563743939,"taker":"101ace6b08605b9424b0582b5cce044b70a3c8d8d10cb2965e039b0967ae92b9","taker_amount":"0.02004833998671660000000000","taker_coin":"ETH","taker_coin_start_block":8196380,"taker_payment_confirmations":1,"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"},"type":"Started"},"timestamp":1563743939211},{"event":{"data":{"taker_payment_locktime":1563751737,"taker_pubkey":"03101ace6b08605b9424b0582b5cce044b70a3c8d8d10cb2965e039b0967ae92b9"},"type":"Negotiated"},"timestamp":1563743979835},{"event":{"data":{"tx_hash":"a59203eb2328827de00bed699a29389792906e4f39fdea145eb40dc6b3821bd6","tx_hex":"f8690284ee6b280082520894d8997941dd1346e9231118d5685d866294f59e5b865af3107a4000801ca0743d2b7c9fad65805d882179062012261be328d7628ae12ee08eff8d7657d993a07eecbd051f49d35279416778faa4664962726d516ce65e18755c9b9406a9c2fd"},"type":"TakerFeeValidated"},"timestamp":1563744052878},{"event":{"data":{"error":"lp_swap:1888] eth:654] RPC error: Error { code: ServerError(-32010), message: \"Transaction with the same hash was already imported.\", data: None }"},"type":"MakerPaymentTransactionFailed"},"timestamp":1563744118577},{"event":{"type":"Finished"},"timestamp":1563763243350}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
+        let mut saved_swap: SavedSwap = json::from_str(saved_swap_str).unwrap();
+        let first_saved_item = SavedSwapTable {
+            uuid: *saved_swap.uuid(),
+            saved_swap: json::to_value(&saved_swap).unwrap(),
+        };
+
+        saved_swap.save_to_db(&ctx).await.expect("!save_to_db");
+
+        let first_item_id = {
+            let items = get_all_items(&ctx).await;
+            assert_eq!(items.len(), 1);
+            let (first_item_id, item) = items.into_iter().next().unwrap();
+            assert_eq!(item, first_saved_item);
+            first_item_id
+        };
+
+        saved_swap.hide_secrets();
+
+        let second_saved_item = SavedSwapTable {
+            uuid: *saved_swap.uuid(),
+            saved_swap: json::to_value(&saved_swap).unwrap(),
+        };
+        assert_ne!(first_saved_item, second_saved_item);
+
+        saved_swap.save_to_db(&ctx).await.expect("!save_to_db");
+
+        {
+            let items = get_all_items(&ctx).await;
+            assert_eq!(items.len(), 1);
+            let (second_item_id, item) = items.into_iter().next().unwrap();
+            assert_eq!(first_item_id, second_item_id);
+            assert_eq!(item, second_saved_item);
+        }
+
+        let actual_saved_swap = SavedSwap::load_my_swap_from_db(&ctx, *saved_swap.uuid())
+            .await
+            .expect("!load_from_db")
+            .expect("Swap not found");
+        let actual_saved_item = SavedSwapTable {
+            uuid: *actual_saved_swap.uuid(),
+            saved_swap: json::to_value(actual_saved_swap).unwrap(),
+        };
+        assert_eq!(actual_saved_item, second_saved_item);
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_swap/swap_lock.rs b/mm2src/mm2_main/src/lp_swap/swap_lock.rs
new file mode 100644
index 0000000000..d233831b4e
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_swap/swap_lock.rs
@@ -0,0 +1,296 @@
+use async_trait::async_trait;
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use uuid::Uuid;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use native_lock::SwapLock;
+#[cfg(target_arch = "wasm32")] pub use wasm_lock::SwapLock;
+
+pub type SwapLockResult<T> = Result<T, MmError<SwapLockError>>;
+
+#[derive(Debug, Display)]
+pub enum SwapLockError {
+    #[display(fmt = "Error reading timestamp: {}", _0)]
+    ErrorReadingTimestamp(String),
+    #[display(fmt = "Error writing timestamp: {}", _0)]
+    ErrorWritingTimestamp(String),
+    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+#[async_trait]
+pub trait SwapLockOps: Sized {
+    async fn lock(ctx: &MmArc, swap_uuid: Uuid, ttl_sec: f64) -> SwapLockResult<Option<Self>>;
+
+    async fn touch(&self) -> SwapLockResult<()>;
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+mod native_lock {
+    use super::*;
+    use crate::mm2::lp_swap::my_swaps_dir;
+    use mm2_io::file_lock::{FileLock, FileLockError};
+    use std::path::PathBuf;
+
+    impl From<FileLockError> for SwapLockError {
+        fn from(e: FileLockError) -> Self {
+            match e {
+                FileLockError::ErrorReadingTimestamp { path, error } => {
+                    SwapLockError::ErrorReadingTimestamp(format!("Path: {:?}, Error: {}", path, error))
+                },
+                FileLockError::ErrorWritingTimestamp { path, error }
+                | FileLockError::ErrorCreatingLockFile { path, error } => {
+                    SwapLockError::ErrorWritingTimestamp(format!("Path: {:?}, Error: {}", path, error))
+                },
+            }
+        }
+    }
+
+    pub struct SwapLock {
+        file_lock: FileLock<PathBuf>,
+    }
+
+    #[async_trait]
+    impl SwapLockOps for SwapLock {
+        async fn lock(ctx: &MmArc, swap_uuid: Uuid, ttl_sec: f64) -> SwapLockResult<Option<SwapLock>> {
+            let lock_path = my_swaps_dir(ctx).join(format!("{}.lock", swap_uuid));
+            let file_lock = match FileLock::lock(lock_path, ttl_sec)? {
+                Some(lock) => lock,
+                None => return Ok(None),
+            };
+            Ok(Some(SwapLock { file_lock }))
+        }
+
+        async fn touch(&self) -> SwapLockResult<()> { Ok(self.file_lock.touch()?) }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_lock {
+    use super::*;
+    use crate::mm2::lp_swap::swap_wasm_db::{DbTransactionError, InitDbError, ItemId, SwapLockTable};
+    use crate::mm2::lp_swap::SwapsContext;
+    use common::executor::spawn;
+    use common::log::{debug, error};
+    use common::{now_float, now_ms};
+
+    impl From<DbTransactionError> for SwapLockError {
+        fn from(e: DbTransactionError) -> Self {
+            match e {
+                e @ DbTransactionError::NoSuchTable { .. }
+                | e @ DbTransactionError::ErrorCreatingTransaction(_)
+                | e @ DbTransactionError::ErrorOpeningTable { .. }
+                | e @ DbTransactionError::ErrorSerializingIndex { .. }
+                | e @ DbTransactionError::ErrorSerializingItem(_)
+                | e @ DbTransactionError::MultipleItemsByUniqueIndex { .. }
+                | e @ DbTransactionError::NoSuchIndex { .. }
+                | e @ DbTransactionError::InvalidIndex { .. }
+                | e @ DbTransactionError::UnexpectedState(_)
+                | e @ DbTransactionError::TransactionAborted => SwapLockError::InternalError(e.to_string()),
+                e @ DbTransactionError::ErrorDeserializingItem(_)
+                | e @ DbTransactionError::ErrorGettingItems(_)
+                | e @ DbTransactionError::ErrorCountingItems(_) => SwapLockError::ErrorReadingTimestamp(e.to_string()),
+                e @ DbTransactionError::ErrorDeletingItems(_) | e @ DbTransactionError::ErrorUploadingItem(_) => {
+                    SwapLockError::ErrorWritingTimestamp(e.to_string())
+                },
+            }
+        }
+    }
+
+    impl From<InitDbError> for SwapLockError {
+        fn from(e: InitDbError) -> Self { SwapLockError::InternalError(e.to_string()) }
+    }
+
+    pub struct SwapLock {
+        ctx: MmArc,
+        swap_uuid: Uuid,
+        /// The identifier of the timestamp record in the `SwapLockTable`.
+        pub(super) record_id: ItemId,
+    }
+
+    impl Drop for SwapLock {
+        fn drop(&mut self) {
+            let ctx = self.ctx.clone();
+            let record_id = self.record_id;
+            let fut = async move {
+                if let Err(e) = Self::release(ctx, record_id).await {
+                    error!("Error realising the SwapLock: {}", e);
+                }
+                debug!("SwapLock::drop] Finish");
+            };
+            spawn(fut);
+        }
+    }
+
+    #[async_trait]
+    impl SwapLockOps for SwapLock {
+        async fn lock(ctx: &MmArc, uuid: Uuid, ttl_sec: f64) -> SwapLockResult<Option<Self>> {
+            let swaps_ctx = SwapsContext::from_ctx(ctx).map_to_mm(SwapLockError::InternalError)?;
+            let db = swaps_ctx.swap_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<SwapLockTable>().await?;
+
+            if let Some((item_id, SwapLockTable { timestamp, .. })) =
+                table.get_item_by_unique_index("uuid", uuid).await?
+            {
+                let time_passed = now_float() - timestamp as f64;
+                if time_passed <= ttl_sec {
+                    return Ok(None);
+                }
+                // delete the timestamp from the table before the new timestamp is written
+                table.delete_item(item_id).await?;
+            }
+
+            let item = SwapLockTable {
+                uuid,
+                timestamp: now_ms() / 1000,
+            };
+            let record_id = table.add_item(&item).await?;
+
+            Ok(Some(SwapLock {
+                ctx: ctx.clone(),
+                swap_uuid: uuid,
+                record_id,
+            }))
+        }
+
+        async fn touch(&self) -> SwapLockResult<()> {
+            let swaps_ctx = SwapsContext::from_ctx(&self.ctx).map_to_mm(SwapLockError::InternalError)?;
+            let db = swaps_ctx.swap_db().await?;
+
+            let item = SwapLockTable {
+                uuid: self.swap_uuid,
+                timestamp: now_ms() / 1000,
+            };
+
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<SwapLockTable>().await?;
+
+            let replaced_record_id = table.replace_item(self.record_id, &item).await?;
+
+            if self.record_id != replaced_record_id {
+                let error = format!("Expected {} record id, found {}", self.record_id, replaced_record_id);
+                return MmError::err(SwapLockError::ErrorWritingTimestamp(error));
+            }
+            Ok(())
+        }
+    }
+
+    impl SwapLock {
+        async fn release(ctx: MmArc, record_id: ItemId) -> SwapLockResult<()> {
+            let swaps_ctx = SwapsContext::from_ctx(&ctx).map_to_mm(SwapLockError::InternalError)?;
+            let db = swaps_ctx.swap_db().await?;
+            let transaction = db.transaction().await?;
+            let table = transaction.table::<SwapLockTable>().await?;
+            table.delete_item(record_id).await?;
+            Ok(())
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod tests {
+    use super::wasm_lock::*;
+    use super::*;
+    use crate::mm2::lp_swap::swap_wasm_db::SwapLockTable;
+    use crate::mm2::lp_swap::SwapsContext;
+    use common::executor::Timer;
+    use common::new_uuid;
+    use common::now_ms;
+    use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
+    use mm2_db::indexed_db::ItemId;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    async fn get_all_items(ctx: &MmArc) -> Vec<(ItemId, SwapLockTable)> {
+        let swaps_ctx = SwapsContext::from_ctx(&ctx).unwrap();
+        let db = swaps_ctx.swap_db().await.expect("Error getting SwapDb");
+        let transaction = db.transaction().await.expect("Error creating transaction");
+        let table = transaction.table::<SwapLockTable>().await.expect("Error opening table");
+        table.get_all_items().await.expect("Error getting items")
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_file_lock_should_create_file_and_record_timestamp_and_then_delete_on_drop() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let uuid = new_uuid();
+
+        let started_at = now_ms() / 1000;
+        let swap_lock = SwapLock::lock(&ctx, uuid, 10.)
+            .await
+            .expect("!SwapLock::lock")
+            .expect("SwapLock::lock must return a value");
+
+        let items = get_all_items(&ctx).await;
+        assert_eq!(items.len(), 1);
+        let (record_id, lock_item) = items[0].clone();
+
+        assert_eq!(record_id, swap_lock.record_id);
+        assert_eq!(lock_item.uuid, uuid);
+        assert!(started_at <= lock_item.timestamp);
+
+        drop(swap_lock);
+
+        Timer::sleep(1.).await;
+        let actual = get_all_items(&ctx).await;
+        assert!(
+            actual.is_empty(),
+            "SwapLockTable must be empty after the SwapLock is dropped"
+        );
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_file_lock_should_return_none_if_lock_acquired() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let uuid = new_uuid();
+        let _lock = SwapLock::lock(&ctx, uuid, 10.)
+            .await
+            .expect("!SwapLock::lock")
+            .expect("SwapLock::lock must return a value");
+        let new_lock = SwapLock::lock(&ctx, uuid, 10.).await.expect("!SwapLock::lock");
+        assert!(
+            new_lock.is_none(),
+            "SwapLock::lock must return None if the lock has already been acquired"
+        );
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_file_lock_should_acquire_and_update_timestamp_if_ttl_expired() {
+        let ctx = MmCtxBuilder::new().with_test_db_namespace().into_mm_arc();
+        let uuid = new_uuid();
+
+        let started_at = now_ms() / 1000;
+        let first_lock = SwapLock::lock(&ctx, uuid, 1.)
+            .await
+            .expect("!SwapLock::lock")
+            .expect("SwapLock::lock must return a value");
+
+        let items = get_all_items(&ctx).await;
+        assert_eq!(items.len(), 1);
+        let (first_record_id, first_lock_item) = items[0].clone();
+
+        assert_eq!(first_record_id, first_lock.record_id);
+        assert_eq!(first_lock_item.uuid, uuid);
+        assert!(started_at <= first_lock_item.timestamp);
+
+        Timer::sleep(2.).await;
+
+        let second_lock = SwapLock::lock(&ctx, uuid, 1.)
+            .await
+            .expect("!SwapLock::lock")
+            .expect("SwapLock::lock must return a value after the last ttl is over");
+
+        let items = get_all_items(&ctx).await;
+        assert_eq!(items.len(), 1);
+        let (second_record_id, second_lock_item) = items[0].clone();
+
+        assert_eq!(second_record_id, second_lock.record_id);
+        assert_ne!(first_record_id, second_record_id);
+        assert_eq!(second_lock_item.uuid, uuid);
+        assert!(first_lock_item.timestamp < second_lock_item.timestamp);
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_swap/swap_wasm_db.rs b/mm2src/mm2_main/src/lp_swap/swap_wasm_db.rs
new file mode 100644
index 0000000000..58511edb2d
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_swap/swap_wasm_db.rs
@@ -0,0 +1,118 @@
+use async_trait::async_trait;
+use mm2_db::indexed_db::{DbIdentifier, DbInstance, DbUpgrader, IndexedDb, IndexedDbBuilder, OnUpgradeResult,
+                         TableSignature};
+use std::ops::Deref;
+use uuid::Uuid;
+
+pub use mm2_db::indexed_db::{cursor_prelude, DbTransactionError, DbTransactionResult, InitDbError, InitDbResult,
+                             ItemId};
+pub use tables::{MySwapsFiltersTable, SavedSwapTable, SwapLockTable};
+
+const DB_NAME: &str = "swap";
+const DB_VERSION: u32 = 1;
+
+pub struct SwapDb {
+    inner: IndexedDb,
+}
+
+#[async_trait]
+impl DbInstance for SwapDb {
+    fn db_name() -> &'static str { DB_NAME }
+
+    async fn init(db_id: DbIdentifier) -> InitDbResult<Self> {
+        let inner = IndexedDbBuilder::new(db_id)
+            .with_version(DB_VERSION)
+            .with_table::<SwapLockTable>()
+            .with_table::<SavedSwapTable>()
+            .with_table::<MySwapsFiltersTable>()
+            .build()
+            .await?;
+        Ok(SwapDb { inner })
+    }
+}
+
+impl Deref for SwapDb {
+    type Target = IndexedDb;
+
+    fn deref(&self) -> &Self::Target { &self.inner }
+}
+
+pub mod tables {
+    use super::*;
+    use serde_json::Value as Json;
+
+    #[derive(Debug, Deserialize, Clone, Serialize, PartialEq)]
+    pub struct SwapLockTable {
+        pub uuid: Uuid,
+        pub timestamp: u64,
+    }
+
+    impl TableSignature for SwapLockTable {
+        fn table_name() -> &'static str { "swap_lock" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+            on_upgrade_swap_table_by_uuid_v1(upgrader, old_version, new_version, Self::table_name())
+        }
+    }
+
+    #[derive(Debug, Serialize, Deserialize, PartialEq)]
+    pub struct SavedSwapTable {
+        pub uuid: Uuid,
+        pub saved_swap: Json,
+    }
+
+    impl TableSignature for SavedSwapTable {
+        fn table_name() -> &'static str { "saved_swap" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+            on_upgrade_swap_table_by_uuid_v1(upgrader, old_version, new_version, Self::table_name())
+        }
+    }
+
+    /// This table is used to select uuids applying given filters.
+    /// When we iterate over an index like `["my_coin", "other_coin"]`, a cursor returns items with all fields.
+    /// So, if we combine `SavedSwapTable` and `MySwapsFiltersTable` into one, we will get `saved_swap` on every cursor callback that is overhead.
+    #[derive(Debug, Serialize, Deserialize, Eq, Ord, PartialEq, PartialOrd)]
+    pub struct MySwapsFiltersTable {
+        pub uuid: Uuid,
+        pub my_coin: String,
+        pub other_coin: String,
+        pub started_at: u32,
+    }
+
+    impl TableSignature for MySwapsFiltersTable {
+        fn table_name() -> &'static str { "my_swaps" }
+
+        fn on_upgrade_needed(upgrader: &DbUpgrader, old_version: u32, new_version: u32) -> OnUpgradeResult<()> {
+            match (old_version, new_version) {
+                (0, 1) => {
+                    let table = upgrader.create_table(Self::table_name())?;
+                    table.create_index("uuid", true)?;
+                    table.create_index("started_at", false)?;
+                    table.create_multi_index("with_my_coin", &["my_coin", "started_at"], false)?;
+                    table.create_multi_index("with_other_coin", &["other_coin", "started_at"], false)?;
+                    table.create_multi_index("with_my_other_coins", &["my_coin", "other_coin", "started_at"], false)?;
+                },
+                _ => (),
+            }
+            Ok(())
+        }
+    }
+
+    /// [`TableSignature::on_upgrade_needed`] implementation common for the most tables with the only `uuid` unique index.
+    fn on_upgrade_swap_table_by_uuid_v1(
+        upgrader: &DbUpgrader,
+        old_version: u32,
+        new_version: u32,
+        table_name: &'static str,
+    ) -> OnUpgradeResult<()> {
+        match (old_version, new_version) {
+            (0, 1) => {
+                let table = upgrader.create_table(table_name)?;
+                table.create_index("uuid", true)?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
diff --git a/mm2src/lp_swap/taker_swap.rs b/mm2src/mm2_main/src/lp_swap/taker_swap.rs
similarity index 86%
rename from mm2src/lp_swap/taker_swap.rs
rename to mm2src/mm2_main/src/lp_swap/taker_swap.rs
index cfd0b6c288..2c35bd5f0c 100644
--- a/mm2src/lp_swap/taker_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap/taker_swap.rs
@@ -1,26 +1,30 @@
 use super::check_balance::{check_my_coin_balance_for_swap, CheckBalanceError, CheckBalanceResult,
                            TakerFeeAdditionalInfo};
 use super::pubkey_banning::ban_pubkey_on_failed_swap;
+use super::swap_lock::{SwapLock, SwapLockOps};
 use super::trade_preimage::{TradePreimageRequest, TradePreimageRpcError, TradePreimageRpcResult};
 use super::{broadcast_my_swap_status, broadcast_swap_message_every, check_other_coin_balance_for_swap,
-            dex_fee_amount_from_taker_coin, dex_fee_rate, dex_fee_threshold, get_locked_amount, my_swap_file_path,
-            my_swaps_dir, recv_swap_msg, swap_topic, AtomicSwap, LockedAmount, MySwapInfo, NegotiationDataMsg,
-            NegotiationDataV2, RecoveredSwap, RecoveredSwapAction, SavedSwap, SavedTradeFee,
+            dex_fee_amount_from_taker_coin, dex_fee_rate, dex_fee_threshold, get_locked_amount, recv_swap_msg,
+            swap_topic, AtomicSwap, LockedAmount, MySwapInfo, NegotiationDataMsg, NegotiationDataV2,
+            NegotiationDataV3, RecoveredSwap, RecoveredSwapAction, SavedSwap, SavedSwapIo, SavedTradeFee,
             SwapConfirmationsSettings, SwapError, SwapMsg, SwapsContext, TransactionIdentifier, WAIT_CONFIRM_INTERVAL};
 use crate::mm2::lp_network::subscribe_to_topic;
 use crate::mm2::lp_ordermatch::{MatchBy, OrderConfirmationsSettings, TakerAction, TakerOrderBuilder};
+use crate::mm2::lp_price::fetch_swap_coins_price;
+use crate::mm2::lp_swap::{broadcast_p2p_tx_msg, tx_helper_topic};
 use crate::mm2::MM_VERSION;
-use bigdecimal::BigDecimal;
-use coins::{lp_coinfind, CanRefundHtlc, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum, TradeFee, TradePreimageValue};
+use coins::{lp_coinfind, CanRefundHtlc, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum, SearchForSwapTxSpendInput,
+            TradeFee, TradePreimageValue, ValidatePaymentInput};
 use common::executor::Timer;
-use common::log::{debug, error, warn};
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
-use common::mm_number::MmNumber;
-use common::{bits256, file_lock::FileLock, now_ms, slurp, write, DEX_FEE_ADDR_RAW_PUBKEY};
+use common::log::{debug, error, info, warn};
+use common::{bits256, now_ms, DEX_FEE_ADDR_RAW_PUBKEY};
+use crypto::privkey::SerializableSecp256k1Keypair;
 use futures::{compat::Future01CompatExt, select, FutureExt};
-use futures01::Future;
 use http::Response;
+use keys::KeyPair;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumber};
 use parking_lot::Mutex as PaMutex;
 use primitives::hash::H264;
 use rpc::v1::types::{Bytes as BytesJson, H160 as H160Json, H256 as H256Json, H264 as H264Json};
@@ -30,73 +34,79 @@ use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use uuid::Uuid;
 
+pub const TAKER_SUCCESS_EVENTS: [&str; 10] = [
+    "Started",
+    "Negotiated",
+    "TakerFeeSent",
+    "MakerPaymentReceived",
+    "MakerPaymentWaitConfirmStarted",
+    "MakerPaymentValidatedAndConfirmed",
+    "TakerPaymentSent",
+    "TakerPaymentSpent",
+    "MakerPaymentSpent",
+    "Finished",
+];
+
+pub const TAKER_ERROR_EVENTS: [&str; 13] = [
+    "StartFailed",
+    "NegotiateFailed",
+    "TakerFeeSendFailed",
+    "MakerPaymentValidateFailed",
+    "MakerPaymentWaitConfirmFailed",
+    "TakerPaymentTransactionFailed",
+    "TakerPaymentWaitConfirmFailed",
+    "TakerPaymentDataSendFailed",
+    "TakerPaymentWaitForSpendFailed",
+    "MakerPaymentSpendFailed",
+    "TakerPaymentWaitRefundStarted",
+    "TakerPaymentRefunded",
+    "TakerPaymentRefundFailed",
+];
+
 pub fn stats_taker_swap_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("SWAPS").join("STATS").join("TAKER") }
 
 pub fn stats_taker_swap_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     stats_taker_swap_dir(ctx).join(format!("{}.json", uuid))
 }
 
-fn save_my_taker_swap_event(ctx: &MmArc, swap: &TakerSwap, event: TakerSavedEvent) -> Result<(), String> {
-    let path = my_swap_file_path(ctx, &swap.uuid);
-    let content = try_s!(slurp(&path));
-    let swap: SavedSwap = if content.is_empty() {
-        SavedSwap::Taker(TakerSavedSwap {
+async fn save_my_taker_swap_event(ctx: &MmArc, swap: &TakerSwap, event: TakerSavedEvent) -> Result<(), String> {
+    let swap = match SavedSwap::load_my_swap_from_db(ctx, swap.uuid).await {
+        Ok(Some(swap)) => swap,
+        Ok(None) => SavedSwap::Taker(TakerSavedSwap {
             uuid: swap.uuid,
             my_order_uuid: swap.my_order_uuid,
             maker_amount: Some(swap.maker_amount.to_decimal()),
             maker_coin: Some(swap.maker_coin.ticker().to_owned()),
+            maker_coin_usd_price: None,
             taker_amount: Some(swap.taker_amount.to_decimal()),
             taker_coin: Some(swap.taker_coin.ticker().to_owned()),
+            taker_coin_usd_price: None,
             gui: ctx.gui().map(|g| g.to_owned()),
             mm_version: Some(MM_VERSION.to_owned()),
             events: vec![],
-            success_events: vec![
-                "Started".into(),
-                "Negotiated".into(),
-                "TakerFeeSent".into(),
-                "MakerPaymentReceived".into(),
-                "MakerPaymentWaitConfirmStarted".into(),
-                "MakerPaymentValidatedAndConfirmed".into(),
-                "TakerPaymentSent".into(),
-                "TakerPaymentSpent".into(),
-                "MakerPaymentSpent".into(),
-                "Finished".into(),
-            ],
-            error_events: vec![
-                "StartFailed".into(),
-                "NegotiateFailed".into(),
-                "TakerFeeSendFailed".into(),
-                "MakerPaymentValidateFailed".into(),
-                "MakerPaymentWaitConfirmFailed".into(),
-                "TakerPaymentTransactionFailed".into(),
-                "TakerPaymentWaitConfirmFailed".into(),
-                "TakerPaymentDataSendFailed".into(),
-                "TakerPaymentWaitForSpendFailed".into(),
-                "MakerPaymentSpendFailed".into(),
-                "TakerPaymentWaitRefundStarted".into(),
-                "TakerPaymentRefunded".into(),
-                "TakerPaymentRefundFailed".into(),
-            ],
-        })
-    } else {
-        try_s!(json::from_slice(&content))
+            success_events: TAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
+            error_events: TAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
+        }),
+        Err(e) => return ERR!("{}", e),
     };
 
     if let SavedSwap::Taker(mut taker_swap) = swap {
         taker_swap.events.push(event);
+        if taker_swap.is_success().unwrap_or(false) {
+            taker_swap.fetch_and_set_usd_prices().await;
+        }
         let new_swap = SavedSwap::Taker(taker_swap);
-        let new_content = try_s!(json::to_vec(&new_swap));
-        try_s!(write(&path, &new_content));
+        try_s!(new_swap.save_to_db(ctx).await);
         Ok(())
     } else {
-        ERR!("Expected SavedSwap::Taker at {}, got {:?}", path.display(), swap)
+        ERR!("Expected SavedSwap::Taker, got {:?}", swap)
     }
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 pub struct TakerSavedEvent {
-    timestamp: u64,
-    event: TakerSwapEvent,
+    pub timestamp: u64,
+    pub event: TakerSwapEvent,
 }
 
 impl TakerSavedEvent {
@@ -130,19 +140,21 @@ impl TakerSavedEvent {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 pub struct TakerSavedSwap {
     pub uuid: Uuid,
-    my_order_uuid: Option<Uuid>,
+    pub my_order_uuid: Option<Uuid>,
     pub events: Vec<TakerSavedEvent>,
-    maker_amount: Option<BigDecimal>,
-    maker_coin: Option<String>,
-    taker_amount: Option<BigDecimal>,
-    taker_coin: Option<String>,
-    gui: Option<String>,
-    mm_version: Option<String>,
-    success_events: Vec<String>,
-    error_events: Vec<String>,
+    pub maker_amount: Option<BigDecimal>,
+    pub maker_coin: Option<String>,
+    pub maker_coin_usd_price: Option<BigDecimal>,
+    pub taker_amount: Option<BigDecimal>,
+    pub taker_coin: Option<String>,
+    pub taker_coin_usd_price: Option<BigDecimal>,
+    pub gui: Option<String>,
+    pub mm_version: Option<String>,
+    pub success_events: Vec<String>,
+    pub error_events: Vec<String>,
 }
 
 impl TakerSavedSwap {
@@ -243,6 +255,13 @@ impl TakerSavedSwap {
 
         Ok(true)
     }
+
+    pub async fn fetch_and_set_usd_prices(&mut self) {
+        if let Some(rates) = fetch_swap_coins_price(self.maker_coin.clone(), self.taker_coin.clone()).await {
+            self.maker_coin_usd_price = Some(rates.base);
+            self.taker_coin_usd_price = Some(rates.rel);
+        }
+    }
 }
 
 #[allow(clippy::large_enum_variant)]
@@ -270,14 +289,16 @@ impl RunTakerSwapInput {
 /// Every produced event is saved to local DB. Swap status is broadcast to P2P network after completion.
 pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
     let uuid = swap.uuid().to_owned();
-    let lock_path = my_swaps_dir(&ctx).join(fomat!((uuid) ".lock"));
     let mut attempts = 0;
-    let file_lock = loop {
-        match FileLock::lock(&lock_path, 40.) {
+    let swap_lock = loop {
+        match SwapLock::lock(&ctx, uuid, 40.).await {
             Ok(Some(l)) => break l,
             Ok(None) => {
                 if attempts >= 1 {
-                    log!("Swap " (uuid) " file lock is acquired by another process/thread, aborting");
+                    warn!(
+                        "Swap {} file lock is acquired by another process/thread, aborting",
+                        uuid
+                    );
                     return;
                 } else {
                     attempts += 1;
@@ -285,10 +306,10 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
                 }
             },
             Err(e) => {
-                log!("Swap " (uuid) " file lock error " (e));
+                error!("Swap {} file lock error: {}", uuid, e);
                 return;
             },
-        };
+        }
     };
 
     let (swap, mut command) = match swap {
@@ -297,19 +318,19 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
             maker_coin,
             taker_coin,
             swap_uuid,
-        } => match TakerSwap::load_from_db_by_uuid(ctx, maker_coin, taker_coin, &swap_uuid) {
+        } => match TakerSwap::load_from_db_by_uuid(ctx, maker_coin, taker_coin, &swap_uuid).await {
             Ok((swap, command)) => match command {
                 Some(c) => {
-                    log!("Swap " (uuid) " kick started.");
+                    info!("Swap {} kick started.", uuid);
                     (swap, c)
                 },
                 None => {
-                    log!("Swap " (uuid) " has been finished already, aborting.");
+                    warn!("Swap {} has been finished already, aborting.", uuid);
                     return;
                 },
             },
             Err(e) => {
-                log!("Error " (e) " loading swap " (uuid));
+                error!("Error loading swap {}: {}", uuid, e);
                 return;
             },
         },
@@ -318,9 +339,9 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
     let mut touch_loop = Box::pin(
         async move {
             loop {
-                match file_lock.touch() {
+                match swap_lock.touch().await {
                     Ok(_) => (),
-                    Err(e) => log!("Warning, touch error " (e) " for swap " (uuid)),
+                    Err(e) => warn!("Swap {} file lock error: {}", uuid, e),
                 };
                 Timer::sleep(30.).await;
             }
@@ -329,9 +350,10 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
     );
 
     let ctx = swap.ctx.clone();
-    subscribe_to_topic(&ctx, swap_topic(&swap.uuid)).await;
+    subscribe_to_topic(&ctx, swap_topic(&swap.uuid));
     let mut status = ctx.log.status_handle();
     let uuid = swap.uuid.to_string();
+    let to_broadcast = !(swap.maker_coin.is_privacy() || swap.taker_coin.is_privacy());
     let running_swap = Arc::new(swap);
     let weak_ref = Arc::downgrade(&running_swap);
     let swap_ctx = SwapsContext::from_ctx(&ctx).unwrap();
@@ -352,7 +374,9 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
                         event: event.clone(),
                     };
 
-                    save_my_taker_swap_event(&ctx, &running_swap, to_save).expect("!save_my_taker_swap_event");
+                    save_my_taker_swap_event(&ctx, &running_swap, to_save)
+                        .await
+                        .expect("!save_my_taker_swap_event");
                     if event.should_ban_maker() {
                         ban_pubkey_on_failed_swap(
                             &ctx,
@@ -369,8 +393,10 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
                         command = c;
                     },
                     None => {
-                        if let Err(e) = broadcast_my_swap_status(&running_swap.uuid, &ctx) {
-                            log!("!broadcast_my_swap_status(" (uuid) "): " (e));
+                        if to_broadcast {
+                            if let Err(e) = broadcast_my_swap_status(&ctx, running_swap.uuid).await {
+                                error!("!broadcast_my_swap_status({}): {}", uuid, e);
+                            }
                         }
                         break;
                     },
@@ -383,7 +409,7 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
     let do_nothing = (); // to fix https://rust-lang.github.io/rust-clippy/master/index.html#unused_unit
     select! {
         _swap = swap_fut => do_nothing, // swap finished normally
-        _shutdown = shutdown_fut => log!("on_stop] swap " (swap_for_log.uuid) " stopped!"),
+        _shutdown = shutdown_fut => info!("swap {} stopped!", swap_for_log.uuid),
         _touch = touch_loop => unreachable!("Touch loop can not stop!"),
     };
 }
@@ -392,40 +418,47 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
 pub struct TakerSwapData {
     pub taker_coin: String,
     pub maker_coin: String,
-    maker: H256Json,
-    my_persistent_pub: H264Json,
-    lock_duration: u64,
+    pub maker: H256Json,
+    pub my_persistent_pub: H264Json,
+    pub lock_duration: u64,
     pub maker_amount: BigDecimal,
     pub taker_amount: BigDecimal,
-    maker_payment_confirmations: u64,
-    maker_payment_requires_nota: Option<bool>,
-    taker_payment_confirmations: u64,
-    taker_payment_requires_nota: Option<bool>,
-    taker_payment_lock: u64,
+    pub maker_payment_confirmations: u64,
+    pub maker_payment_requires_nota: Option<bool>,
+    pub taker_payment_confirmations: u64,
+    pub taker_payment_requires_nota: Option<bool>,
+    pub taker_payment_lock: u64,
     /// Allows to recognize one SWAP from the other in the logs. #274.
-    uuid: Uuid,
+    pub uuid: Uuid,
     pub started_at: u64,
-    maker_payment_wait: u64,
-    maker_coin_start_block: u64,
-    taker_coin_start_block: u64,
+    pub maker_payment_wait: u64,
+    pub maker_coin_start_block: u64,
+    pub taker_coin_start_block: u64,
     /// A transaction fee that should be paid to send a `TakerFee`.
     /// Note this value is used to calculate locked amount only.
-    fee_to_send_taker_fee: Option<SavedTradeFee>,
+    pub fee_to_send_taker_fee: Option<SavedTradeFee>,
     /// A `TakerPayment` transaction fee.
     /// Note this value is used to calculate locked amount only.
-    taker_payment_trade_fee: Option<SavedTradeFee>,
+    pub taker_payment_trade_fee: Option<SavedTradeFee>,
     /// A transaction fee that should be paid to spend a `MakerPayment`.
     /// Note this value is used to calculate locked amount only.
-    maker_payment_spend_trade_fee: Option<SavedTradeFee>,
+    pub maker_payment_spend_trade_fee: Option<SavedTradeFee>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    maker_coin_swap_contract_address: Option<BytesJson>,
+    pub maker_coin_swap_contract_address: Option<BytesJson>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    taker_coin_swap_contract_address: Option<BytesJson>,
+    pub taker_coin_swap_contract_address: Option<BytesJson>,
+    /// Temporary pubkey used in HTLC redeem script when applicable for maker coin
+    pub maker_coin_htlc_pubkey: Option<H264Json>,
+    /// Temporary pubkey used in HTLC redeem script when applicable for taker coin
+    pub taker_coin_htlc_pubkey: Option<H264Json>,
+    /// Temporary privkey used to sign P2P messages when applicable
+    pub p2p_privkey: Option<SerializableSecp256k1Keypair>,
 }
 
 pub struct TakerSwapMut {
     data: TakerSwapData,
-    other_persistent_pub: H264,
+    other_maker_coin_htlc_pub: H264,
+    other_taker_coin_htlc_pub: H264,
     taker_fee: Option<TransactionIdentifier>,
     maker_payment: Option<TransactionIdentifier>,
     taker_payment: Option<TransactionIdentifier>,
@@ -453,21 +486,30 @@ pub struct TakerSwap {
     mutable: RwLock<TakerSwapMut>,
     conf_settings: SwapConfirmationsSettings,
     payment_locktime: u64,
+    p2p_privkey: Option<KeyPair>,
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct TakerPaymentSpentData {
-    transaction: TransactionIdentifier,
-    secret: H256Json,
+    pub transaction: TransactionIdentifier,
+    pub secret: H256Json,
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct MakerNegotiationData {
-    maker_payment_locktime: u64,
-    maker_pubkey: H264Json,
-    secret_hash: H160Json,
-    maker_coin_swap_contract_addr: Option<BytesJson>,
-    taker_coin_swap_contract_addr: Option<BytesJson>,
+    pub maker_payment_locktime: u64,
+    pub maker_pubkey: H264Json,
+    pub secret_hash: H160Json,
+    pub maker_coin_swap_contract_addr: Option<BytesJson>,
+    pub taker_coin_swap_contract_addr: Option<BytesJson>,
+    pub maker_coin_htlc_pubkey: Option<H264Json>,
+    pub taker_coin_htlc_pubkey: Option<H264Json>,
+}
+
+impl MakerNegotiationData {
+    fn other_maker_coin_htlc_pub(&self) -> H264 { self.maker_coin_htlc_pubkey.unwrap_or(self.maker_pubkey).into() }
+
+    fn other_taker_coin_htlc_pub(&self) -> H264 { self.taker_coin_htlc_pubkey.unwrap_or(self.maker_pubkey).into() }
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
@@ -500,7 +542,7 @@ pub enum TakerSwapEvent {
 }
 
 impl TakerSwapEvent {
-    fn status_str(&self) -> String {
+    pub fn status_str(&self) -> String {
         match self {
             TakerSwapEvent::Started(_) => "Started...".to_owned(),
             TakerSwapEvent::StartFailed(_) => "Start failed...".to_owned(),
@@ -575,19 +617,42 @@ pub enum TakerSwapCommand {
 }
 
 impl TakerSwap {
+    #[inline]
     fn w(&self) -> RwLockWriteGuard<TakerSwapMut> { self.mutable.write().unwrap() }
+
+    #[inline]
     fn r(&self) -> RwLockReadGuard<TakerSwapMut> { self.mutable.read().unwrap() }
 
+    #[inline]
+    fn my_maker_coin_htlc_pub(&self) -> H264Json {
+        self.r()
+            .data
+            .maker_coin_htlc_pubkey
+            .unwrap_or_else(|| self.my_persistent_pub.into())
+    }
+
+    #[inline]
+    fn my_taker_coin_htlc_pub(&self) -> H264Json {
+        self.r()
+            .data
+            .taker_coin_htlc_pubkey
+            .unwrap_or_else(|| self.my_persistent_pub.into())
+    }
+
+    #[inline]
     fn wait_refund_until(&self) -> u64 { self.r().data.taker_payment_lock + 3700 }
 
     fn apply_event(&self, event: TakerSwapEvent) {
         match event {
-            TakerSwapEvent::Started(data) => self.w().data = data,
+            TakerSwapEvent::Started(data) => {
+                self.w().data = data;
+            },
             TakerSwapEvent::StartFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::Negotiated(data) => {
                 self.maker_payment_lock
                     .store(data.maker_payment_locktime, Ordering::Relaxed);
-                self.w().other_persistent_pub = data.maker_pubkey.into();
+                self.w().other_maker_coin_htlc_pub = data.other_maker_coin_htlc_pub();
+                self.w().other_taker_coin_htlc_pub = data.other_taker_coin_htlc_pub();
                 self.w().secret_hash = data.secret_hash;
 
                 if data.maker_coin_swap_contract_addr.is_some() {
@@ -657,9 +722,9 @@ impl TakerSwap {
         maker_coin: MmCoinEnum,
         taker_coin: MmCoinEnum,
         payment_locktime: u64,
+        p2p_privkey: Option<KeyPair>,
     ) -> Self {
         TakerSwap {
-            ctx,
             maker_coin,
             taker_coin,
             maker_amount,
@@ -674,9 +739,11 @@ impl TakerSwap {
             errors: PaMutex::new(Vec::new()),
             conf_settings,
             payment_locktime,
+            p2p_privkey,
             mutable: RwLock::new(TakerSwapMut {
                 data: TakerSwapData::default(),
-                other_persistent_pub: H264::default(),
+                other_maker_coin_htlc_pub: H264::default(),
+                other_taker_coin_htlc_pub: H264::default(),
                 taker_fee: None,
                 maker_payment: None,
                 taker_payment: None,
@@ -686,6 +753,36 @@ impl TakerSwap {
                 secret_hash: H160Json::default(),
                 secret: H256Json::default(),
             }),
+            ctx,
+        }
+    }
+
+    fn get_my_negotiation_data(
+        &self,
+        secret_hash: Vec<u8>,
+        maker_coin_swap_contract: Vec<u8>,
+        taker_coin_swap_contract: Vec<u8>,
+    ) -> NegotiationDataMsg {
+        let r = self.r();
+        if r.data.maker_coin_htlc_pubkey != r.data.taker_coin_htlc_pubkey {
+            NegotiationDataMsg::V3(NegotiationDataV3 {
+                started_at: r.data.started_at,
+                payment_locktime: r.data.taker_payment_lock,
+                secret_hash,
+                maker_coin_swap_contract,
+                taker_coin_swap_contract,
+                maker_coin_htlc_pub: self.my_maker_coin_htlc_pub().into(),
+                taker_coin_htlc_pub: self.my_taker_coin_htlc_pub().into(),
+            })
+        } else {
+            NegotiationDataMsg::V2(NegotiationDataV2 {
+                started_at: r.data.started_at,
+                secret_hash,
+                payment_locktime: r.data.taker_payment_lock,
+                persistent_pubkey: self.my_persistent_pub.to_vec(),
+                maker_coin_swap_contract,
+                taker_coin_swap_contract,
+            })
         }
     }
 
@@ -698,7 +795,7 @@ impl TakerSwap {
         let fee_to_send_dex_fee_fut = self
             .taker_coin
             .get_fee_to_send_taker_fee(dex_fee.to_decimal(), stage.clone());
-        let fee_to_send_dex_fee = match fee_to_send_dex_fee_fut.compat().await {
+        let fee_to_send_dex_fee = match fee_to_send_dex_fee_fut.await {
             Ok(fee) => fee,
             Err(e) => {
                 return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::StartFailed(
@@ -707,7 +804,7 @@ impl TakerSwap {
             },
         };
         let get_sender_trade_fee_fut = self.taker_coin.get_sender_trade_fee(preimage_value, stage.clone());
-        let taker_payment_trade_fee = match get_sender_trade_fee_fut.compat().await {
+        let taker_payment_trade_fee = match get_sender_trade_fee_fut.await {
             Ok(fee) => fee,
             Err(e) => {
                 return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::StartFailed(
@@ -769,6 +866,10 @@ impl TakerSwap {
         let maker_coin_swap_contract_address = self.maker_coin.swap_contract_address();
         let taker_coin_swap_contract_address = self.taker_coin.swap_contract_address();
 
+        let unique_data = self.unique_swap_data();
+        let maker_coin_htlc_key_pair = self.maker_coin.derive_htlc_key_pair(&unique_data);
+        let taker_coin_htlc_key_pair = self.taker_coin.derive_htlc_key_pair(&unique_data);
+
         let data = TakerSwapData {
             taker_coin: self.taker_coin.ticker().to_owned(),
             maker_coin: self.maker_coin.ticker().to_owned(),
@@ -782,9 +883,9 @@ impl TakerSwap {
             taker_payment_confirmations: self.conf_settings.taker_coin_confs,
             taker_payment_requires_nota: Some(self.conf_settings.taker_coin_nota),
             taker_payment_lock: started_at + self.payment_locktime,
-            my_persistent_pub: self.my_persistent_pub.clone().into(),
+            my_persistent_pub: self.my_persistent_pub.into(),
             uuid: self.uuid,
-            maker_payment_wait: started_at + (self.payment_locktime * 2) / 5,
+            maker_payment_wait: maker_payment_wait(started_at, self.payment_locktime),
             maker_coin_start_block,
             taker_coin_start_block,
             fee_to_send_taker_fee: Some(SavedTradeFee::from(fee_to_send_dex_fee)),
@@ -792,6 +893,9 @@ impl TakerSwap {
             maker_payment_spend_trade_fee: Some(SavedTradeFee::from(maker_payment_spend_trade_fee)),
             maker_coin_swap_contract_address,
             taker_coin_swap_contract_address,
+            maker_coin_htlc_pubkey: Some(maker_coin_htlc_key_pair.public_slice().into()),
+            taker_coin_htlc_pubkey: Some(taker_coin_htlc_key_pair.public_slice().into()),
+            p2p_privkey: self.p2p_privkey.map(SerializableSecp256k1Keypair::from),
         };
 
         Ok((Some(TakerSwapCommand::Negotiate), vec![TakerSwapEvent::Started(data)]))
@@ -815,6 +919,7 @@ impl TakerSwap {
             },
         };
 
+        debug!("Received maker negotiation data {:?}", maker_data);
         let time_dif = (self.r().data.started_at as i64 - maker_data.started_at() as i64).abs();
         if time_dif > 60 {
             return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
@@ -858,19 +963,26 @@ impl TakerSwap {
             },
         };
 
-        let taker_data = SwapMsg::NegotiationReply(NegotiationDataMsg::V2(NegotiationDataV2 {
-            started_at: self.r().data.started_at,
-            secret_hash: maker_data.secret_hash().to_vec(),
-            payment_locktime: self.r().data.taker_payment_lock,
-            persistent_pubkey: self.my_persistent_pub.to_vec(),
-            maker_coin_swap_contract: maker_coin_swap_contract_addr.clone().map_or(vec![], |bytes| bytes.0),
-            taker_coin_swap_contract: taker_coin_swap_contract_addr.clone().map_or(vec![], |bytes| bytes.0),
-        }));
+        let maker_coin_swap_contract_bytes = maker_coin_swap_contract_addr
+            .clone()
+            .map_or_else(Vec::new, |bytes| bytes.0);
+        let taker_coin_swap_contract_bytes = taker_coin_swap_contract_addr
+            .clone()
+            .map_or_else(Vec::new, |bytes| bytes.0);
+        let my_negotiation_data = self.get_my_negotiation_data(
+            maker_data.secret_hash().to_vec(),
+            maker_coin_swap_contract_bytes,
+            taker_coin_swap_contract_bytes,
+        );
+
+        let taker_data = SwapMsg::NegotiationReply(my_negotiation_data);
+        debug!("Sending taker negotiation data {:?}", taker_data);
         let send_abort_handle = broadcast_swap_message_every(
             self.ctx.clone(),
             swap_topic(&self.uuid),
             taker_data,
             NEGOTIATE_TIMEOUT as f64 / 6.,
+            self.p2p_privkey,
         );
         let recv_fut = recv_swap_msg(
             self.ctx.clone(),
@@ -897,10 +1009,14 @@ impl TakerSwap {
         Ok((Some(TakerSwapCommand::SendTakerFee), vec![TakerSwapEvent::Negotiated(
             MakerNegotiationData {
                 maker_payment_locktime: maker_data.payment_locktime(),
-                maker_pubkey: maker_data.persistent_pubkey().into(),
+                // using default to avoid misuse of this field
+                // maker_coin_htlc_pubkey and taker_coin_htlc_pubkey must be used instead
+                maker_pubkey: H264Json::default(),
                 secret_hash: maker_data.secret_hash().into(),
                 maker_coin_swap_contract_addr,
                 taker_coin_swap_contract_addr,
+                maker_coin_htlc_pubkey: Some(maker_data.maker_coin_htlc_pub().into()),
+                taker_coin_htlc_pubkey: Some(maker_data.taker_coin_htlc_pub().into()),
             },
         )]))
     }
@@ -918,20 +1034,20 @@ impl TakerSwap {
             dex_fee_amount_from_taker_coin(&self.taker_coin, &self.r().data.maker_coin, &self.taker_amount);
         let fee_tx = self
             .taker_coin
-            .send_taker_fee(&DEX_FEE_ADDR_RAW_PUBKEY, fee_amount.into())
+            .send_taker_fee(&DEX_FEE_ADDR_RAW_PUBKEY, fee_amount.into(), self.uuid.as_bytes())
             .compat()
             .await;
         let transaction = match fee_tx {
             Ok(t) => t,
             Err(err) => {
                 return Ok((Some(TakerSwapCommand::Finish), vec![
-                    TakerSwapEvent::TakerFeeSendFailed(ERRL!("{}", err).into()),
-                ]))
+                    TakerSwapEvent::TakerFeeSendFailed(ERRL!("{}", err.get_plain_text_format()).into()),
+                ]));
             },
         };
 
         let tx_hash = transaction.tx_hash();
-        log!({"Taker fee tx hash {:02x}", tx_hash});
+        info!("Taker fee tx hash {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: transaction.tx_hex().into(),
             tx_hash,
@@ -943,7 +1059,7 @@ impl TakerSwap {
     }
 
     async fn wait_for_maker_payment(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
-        const MAKER_PAYMENT_WAIT_TIMEOUT: u64 = 180;
+        const MAKER_PAYMENT_WAIT_TIMEOUT: u64 = 600;
         let tx_hex = self.r().taker_fee.as_ref().unwrap().tx_hex.0.clone();
         let msg = SwapMsg::TakerFee(tx_hex);
         let abort_send_handle = broadcast_swap_message_every(
@@ -951,6 +1067,7 @@ impl TakerSwap {
             swap_topic(&self.uuid),
             msg,
             MAKER_PAYMENT_WAIT_TIMEOUT as f64 / 6.,
+            self.p2p_privkey,
         );
 
         let recv_fut = recv_swap_msg(
@@ -982,7 +1099,7 @@ impl TakerSwap {
         };
 
         let tx_hash = maker_payment.tx_hash();
-        log!({"Got maker payment {:02x}", tx_hash});
+        info!("Got maker payment {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: maker_payment.tx_hex().into(),
             tx_hash,
@@ -995,10 +1112,11 @@ impl TakerSwap {
     }
 
     async fn validate_maker_payment(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
-        log!({ "Before wait confirm" });
+        info!("Before wait confirm");
+        let confirmations = self.r().data.maker_payment_confirmations;
         let f = self.maker_coin.wait_for_confirmations(
             &self.r().maker_payment.clone().unwrap().tx_hex,
-            self.r().data.maker_payment_confirmations,
+            confirmations,
             self.r().data.maker_payment_requires_nota.unwrap_or(false),
             self.r().data.maker_payment_wait,
             WAIT_CONFIRM_INTERVAL,
@@ -1010,17 +1128,20 @@ impl TakerSwap {
                 ),
             ]));
         }
-        log!({ "After wait confirm" });
-
-        let validated_f = self.maker_coin.validate_maker_payment(
-            &self.r().maker_payment.clone().unwrap().tx_hex,
-            self.maker_payment_lock.load(Ordering::Relaxed) as u32,
-            &*self.r().other_persistent_pub,
-            &self.r().secret_hash.0,
-            self.maker_amount.to_decimal(),
-            &self.r().data.maker_coin_swap_contract_address,
-        );
-        let validated = validated_f.compat().await;
+        info!("After wait confirm");
+
+        let validate_input = ValidatePaymentInput {
+            payment_tx: self.r().maker_payment.clone().unwrap().tx_hex.0,
+            time_lock: self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+            other_pub: self.r().other_maker_coin_htlc_pub.to_vec(),
+            secret_hash: self.r().secret_hash.0.to_vec(),
+            amount: self.maker_amount.to_decimal(),
+            swap_contract_address: self.r().data.maker_coin_swap_contract_address.clone(),
+            try_spv_proof_until: self.r().data.maker_payment_wait,
+            confirmations,
+            unique_swap_data: self.unique_swap_data(),
+        };
+        let validated = self.maker_coin.validate_maker_payment(validate_input).compat().await;
 
         if let Err(e) = validated {
             return Ok((Some(TakerSwapCommand::Finish), vec![
@@ -1042,12 +1163,14 @@ impl TakerSwap {
             ]));
         }
 
+        let unique_data = self.unique_swap_data();
         let f = self.taker_coin.check_if_my_payment_sent(
             self.r().data.taker_payment_lock as u32,
-            &*self.r().other_persistent_pub,
+            self.r().other_taker_coin_htlc_pub.as_slice(),
             &self.r().secret_hash.0,
             self.r().data.taker_coin_start_block,
             &self.r().data.taker_coin_swap_contract_address,
+            &unique_data,
         );
         let transaction = match f.compat().await {
             Ok(res) => match res {
@@ -1055,18 +1178,21 @@ impl TakerSwap {
                 None => {
                     let payment_fut = self.taker_coin.send_taker_payment(
                         self.r().data.taker_payment_lock as u32,
-                        &*self.r().other_persistent_pub,
+                        &*self.r().other_taker_coin_htlc_pub,
                         &self.r().secret_hash.0,
                         self.taker_amount.to_decimal(),
                         &self.r().data.taker_coin_swap_contract_address,
+                        &unique_data,
                     );
 
                     match payment_fut.compat().await {
                         Ok(t) => t,
-                        Err(e) => {
+                        Err(err) => {
                             return Ok((Some(TakerSwapCommand::Finish), vec![
-                                TakerSwapEvent::TakerPaymentTransactionFailed(ERRL!("{}", e).into()),
-                            ]))
+                                TakerSwapEvent::TakerPaymentTransactionFailed(
+                                    ERRL!("{}", err.get_plain_text_format()).into(),
+                                ),
+                            ]));
                         },
                     }
                 },
@@ -1079,7 +1205,7 @@ impl TakerSwap {
         };
 
         let tx_hash = transaction.tx_hash();
-        log!({"Taker payment tx hash {:02x}", tx_hash });
+        info!("Taker payment tx hash {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: transaction.tx_hex().into(),
             tx_hash,
@@ -1093,7 +1219,8 @@ impl TakerSwap {
     async fn wait_for_taker_payment_spend(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
         let tx_hex = self.r().taker_payment.as_ref().unwrap().tx_hex.0.clone();
         let msg = SwapMsg::TakerPayment(tx_hex);
-        let send_abort_handle = broadcast_swap_message_every(self.ctx.clone(), swap_topic(&self.uuid), msg, 600.);
+        let send_abort_handle =
+            broadcast_swap_message_every(self.ctx.clone(), swap_topic(&self.uuid), msg, 600., self.p2p_privkey);
 
         let wait_duration = (self.r().data.lock_duration * 4) / 5;
         let wait_taker_payment = self.r().data.started_at + wait_duration;
@@ -1126,18 +1253,18 @@ impl TakerSwap {
         );
         let tx = match f.compat().await {
             Ok(t) => t,
-            Err(e) => {
+            Err(err) => {
                 return Ok((Some(TakerSwapCommand::RefundTakerPayment), vec![
-                    TakerSwapEvent::TakerPaymentWaitForSpendFailed(e.into()),
+                    TakerSwapEvent::TakerPaymentWaitForSpendFailed(err.get_plain_text_format().into()),
                     TakerSwapEvent::TakerPaymentWaitRefundStarted {
                         wait_until: self.wait_refund_until(),
                     },
-                ]))
+                ]));
             },
         };
         drop(send_abort_handle);
         let tx_hash = tx.tx_hash();
-        log!({"Taker payment spend tx {:02x}", tx_hash });
+        info!("Taker payment spend tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: tx.tx_hex().into(),
             tx_hash,
@@ -1166,21 +1293,38 @@ impl TakerSwap {
         let spend_fut = self.maker_coin.send_taker_spends_maker_payment(
             &self.r().maker_payment.clone().unwrap().tx_hex,
             self.maker_payment_lock.load(Ordering::Relaxed) as u32,
-            &*self.r().other_persistent_pub,
+            &*self.r().other_maker_coin_htlc_pub,
             &self.r().secret.0,
             &self.r().data.maker_coin_swap_contract_address,
+            &self.unique_swap_data(),
         );
         let transaction = match spend_fut.compat().await {
             Ok(t) => t,
             Err(err) => {
+                if let Some(tx) = err.get_tx() {
+                    broadcast_p2p_tx_msg(
+                        &self.ctx,
+                        tx_helper_topic(self.maker_coin.ticker()),
+                        &tx,
+                        &self.p2p_privkey,
+                    );
+                };
+
                 return Ok((Some(TakerSwapCommand::Finish), vec![
-                    TakerSwapEvent::MakerPaymentSpendFailed(ERRL!("{}", err).into()),
-                ]))
+                    TakerSwapEvent::MakerPaymentSpendFailed(ERRL!("{}", err.get_plain_text_format()).into()),
+                ]));
             },
         };
 
+        broadcast_p2p_tx_msg(
+            &self.ctx,
+            tx_helper_topic(self.maker_coin.ticker()),
+            &transaction,
+            &self.p2p_privkey,
+        );
+
         let tx_hash = transaction.tx_hash();
-        log!({"Maker payment spend tx {:02x}", tx_hash });
+        info!("Maker payment spend tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: transaction.tx_hex().into(),
             tx_hash,
@@ -1207,22 +1351,39 @@ impl TakerSwap {
         let refund_fut = self.taker_coin.send_taker_refunds_payment(
             &self.r().taker_payment.clone().unwrap().tx_hex.0,
             self.r().data.taker_payment_lock as u32,
-            &*self.r().other_persistent_pub,
+            &*self.r().other_taker_coin_htlc_pub,
             &self.r().secret_hash.0,
             &self.r().data.taker_coin_swap_contract_address,
+            &self.unique_swap_data(),
         );
 
         let transaction = match refund_fut.compat().await {
             Ok(t) => t,
             Err(err) => {
+                if let Some(tx) = err.get_tx() {
+                    broadcast_p2p_tx_msg(
+                        &self.ctx,
+                        tx_helper_topic(self.taker_coin.ticker()),
+                        &tx,
+                        &self.p2p_privkey,
+                    );
+                }
+
                 return Ok((Some(TakerSwapCommand::Finish), vec![
-                    TakerSwapEvent::TakerPaymentRefundFailed(ERRL!("{}", err).into()),
-                ]))
+                    TakerSwapEvent::TakerPaymentRefundFailed(ERRL!("{:?}", err.get_plain_text_format()).into()),
+                ]));
             },
         };
 
+        broadcast_p2p_tx_msg(
+            &self.ctx,
+            tx_helper_topic(self.taker_coin.ticker()),
+            &transaction,
+            &self.p2p_privkey,
+        );
+
         let tx_hash = transaction.tx_hash();
-        log!({"Taker refund tx hash {:02x}", tx_hash });
+        info!("Taker refund tx hash {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
             tx_hex: transaction.tx_hex().into(),
             tx_hash,
@@ -1233,14 +1394,17 @@ impl TakerSwap {
         ]))
     }
 
-    pub fn load_from_db_by_uuid(
+    pub async fn load_from_db_by_uuid(
         ctx: MmArc,
         maker_coin: MmCoinEnum,
         taker_coin: MmCoinEnum,
         swap_uuid: &Uuid,
     ) -> Result<(Self, Option<TakerSwapCommand>), String> {
-        let path = my_swap_file_path(&ctx, swap_uuid);
-        let saved: SavedSwap = try_s!(json::from_slice(&try_s!(slurp(&path))));
+        let saved = match SavedSwap::load_my_swap_from_db(&ctx, *swap_uuid).await {
+            Ok(Some(saved)) => saved,
+            Ok(None) => return ERR!("Couldn't find a swap with the uuid '{}'", swap_uuid),
+            Err(e) => return ERR!("{}", e),
+        };
         let saved = match saved {
             SavedSwap::Taker(swap) => swap,
             SavedSwap::Maker(_) => return ERR!("Can not load TakerSwap from SavedSwap::Maker uuid: {}", swap_uuid),
@@ -1297,6 +1461,7 @@ impl TakerSwap {
             maker_coin,
             taker_coin,
             data.lock_duration,
+            data.p2p_privkey.map(SerializableSecp256k1Keypair::into_inner),
         );
         let command = saved.events.last().unwrap().get_command();
         for saved_event in saved.events {
@@ -1305,7 +1470,7 @@ impl TakerSwap {
         Ok((swap, command))
     }
 
-    pub fn recover_funds(&self) -> Result<RecoveredSwap, String> {
+    pub async fn recover_funds(&self) -> Result<RecoveredSwap, String> {
         if self.finished_at.load(Ordering::Relaxed) == 0 {
             return ERR!("Swap must be finished before recover funds attempt");
         }
@@ -1323,17 +1488,33 @@ impl TakerSwap {
             None => return ERR!("No info about maker payment, swap is not recoverable"),
         };
 
+        // have to do this because std::sync::RwLockReadGuard returned by r() is not Send,
+        // so it can't be used across await
+        let other_maker_coin_htlc_pub = self.r().other_maker_coin_htlc_pub;
+        let other_taker_coin_htlc_pub = self.r().other_taker_coin_htlc_pub;
+        let secret_hash = self.r().secret_hash.0;
+        let maker_coin_start_block = self.r().data.maker_coin_start_block;
+        let maker_coin_swap_contract_address = self.r().data.maker_coin_swap_contract_address.clone();
+
+        let taker_payment_lock = self.r().data.taker_payment_lock;
+        let taker_coin_start_block = self.r().data.taker_coin_start_block;
+        let taker_coin_swap_contract_address = self.r().data.taker_coin_swap_contract_address.clone();
+
+        let unique_data = self.unique_swap_data();
         macro_rules! check_maker_payment_is_not_spent {
             // validate that maker payment is not spent
             () => {
-                match self.maker_coin.search_for_swap_tx_spend_other(
-                    self.maker_payment_lock.load(Ordering::Relaxed) as u32,
-                    &*self.r().other_persistent_pub,
-                    &self.r().secret_hash.0,
-                    &maker_payment,
-                    self.r().data.maker_coin_start_block,
-                    &self.r().data.maker_coin_swap_contract_address,
-                ) {
+                let search_input = SearchForSwapTxSpendInput {
+                    time_lock: self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+                    other_pub: other_maker_coin_htlc_pub.as_slice(),
+                    secret_hash: &secret_hash,
+                    tx: &maker_payment,
+                    search_from_block: maker_coin_start_block,
+                    swap_contract_address: &maker_coin_swap_contract_address,
+                    swap_unique_data: &unique_data,
+                };
+
+                match self.maker_coin.search_for_swap_tx_spend_other(search_input).await {
                     Ok(Some(FoundSwapTxSpend::Spent(tx))) => {
                         return ERR!(
                             "Maker payment was already spent by {} tx {:02x}",
@@ -1354,19 +1535,23 @@ impl TakerSwap {
             };
         }
 
-        let taker_payment = match &self.r().taker_payment {
+        let maybe_taker_payment = self.r().taker_payment.clone();
+        let taker_payment = match maybe_taker_payment {
             Some(tx) => tx.tx_hex.0.clone(),
             None => {
-                let maybe_sent = try_s!(self
-                    .taker_coin
-                    .check_if_my_payment_sent(
-                        self.r().data.taker_payment_lock as u32,
-                        &*self.r().other_persistent_pub,
-                        &self.r().secret_hash.0,
-                        self.r().data.taker_coin_start_block,
-                        &self.r().data.taker_coin_swap_contract_address,
-                    )
-                    .wait());
+                let maybe_sent = try_s!(
+                    self.taker_coin
+                        .check_if_my_payment_sent(
+                            taker_payment_lock as u32,
+                            other_taker_coin_htlc_pub.as_slice(),
+                            &secret_hash,
+                            taker_coin_start_block,
+                            &taker_coin_swap_contract_address,
+                            &unique_data,
+                        )
+                        .compat()
+                        .await
+                );
                 match maybe_sent {
                     Some(tx) => tx.tx_hex(),
                     None => return ERR!("Taker payment is not found, swap is not recoverable"),
@@ -1376,16 +1561,36 @@ impl TakerSwap {
 
         if self.r().taker_payment_spend.is_some() {
             check_maker_payment_is_not_spent!();
-            let transaction = try_s!(self
-                .maker_coin
-                .send_taker_spends_maker_payment(
-                    &maker_payment,
-                    self.maker_payment_lock.load(Ordering::Relaxed) as u32,
-                    &*self.r().other_persistent_pub,
-                    &self.r().secret.0,
-                    &self.r().data.maker_coin_swap_contract_address,
-                )
-                .wait());
+            // has to do this because std::sync::RwLockReadGuard returned by r() is not Send,
+            // so it can't be used across await
+            let other_maker_coin_htlc_pub = self.r().other_maker_coin_htlc_pub;
+            let secret = self.r().secret.0;
+            let maker_coin_swap_contract_address = self.r().data.maker_coin_swap_contract_address.clone();
+
+            let fut = self.maker_coin.send_taker_spends_maker_payment(
+                &maker_payment,
+                self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+                other_maker_coin_htlc_pub.as_slice(),
+                &secret,
+                &maker_coin_swap_contract_address,
+                &unique_data,
+            );
+
+            let transaction = match fut.compat().await {
+                Ok(t) => t,
+                Err(err) => {
+                    if let Some(tx) = err.get_tx() {
+                        broadcast_p2p_tx_msg(
+                            &self.ctx,
+                            tx_helper_topic(self.maker_coin.ticker()),
+                            &tx,
+                            &self.p2p_privkey,
+                        );
+                    }
+
+                    return ERR!("{}", err.get_plain_text_format());
+                },
+            };
 
             return Ok(RecoveredSwap {
                 action: RecoveredSwapAction::SpentOtherPayment,
@@ -1394,30 +1599,47 @@ impl TakerSwap {
             });
         }
 
-        let taker_payment_spend = try_s!(self.taker_coin.search_for_swap_tx_spend_my(
-            self.r().data.taker_payment_lock as u32,
-            &*self.r().other_persistent_pub,
-            &self.r().secret_hash.0,
-            &taker_payment,
-            self.r().data.taker_coin_start_block,
-            &self.r().data.taker_coin_swap_contract_address,
-        ));
+        let search_input = SearchForSwapTxSpendInput {
+            time_lock: taker_payment_lock as u32,
+            other_pub: other_taker_coin_htlc_pub.as_slice(),
+            secret_hash: &secret_hash,
+            tx: &taker_payment,
+            search_from_block: taker_coin_start_block,
+            swap_contract_address: &taker_coin_swap_contract_address,
+            swap_unique_data: &unique_data,
+        };
+        let taker_payment_spend = try_s!(self.taker_coin.search_for_swap_tx_spend_my(search_input).await);
 
         match taker_payment_spend {
             Some(spend) => match spend {
                 FoundSwapTxSpend::Spent(tx) => {
                     check_maker_payment_is_not_spent!();
                     let secret = try_s!(self.taker_coin.extract_secret(&self.r().secret_hash.0, &tx.tx_hex()));
-                    let transaction = try_s!(self
-                        .maker_coin
-                        .send_taker_spends_maker_payment(
-                            &maker_payment,
-                            self.maker_payment_lock.load(Ordering::Relaxed) as u32,
-                            &*self.r().other_persistent_pub,
-                            &secret,
-                            &self.r().data.maker_coin_swap_contract_address,
-                        )
-                        .wait());
+
+                    let fut = self.maker_coin.send_taker_spends_maker_payment(
+                        &maker_payment,
+                        self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+                        other_maker_coin_htlc_pub.as_slice(),
+                        &secret,
+                        &maker_coin_swap_contract_address,
+                        &unique_data,
+                    );
+
+                    let transaction = match fut.compat().await {
+                        Ok(t) => t,
+                        Err(err) => {
+                            if let Some(tx) = err.get_tx() {
+                                broadcast_p2p_tx_msg(
+                                    &self.ctx,
+                                    tx_helper_topic(self.maker_coin.ticker()),
+                                    &tx,
+                                    &self.p2p_privkey,
+                                );
+                            }
+
+                            return ERR!("{}", err.get_plain_text_format());
+                        },
+                    };
 
                     Ok(RecoveredSwap {
                         action: RecoveredSwapAction::SpentOtherPayment,
@@ -1438,20 +1660,34 @@ impl TakerSwap {
                     );
                 }
 
-                let transaction = try_s!(self
-                    .taker_coin
-                    .send_taker_refunds_payment(
-                        &taker_payment,
-                        self.r().data.taker_payment_lock as u32,
-                        &*self.r().other_persistent_pub,
-                        &self.r().secret_hash.0,
-                        &self.r().data.taker_coin_swap_contract_address,
-                    )
-                    .wait());
+                let fut = self.taker_coin.send_taker_refunds_payment(
+                    &taker_payment,
+                    taker_payment_lock as u32,
+                    other_taker_coin_htlc_pub.as_slice(),
+                    &secret_hash,
+                    &taker_coin_swap_contract_address,
+                    &unique_data,
+                );
+
+                let transaction = match fut.compat().await {
+                    Ok(t) => t,
+                    Err(err) => {
+                        if let Some(tx) = err.get_tx() {
+                            broadcast_p2p_tx_msg(
+                                &self.ctx,
+                                tx_helper_topic(self.taker_coin.ticker()),
+                                &tx,
+                                &self.p2p_privkey,
+                            );
+                        }
+
+                        return ERR!("{:?}", err.get_plain_text_format());
+                    },
+                };
 
                 Ok(RecoveredSwap {
                     action: RecoveredSwapAction::RefundedMyPayment,
-                    coin: self.maker_coin.ticker().to_string(),
+                    coin: self.taker_coin.ticker().to_string(),
                     transaction,
                 })
             },
@@ -1498,11 +1734,20 @@ impl AtomicSwap for TakerSwap {
         result
     }
 
+    #[inline]
     fn uuid(&self) -> &Uuid { &self.uuid }
 
+    #[inline]
     fn maker_coin(&self) -> &str { self.maker_coin.ticker() }
 
+    #[inline]
     fn taker_coin(&self) -> &str { self.taker_coin.ticker() }
+
+    #[inline]
+    fn unique_swap_data(&self) -> Vec<u8> {
+        // Taker generates swap UUID so it's safe for him to use it for privkey derivation
+        self.uuid.as_bytes().to_vec()
+    }
 }
 
 pub struct TakerSwapPreparedParams {
@@ -1527,13 +1772,11 @@ pub async fn check_balance_for_taker_swap(
             let dex_fee = dex_fee_amount_from_taker_coin(my_coin, other_coin.ticker(), &volume);
             let fee_to_send_dex_fee = my_coin
                 .get_fee_to_send_taker_fee(dex_fee.to_decimal(), stage.clone())
-                .compat()
                 .await
                 .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, my_coin.ticker()))?;
             let preimage_value = TradePreimageValue::Exact(volume.to_decimal());
             let taker_payment_trade_fee = my_coin
                 .get_sender_trade_fee(preimage_value, stage.clone())
-                .compat()
                 .await
                 .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, my_coin.ticker()))?;
             let maker_payment_spend_trade_fee = other_coin
@@ -1623,14 +1866,12 @@ pub async fn taker_swap_trade_preimage(
 
     let fee_to_send_taker_fee = my_coin
         .get_fee_to_send_taker_fee(dex_amount.to_decimal(), stage.clone())
-        .compat()
         .await
         .mm_err(|e| TradePreimageRpcError::from_trade_preimage_error(e, my_coin_ticker))?;
 
     let preimage_value = TradePreimageValue::Exact(my_coin_volume.to_decimal());
     let my_coin_trade_fee = my_coin
         .get_sender_trade_fee(preimage_value, stage.clone())
-        .compat()
         .await
         .mm_err(|e| TradePreimageRpcError::from_trade_preimage_error(e, my_coin_ticker))?;
     let other_coin_trade_fee = other_coin
@@ -1756,7 +1997,6 @@ pub async fn calc_max_taker_vol(
     let preimage_value = TradePreimageValue::UpperBound(max_possible.to_decimal());
     let max_trade_fee = coin
         .get_sender_trade_fee(preimage_value, stage.clone())
-        .compat()
         .await
         .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, my_coin))?;
 
@@ -1766,7 +2006,6 @@ pub async fn calc_max_taker_vol(
         let max_dex_fee = dex_fee_amount_from_taker_coin(coin, other_coin, &max_possible_2);
         let max_fee_to_send_taker_fee = coin
             .get_fee_to_send_taker_fee(max_dex_fee.to_decimal(), stage)
-            .compat()
             .await
             .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, my_coin))?;
         let min_max_possible = &max_possible_2 - &max_fee_to_send_taker_fee.amount;
@@ -1826,16 +2065,20 @@ pub fn max_taker_vol_from_available(
     Ok(max_vol)
 }
 
-#[cfg(test)]
+pub fn maker_payment_wait(swap_started_at: u64, payment_locktime: u64) -> u64 {
+    swap_started_at + (payment_locktime * 2) / 5
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
 mod taker_swap_tests {
     use super::*;
     use crate::mm2::lp_swap::{dex_fee_amount, get_locked_amount_by_other_swaps};
     use coins::eth::{addr_from_str, signed_eth_tx_from_bytes, SignedEthTx};
     use coins::utxo::UtxoTx;
     use coins::{FoundSwapTxSpend, MarketCoinOps, MmCoin, SwapOps, TestCoin};
-    use common::mm_ctx::MmCtxBuilder;
-    use common::new_uuid;
-    use common::privkey::key_pair_from_seed;
+    use common::{block_on, new_uuid};
+    use crypto::privkey::key_pair_from_seed;
+    use mm2_core::mm_ctx::MmCtxBuilder;
     use mocktopus::mocking::*;
 
     fn eth_tx_for_test() -> SignedEthTx {
@@ -1868,15 +2111,16 @@ mod taker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut MAKER_PAYMENT_SPEND_CALLED: bool = false;
-        TestCoin::send_taker_spends_maker_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_taker_spends_maker_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MAKER_PAYMENT_SPEND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
-        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _, _, _, _, _, _| MockResult::Return(Ok(None)));
+        TestCoin::search_for_swap_tx_spend_other
+            .mock_safe(|_, _| MockResult::Return(Box::pin(futures::future::ready(Ok(None)))));
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (taker_swap, _) = TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, taker_saved_swap).unwrap();
-        let actual = taker_swap.recover_funds().unwrap();
+        let actual = block_on(taker_swap.recover_funds()).unwrap();
         let expected = RecoveredSwap {
             action: RecoveredSwapAction::SpentOtherPayment,
             coin: "ticker".to_string(),
@@ -1899,26 +2143,26 @@ mod taker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut MY_PAYMENT_SENT_CALLED: bool = false;
-        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MY_PAYMENT_SENT_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(Some(eth_tx_for_test().into()))))
         });
 
         static mut TX_SPEND_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { TX_SPEND_CALLED = true };
-            MockResult::Return(Ok(None))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(None))))
         });
 
         static mut TAKER_PAYMENT_REFUND_CALLED: bool = false;
-        TestCoin::send_taker_refunds_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_taker_refunds_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { TAKER_PAYMENT_REFUND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (taker_swap, _) = TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, taker_saved_swap).unwrap();
-        let actual = taker_swap.recover_funds().unwrap();
+        let actual = block_on(taker_swap.recover_funds()).unwrap();
         let expected = RecoveredSwap {
             action: RecoveredSwapAction::RefundedMyPayment,
             coin: "ticker".to_string(),
@@ -1944,29 +2188,30 @@ mod taker_swap_tests {
         TestCoin::extract_secret.mock_safe(|_, _, _| MockResult::Return(Ok(vec![])));
 
         static mut MY_PAYMENT_SENT_CALLED: bool = false;
-        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::check_if_my_payment_sent.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MY_PAYMENT_SENT_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(Some(eth_tx_for_test().into()))))
         });
 
         static mut SEARCH_TX_SPEND_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_TX_SPEND_CALLED = true };
             let tx: UtxoTx = "0100000001de7aa8d29524906b2b54ee2e0281f3607f75662cbc9080df81d1047b78e21dbc00000000d7473044022079b6c50820040b1fbbe9251ced32ab334d33830f6f8d0bf0a40c7f1336b67d5b0220142ccf723ddabb34e542ed65c395abc1fbf5b6c3e730396f15d25c49b668a1a401209da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365004c6b6304f62b0e5cb175210270e75970bb20029b3879ec76c4acd320a8d0589e003636264d01a7d566504bfbac6782012088a9142fb610d856c19fd57f2d0cffe8dff689074b3d8a882103f368228456c940ac113e53dad5c104cf209f2f102a409207269383b6ab9b03deac68ffffffff01d0dc9800000000001976a9146d9d2b554d768232320587df75c4338ecc8bf37d88ac40280e5c".into();
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Spent(tx.into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Spent(tx.into()))))))
         });
 
-        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _, _, _, _, _, _| MockResult::Return(Ok(None)));
+        TestCoin::search_for_swap_tx_spend_other
+            .mock_safe(|_, _| MockResult::Return(Box::pin(futures::future::ready(Ok(None)))));
 
         static mut MAKER_PAYMENT_SPEND_CALLED: bool = false;
-        TestCoin::send_taker_spends_maker_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_taker_spends_maker_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MAKER_PAYMENT_SPEND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (taker_swap, _) = TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, taker_saved_swap).unwrap();
-        let actual = taker_swap.recover_funds().unwrap();
+        let actual = block_on(taker_swap.recover_funds()).unwrap();
         let expected = RecoveredSwap {
             action: RecoveredSwapAction::SpentOtherPayment,
             coin: "ticker".to_string(),
@@ -1991,20 +2236,20 @@ mod taker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut SEARCH_TX_SPEND_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_TX_SPEND_CALLED = true };
-            MockResult::Return(Ok(None))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(None))))
         });
 
         static mut REFUND_CALLED: bool = false;
-        TestCoin::send_taker_refunds_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_taker_refunds_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { REFUND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (taker_swap, _) = TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, taker_saved_swap).unwrap();
-        let actual = taker_swap.recover_funds().unwrap();
+        let actual = block_on(taker_swap.recover_funds()).unwrap();
         let expected = RecoveredSwap {
             action: RecoveredSwapAction::RefundedMyPayment,
             coin: "ticker".to_string(),
@@ -2028,15 +2273,15 @@ mod taker_swap_tests {
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
 
         static mut SEARCH_TX_SPEND_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_TX_SPEND_CALLED = true };
-            MockResult::Return(Ok(None))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(None))))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (taker_swap, _) = TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, taker_saved_swap).unwrap();
         taker_swap.w().data.taker_payment_lock = (now_ms() / 1000) - 3690;
-        assert!(taker_swap.recover_funds().is_err());
+        assert!(block_on(taker_swap.recover_funds()).is_err());
         assert!(unsafe { SEARCH_TX_SPEND_CALLED });
     }
 
@@ -2054,23 +2299,24 @@ mod taker_swap_tests {
         TestCoin::extract_secret.mock_safe(|_, _, _| MockResult::Return(Ok(vec![])));
 
         static mut SEARCH_TX_SPEND_CALLED: bool = false;
-        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _, _, _, _, _, _| {
+        TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
             unsafe { SEARCH_TX_SPEND_CALLED = true };
             let tx: UtxoTx = "0100000001de7aa8d29524906b2b54ee2e0281f3607f75662cbc9080df81d1047b78e21dbc00000000d7473044022079b6c50820040b1fbbe9251ced32ab334d33830f6f8d0bf0a40c7f1336b67d5b0220142ccf723ddabb34e542ed65c395abc1fbf5b6c3e730396f15d25c49b668a1a401209da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365004c6b6304f62b0e5cb175210270e75970bb20029b3879ec76c4acd320a8d0589e003636264d01a7d566504bfbac6782012088a9142fb610d856c19fd57f2d0cffe8dff689074b3d8a882103f368228456c940ac113e53dad5c104cf209f2f102a409207269383b6ab9b03deac68ffffffff01d0dc9800000000001976a9146d9d2b554d768232320587df75c4338ecc8bf37d88ac40280e5c".into();
-            MockResult::Return(Ok(Some(FoundSwapTxSpend::Spent(tx.into()))))
+            MockResult::Return(Box::pin(futures::future::ready(Ok(Some(FoundSwapTxSpend::Spent(tx.into()))))))
         });
 
-        TestCoin::search_for_swap_tx_spend_other.mock_safe(|_, _, _, _, _, _, _| MockResult::Return(Ok(None)));
+        TestCoin::search_for_swap_tx_spend_other
+            .mock_safe(|_, _| MockResult::Return(Box::pin(futures::future::ready(Ok(None)))));
 
         static mut MAKER_PAYMENT_SPEND_CALLED: bool = false;
-        TestCoin::send_taker_spends_maker_payment.mock_safe(|_, _, _, _, _, _| {
+        TestCoin::send_taker_spends_maker_payment.mock_safe(|_, _, _, _, _, _, _| {
             unsafe { MAKER_PAYMENT_SPEND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (taker_swap, _) = TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, taker_saved_swap).unwrap();
-        let actual = taker_swap.recover_funds().unwrap();
+        let actual = block_on(taker_swap.recover_funds()).unwrap();
         let expected = RecoveredSwap {
             action: RecoveredSwapAction::SpentOtherPayment,
             coin: "ticker".to_string(),
@@ -2096,7 +2342,7 @@ mod taker_swap_tests {
         let maker_coin = MmCoinEnum::Test(TestCoin::default());
         let taker_coin = MmCoinEnum::Test(TestCoin::default());
         let (taker_swap, _) = TakerSwap::load_from_saved(ctx, maker_coin, taker_coin, taker_saved_swap).unwrap();
-        assert!(taker_swap.recover_funds().is_err());
+        assert!(block_on(taker_swap.recover_funds()).is_err());
     }
 
     #[test]
@@ -2230,7 +2476,12 @@ mod taker_swap_tests {
             let max_taker_vol = max_taker_vol_from_available(available.clone(), base, "MORTY", &min_tx_amount)
                 .expect("!max_taker_vol_from_available");
             let dex_fee = dex_fee_amount(base, "MORTY", &max_taker_vol, &dex_fee_threshold);
-            log!("available "[available.to_decimal()]" max_taker_vol "[max_taker_vol.to_decimal()]", dex_fee "[dex_fee.to_decimal()]);
+            println!(
+                "available={:?} max_taker_vol={:?} dex_fee={:?}",
+                available.to_decimal(),
+                max_taker_vol.to_decimal(),
+                dex_fee.to_decimal()
+            );
             assert_eq!(dex_fee_threshold, dex_fee);
             assert!(min_tx_amount <= max_taker_vol);
             assert_eq!(max_taker_vol + dex_fee, available);
diff --git a/mm2src/lp_swap/trade_preimage.rs b/mm2src/mm2_main/src/lp_swap/trade_preimage.rs
similarity index 97%
rename from mm2src/lp_swap/trade_preimage.rs
rename to mm2src/mm2_main/src/lp_swap/trade_preimage.rs
index 0ab19fd2d3..56c6b374ca 100644
--- a/mm2src/lp_swap/trade_preimage.rs
+++ b/mm2src/mm2_main/src/lp_swap/trade_preimage.rs
@@ -1,14 +1,13 @@
 use super::check_balance::CheckBalanceError;
 use super::{maker_swap_trade_preimage, taker_swap_trade_preimage, MakerTradePreimage, TakerTradePreimage};
 use crate::mm2::lp_ordermatch::{MakerOrderBuildError, TakerAction, TakerOrderBuildError};
-use bigdecimal::BigDecimal;
 use coins::{is_wallet_only_ticker, lp_coinfind_or_err, BalanceError, CoinFindError, TradeFee, TradePreimageError};
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
-use common::mm_number::MmNumber;
 use common::HttpStatusCode;
 use derive_more::Display;
 use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{construct_detailed, BigDecimal, MmNumber};
 use std::collections::HashMap;
 
 construct_detailed!(DetailedAmount, amount);
@@ -260,6 +259,8 @@ impl From<BalanceError> for TradePreimageRpcError {
             BalanceError::Transport(transport) | BalanceError::InvalidResponse(transport) => {
                 TradePreimageRpcError::Transport(transport)
             },
+            e @ BalanceError::UnexpectedDerivationMethod(_) => TradePreimageRpcError::InternalError(e.to_string()),
+            e @ BalanceError::WalletStorageError(_) => TradePreimageRpcError::InternalError(e.to_string()),
             BalanceError::Internal(internal) => TradePreimageRpcError::InternalError(internal),
         }
     }
diff --git a/mm2src/mm2.rs b/mm2src/mm2_main/src/mm2.rs
similarity index 59%
rename from mm2src/mm2.rs
rename to mm2src/mm2_main/src/mm2.rs
index d1b6eb4e91..0a3983b723 100644
--- a/mm2src/mm2.rs
+++ b/mm2src/mm2_main/src/mm2.rs
@@ -1,13 +1,15 @@
 /******************************************************************************
- * Copyright © 2014-2019 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -16,16 +18,23 @@
 //  mm2.rs
 //  marketmaker
 //
-//  Copyright © 2017-2019 SuperNET. All rights reserved.
+//  Copyright © 2022 AtomicDEX. All rights reserved.
 //
 
 #![cfg_attr(target_arch = "wasm32", allow(dead_code))]
 #![cfg_attr(target_arch = "wasm32", allow(unused_imports))]
 
+#[cfg(not(target_arch = "wasm32"))] use common::block_on;
 use common::crash_reports::init_crash_reports;
+use common::double_panic_crash;
 use common::log::LogLevel;
-use common::mm_ctx::MmCtxBuilder;
-use common::{block_on, double_panic_crash};
+use mm2_core::mm_ctx::MmCtxBuilder;
+
+#[cfg(feature = "custom-swap-locktime")] use common::log::warn;
+#[cfg(feature = "custom-swap-locktime")]
+use lp_swap::PAYMENT_LOCKTIME;
+#[cfg(feature = "custom-swap-locktime")]
+use std::sync::atomic::Ordering;
 
 use derive_more::Display;
 use gstuff::slurp;
@@ -44,15 +53,17 @@ use std::str;
 #[path = "lp_native_dex.rs"] mod lp_native_dex;
 use self::lp_native_dex::lp_init;
 use coins::update_coins_config;
-use common::mm_error::MmError;
+use mm2_err_handle::prelude::*;
 
 #[cfg(not(target_arch = "wasm32"))]
 #[path = "database.rs"]
 pub mod database;
 
+#[path = "lp_dispatcher.rs"] pub mod lp_dispatcher;
+#[path = "lp_message_service.rs"] pub mod lp_message_service;
 #[path = "lp_network.rs"] pub mod lp_network;
-
 #[path = "lp_ordermatch.rs"] pub mod lp_ordermatch;
+#[path = "lp_price.rs"] pub mod lp_price;
 #[path = "lp_stats.rs"] pub mod lp_stats;
 #[path = "lp_swap.rs"] pub mod lp_swap;
 #[path = "rpc.rs"] pub mod rpc;
@@ -61,11 +72,30 @@ pub mod database;
 #[path = "mm2_tests.rs"]
 pub mod mm2_tests;
 
-const DEFAULT_LOG_FILTER: LogLevel = LogLevel::Info;
 pub const MM_DATETIME: &str = env!("MM_DATETIME");
 pub const MM_VERSION: &str = env!("MM_VERSION");
 pub const PASSWORD_MAXIMUM_CONSECUTIVE_CHARACTERS: usize = 3;
 
+#[cfg(feature = "custom-swap-locktime")]
+const CUSTOM_PAYMENT_LOCKTIME_DEFAULT: u64 = 900;
+
+#[derive(Serialize)]
+pub struct MmVersionResult {
+    result: &'static str,
+    datetime: &'static str,
+}
+
+impl MmVersionResult {
+    pub const fn new() -> MmVersionResult {
+        MmVersionResult {
+            result: MM_VERSION,
+            datetime: MM_DATETIME,
+        }
+    }
+
+    pub fn to_json(&self) -> Json { json::to_value(self).expect("expected valid JSON object") }
+}
+
 pub struct LpMainParams {
     conf: Json,
     filter: Option<LogLevel>,
@@ -74,9 +104,8 @@ pub struct LpMainParams {
 impl LpMainParams {
     pub fn with_conf(conf: Json) -> LpMainParams { LpMainParams { conf, filter: None } }
 
-    #[allow(dead_code)]
-    pub fn log_filter(mut self, filter: LogLevel) -> LpMainParams {
-        self.filter = Some(filter);
+    pub fn log_filter(mut self, filter: Option<LogLevel>) -> LpMainParams {
+        self.filter = filter;
         self
     }
 }
@@ -85,7 +114,7 @@ impl LpMainParams {
 pub enum PasswordPolicyError {
     #[display(fmt = "Password can't contain the word password")]
     ContainsTheWordPassword,
-    #[display(fmt = "Password length should be between 8 and 32")]
+    #[display(fmt = "Password length should be at least 8 characters long")]
     PasswordLength,
     #[display(fmt = "Password should contain at least 1 digit")]
     PasswordMissDigit,
@@ -110,7 +139,7 @@ pub fn password_policy(password: &str) -> Result<(), MmError<PasswordPolicyError
         return MmError::err(PasswordPolicyError::ContainsTheWordPassword);
     }
     let password_len = password.chars().count();
-    if !(8..=32).contains(&password_len) {
+    if (0..8).contains(&password_len) {
         return MmError::err(PasswordPolicyError::PasswordLength);
     }
     if !REGEX_NUMBER.is_match(password) {
@@ -135,7 +164,7 @@ pub fn password_policy(password: &str) -> Result<(), MmError<PasswordPolicyError
 fn check_password_policy() {
     // Length
     assert_eq!(
-        password_policy("123").unwrap_err().into_inner(),
+        password_policy("1234567").unwrap_err().into_inner(),
         PasswordPolicyError::PasswordLength
     );
 
@@ -163,7 +192,7 @@ fn check_password_policy() {
         PasswordPolicyError::PasswordMissUppercase
     );
 
-    // Miss uppercase
+    // Contains the same character 3 times in a row
     assert_eq!(
         password_policy("SecretPassSoStrong123*aaa").unwrap_err().into_inner(),
         PasswordPolicyError::PasswordConsecutiveCharactersExceeded
@@ -181,17 +210,39 @@ fn check_password_policy() {
         PasswordPolicyError::ContainsTheWordPassword
     );
 
+    // Check valid long password
+    let long_pass = "SecretPassSoStrong*!1234567891012";
+    assert!(long_pass.len() > 32);
+    assert!(password_policy(long_pass).is_ok());
+
     // Valid passwords
     password_policy("StrongPass123*").unwrap();
     password_policy(r#"StrongPass123[]\± "#).unwrap();
     password_policy("StrongPass123£StrongPass123£Pass").unwrap();
 }
 
+#[cfg(feature = "custom-swap-locktime")]
+/// Reads `payment_locktime` from conf arg and assigns it into `PAYMENT_LOCKTIME` in lp_swap.
+/// Assigns 900 if `payment_locktime` is invalid or not provided.
+fn initialize_payment_locktime(conf: &Json) {
+    match conf["payment_locktime"].as_u64() {
+        Some(lt) => PAYMENT_LOCKTIME.store(lt, Ordering::Relaxed),
+        None => {
+            warn!(
+                "payment_locktime is either invalid type or not provided in the configuration or
+                MM2.json file. payment_locktime will be proceeded as {} seconds.",
+                CUSTOM_PAYMENT_LOCKTIME_DEFAULT
+            );
+        },
+    };
+}
+
 /// * `ctx_cb` - callback used to share the `MmCtx` ID with the call site.
 pub async fn lp_main(params: LpMainParams, ctx_cb: &dyn Fn(u32)) -> Result<(), String> {
-    if let Err(e) = init_logger(params.filter) {
-        log!("Logger initialization failed: "(e))
-    }
+    let log_filter = params.filter.unwrap_or_default();
+    // Logger can be initialized once.
+    // If `mm2` is linked as a library, and `mm2` is restarted, `init_logger` returns an error.
+    init_logger(log_filter).ok();
 
     let conf = params.conf;
     if !conf["rpc_password"].is_null() {
@@ -213,95 +264,78 @@ pub async fn lp_main(params: LpMainParams, ctx_cb: &dyn Fn(u32)) -> Result<(), S
         }
     }
 
-    if conf["passphrase"].is_string() {
-        let ctx = MmCtxBuilder::new()
-            .with_conf(conf)
-            .with_version(MM_VERSION.into())
-            .into_mm_arc();
-        ctx_cb(try_s!(ctx.ffi_handle()));
-        try_s!(lp_init(ctx).await);
-        Ok(())
-    } else {
-        ERR!("!passphrase")
-    }
+    #[cfg(feature = "custom-swap-locktime")]
+    initialize_payment_locktime(&conf);
+
+    let ctx = MmCtxBuilder::new()
+        .with_conf(conf)
+        .with_log_level(log_filter)
+        .with_version(MM_VERSION.into())
+        .into_mm_arc();
+    ctx_cb(try_s!(ctx.ffi_handle()));
+    try_s!(lp_init(ctx).await);
+    Ok(())
 }
 
-#[allow(dead_code)]
 fn help() {
-    // Removed options:
-    // "client" - In MM2 anyone can be a Maker, the "client" option is no longer applicable.
-
-    pintln! (
-            "Command-line options.\n"
-            "The first command-line argument is special and designates the mode.\n"
-            "\n"
-            "  help                       ..  Display this message.\n"
-            "  btc2kmd {WIF or BTC}       ..  Convert a BTC WIF into a KMD WIF.\n"
-            "  events                     ..  Listen to a feed coming from a separate MM daemon and print it to stdout.\n"
-            "  vanity {substring}         ..  Tries to find an address with the given substring.\n"
-            "  update_config {SRC} {DST}  ..  Update the configuration of coins from the SRC config and save it to DST file.\n"
-            "  {JSON configuration}       ..  Run the MarketMaker daemon.\n"
-            "\n"
-            "Some (but not all) of the JSON configuration parameters (* - required):\n"
-            "\n"
-            // We don't want to break the existing RPC API,
-            // so the "refrel=coinmarketcap" designator will act as autoselect,
-            // using the CoinGecko behind the scenes unless the "cmc_key" is given.
-            // In the future, when MM2 is more widely used and thus we're working more tighly with the GUIs (BarterDEX, HyperDEX, dICO),
-            // we might add the "refrel=cmc" and "refrel=coingecko" RPC options.
-    /* we're not using the `portfolio` crate at present
-            "  cmc_key        ..  CoinMarketCap Professional API Key. Switches from CoinGecko to CoinMarketCap.\n"
-            "                     The Key can be obtained from 'https://pro.coinmarketcap.com/account'.\n"
-    */
-            "                     NB: The 'coins' command-line configuration must have the lowercased coin names in the 'name' field,\n"
-          r#"                     {"coins": [{"name": "dash", "coin": "DASH", ...}, ...], ...}."# "\n"
-            // cf. https://github.com/atomiclabs/hyperdex/blob/1d4ed3234b482e769124725c7e979eef5cd72d24/app/marketmaker/supported-currencies.js#L12
-            "  coins          ..  Information about the currencies: their ticker symbols, names, ports, addresses, etc.\n"
-            "                     If the field isn't present on the command line then we try loading it from the 'coins' file.\n"
-            "  crash          ..  Simulate a crash to check how the crash handling works.\n"
-            "  dbdir          ..  MM database path. 'DB' by default.\n"
-            "  gui            ..  The information about GUI app using MM2 instance. Included in swap statuses shared with network.\n"
-            "                 ..  It's recommended to put essential info to this field (application name, OS, version, etc).\n"
-            "                 ..  e.g. AtomicDEX iOS 1.0.1000.\n"
-            "  myipaddr       ..  IP address to bind to for P2P networking.\n"
-            "  netid          ..  Subnetwork. Affects ports and keys.\n"
-            "  passphrase *   ..  Wallet seed.\n"
-            "                     Compressed WIFs and hexadecimal ECDSA keys (prefixed with 0x) are also accepted.\n"
-            "  panic          ..  Simulate a panic to see if backtrace works.\n"
-            // cf. https://github.com/atomiclabs/hyperdex/pull/563/commits/6d17c0c994693b768e30130855c679a7849a2b27
-            "  rpccors        ..  Access-Control-Allow-Origin header value to be used in all the RPC responses.\n"
-            "                     Default is currently 'http://localhost:3000'\n"
-            "  rpcip          ..  IP address to bind to for RPC server. Overrides the 127.0.0.1 default\n"
-            "  rpc_password   ..  RPC password used to authorize non-public RPC calls\n"
-            "                     MM generates password from passphrase if this field is not set\n"
-            "  rpc_local_only ..  MM forbids some RPC requests from not loopback (localhost) IPs as additional security measure.\n"
-            "                     Defaults to `true`, set `false` to disable. `Use with caution`.\n"
-            "  rpcport        ..  If > 1000 overrides the 7783 default.\n"
-            "  i_am_seed      ..  Activate the seed node mode (acting as a relay for mm2 clients).\n"
-            "                     Defaults to `false`.\n"
-            "  seednodes      ..  Seednode IPs that node will use.\n"
-            "                     At least one seed IP must be present if the node is not a seed itself.\n"
-            "  stderr         ..  Print a message to stderr and exit.\n"
-            "  userhome       ..  System home directory of a user ('/root' by default).\n"
-            "  wif            ..  `1` to add WIFs to the information we provide about a coin.\n"
-            "\n"
-            "Environment variables:\n"
-            "\n"
-            // Per-process (we might have several MM instances running but they will share the same log).
-            "  MM_CONF_PATH   ..  File path. MM2 will try to load the JSON configuration from this file.\n"
-            "                     File must contain valid json with structure mentioned above.\n"
-            "                     Defaults to `MM2.json`\n"
-            "  MM_COINS_PATH  ..  File path. MM2 will try to load coins data from this file.\n"
-            "                     File must contain valid json.\n"
-            "                     Recommended: https://github.com/jl777/coins/blob/master/coins.\n"
-            "                     Defaults to `coins`.\n"
-            "  MM_LOG         ..  File path. Must end with '.log'. MM will log to this file.\n"
-            "\n"
-            // Generated from https://github.com/KomodoPlatform/developer-docs/tree/sidd.
-            // (SHossain, siddhartha-crypto).
-            "See also the online documentation at\n"
-            "https://developers.atomicdex.io\n"
-        )
+    const HELP_MSG: &str = r#"Command-line options.
+The first command-line argument is special and designates the mode.
+
+  help                       ..  Display this message.
+  btc2kmd {WIF or BTC}       ..  Convert a BTC WIF into a KMD WIF.
+  events                     ..  Listen to a feed coming from a separate MM daemon and print it to stdout.
+  vanity {substring}         ..  Tries to find an address with the given substring.
+  update_config {SRC} {DST}  ..  Update the configuration of coins from the SRC config and save it to DST file.
+  {JSON configuration}       ..  Run the MarketMaker daemon.
+
+Some (but not all) of the JSON configuration parameters (* - required):
+
+                     NB: The 'coins' command-line configuration must have the lowercased coin names in the 'name' field,
+                     {"coins": [{"name": "dash", "coin": "DASH", ...}, ...], ...}.
+  coins          ..  Information about the currencies: their ticker symbols, names, ports, addresses, etc.
+                     If the field isn't present on the command line then we try loading it from the 'coins' file.
+  crash          ..  Simulate a crash to check how the crash handling works.
+  dbdir          ..  MM database path. 'DB' by default.
+  gui            ..  The information about GUI app using MM2 instance. Included in swap statuses shared with network.
+                 ..  It's recommended to put essential info to this field (application name, OS, version, etc).
+                 ..  e.g. AtomicDEX iOS 1.0.1000.
+  myipaddr       ..  IP address to bind to for P2P networking.
+  netid          ..  Subnetwork. Affects ports and keys.
+  passphrase *   ..  Wallet seed.
+                     Compressed WIFs and hexadecimal ECDSA keys (prefixed with 0x) are also accepted.
+  panic          ..  Simulate a panic to see if backtrace works.
+  rpccors        ..  Access-Control-Allow-Origin header value to be used in all the RPC responses.
+                     Default is currently 'http://localhost:3000'
+  rpcip          ..  IP address to bind to for RPC server. Overrides the 127.0.0.1 default
+  rpc_password   ..  RPC password used to authorize non-public RPC calls
+                     MM generates password from passphrase if this field is not set
+  rpc_local_only ..  MM forbids some RPC requests from not loopback (localhost) IPs as additional security measure.
+                     Defaults to `true`, set `false` to disable. `Use with caution`.
+  rpcport        ..  If > 1000 overrides the 7783 default.
+  i_am_seed      ..  Activate the seed node mode (acting as a relay for mm2 clients).
+                     Defaults to `false`.
+  seednodes      ..  Seednode IPs that node will use.
+                     At least one seed IP must be present if the node is not a seed itself.
+  stderr         ..  Print a message to stderr and exit.
+  userhome       ..  System home directory of a user ('/root' by default).
+  wif            ..  `1` to add WIFs to the information we provide about a coin.
+
+Environment variables:
+
+  MM_CONF_PATH   ..  File path. MM2 will try to load the JSON configuration from this file.
+                     File must contain valid json with structure mentioned above.
+                     Defaults to `MM2.json`
+  MM_COINS_PATH  ..  File path. MM2 will try to load coins data from this file.
+                     File must contain valid json.
+                     Recommended: https://github.com/jl777/coins/blob/master/coins.
+                     Defaults to `coins`.
+  MM_LOG         ..  File path. Must end with '.log'. MM will log to this file.
+
+See also the online documentation at
+https://developers.atomicdex.io
+"#;
+
+    println!("{}", HELP_MSG);
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -310,7 +344,7 @@ pub fn mm2_main() {
     use libc::c_char;
 
     init_crash_reports();
-    log!({"AtomicDEX MarketMaker {} DT {}", MM_VERSION, MM_DATETIME});
+    log!("AtomicDEX MarketMaker {} DT {}", MM_VERSION, MM_DATETIME);
 
     // Temporarily simulate `argv[]` for the C version of the main method.
     let args: Vec<String> = env::args()
@@ -357,18 +391,15 @@ pub fn mm2_main() {
     }
 
     if let Err(err) = run_lp_main(first_arg, &|_| ()) {
-        log!((err));
+        log!("{}", err);
         exit(1);
     }
 }
 
-/// Parses the `first_arg` as JSON and runs LP_main.
-/// Attempts to load the config from `MM2.json` file if `first_arg` is None
-///
-/// * `ctx_cb` - Invoked with the MM context handle,
-///              allowing the `run_lp_main` caller to communicate with MM.
 #[cfg(not(target_arch = "wasm32"))]
-pub fn run_lp_main(first_arg: Option<&str>, ctx_cb: &dyn Fn(u32)) -> Result<(), String> {
+/// Parses and returns the `first_arg` as JSON.
+/// Attempts to load the config from `MM2.json` file if `first_arg` is None
+pub fn get_mm2config(first_arg: Option<&str>) -> Result<Json, String> {
     let conf_path = env::var("MM_CONF_PATH").unwrap_or_else(|_| "MM2.json".into());
     let conf_from_file = slurp(&conf_path);
     let conf = match first_arg {
@@ -409,17 +440,32 @@ pub fn run_lp_main(first_arg: Option<&str>, ctx_cb: &dyn Fn(u32)) -> Result<(),
         }
     }
 
-    let params = LpMainParams::with_conf(conf);
+    Ok(conf)
+}
+
+/// Runs LP_main with result of `get_mm2config()`.
+///
+/// * `ctx_cb` - Invoked with the MM context handle,
+///              allowing the `run_lp_main` caller to communicate with MM.
+#[cfg(not(target_arch = "wasm32"))]
+pub fn run_lp_main(first_arg: Option<&str>, ctx_cb: &dyn Fn(u32)) -> Result<(), String> {
+    let conf = get_mm2config(first_arg)?;
+
+    let log_filter = LogLevel::from_env();
+
+    let params = LpMainParams::with_conf(conf).log_filter(log_filter);
     try_s!(block_on(lp_main(params, ctx_cb)));
     Ok(())
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 fn on_update_config(args: &[OsString]) -> Result<(), String> {
+    use mm2_io::fs::safe_slurp;
+
     let src_path = args.get(2).ok_or(ERRL!("Expect path to the source coins config."))?;
     let dst_path = args.get(3).ok_or(ERRL!("Expect destination path."))?;
 
-    let config = try_s!(common::safe_slurp(src_path));
+    let config = try_s!(safe_slurp(src_path));
     let mut config: Json = try_s!(json::from_slice(&config));
 
     let result = if config.is_array() {
@@ -442,13 +488,9 @@ fn on_update_config(args: &[OsString]) -> Result<(), String> {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-fn init_logger(level: Option<LogLevel>) -> Result<(), String> {
+fn init_logger(level: LogLevel) -> Result<(), String> {
     use common::log::UnifiedLoggerBuilder;
 
-    let level = match level {
-        Some(l) => l,
-        None => LogLevel::from_env().unwrap_or(DEFAULT_LOG_FILTER),
-    };
     UnifiedLoggerBuilder::default()
         .level_filter(level)
         .console(false)
@@ -457,9 +499,6 @@ fn init_logger(level: Option<LogLevel>) -> Result<(), String> {
 }
 
 #[cfg(target_arch = "wasm32")]
-fn init_logger(level: Option<LogLevel>) -> Result<(), String> {
-    use common::log::WasmLoggerBuilder;
-
-    let level = level.unwrap_or(DEFAULT_LOG_FILTER);
-    WasmLoggerBuilder::default().level_filter(level).try_init()
+fn init_logger(level: LogLevel) -> Result<(), String> {
+    common::log::WasmLoggerBuilder::default().level_filter(level).try_init()
 }
diff --git a/mm2src/mm2_bin.rs b/mm2src/mm2_main/src/mm2_bin.rs
similarity index 93%
rename from mm2src/mm2_bin.rs
rename to mm2src/mm2_main/src/mm2_bin.rs
index a8c6df4686..798e95c8de 100644
--- a/mm2src/mm2_bin.rs
+++ b/mm2src/mm2_main/src/mm2_bin.rs
@@ -7,7 +7,6 @@
 #![feature(map_first_last)]
 
 #[macro_use] extern crate common;
-#[macro_use] extern crate fomat_macros;
 #[macro_use] extern crate gstuff;
 #[macro_use] extern crate serde_json;
 #[macro_use] extern crate serde_derive;
diff --git a/mm2src/mm2_lib.rs b/mm2src/mm2_main/src/mm2_lib.rs
similarity index 96%
rename from mm2src/mm2_lib.rs
rename to mm2src/mm2_main/src/mm2_lib.rs
index 1f6547426e..b434c474a7 100644
--- a/mm2src/mm2_lib.rs
+++ b/mm2src/mm2_main/src/mm2_lib.rs
@@ -8,7 +8,6 @@
 
 #[macro_use] extern crate common;
 #[macro_use] extern crate enum_primitive_derive;
-#[macro_use] extern crate fomat_macros;
 #[macro_use] extern crate gstuff;
 #[macro_use] extern crate serde_json;
 #[macro_use] extern crate serde_derive;
@@ -25,7 +24,7 @@ mod mm2_native_lib;
 #[path = "mm2_lib/mm2_wasm_lib.rs"]
 mod mm2_wasm_lib;
 
-use crate::common::mm_ctx::MmArc;
+use mm2_core::mm_ctx::MmArc;
 use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
 #[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*;
 
diff --git a/mm2src/mm2_lib/mm2_native_lib.rs b/mm2src/mm2_main/src/mm2_lib/mm2_native_lib.rs
similarity index 80%
rename from mm2src/mm2_lib/mm2_native_lib.rs
rename to mm2src/mm2_main/src/mm2_lib/mm2_native_lib.rs
index 864b7ce089..a181889b7d 100644
--- a/mm2src/mm2_lib/mm2_native_lib.rs
+++ b/mm2src/mm2_main/src/mm2_lib/mm2_native_lib.rs
@@ -1,11 +1,13 @@
 use super::*;
+use crate::mm2::lp_dispatcher::dispatch_lp_event;
+use crate::mm2::lp_dispatcher::StopCtxEvent;
 use common::crash_reports::init_crash_reports;
+use common::executor::spawn;
 use common::log::{register_callback, FfiCallback};
-use common::mm_ctx::MmArc;
-use common::now_float;
-use futures01::Future;
+use common::{block_on, now_float};
 use gstuff::any_to_str;
 use libc::c_char;
+use mm2_core::mm_ctx::MmArc;
 use num_traits::FromPrimitive;
 use serde_json::{self as json};
 use std::ffi::{CStr, CString};
@@ -29,14 +31,22 @@ enum MainErr {
 pub unsafe extern "C" fn mm2_main(conf: *const c_char, log_cb: extern "C" fn(line: *const c_char)) -> i8 {
     init_crash_reports();
     macro_rules! log {
-        ($($args: tt)+) => {{
-            let msg = fomat! ("mm2_lib:" ((line!())) "] " $($args)+ '\0');
-            log_cb (msg.as_ptr() as *const c_char);
+        ($($args: tt)*) => {{
+            let mut msg = format!("mm2_lib:{}] ", line!());
+            let args = format!($($args)*);
+            msg.push_str(&args);
+            log_cb(msg.as_ptr() as *const c_char);
         }}
     }
     macro_rules! eret {
-        ($rc: expr, $($args: tt)+) => {{log! ("error " ($rc as i8) ", " [$rc] ": " $($args)+); return $rc as i8}};
-        ($rc: expr) => {{log! ("error " ($rc as i8) ", " [$rc]); return $rc as i8}};
+        ($rc: expr, $desc:expr) => {{
+            log!("error {}, {:?}: {}", $rc as i8, $rc, $desc);
+            return $rc as i8;
+        }};
+        ($rc: expr) => {{
+            log!("error {}, {:?}", $rc as i8, $rc);
+            return $rc as i8;
+        }};
     }
 
     if LP_MAIN_RUNNING.load(Ordering::Relaxed) {
@@ -50,7 +60,7 @@ pub unsafe extern "C" fn mm2_main(conf: *const c_char, log_cb: extern "C" fn(lin
     let conf = CStr::from_ptr(conf);
     let conf = match conf.to_str() {
         Ok(s) => s,
-        Err(e) => eret!(MainErr::ConfNotUtf8, (e)),
+        Err(e) => eret!(MainErr::ConfNotUtf8, e),
     };
     let conf = conf.to_owned();
 
@@ -63,13 +73,13 @@ pub unsafe extern "C" fn mm2_main(conf: *const c_char, log_cb: extern "C" fn(lin
         let ctx_cb = &|ctx| CTX.store(ctx, Ordering::Relaxed);
         match catch_unwind(move || mm2::run_lp_main(Some(&conf), ctx_cb)) {
             Ok(Ok(_)) => log!("run_lp_main finished"),
-            Ok(Err(err)) => log!("run_lp_main error: "(err)),
-            Err(err) => log!("run_lp_main panic: "[any_to_str(&*err)]),
+            Ok(Err(err)) => log!("run_lp_main error: {}", err),
+            Err(err) => log!("run_lp_main panic: {:?}", any_to_str(&*err)),
         };
         LP_MAIN_RUNNING.store(false, Ordering::Relaxed)
     });
     if let Err(e) = rc {
-        eret!(MainErr::CantThread, (e))
+        eret!(MainErr::CantThread, e)
     }
     MainErr::Ok as i8
 }
@@ -105,25 +115,25 @@ pub extern "C" fn mm2_test(torch: i32, log_cb: extern "C" fn(line: *const c_char
     // #402: Stop the MM in order to test the library restart.
     let prev = if LP_MAIN_RUNNING.load(Ordering::Relaxed) {
         let ctx_id = CTX.load(Ordering::Relaxed);
-        log! ("mm2_test] Stopping MM instance " (ctx_id) "…");
+        log!("mm2_test] Stopping MM instance {}…", ctx_id);
         let ctx = match MmArc::from_ffi_handle(ctx_id) {
             Ok(ctx) => ctx,
             Err(err) => {
-                log!("mm2_test] Invalid CTX? !from_ffi_handle: "(err));
+                log!("mm2_test] Invalid CTX? !from_ffi_handle: {}", err);
                 return -1;
             },
         };
         let conf = json::to_string(&ctx.conf).unwrap();
-        let hy_res = mm2::rpc::lp_commands::stop(ctx);
-        let r = match hy_res.wait() {
+        let hy_res = mm2::rpc::lp_commands_legacy::stop(ctx);
+        let r = match block_on(hy_res) {
             Ok(r) => r,
             Err(err) => {
-                log!("mm2_test] !stop: "(err));
+                log!("mm2_test] !stop: {}", err);
                 return -1;
             },
         };
         if !r.status().is_success() {
-            log!("mm2_test] stop status "(r.status()));
+            log!("mm2_test] stop status {}", r.status());
             return -1;
         }
 
@@ -158,7 +168,7 @@ pub extern "C" fn mm2_test(torch: i32, log_cb: extern "C" fn(line: *const c_char
     });
 
     if let Err(err) = rc {
-        log!("mm2_test] There was an error: "(any_to_str(&*err).unwrap_or("-")));
+        log!("mm2_test] There was an error: {}", any_to_str(&*err).unwrap_or("-"));
         return -1;
     }
 
@@ -169,7 +179,7 @@ pub extern "C" fn mm2_test(torch: i32, log_cb: extern "C" fn(line: *const c_char
         let rc = unsafe { mm2_main(conf.as_ptr(), log_cb) };
         let rc = MainErr::from_i8(rc).unwrap();
         if rc != MainErr::Ok {
-            log!("!mm2_main: "[rc]);
+            log!("!mm2_main: {:?}", rc);
             return -1;
         }
 
@@ -191,7 +201,7 @@ pub extern "C" fn mm2_test(torch: i32, log_cb: extern "C" fn(line: *const c_char
             log!("mm2_test] Context ID is the same");
             return -1;
         }
-        log! ("mm2_test] New MM instance " (ctx_id) " started");
+        log!("mm2_test] New MM instance {} started", ctx_id);
     }
 
     RUNNING.store(false, Ordering::Relaxed);
@@ -204,13 +214,14 @@ enum StopErr {
     Ok = 0,
     NotRunning = 1,
     ErrorStopping = 2,
+    StoppingAlready = 3,
 }
 
 /// Stop an MM2 instance or reset the static variables.
 #[no_mangle]
 pub extern "C" fn mm2_stop() -> i8 {
     // The log callback might be initialized already, so try to use the common logs.
-    use common::log::{error, warn};
+    use common::log::warn;
 
     if !LP_MAIN_RUNNING.load(Ordering::Relaxed) {
         return StopErr::NotRunning as i8;
@@ -233,11 +244,14 @@ pub extern "C" fn mm2_stop() -> i8 {
         },
     };
 
-    match ctx.stop() {
-        Ok(()) => StopErr::Ok as i8,
-        Err(e) => {
-            error!("mm2_stop] {}", e);
-            StopErr::ErrorStopping as i8
-        },
+    if ctx.is_stopping() {
+        return StopErr::StoppingAlready as i8;
     }
+
+    spawn(async move {
+        dispatch_lp_event(ctx.clone(), StopCtxEvent.into()).await;
+        let _ = ctx.stop();
+    });
+
+    StopErr::Ok as i8
 }
diff --git a/mm2src/mm2_lib/mm2_wasm_lib.rs b/mm2src/mm2_main/src/mm2_lib/mm2_wasm_lib.rs
similarity index 88%
rename from mm2src/mm2_lib/mm2_wasm_lib.rs
rename to mm2src/mm2_main/src/mm2_lib/mm2_wasm_lib.rs
index d04cd23e56..4200e70fe1 100644
--- a/mm2src/mm2_lib/mm2_wasm_lib.rs
+++ b/mm2src/mm2_main/src/mm2_lib/mm2_wasm_lib.rs
@@ -13,13 +13,14 @@
 //! [blogpost]: https://rustwasm.github.io/2018/10/24/multithreading-rust-and-wasm.html
 
 use super::*;
-use crate::mm2::LpMainParams;
-use common::executor;
+use crate::mm2::{LpMainParams, MmVersionResult};
 use common::log::{register_callback, LogLevel, WasmCallback};
-use common::wasm_rpc::WasmRpcResponse;
+use common::{deserialize_from_js, executor, serialize_to_js, set_panic_hook};
 use gstuff::any_to_str;
 use js_sys::Array;
+use mm2_rpc::wasm_rpc::WasmRpcResponse;
 use num_traits::FromPrimitive;
+use serde::Serialize;
 use serde_json::{self as json, Value as Json};
 use std::cell::RefCell;
 use std::sync::Mutex;
@@ -46,7 +47,7 @@ struct MainParams {
 }
 
 impl From<MainParams> for LpMainParams {
-    fn from(orig: MainParams) -> Self { LpMainParams::with_conf(orig.conf).log_filter(orig.log_level) }
+    fn from(orig: MainParams) -> Self { LpMainParams::with_conf(orig.conf).log_filter(Some(orig.log_level)) }
 }
 
 /// Run the MarketMaker2.
@@ -85,7 +86,7 @@ impl From<MainParams> for LpMainParams {
 /// ```
 #[wasm_bindgen]
 pub fn mm2_main(params: JsValue, log_cb: js_sys::Function) -> Result<(), JsValue> {
-    let params: MainParams = match params.into_serde() {
+    let params: MainParams = match deserialize_from_js(params.clone()) {
         Ok(p) => p,
         Err(e) => {
             console_err!("Expected 'MainParams' as the first argument, found {:?}: {}", params, e);
@@ -104,6 +105,8 @@ pub fn mm2_main(params: JsValue, log_cb: js_sys::Function) -> Result<(), JsValue
     CTX.store(0, Ordering::Relaxed); // Remove the old context ID during restarts.
 
     register_callback(WasmCallback::with_js_function(log_cb));
+    set_panic_hook();
+
     let fut = async move {
         if let Err(true) = LP_MAIN_RUNNING.compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed) {
             console_err!("lp_main already started!");
@@ -192,11 +195,10 @@ impl From<Mm2RpcErr> for JsValue {
 ///         }
 ///     }
 /// }
-///
 /// ```
 #[wasm_bindgen]
 pub async fn mm2_rpc(payload: JsValue) -> Result<JsValue, JsValue> {
-    let request_json: Json = match payload.into_serde() {
+    let request_json: Json = match deserialize_from_js(payload) {
         Ok(p) => p,
         Err(e) => {
             console_err!("Payload is not a valid JSON: {}", e);
@@ -221,8 +223,25 @@ pub async fn mm2_rpc(payload: JsValue) -> Result<JsValue, JsValue> {
     let wasm_rpc = ctx.wasm_rpc.ok_or(JsValue::from(Mm2RpcErr::NotRunning))?;
     let response: Mm2RpcResponse = wasm_rpc.request(request_json).await.into();
 
-    JsValue::from_serde(&response).map_err(|e| {
+    serialize_to_js(&response).map_err(|e| {
         console_err!("Couldn't represent the response '{:?}' as a JsValue: {}", response, e);
         JsValue::from(Mm2RpcErr::InternalError)
     })
 }
+
+/// Get the MarketMaker2 version.
+///
+/// # Usage
+///
+/// The function can be used before mm2 runs.
+///
+/// ```javascript
+/// import init, {mm2_version} from "./path/to/mm2.js";
+///
+/// function print_version () {
+///     const response = mm2_version();
+///     console.log(`version: ${response.result}, datetime: ${response.datetime}`);
+/// }
+/// ```
+#[wasm_bindgen]
+pub fn mm2_version() -> JsValue { serialize_to_js(&MmVersionResult::new()).expect("expected serialization to succeed") }
diff --git a/mm2src/mm2_tests.rs b/mm2src/mm2_main/src/mm2_tests.rs
similarity index 69%
rename from mm2src/mm2_tests.rs
rename to mm2src/mm2_main/src/mm2_tests.rs
index 1a35e4088a..39553e51d9 100644
--- a/mm2src/mm2_tests.rs
+++ b/mm2src/mm2_main/src/mm2_tests.rs
@@ -1,23 +1,21 @@
 use super::{lp_main, LpMainParams};
-use bigdecimal::BigDecimal;
-#[cfg(target_arch = "wasm32")] use common::call_back;
+use crate::mm2::lp_ordermatch::MIN_ORDER_KEEP_ALIVE_INTERVAL;
 use common::executor::Timer;
-use common::for_tests::{check_my_swap_status, check_recent_swaps, check_stats_swap_status,
-                        enable_electrum as enable_electrum_impl, enable_native as enable_native_impl, enable_qrc20,
-                        find_metrics_in_json, from_env_file, get_passphrase, mm_spat, new_mm2_temp_folder_path,
-                        wait_till_history_has_records, LocalStart, MarketMakerIt, RaiiDump, MAKER_ERROR_EVENTS,
-                        MAKER_SUCCESS_EVENTS, TAKER_ERROR_EVENTS, TAKER_SUCCESS_EVENTS};
+use common::log::LogLevel;
 use common::mm_metrics::{MetricType, MetricsJson};
-use common::mm_number::{Fraction, MmNumber};
-use common::privkey::key_pair_from_seed;
-use common::{block_on, slurp};
+use common::now_ms;
+use crypto::privkey::key_pair_from_seed;
 use http::{HeaderMap, StatusCode};
-#[cfg(not(target_arch = "wasm32"))]
-use hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN;
-use num_rational::BigRational;
+use mm2_number::{BigDecimal, BigRational, Fraction, MmNumber};
+use mm2_test_helpers::for_tests::{check_my_swap_status, check_recent_swaps, check_stats_swap_status,
+                                  enable_native as enable_native_impl, enable_qrc20, find_metrics_in_json,
+                                  from_env_file, init_z_coin_light, init_z_coin_status, mm_spat, morty_conf,
+                                  rick_conf, sign_message, verify_message, wait_till_history_has_records, LocalStart,
+                                  MarketMakerIt, Mm2TestConf, RaiiDump, MAKER_ERROR_EVENTS, MAKER_SUCCESS_EVENTS,
+                                  MORTY, RICK, TAKER_ERROR_EVENTS, TAKER_SUCCESS_EVENTS};
 use serde_json::{self as json, Value as Json};
 use std::collections::HashMap;
-use std::convert::identity;
+use std::convert::{identity, TryFrom};
 use std::env::{self, var};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
@@ -25,50 +23,142 @@ use std::thread;
 use std::time::Duration;
 use uuid::Uuid;
 
+#[cfg(all(feature = "zhtlc-native-tests", not(target_arch = "wasm32")))]
+use mm2_test_helpers::for_tests::init_z_coin_native;
+
+#[cfg(all(feature = "zhtlc-native-tests", not(target_arch = "wasm32")))]
+async fn enable_z_coin(mm: &MarketMakerIt, coin: &str) -> ZcoinActivationResult {
+    let init = init_z_coin_native(mm, coin).await;
+    let init: RpcV2Response<InitTaskResult> = json::from_value(init).unwrap();
+    let timeout = now_ms() + 120000;
+
+    loop {
+        if gstuff::now_ms() > timeout {
+            panic!("{} initialization timed out", coin);
+        }
+
+        let status = init_z_coin_status(mm, init.result.task_id).await;
+        let status: RpcV2Response<InitZcoinStatus> = json::from_value(status).unwrap();
+        if let InitZcoinStatus::Ready(rpc_result) = status.result {
+            match rpc_result {
+                MmRpcResult::Ok { result } => break result,
+                MmRpcResult::Err(e) => panic!("{} initialization error {:?}", coin, e),
+            }
+        }
+        Timer::sleep(1.).await;
+    }
+}
+
+cfg_native! {
+    use common::block_on;
+    use mm2_test_helpers::for_tests::{get_passphrase, new_mm2_temp_folder_path};
+    use mm2_io::fs::slurp;
+    use hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN;
+}
+
+cfg_wasm32! {
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+macro_rules! local_start {
+    ($who: expr) => {
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == $who => Some(local_start()),
+            _ => None,
+        }
+    };
+}
+
+#[cfg(target_arch = "wasm32")]
+macro_rules! local_start {
+    ($who: expr) => {
+        Some(local_start())
+    };
+}
+
+#[path = "mm2_tests/bch_and_slp_tests.rs"] mod bch_and_slp_tests;
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+#[path = "mm2_tests/best_orders_tests.rs"]
+mod best_orders_tests;
+
+#[path = "mm2_tests/electrums.rs"] pub mod electrums;
+use electrums::*;
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+#[path = "mm2_tests/lightning_tests.rs"]
+mod lightning_tests;
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+#[path = "mm2_tests/lp_bot_tests.rs"]
+mod lp_bot_tests;
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+#[path = "mm2_tests/orderbook_sync_tests.rs"]
+mod orderbook_sync_tests;
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+#[path = "mm2_tests/z_coin_tests.rs"]
+mod z_coin_tests;
+
 #[path = "mm2_tests/structs.rs"] pub mod structs;
+
 use structs::*;
 
 // TODO: Consider and/or try moving the integration tests into separate Rust files.
 // "Tests in your src files should be unit tests, and tests in tests/ should be integration-style tests."
 // - https://doc.rust-lang.org/cargo/guide/tests.html
 
+/// Ideally, this function should be replaced everywhere with `enable_electrum_json`.
 async fn enable_electrum(mm: &MarketMakerIt, coin: &str, tx_history: bool, urls: &[&str]) -> EnableElectrumResponse {
+    use mm2_test_helpers::for_tests::enable_electrum as enable_electrum_impl;
+
     let value = enable_electrum_impl(mm, coin, tx_history, urls).await;
     json::from_value(value).unwrap()
 }
 
+async fn enable_electrum_json(
+    mm: &MarketMakerIt,
+    coin: &str,
+    tx_history: bool,
+    servers: Vec<Json>,
+) -> EnableElectrumResponse {
+    use mm2_test_helpers::for_tests::enable_electrum_json as enable_electrum_impl;
+
+    let value = enable_electrum_impl(mm, coin, tx_history, servers).await;
+    json::from_value(value).unwrap()
+}
+
 async fn enable_native(mm: &MarketMakerIt, coin: &str, urls: &[&str]) -> EnableElectrumResponse {
     let value = enable_native_impl(mm, coin, urls).await;
     json::from_value(value).unwrap()
 }
 
+async fn enable_coins_rick_morty_electrum(mm: &MarketMakerIt) -> HashMap<&'static str, EnableElectrumResponse> {
+    let mut replies = HashMap::new();
+    replies.insert("RICK", enable_electrum_json(mm, "RICK", false, rick_electrums()).await);
+    replies.insert(
+        "MORTY",
+        enable_electrum_json(mm, "MORTY", false, morty_electrums()).await,
+    );
+    replies
+}
+
 async fn enable_coins_eth_electrum(
     mm: &MarketMakerIt,
     eth_urls: &[&str],
 ) -> HashMap<&'static str, EnableElectrumResponse> {
     let mut replies = HashMap::new();
-    replies.insert(
-        "RICK",
-        enable_electrum(mm, "RICK", false, &[
-            "electrum1.cipig.net:10017",
-            "electrum2.cipig.net:10017",
-            "electrum3.cipig.net:10017",
-        ])
-        .await,
-    );
+    replies.insert("RICK", enable_electrum_json(mm, "RICK", false, rick_electrums()).await);
     replies.insert(
         "MORTY",
-        enable_electrum(mm, "MORTY", false, &[
-            "electrum1.cipig.net:10018",
-            "electrum2.cipig.net:10018",
-            "electrum3.cipig.net:10018",
-        ])
-        .await,
+        enable_electrum_json(mm, "MORTY", false, morty_electrums()).await,
     );
     replies.insert("ETH", enable_native(mm, "ETH", eth_urls).await);
     replies.insert("JST", enable_native(mm, "JST", eth_urls).await);
-    #[cfg(feature = "zhtlc")]
-    replies.insert("ZOMBIE", enable_native(mm, "ZOMBIE", eth_urls).await);
     replies
 }
 
@@ -80,6 +170,48 @@ fn rmd160_from_passphrase(passphrase: &str) -> [u8; 20] {
     key_pair_from_seed(passphrase).unwrap().public().address_hash().take()
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+fn blocks_cache_path(mm: &MarketMakerIt, seed: &str, coin: &str) -> PathBuf {
+    let rmd = rmd160_from_passphrase(seed);
+    let db_name = format!("{}_light_cache.db", coin);
+    mm.folder.join("DB").join(hex::encode(rmd)).join(db_name)
+}
+
+async fn enable_z_coin_light(
+    mm: &MarketMakerIt,
+    coin: &str,
+    electrums: &[&str],
+    lightwalletd_urls: &[&str],
+    blocks_cache_path: &dyn AsRef<Path>,
+) -> ZcoinActivationResult {
+    const TEST_CACHE_ZOMBIE: &str = "../coins/test_cache_zombie.db";
+    std::fs::copy(TEST_CACHE_ZOMBIE, blocks_cache_path).unwrap();
+
+    let init = init_z_coin_light(mm, coin, electrums, lightwalletd_urls).await;
+    let init: RpcV2Response<InitTaskResult> = json::from_value(init).unwrap();
+    let timeout = now_ms() + 600000;
+
+    loop {
+        if now_ms() > timeout {
+            panic!("{} initialization timed out", coin);
+        }
+
+        let status = init_z_coin_status(mm, init.result.task_id).await;
+        println!("Status {}", json::to_string(&status).unwrap());
+        let status: RpcV2Response<InitZcoinStatus> = json::from_value(status).unwrap();
+        if let InitZcoinStatus::Ready(rpc_result) = status.result {
+            match rpc_result {
+                MmRpcResult::Ok { result } => {
+                    std::fs::copy(blocks_cache_path, TEST_CACHE_ZOMBIE).unwrap();
+                    break result;
+                },
+                MmRpcResult::Err(e) => panic!("{} initialization error {:?}", coin, e),
+            }
+        }
+        Timer::sleep(1.).await;
+    }
+}
+
 /// Integration test for RPC server.
 /// Check that MM doesn't crash in case of invalid RPC requests
 #[test]
@@ -87,7 +219,7 @@ fn rmd160_from_passphrase(passphrase: &str) -> [u8; 20] {
 fn test_rpc() {
     let (_, mm, _dump_log, _dump_dashboard) = mm_spat(local_start(), &identity);
 
-    let no_method = block_on(mm.rpc(json! ({
+    let no_method = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "coin": "RICK",
         "ipaddr": "electrum1.cipig.net",
@@ -101,7 +233,7 @@ fn test_rpc() {
     assert!(not_json.0.is_server_error());
     assert_eq!((not_json.2)[ACCESS_CONTROL_ALLOW_ORIGIN], "http://localhost:4000");
 
-    let unknown_method = block_on(mm.rpc(json! ({
+    let unknown_method = block_on(mm.rpc(&json! ({
         "method": "unknown_method",
     })))
     .unwrap();
@@ -109,15 +241,16 @@ fn test_rpc() {
     assert!(unknown_method.0.is_server_error());
     assert_eq!((unknown_method.2)[ACCESS_CONTROL_ALLOW_ORIGIN], "http://localhost:4000");
 
-    let version = block_on(mm.rpc(json! ({
+    let version = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "version",
     })))
     .unwrap();
     assert_eq!(version.0, StatusCode::OK);
     assert_eq!((version.2)[ACCESS_CONTROL_ALLOW_ORIGIN], "http://localhost:4000");
+    let _version: MmVersion = json::from_str(&version.1).unwrap();
 
-    let help = block_on(mm.rpc(json! ({
+    let help = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "help",
     })))
@@ -132,12 +265,17 @@ fn test_rpc() {
 
 /// This is not a separate test but a helper used by `MarketMakerIt` to run the MarketMaker from the test binary.
 #[test]
+#[cfg(not(target_arch = "wasm32"))]
 fn test_mm_start() {
     if let Ok(conf) = var("_MM2_TEST_CONF") {
-        log!("test_mm_start] Starting the MarketMaker...");
-        let conf: Json = json::from_str(&conf).unwrap();
-        let params = LpMainParams::with_conf(conf);
-        block_on(lp_main(params, &|_ctx| ())).unwrap()
+        if let Ok(log_var) = var("RUST_LOG") {
+            if let Ok(filter) = LogLevel::from_str(&log_var) {
+                log!("test_mm_start] Starting the MarketMaker...");
+                let conf: Json = json::from_str(&conf).unwrap();
+                let params = LpMainParams::with_conf(conf).log_filter(Some(filter));
+                block_on(lp_main(params, &|_ctx| ())).unwrap()
+            }
+        }
     }
 }
 
@@ -181,7 +319,7 @@ fn local_start_impl(folder: PathBuf, log_path: PathBuf, mut conf: Json) {
                 assert_eq!(log_path, path);
             }
 
-            log! ({"local_start] MM in a thread, log {:?}.", log_path});
+            log!("local_start] MM in a thread, log {:?}.", log_path);
 
             chdir(&folder);
 
@@ -193,7 +331,7 @@ fn local_start_impl(folder: PathBuf, log_path: PathBuf, mut conf: Json) {
 
 /// Starts the WASM version of MM.
 #[cfg(target_arch = "wasm32")]
-fn wasm_start_impl(ctx: crate::common::mm_ctx::MmArc) {
+fn wasm_start_impl(ctx: mm2_core::mm_ctx::MmArc) {
     common::executor::spawn(async move {
         super::lp_init(ctx).await.unwrap();
     })
@@ -205,232 +343,13 @@ fn local_start() -> LocalStart { local_start_impl }
 #[cfg(target_arch = "wasm32")]
 fn local_start() -> LocalStart { wasm_start_impl }
 
-macro_rules! local_start {
-    ($who: expr) => {
-        if cfg!(not(target_acrh = "wasm32")) {
-            match var("LOCAL_THREAD_MM") {
-                Ok(ref e) if e == $who => Some(local_start()),
-                _ => None,
-            }
-        } else {
-            Some(local_start())
-        }
-    };
-}
-
-/// https://github.com/artemii235/SuperNET/issues/241
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn alice_can_see_the_active_order_after_connection() {
-    let coins = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0xc0eb7AeD740E1796992A08962c15661bDEB58003"}}}
-    ]);
-
-    // start bob and immediately place the order
-    let mm_bob = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": "bob passphrase",
-            "coins": coins,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-    // Enable coins on Bob side. Print the replies in case we need the "address".
-    log!({ "enable_coins (bob): {:?}", block_on(enable_coins_eth_electrum(&mm_bob, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"])) });
-    // issue sell request on Bob side by setting base/rel price
-    log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "setprice",
-        "base": "RICK",
-        "rel": "MORTY",
-        "price": 0.9,
-        "volume": "0.9",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    // Bob orderbook must show the new order
-    log!("Get RICK/MORTY orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "orderbook",
-        "base": "RICK",
-        "rel": "MORTY",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let bob_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
-    assert!(!bob_orderbook.asks.is_empty(), "Bob RICK/MORTY asks are empty");
-    assert_eq!(BigDecimal::from_str("0.9").unwrap(), bob_orderbook.asks[0].max_volume);
-
-    // start eve and immediately place the order
-    let mm_eve = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": "eve passphrase",
-            "coins": coins,
-            "rpc_password": "pass",
-            "seednodes": [fomat!((mm_bob.ip))],
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_eve_dump_log, _eve_dump_dashboard) = mm_eve.mm_dump();
-    log!({ "Eve log path: {}", mm_eve.log_path.display() });
-    // Enable coins on Eve side. Print the replies in case we need the "address".
-    log!({ "enable_coins (eve): {:?}", block_on(enable_coins_eth_electrum(&mm_eve, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"])) });
-    // issue sell request on Eve side by setting base/rel price
-    log!("Issue eve sell request");
-    let rc = block_on(mm_eve.rpc(json! ({
-        "userpass": mm_eve.userpass,
-        "method": "setprice",
-        "base": "RICK",
-        "rel": "MORTY",
-        "price": "1",
-        "volume": "0.9",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    // issue sell request on Eve side by setting base/rel price
-    log!("Issue eve sell request");
-    let rc = block_on(mm_eve.rpc(json! ({
-        "userpass": mm_eve.userpass,
-        "method": "setprice",
-        "base": "MORTY",
-        "rel": "RICK",
-        "price": "1",
-        "volume": "0.9",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-    log!("Get RICK/MORTY orderbook on Eve side");
-    let rc = block_on(mm_eve.rpc(json! ({
-        "userpass": mm_eve.userpass,
-        "method": "orderbook",
-        "base": "RICK",
-        "rel": "MORTY",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let eve_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Eve orderbook "[eve_orderbook]);
-    assert_eq!(
-        eve_orderbook.asks.len(),
-        2,
-        "Eve RICK/MORTY orderbook must have exactly 2 asks"
-    );
-    assert_eq!(
-        eve_orderbook.bids.len(),
-        1,
-        "Eve RICK/MORTY orderbook must have exactly 1 bid"
-    );
-
-    log!("Give Bob 2 seconds to import Eve order");
-    thread::sleep(Duration::from_secs(2));
-    log!("Get RICK/MORTY orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "orderbook",
-        "base": "RICK",
-        "rel": "MORTY",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let bob_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
-    assert_eq!(
-        bob_orderbook.asks.len(),
-        2,
-        "Bob RICK/MORTY orderbook must have exactly 2 asks"
-    );
-    assert_eq!(
-        bob_orderbook.bids.len(),
-        1,
-        "Bob RICK/MORTY orderbook must have exactly 1 bid"
-    );
-
-    let mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
-            "passphrase": "alice passphrase",
-            "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        local_start!("alice"),
-    )
-    .unwrap();
-
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
-
-    // Enable coins on Alice side. Print the replies in case we need the "address".
-    log!({ "enable_coins (alice): {:?}", block_on(enable_coins_eth_electrum(&mm_alice, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"])) });
-
-    log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "orderbook",
-        "base": "RICK",
-        "rel": "MORTY",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
-    assert_eq!(
-        alice_orderbook.asks.len(),
-        2,
-        "Alice RICK/MORTY orderbook must have exactly 2 asks"
-    );
-    assert_eq!(
-        alice_orderbook.bids.len(),
-        1,
-        "Alice RICK/MORTY orderbook must have exactly 1 bid"
-    );
-
-    block_on(mm_bob.stop()).unwrap();
-    block_on(mm_alice.stop()).unwrap();
-    block_on(mm_eve.stop()).unwrap();
-}
-
 /// https://github.com/KomodoPlatform/atomicDEX-API/issues/886#issuecomment-812489844
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn orders_of_banned_pubkeys_should_not_be_displayed() {
     let coins = json!([
         {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0xc0eb7AeD740E1796992A08962c15661bDEB58003"}}}
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     // start bob and immediately place the order
@@ -451,12 +370,15 @@ fn orders_of_banned_pubkeys_should_not_be_displayed() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
     // Enable coins on Bob side. Print the replies in case we need the "address".
-    log!({ "enable_coins (bob): {:?}", block_on(enable_coins_eth_electrum(&mm_bob, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"])) });
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
     // issue sell request on Bob side by setting base/rel price
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -475,7 +397,7 @@ fn orders_of_banned_pubkeys_should_not_be_displayed() {
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
         }),
         "pass".into(),
@@ -484,10 +406,10 @@ fn orders_of_banned_pubkeys_should_not_be_displayed() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     log!("Ban Bob pubkey on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "ban_pubkey",
         "pubkey": "2cd3021a2197361fb70b862c412bc8e44cff6951fa1de45ceabfdd9b4c520420",
@@ -497,7 +419,7 @@ fn orders_of_banned_pubkeys_should_not_be_displayed() {
     assert!(rc.0.is_success(), "!ban_pubkey: {}", rc.1);
 
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -507,7 +429,7 @@ fn orders_of_banned_pubkeys_should_not_be_displayed() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     assert_eq!(
         alice_orderbook.asks.len(),
         0,
@@ -552,7 +474,7 @@ fn test_my_balance() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"log path: {}", mm.log_path.display()});
+    log!("log path: {}", mm.log_path.display());
     // Enable RICK.
     let json = block_on(enable_electrum(&mm, "RICK", false, &[
         "electrum1.cipig.net:10017",
@@ -561,7 +483,7 @@ fn test_my_balance() {
     ]));
     assert_eq!(json.balance, "7.777".parse().unwrap());
 
-    let my_balance = block_on(mm.rpc(json! ({
+    let my_balance = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "my_balance",
         "coin": "RICK",
@@ -627,9 +549,9 @@ fn test_p2wpkh_my_balance() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
 
-    let electrum = block_on(mm.rpc(json!({
+    let electrum = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "electrum",
         "coin": "tBTC",
@@ -647,7 +569,7 @@ fn test_p2wpkh_my_balance() {
         electrum.1
     );
 
-    let my_balance = block_on(mm.rpc(json! ({
+    let my_balance = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "my_balance",
         "coin": "tBTC",
@@ -662,8 +584,9 @@ fn test_p2wpkh_my_balance() {
     assert_eq!(my_address, "tb1qssfmay8nnghx7ynlznejnjxn6m4pemz9v7fsxy");
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn check_set_price_fails(mm: &MarketMakerIt, base: &str, rel: &str) {
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": base,
@@ -679,8 +602,9 @@ fn check_set_price_fails(mm: &MarketMakerIt, base: &str, rel: &str) {
     );
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn check_buy_fails(mm: &MarketMakerIt, base: &str, rel: &str, vol: f64) {
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "buy",
         "base": base,
@@ -692,8 +616,9 @@ fn check_buy_fails(mm: &MarketMakerIt, base: &str, rel: &str, vol: f64) {
     assert!(rc.0.is_server_error(), "!buy success but should be error: {}", rc.1);
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn check_sell_fails(mm: &MarketMakerIt, base: &str, rel: &str, vol: f64) {
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "sell",
         "base": base,
@@ -733,9 +658,12 @@ fn test_check_balance_on_order_post() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
+    log!("Log path: {}", mm.log_path.display());
     // Enable coins. Print the replies in case we need the "address".
-    log! ({"enable_coins (bob): {:?}", block_on (enable_coins_eth_electrum (&mm, &["http://eth1.cipig.net:8555"]))});
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_eth_electrum(&mm, &["http://eth1.cipig.net:8555"]))
+    );
     // issue sell request by setting base/rel price
 
     // Expect error as MORTY balance is 0
@@ -820,8 +748,8 @@ fn test_rpc_password_from_json() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    let electrum_invalid = block_on(mm.rpc(json! ({
+    log!("Log path: {}", mm.log_path.display());
+    let electrum_invalid = block_on(mm.rpc(&json! ({
         "userpass": "password1",
         "method": "electrum",
         "coin": "RICK",
@@ -837,7 +765,7 @@ fn test_rpc_password_from_json() {
         electrum_invalid.1
     );
 
-    let electrum = block_on(mm.rpc (json! ({
+    let electrum = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "electrum",
         "coin": "RICK",
@@ -854,7 +782,7 @@ fn test_rpc_password_from_json() {
         electrum.1
     );
 
-    let electrum = block_on(mm.rpc(json! ({
+    let electrum = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "electrum",
         "coin": "MORTY",
@@ -871,7 +799,7 @@ fn test_rpc_password_from_json() {
         electrum.1
     );
 
-    let orderbook = block_on(mm.rpc(json! ({
+    let orderbook = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -911,7 +839,7 @@ fn test_mmrpc_v2() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
+    log!("Log path: {}", mm.log_path.display());
 
     let _electrum = block_on(enable_electrum(&mm, "RICK", false, &[
         "electrum3.cipig.net:10017",
@@ -920,7 +848,7 @@ fn test_mmrpc_v2() {
     ]));
 
     // no `userpass`
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "mmrpc": "2.0",
         "method": "withdraw",
         "params": {
@@ -940,7 +868,7 @@ fn test_mmrpc_v2() {
     assert!(withdraw_error.error_data.is_none());
 
     // invalid `userpass`
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "mmrpc": "2.0",
         "userpass": "another password",
         "method": "withdraw",
@@ -961,7 +889,7 @@ fn test_mmrpc_v2() {
     assert!(withdraw_error.error_data.is_some());
 
     // invalid `mmrpc` version
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "mmrpc": "1.0",
         "userpass": mm.userpass,
         "method": "withdraw",
@@ -977,12 +905,12 @@ fn test_mmrpc_v2() {
         "withdraw should have failed, but got: {}",
         withdraw.1
     );
-    log!([withdraw.1]);
+    log!("{:?}", withdraw.1);
     let withdraw_error: RpcErrorResponse<String> = json::from_str(&withdraw.1).expect("Expected 'RpcErrorResponse'");
     assert_eq!(withdraw_error.error_type, "InvalidMmRpcVersion");
 
     // 'id' = 3
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "mmrpc": "2.0",
         "userpass": mm.userpass,
         "method": "withdraw",
@@ -1020,8 +948,8 @@ fn test_rpc_password_from_json_no_userpass() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    let electrum = block_on(mm.rpc(json! ({
+    log!("Log path: {}", mm.log_path.display());
+    let electrum = block_on(mm.rpc(&json! ({
         "method": "electrum",
         "coin": "RICK",
         "urls": ["electrum2.cipig.net:10017"],
@@ -1045,18 +973,20 @@ async fn trade_base_rel_electrum(
     taker_price: i32,
     volume: f64,
 ) {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
-    let alice_passphrase = get_passphrase(&".env.client", "ALICE_PASSPHRASE").unwrap();
+    use mm2_test_helpers::get_passphrase;
+
+    let bob_passphrase = get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+    let alice_passphrase = get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
 
     let coins = json! ([
         {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
         {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
         {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"ZOMBIE","asset":"ZOMBIE","fname":"ZOMBIE (TESTCOIN)","txversion":4,"overwintered":1,"mm2":1,"protocol":{"type":"ZHTLC"}},
+        {"coin":"ZOMBIE","asset":"ZOMBIE","fname":"ZOMBIE (TESTCOIN)","txversion":4,"overwintered":1,"mm2":1,"protocol":{"type":"ZHTLC"},"required_confirmations":0},
         {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
     ]);
 
-    let mut mm_bob = MarketMakerIt::start(
+    let mut mm_bob = MarketMakerIt::start_async(
         json! ({
             "gui": "nogui",
             "netid": 8999,
@@ -1068,31 +998,22 @@ async fn trade_base_rel_electrum(
             "coins": coins,
             "rpc_password": "password",
             "i_am_seed": true,
-            "skip_startup_checks": true,
         }),
         "password".into(),
         local_start!("bob"),
     )
+    .await
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
     #[cfg(not(target_arch = "wasm32"))]
     {
-        log! ({"Bob log path: {}", mm_bob.log_path.display()})
+        log!("Bob log path: {}", mm_bob.log_path.display())
     }
 
-    // wait until bob starts listening on the p2p port and sleep for 1 second
-    wait_log_re!(mm_bob, 22., "INFO Listening on");
     Timer::sleep(1.).await;
 
-    // Both Alice and Bob might try to bind on the "0.0.0.0:47773" DHT port in this test
-    // (because the local "127.0.0.*:47773" addresses aren't that useful for DHT).
-    // We want to give Bob a headstart in acquiring the port,
-    // because Alice will then be able to directly reach it (thanks to "seednode").
-    // Direct communication is not required in this test, but it's nice to have.
-    // wait_log_re! (mm_bob, 9., "preferred port");
-
-    let mut mm_alice = MarketMakerIt::start(
+    let mut mm_alice = MarketMakerIt::start_async(
         json! ({
             "gui": "nogui",
             "netid": 8999,
@@ -1101,31 +1022,52 @@ async fn trade_base_rel_electrum(
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": alice_passphrase,
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.my_seed_addr()],
             "rpc_password": "password",
             "skip_startup_checks": true,
         }),
         "password".into(),
         local_start!("alice"),
     )
+    .await
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
     #[cfg(not(target_arch = "wasm32"))]
     {
-        log! ({"Alice log path: {}", mm_alice.log_path.display()})
+        log!("Alice log path: {}", mm_alice.log_path.display())
     }
 
-    // wait until both nodes RPC API is active
-    wait_log_re!(mm_bob, 22., ">>>>>>>>> DEX stats ");
-    wait_log_re!(mm_alice, 22., ">>>>>>>>> DEX stats ");
-
+    #[cfg(all(feature = "zhtlc-native-tests", not(target_arch = "wasm32")))]
+    {
+        Timer::sleep(1.).await;
+        let rmd = rmd160_from_passphrase(&bob_passphrase);
+        let bob_zombie_cache_path = mm_bob.folder.join("DB").join(hex::encode(rmd)).join("ZOMBIE_CACHE.db");
+        log!("bob_zombie_cache_path {}", bob_zombie_cache_path.display());
+        std::fs::copy("./mm2src/coins/for_tests/ZOMBIE_CACHE.db", bob_zombie_cache_path).unwrap();
+
+        let rmd = rmd160_from_passphrase(&alice_passphrase);
+        let alice_zombie_cache_path = mm_alice
+            .folder
+            .join("DB")
+            .join(hex::encode(rmd))
+            .join("ZOMBIE_CACHE.db");
+        log!("alice_zombie_cache_path {}", alice_zombie_cache_path.display());
+
+        std::fs::copy("./mm2src/coins/for_tests/ZOMBIE_CACHE.db", alice_zombie_cache_path).unwrap();
+
+        let zombie_bob = enable_z_coin(&mm_bob, "ZOMBIE").await;
+        log!("enable ZOMBIE bob {:?}", zombie_bob);
+        let zombie_alice = enable_z_coin(&mm_alice, "ZOMBIE").await;
+        log!("enable ZOMBIE alice {:?}", zombie_alice);
+    }
     // Enable coins on Bob side. Print the replies in case we need the address.
     let rc = enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]).await;
-    log! ({"enable_coins (bob): {:?}", rc});
+    log!("enable_coins (bob): {:?}", rc);
+
     // Enable coins on Alice side. Print the replies in case we need the address.
     let rc = enable_coins_eth_electrum(&mm_alice, &["http://195.201.0.6:8565"]).await;
-    log! ({"enable_coins (alice): {:?}", rc});
+    log!("enable_coins (alice): {:?}", rc);
 
     // unwrap! (mm_alice.wait_for_log (999., &|log| log.contains ("set pubkey for ")));
 
@@ -1133,9 +1075,9 @@ async fn trade_base_rel_electrum(
 
     // issue sell request on Bob side by setting base/rel price
     for (base, rel) in pairs.iter() {
-        log!("Issue bob " (base) "/" (rel) " sell request");
+        log!("Issue bob {}/{} sell request", base, rel);
         let rc = mm_bob
-            .rpc(json! ({
+            .rpc(&json! ({
                 "userpass": mm_bob.userpass,
                 "method": "setprice",
                 "base": base,
@@ -1155,7 +1097,7 @@ async fn trade_base_rel_electrum(
             rel
         );
         let rc = mm_alice
-            .rpc(json! ({
+            .rpc(&json! ({
                 "userpass": mm_alice.userpass,
                 "method": "orderbook",
                 "base": base,
@@ -1167,7 +1109,7 @@ async fn trade_base_rel_electrum(
         Timer::sleep(1.).await;
         common::log::info!("Issue alice {}/{} buy request", base, rel);
         let rc = mm_alice
-            .rpc(json! ({
+            .rpc(&json! ({
                 "userpass": mm_alice.userpass,
                 "method": "buy",
                 "base": base,
@@ -1196,6 +1138,7 @@ async fn trade_base_rel_electrum(
             .unwrap()
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     for uuid in uuids.iter() {
         // ensure the swaps are indexed to the SQLite database
         let expected_log = format!("Inserting new swap {} to the SQLite database", uuid);
@@ -1211,20 +1154,17 @@ async fn trade_base_rel_electrum(
 
     for uuid in uuids.iter() {
         mm_bob
-            .wait_for_log(300., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
+            .wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
             .await
             .unwrap();
 
         mm_alice
-            .wait_for_log(300., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
+            .wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
             .await
             .unwrap();
 
-        #[cfg(target_arch = "wasm32")]
-        {
-            log!("Waiting a few second for the fresh swap status to be saved..");
-            Timer::sleep(7.77).await;
-        }
+        log!("Waiting a few second for the fresh swap status to be saved..");
+        Timer::sleep(7.77).await;
 
         log!("Checking alice/taker status..");
         check_my_swap_status(
@@ -1232,8 +1172,8 @@ async fn trade_base_rel_electrum(
             uuid,
             &TAKER_SUCCESS_EVENTS,
             &TAKER_ERROR_EVENTS,
-            volume.into(),
-            volume.into(),
+            BigDecimal::try_from(volume).unwrap(),
+            BigDecimal::try_from(volume).unwrap(),
         )
         .await;
 
@@ -1243,8 +1183,8 @@ async fn trade_base_rel_electrum(
             uuid,
             &MAKER_SUCCESS_EVENTS,
             &MAKER_ERROR_EVENTS,
-            volume.into(),
-            volume.into(),
+            BigDecimal::try_from(volume).unwrap(),
+            BigDecimal::try_from(volume).unwrap(),
         )
         .await;
     }
@@ -1252,6 +1192,7 @@ async fn trade_base_rel_electrum(
     log!("Waiting 3 seconds for nodes to broadcast their swaps data..");
     Timer::sleep(3.).await;
 
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "zhtlc-native-tests")))]
     for uuid in uuids.iter() {
         log!("Checking alice status..");
         check_stats_swap_status(&mm_alice, uuid, &MAKER_SUCCESS_EVENTS, &TAKER_SUCCESS_EVENTS).await;
@@ -1265,9 +1206,9 @@ async fn trade_base_rel_electrum(
     log!("Checking bob recent swaps..");
     check_recent_swaps(&mm_bob, uuids.len()).await;
     for (base, rel) in pairs.iter() {
-        log!("Get " (base) "/" (rel) " orderbook");
+        log!("Get {}/{} orderbook", base, rel);
         let rc = mm_bob
-            .rpc(json! ({
+            .rpc(&json! ({
                 "userpass": mm_bob.userpass,
                 "method": "orderbook",
                 "base": base,
@@ -1278,7 +1219,7 @@ async fn trade_base_rel_electrum(
         assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
         let bob_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-        log!((base) "/" (rel) " orderbook " [bob_orderbook]);
+        log!("{}/{} orderbook {:?}", base, rel, bob_orderbook);
 
         assert_eq!(0, bob_orderbook.bids.len(), "{} {} bids must be empty", base, rel);
         assert_eq!(0, bob_orderbook.asks.len(), "{} {} asks must be empty", base, rel);
@@ -1289,25 +1230,17 @@ async fn trade_base_rel_electrum(
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn trade_test_electrum_and_eth_coins() {
-    let pairs: &[_] = if cfg!(feature = "zhtlc") {
-        &[("ETH", "JST"), ("RICK", "ZOMBIE")]
-    } else {
-        &[("ETH", "JST")]
-    };
-    block_on(trade_base_rel_electrum(pairs, 1, 2, 0.1));
-}
+fn trade_test_electrum_and_eth_coins() { block_on(trade_base_rel_electrum(&[("ETH", "JST")], 1, 2, 0.1)); }
 
-#[cfg(target_arch = "wasm32")]
-#[no_mangle]
-pub extern "C" fn trade_test_electrum_and_eth_coins(cb_id: i32) {
-    use std::ptr::null;
+#[test]
+#[cfg(all(not(target_arch = "wasm32"), feature = "zhtlc-native-tests"))]
+fn trade_test_electrum_rick_zombie() { block_on(trade_base_rel_electrum(&[("RICK", "ZOMBIE")], 1, 2, 0.1)); }
 
-    common::executor::spawn(async move {
-        let pairs = [("ETH", "JST")];
-        trade_base_rel_electrum(&pairs, 1, 2, 0.1).await;
-        call_back(cb_id, null(), 0)
-    })
+#[wasm_bindgen_test]
+#[cfg(target_arch = "wasm32")]
+async fn trade_test_rick_and_morty() {
+    let pairs: &[_] = &[("RICK", "MORTY")];
+    trade_base_rel_electrum(pairs, 1, 1, 0.0001).await;
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -1319,7 +1252,7 @@ fn withdraw_and_send(
     expected_bal_change: &str,
     amount: f64,
 ) {
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "mmrpc": "2.0",
         "userpass": mm.userpass,
         "method": "withdraw",
@@ -1344,7 +1277,7 @@ fn withdraw_and_send(
     assert_eq!(tx_details.my_balance_change, expected_bal_change);
     assert_eq!(tx_details.from, vec![from]);
 
-    let send = block_on(mm.rpc(json! ({
+    let send = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "send_raw_transaction",
         "coin": coin,
@@ -1394,7 +1327,7 @@ fn test_withdraw_and_send() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log! ({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // wait until RPC API is active
 
@@ -1409,7 +1342,7 @@ fn test_withdraw_and_send() {
         ])),
     );
 
-    log!("enable_coins (alice): "[enable_res]);
+    log!("enable_coins (alice): {:?}", enable_res);
     withdraw_and_send(
         &mm_alice,
         "MORTY",
@@ -1436,8 +1369,8 @@ fn test_withdraw_and_send() {
         0.001,
     );
 
-    // must not allow to withdraw to non-P2PKH addresses
-    let withdraw = block_on(mm_alice.rpc(json! ({
+    // allow to withdraw non-Segwit coin to P2SH addresses
+    let withdraw = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "mmrpc": "2.0",
         "method": "withdraw",
@@ -1449,17 +1382,10 @@ fn test_withdraw_and_send() {
         "id": 0,
     })))
     .unwrap();
+    assert!(withdraw.0.is_success(), "MORTY withdraw: {}", withdraw.1);
 
-    assert!(withdraw.0.is_client_error(), "MORTY withdraw: {}", withdraw.1);
-    let res: RpcErrorResponse<String> = json::from_str(&withdraw.1).unwrap();
-    assert_eq!(res.error_type, "InvalidAddress");
-    assert!(res
-        .error_data
-        .unwrap()
-        .contains("Expected a valid P2PKH or P2SH prefix for MORTY"));
-
-    // but must allow to withdraw to P2SH addresses if Segwit flag is true
-    let withdraw = block_on(mm_alice.rpc(json! ({
+    // allow to withdraw to P2SH addresses if Segwit flag is true
+    let withdraw = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "mmrpc": "2.0",
         "method": "withdraw",
@@ -1475,7 +1401,7 @@ fn test_withdraw_and_send() {
     assert!(withdraw.0.is_success(), "MORTY_SEGWIT withdraw: {}", withdraw.1);
 
     // must not allow to withdraw to invalid checksum address
-    let withdraw = block_on(mm_alice.rpc(json! ({
+    let withdraw = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "mmrpc": "2.0",
         "method": "withdraw",
@@ -1495,7 +1421,7 @@ fn test_withdraw_and_send() {
 
     // must not allow to withdraw too small amount 0.000005 (less than 0.00001 dust)
     let small_amount = MmNumber::from("0.000005").to_decimal();
-    let withdraw = block_on(mm_alice.rpc(json! ({
+    let withdraw = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "mmrpc": "2.0",
         "method": "withdraw",
@@ -1509,7 +1435,7 @@ fn test_withdraw_and_send() {
     .unwrap();
 
     assert!(withdraw.0.is_client_error(), "MORTY withdraw: {}", withdraw.1);
-    log!("error: "[withdraw.1]);
+    log!("error: {:?}", withdraw.1);
     let error: RpcErrorResponse<withdraw_error::AmountTooLow> = json::from_str(&withdraw.1).unwrap();
     let threshold = MmNumber::from("0.00001").to_decimal();
     let expected_error = withdraw_error::AmountTooLow {
@@ -1567,12 +1493,12 @@ fn test_tbtc_withdraw_to_cashaddresses_should_fail() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log! ({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // wait until RPC API is active
 
     // Enable coins. Print the replies in case we need the address.
-    let electrum = block_on(mm_alice.rpc(json!({
+    let electrum = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "electrum",
         "coin": "tBTC",
@@ -1586,7 +1512,7 @@ fn test_tbtc_withdraw_to_cashaddresses_should_fail() {
         electrum.0,
         electrum.1
     );
-    log!("enable_coins (alice): "[electrum]);
+    log!("enable_coins (alice): {:?}", electrum);
 
     let electrum_response: EnableElectrumResponse =
         json::from_str(&electrum.1).expect("Expected 'EnableElectrumResponse'");
@@ -1594,7 +1520,7 @@ fn test_tbtc_withdraw_to_cashaddresses_should_fail() {
     enable_res.insert("tBTC", electrum_response);
 
     // Send from BTC Legacy Address to Cashaddress should fail
-    let withdraw = block_on(mm_alice.rpc(json!({
+    let withdraw = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "withdraw",
         "coin": "tBTC",
@@ -1604,7 +1530,7 @@ fn test_tbtc_withdraw_to_cashaddresses_should_fail() {
     .unwrap();
 
     assert!(withdraw.0.is_server_error(), "tBTC withdraw: {}", withdraw.1);
-    log!([withdraw.1]);
+    log!("{:?}", withdraw.1);
 
     block_on(mm_alice.stop()).unwrap();
 }
@@ -1622,9 +1548,7 @@ fn test_withdraw_legacy() {
     let coins = json!([
         {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
         {"coin":"MORTY","asset":"MORTY","rpcport":8923,"txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY_SEGWIT","asset":"MORTY_SEGWIT","txversion":4,"overwintered":1,"segwit":true,"txfee":1000,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+        {"coin":"MORTY_SEGWIT","asset":"MORTY_SEGWIT","txversion":4,"overwintered":1,"segwit":true,"txfee":1000,"protocol":{"type":"UTXO"}}
     ]);
 
     let mm_alice = MarketMakerIt::start(
@@ -1647,12 +1571,12 @@ fn test_withdraw_legacy() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // wait until RPC API is active
 
     // Enable coins. Print the replies in case we need the address.
-    let mut enable_res = block_on(enable_coins_eth_electrum(&mm_alice, &["http://195.201.0.6:8565"]));
+    let mut enable_res = block_on(enable_coins_rick_morty_electrum(&mm_alice));
     enable_res.insert(
         "MORTY_SEGWIT",
         block_on(enable_electrum(&mm_alice, "MORTY_SEGWIT", false, &[
@@ -1661,9 +1585,9 @@ fn test_withdraw_legacy() {
             "electrum3.cipig.net:10018",
         ])),
     );
-    log!("enable_coins (alice): "[enable_res]);
+    log!("enable_coins (alice): {:?}", enable_res);
 
-    let withdraw = block_on(mm_alice.rpc(json!({
+    let withdraw = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "withdraw",
         "coin": "MORTY",
@@ -1674,8 +1598,8 @@ fn test_withdraw_legacy() {
     assert!(withdraw.0.is_success(), "MORTY withdraw: {}", withdraw.1);
     let _: TransactionDetails = json::from_str(&withdraw.1).expect("Expected 'TransactionDetails'");
 
-    // must not allow to withdraw to non-P2PKH addresses
-    let withdraw = block_on(mm_alice.rpc(json!({
+    // allow to withdraw non-Segwit coin to P2SH addresses
+    let withdraw = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "withdraw",
         "coin": "MORTY",
@@ -1683,18 +1607,7 @@ fn test_withdraw_legacy() {
         "amount": "0.001",
     })))
     .unwrap();
-
-    assert!(withdraw.0.is_server_error(), "MORTY withdraw: {}", withdraw.1);
-    log!([withdraw.1]);
-    let withdraw_error: Json = json::from_str(&withdraw.1).unwrap();
-    withdraw_error["error"]
-        .as_str()
-        .expect("Expected 'error' field")
-        .contains("Expected either P2PKH or P2SH");
-    assert!(withdraw_error.get("error_path").is_none());
-    assert!(withdraw_error.get("error_trace").is_none());
-    assert!(withdraw_error.get("error_type").is_none());
-    assert!(withdraw_error.get("error_data").is_none());
+    assert!(withdraw.0.is_success(), "MORTY withdraw: {}", withdraw.1);
 
     block_on(mm_alice.stop()).unwrap();
 }
@@ -1748,12 +1661,12 @@ fn test_withdraw_segwit() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // wait until RPC API is active
 
     // Enable coins. Print the replies in case we need the address.
-    let electrum = block_on(mm_alice.rpc(json!({
+    let electrum = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "electrum",
         "coin": "tBTC",
@@ -1770,9 +1683,9 @@ fn test_withdraw_segwit() {
         electrum.0,
         electrum.1
     );
-    log!("enable_coins (alice): "[electrum]);
+    log!("enable_coins (alice): {:?}", electrum);
 
-    let withdraw = block_on(mm_alice.rpc(json!({
+    let withdraw = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "withdraw",
         "coin": "tBTC",
@@ -1784,7 +1697,7 @@ fn test_withdraw_segwit() {
     let _: TransactionDetails = json::from_str(&withdraw.1).expect("Expected 'TransactionDetails'");
 
     // must not allow to withdraw to addresses with different hrp
-    let withdraw = block_on(mm_alice.rpc(json!({
+    let withdraw = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "withdraw",
         "coin": "tBTC",
@@ -1794,7 +1707,7 @@ fn test_withdraw_segwit() {
     .unwrap();
 
     assert!(withdraw.0.is_server_error(), "tBTC withdraw: {}", withdraw.1);
-    log!([withdraw.1]);
+    log!("{:?}", withdraw.1);
     let withdraw_error: Json = json::from_str(&withdraw.1).unwrap();
     withdraw_error["error"]
         .as_str()
@@ -1833,7 +1746,7 @@ fn test_swap_status() {
     )
     .unwrap();
 
-    let my_swap = block_on(mm.rpc(json! ({
+    let my_swap = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "my_swap_status",
         "params": {
@@ -1842,14 +1755,9 @@ fn test_swap_status() {
     })))
     .unwrap();
 
-    assert_eq!(
-        my_swap.0,
-        StatusCode::NOT_FOUND,
-        "!not found status code: {}",
-        my_swap.1
-    );
+    assert!(my_swap.0.is_server_error(), "!not found status code: {}", my_swap.1);
 
-    let stats_swap = block_on(mm.rpc(json! ({
+    let stats_swap = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "stats_swap_status",
         "params": {
@@ -1858,9 +1766,8 @@ fn test_swap_status() {
     })))
     .unwrap();
 
-    assert_eq!(
-        stats_swap.0,
-        StatusCode::NOT_FOUND,
+    assert!(
+        stats_swap.0.is_server_error(),
         "!not found status code: {}",
         stats_swap.1
     );
@@ -1895,14 +1802,14 @@ fn test_order_errors_when_base_equal_rel() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
+    log!("Log path: {}", mm.log_path.display());
     block_on(enable_electrum(&mm, "RICK", false, &[
         "electrum3.cipig.net:10017",
         "electrum2.cipig.net:10017",
         "electrum1.cipig.net:10017",
     ]));
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -1912,7 +1819,7 @@ fn test_order_errors_when_base_equal_rel() {
     .unwrap();
     assert!(rc.0.is_server_error(), "setprice should have failed, but got {:?}", rc);
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "buy",
         "base": "RICK",
@@ -1923,7 +1830,7 @@ fn test_order_errors_when_base_equal_rel() {
     .unwrap();
     assert!(rc.0.is_server_error(), "buy should have failed, but got {:?}", rc);
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "sell",
         "base": "RICK",
@@ -1935,6 +1842,7 @@ fn test_order_errors_when_base_equal_rel() {
     assert!(rc.0.is_server_error(), "sell should have failed, but got {:?}", rc);
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn startup_passphrase(passphrase: &str, expected_address: &str) {
     let coins = json!([
         {"coin":"KMD","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
@@ -1962,7 +1870,7 @@ fn startup_passphrase(passphrase: &str, expected_address: &str) {
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
     #[cfg(not(target_arch = "wasm32"))]
     {
-        log!({"Log path: {}", mm.log_path.display()})
+        log!("Log path: {}", mm.log_path.display())
     }
     let enable = block_on(enable_electrum(&mm, "KMD", false, &["electrum1.cipig.net:10001"]));
     assert_eq!(expected_address, enable.address);
@@ -2004,9 +1912,7 @@ fn test_startup_passphrase() {
 fn test_cancel_order() {
     let coins = json!([
         {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","rpcport":80,"protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0xc0eb7AeD740E1796992A08962c15661bDEB58003"}}}
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
     let bob_passphrase = "bob passphrase";
 
@@ -2032,12 +1938,15 @@ fn test_cancel_order() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
     // Enable coins on Bob side. Print the replies in case we need the "address".
-    log! ({"enable_coins (bob): {:?}", block_on (enable_coins_eth_electrum (&mm_bob, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
 
     log!("Issue sell request on Bob side by setting base/rel price…");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -2048,7 +1957,7 @@ fn test_cancel_order() {
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
     let setprice_json: Json = json::from_str(&rc.1).unwrap();
-    log!([setprice_json]);
+    log!("{:?}", setprice_json);
 
     let mm_alice = MarketMakerIt::start(
         json! ({
@@ -2059,7 +1968,7 @@ fn test_cancel_order() {
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
         }),
         "pass".into(),
@@ -2071,13 +1980,16 @@ fn test_cancel_order() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // Enable coins on Alice side. Print the replies in case we need the "address".
-    log! ({"enable_coins (alice): {:?}", block_on (enable_coins_eth_electrum (&mm_alice, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
 
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2087,14 +1999,14 @@ fn test_cancel_order() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     assert_eq!(
         alice_orderbook.asks.len(),
         1,
         "Alice RICK/MORTY orderbook must have exactly 1 ask"
     );
 
-    let cancel_rc = block_on(mm_bob.rpc(json! ({
+    let cancel_rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "cancel_order",
         "uuid": setprice_json["result"]["uuid"],
@@ -2110,12 +2022,12 @@ fn test_cancel_order() {
     assert!(!order_path.exists());
 
     let pause = 3;
-    log!("Waiting (" (pause) " seconds) for Bob to cancel the order…");
+    log!("Waiting ({} seconds) for Bob to cancel the order…", pause);
     thread::sleep(Duration::from_secs(pause));
 
     // Bob orderbook must show no orders
     log!("Get RICK/MORTY orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2125,12 +2037,12 @@ fn test_cancel_order() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let bob_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
+    log!("Bob orderbook {:?}", bob_orderbook);
     assert_eq!(bob_orderbook.asks.len(), 0, "Bob RICK/MORTY asks are not empty");
 
     // Alice orderbook must show no orders
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2140,7 +2052,7 @@ fn test_cancel_order() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     assert_eq!(alice_orderbook.asks.len(), 0, "Alice RICK/MORTY asks are not empty");
 }
 
@@ -2149,9 +2061,7 @@ fn test_cancel_order() {
 fn test_cancel_all_orders() {
     let coins = json!([
         {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","rpcport":80,"protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0xc0eb7AeD740E1796992A08962c15661bDEB58003"}}}
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     let bob_passphrase = "bob passphrase";
@@ -2177,12 +2087,15 @@ fn test_cancel_all_orders() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
     // Enable coins on Bob side. Print the replies in case we need the "address".
-    log! ({"enable_coins (bob): {:?}", block_on (enable_coins_eth_electrum (&mm_bob, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
 
     log!("Issue sell request on Bob side by setting base/rel price…");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -2193,7 +2106,7 @@ fn test_cancel_all_orders() {
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
     let setprice_json: Json = json::from_str(&rc.1).unwrap();
-    log!([setprice_json]);
+    log!("{:?}", setprice_json);
 
     let mm_alice = MarketMakerIt::start(
         json! ({
@@ -2204,7 +2117,7 @@ fn test_cancel_all_orders() {
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
         }),
         "pass".into(),
@@ -2216,16 +2129,19 @@ fn test_cancel_all_orders() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // Enable coins on Alice side. Print the replies in case we need the "address".
-    log! ({"enable_coins (alice): {:?}", block_on (enable_coins_eth_electrum (&mm_alice, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
 
     log!("Give Alice 3 seconds to import the order…");
     thread::sleep(Duration::from_secs(3));
 
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2235,11 +2151,11 @@ fn test_cancel_all_orders() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Alice RICK/MORTY orderbook must have exactly 1 ask");
 
-    let cancel_rc = block_on(mm_bob.rpc(json! ({
+    let cancel_rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "cancel_all_orders",
         "cancel_by": {
@@ -2257,12 +2173,12 @@ fn test_cancel_all_orders() {
     assert!(!order_path.exists());
 
     let pause = 3;
-    log!("Waiting (" (pause) " seconds) for Bob to cancel the order…");
+    log!("Waiting ({} seconds) for Bob to cancel the order…", pause);
     thread::sleep(Duration::from_secs(pause));
 
     // Bob orderbook must show no orders
     log!("Get RICK/MORTY orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2272,13 +2188,13 @@ fn test_cancel_all_orders() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
+    log!("Bob orderbook {:?}", bob_orderbook);
     let asks = bob_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 0, "Bob RICK/MORTY asks are not empty");
 
     // Alice orderbook must show no orders
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2288,7 +2204,7 @@ fn test_cancel_all_orders() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 0, "Alice RICK/MORTY asks are not empty");
 }
@@ -2325,7 +2241,7 @@ fn test_electrum_enable_conn_errors() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
     // Using working servers and few else with random ports to trigger "connection refused"
     block_on(enable_electrum(&mm_bob, "RICK", false, &[
         "electrum3.cipig.net:10017",
@@ -2374,23 +2290,21 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
-    log!(
-        "Bob enable RICK "[block_on(enable_electrum(&mm_bob, "RICK", false, &[
-            "electrum3.cipig.net:10017",
-            "electrum2.cipig.net:10017",
-            "electrum1.cipig.net:10017",
-        ]))]
-    );
+    let electrum_rick = block_on(enable_electrum(&mm_bob, "RICK", false, &[
+        "electrum3.cipig.net:10017",
+        "electrum2.cipig.net:10017",
+        "electrum1.cipig.net:10017",
+    ]));
+    log!("Bob enable RICK {:?}", electrum_rick);
 
-    log!(
-        "Bob enable MORTY "[block_on(enable_electrum(&mm_bob, "MORTY", false, &[
-            "electrum3.cipig.net:10018",
-            "electrum2.cipig.net:10018",
-            "electrum1.cipig.net:10018",
-        ]))]
-    );
+    let electrum_morty = block_on(enable_electrum(&mm_bob, "MORTY", false, &[
+        "electrum3.cipig.net:10018",
+        "electrum2.cipig.net:10018",
+        "electrum1.cipig.net:10018",
+    ]));
+    log!("Bob enable MORTY {:?}", electrum_morty);
 
     let mm_alice = MarketMakerIt::start(
         json! ({
@@ -2400,7 +2314,7 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
             "maker_order_timeout": 5,
         }),
@@ -2413,27 +2327,25 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
-    log!(
-        "Alice enable RICK "[block_on(enable_electrum(&mm_alice, "RICK", false, &[
-            "electrum3.cipig.net:10017",
-            "electrum2.cipig.net:10017",
-            "electrum1.cipig.net:10017",
-        ]))]
-    );
+    let electrum_rick = block_on(enable_electrum(&mm_alice, "RICK", false, &[
+        "electrum3.cipig.net:10017",
+        "electrum2.cipig.net:10017",
+        "electrum1.cipig.net:10017",
+    ]));
+    log!("Alice enable RICK {:?}", electrum_rick);
 
-    log!(
-        "Alice enable MORTY "[block_on(enable_electrum(&mm_alice, "MORTY", false, &[
-            "electrum3.cipig.net:10018",
-            "electrum2.cipig.net:10018",
-            "electrum1.cipig.net:10018",
-        ]))]
-    );
+    let electrum_morty = block_on(enable_electrum(&mm_alice, "MORTY", false, &[
+        "electrum3.cipig.net:10018",
+        "electrum2.cipig.net:10018",
+        "electrum1.cipig.net:10018",
+    ]));
+    log!("Alice enable MORTY {:?}", electrum_morty);
 
     // issue sell request on Bob side by setting base/rel price
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -2447,7 +2359,7 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
     thread::sleep(Duration::from_secs(2));
 
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2457,14 +2369,14 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Alice RICK/MORTY orderbook must have exactly 1 ask");
 
     block_on(mm_bob.stop()).unwrap();
     thread::sleep(Duration::from_secs(6));
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2474,7 +2386,7 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 0, "Alice RICK/MORTY orderbook must have zero asks");
 
@@ -2512,27 +2424,25 @@ fn test_own_orders_should_not_be_removed_from_orderbook() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
-    log!(
-        "Bob enable RICK "[block_on(enable_electrum(&mm_bob, "RICK", false, &[
-            "electrum3.cipig.net:10017",
-            "electrum2.cipig.net:10017",
-            "electrum1.cipig.net:10017",
-        ]))]
-    );
+    let electrum_rick = block_on(enable_electrum(&mm_bob, "RICK", false, &[
+        "electrum3.cipig.net:10017",
+        "electrum2.cipig.net:10017",
+        "electrum1.cipig.net:10017",
+    ]));
+    log!("Bob enable RICK {:?}", electrum_rick);
 
-    log!(
-        "Bob enable MORTY "[block_on(enable_electrum(&mm_bob, "MORTY", false, &[
-            "electrum3.cipig.net:10018",
-            "electrum2.cipig.net:10018",
-            "electrum1.cipig.net:10018",
-        ]))]
-    );
+    let electrum_morty = block_on(enable_electrum(&mm_bob, "MORTY", false, &[
+        "electrum3.cipig.net:10018",
+        "electrum2.cipig.net:10018",
+        "electrum1.cipig.net:10018",
+    ]));
+    log!("Bob enable MORTY {:?}", electrum_morty);
 
     // issue sell request on Bob side by setting base/rel price
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -2545,7 +2455,7 @@ fn test_own_orders_should_not_be_removed_from_orderbook() {
 
     thread::sleep(Duration::from_secs(6));
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -2555,104 +2465,35 @@ fn test_own_orders_should_not_be_removed_from_orderbook() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
+    log!("Bob orderbook {:?}", bob_orderbook);
     let asks = bob_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Bob RICK/MORTY orderbook must have exactly 1 ask");
 
     block_on(mm_bob.stop()).unwrap();
 }
 
-#[test]
 #[cfg(not(target_arch = "wasm32"))]
-// https://github.com/KomodoPlatform/atomicDEX-API/issues/511
-fn test_all_orders_per_pair_per_node_must_be_displayed_in_orderbook() {
-    let coins = json!([
-        {"coin":"RICK","asset":"RICK","protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","protocol":{"type":"UTXO"}},
-    ]);
-
-    let mm = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": "bob passphrase",
-            "coins": coins,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
-    )
-    .unwrap();
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    block_on(enable_electrum(&mm, "RICK", false, &[
-        "electrum3.cipig.net:10017",
-        "electrum2.cipig.net:10017",
-        "electrum1.cipig.net:10017",
-    ]));
-    block_on(enable_electrum(&mm, "MORTY", false, &[
-        "electrum3.cipig.net:10018",
-        "electrum2.cipig.net:10018",
-        "electrum1.cipig.net:10018",
-    ]));
-
-    // set 2 orders with different prices
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "setprice",
-        "base": "RICK",
-        "rel": "MORTY",
-        "price": 0.9,
-        "volume": "0.9",
-        "cancel_previous": false,
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "setprice",
-        "base": "RICK",
-        "rel": "MORTY",
-        "price": 1,
-        "volume": "0.9",
-        "cancel_previous": false,
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-    thread::sleep(Duration::from_secs(2));
-
-    log!("Get RICK/MORTY orderbook");
-    let rc = block_on(mm.rpc(json! ({
+fn check_priv_key(mm: &MarketMakerIt, coin: &str, expected_priv_key: &str) {
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
-        "method": "orderbook",
-        "base": "RICK",
-        "rel": "MORTY",
+        "method": "show_priv_key",
+        "coin": coin
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
-    let asks = orderbook["asks"].as_array().unwrap();
-    assert_eq!(asks.len(), 2, "RICK/MORTY orderbook must have exactly 2 asks");
+    assert!(rc.0.is_success(), "!show_priv_key: {}", rc.1);
+    let privkey: Json = json::from_str(&rc.1).unwrap();
+    assert_eq!(privkey["result"]["priv_key"], Json::from(expected_priv_key))
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-// https://github.com/KomodoPlatform/atomicDEX-API/issues/859
-fn orderbook_extended_data() {
-    let coins = json!([
-        {"coin":"RICK","asset":"RICK","protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","protocol":{"type":"UTXO"}},
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/519#issuecomment-589149811
+fn test_show_priv_key() {
+    let coins = json! ([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
     ]);
 
     let mm = MarketMakerIt::start(
@@ -2674,97 +2515,29 @@ fn orderbook_extended_data() {
         },
     )
     .unwrap();
-    let (_dump_log, _dump_dashboard) = &mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    block_on(enable_electrum(&mm, "RICK", false, &[
-        "electrum3.cipig.net:10017",
-        "electrum2.cipig.net:10017",
-        "electrum1.cipig.net:10017",
-    ]));
-    block_on(enable_electrum(&mm, "MORTY", false, &[
-        "electrum3.cipig.net:10018",
-        "electrum2.cipig.net:10018",
-        "electrum1.cipig.net:10018",
-    ]));
-
-    let bob_orders = &[
-        // (base, rel, price, volume)
-        ("RICK", "MORTY", "0.9", "0.9"),
-        ("RICK", "MORTY", "0.8", "0.9"),
-        ("RICK", "MORTY", "0.7", "0.9"),
-        ("MORTY", "RICK", "0.8", "0.9"),
-        ("MORTY", "RICK", "1", "0.9"),
-    ];
-
-    for (base, rel, price, volume) in bob_orders {
-        let rc = block_on(mm.rpc(json!({
-            "userpass": mm.userpass,
-            "method": "setprice",
-            "base": base,
-            "rel": rel,
-            "price": price,
-            "volume": volume,
-            "cancel_previous": false,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    }
-
-    thread::sleep(Duration::from_secs(1));
-    log!("Get RICK/MORTY orderbook");
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "orderbook",
-        "base": "RICK",
-        "rel": "MORTY",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[rc.1]);
-    let expected_total_asks_base_vol = MmNumber::from("2.7");
-    assert_eq!(expected_total_asks_base_vol.to_decimal(), orderbook.total_asks_base_vol);
-
-    let expected_total_bids_base_vol = MmNumber::from("1.62");
-    assert_eq!(expected_total_bids_base_vol.to_decimal(), orderbook.total_bids_base_vol);
-
-    let expected_total_asks_rel_vol = MmNumber::from("2.16");
-    assert_eq!(expected_total_asks_rel_vol.to_decimal(), orderbook.total_asks_rel_vol);
-
-    let expected_total_bids_rel_vol = MmNumber::from("1.8");
-    assert_eq!(expected_total_bids_rel_vol.to_decimal(), orderbook.total_bids_rel_vol);
-
-    fn check_price_and_vol_aggr(
-        order: &OrderbookEntryAggregate,
-        price: &'static str,
-        base_aggr: &'static str,
-        rel_aggr: &'static str,
-    ) {
-        let price = MmNumber::from(price);
-        assert_eq!(price.to_decimal(), order.price);
-
-        let base_aggr = MmNumber::from(base_aggr);
-        assert_eq!(base_aggr.to_decimal(), order.base_max_volume_aggr);
 
-        let rel_aggr = MmNumber::from(rel_aggr);
-        assert_eq!(rel_aggr.to_decimal(), order.rel_max_volume_aggr);
-    }
-
-    check_price_and_vol_aggr(&orderbook.asks[0], "0.9", "2.7", "2.16");
-    check_price_and_vol_aggr(&orderbook.asks[1], "0.8", "1.8", "1.35");
-    check_price_and_vol_aggr(&orderbook.asks[2], "0.7", "0.9", "0.63");
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+    log!(
+        "enable_coins: {:?}",
+        block_on(enable_coins_eth_electrum(&mm, &["http://195.201.0.6:8565"]))
+    );
 
-    check_price_and_vol_aggr(&orderbook.bids[0], "1.25", "0.72", "0.9");
-    check_price_and_vol_aggr(&orderbook.bids[1], "1", "1.62", "1.8");
+    check_priv_key(&mm, "RICK", "UvCjJf4dKSs2vFGVtCnUTAhR5FTZGdg43DDRa9s7s5DV1sSDX14g");
+    check_priv_key(
+        &mm,
+        "ETH",
+        "0xb8c774f071de08c7fd8f62b97f1a5726f6ce9f1bcf141b70b86689254ed6714e",
+    );
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn orderbook_should_display_base_rel_volumes() {
-    let coins = json!([
-        {"coin":"RICK","asset":"RICK","protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","protocol":{"type":"UTXO"}},
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/586
+fn test_electrum_and_enable_response() {
+    let coins = json! ([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"},"mature_confirmations":101},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
     ]);
 
     let mm = MarketMakerIt::start(
@@ -2786,165 +2559,11 @@ fn orderbook_should_display_base_rel_volumes() {
         },
     )
     .unwrap();
-    let (_dump_log, _dump_dashboard) = &mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    block_on(enable_electrum(&mm, "RICK", false, &[
-        "electrum3.cipig.net:10017",
-        "electrum2.cipig.net:10017",
-        "electrum1.cipig.net:10017",
-    ]));
-    block_on(enable_electrum(&mm, "MORTY", false, &[
-        "electrum3.cipig.net:10018",
-        "electrum2.cipig.net:10018",
-        "electrum1.cipig.net:10018",
-    ]));
 
-    let price = BigRational::new(2.into(), 1.into());
-    let volume = BigRational::new(1.into(), 1.into());
-
-    // create order with rational amount and price
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "setprice",
-        "base": "RICK",
-        "rel": "MORTY",
-        "price": price,
-        "volume": volume,
-        "cancel_previous": false,
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
 
-    thread::sleep(Duration::from_secs(1));
-    log!("Get RICK/MORTY orderbook");
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "orderbook",
-        "base": "RICK",
-        "rel": "MORTY",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
-    assert_eq!(orderbook.asks.len(), 1, "RICK/MORTY orderbook must have exactly 1 ask");
-    let min_volume = BigRational::new(1.into(), 10000.into());
-    assert_eq!(volume, orderbook.asks[0].base_max_volume_rat);
-    assert_eq!(min_volume, orderbook.asks[0].base_min_volume_rat);
-
-    assert_eq!(&volume * &price, orderbook.asks[0].rel_max_volume_rat);
-    assert_eq!(&min_volume * &price, orderbook.asks[0].rel_min_volume_rat);
-
-    log!("Get MORTY/RICK orderbook");
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "orderbook",
-        "base": "MORTY",
-        "rel": "RICK",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
-    assert_eq!(orderbook.bids.len(), 1, "MORTY/RICK orderbook must have exactly 1 bid");
-    let min_volume = BigRational::new(1.into(), 10000.into());
-    assert_eq!(volume, orderbook.bids[0].rel_max_volume_rat);
-    assert_eq!(min_volume, orderbook.bids[0].rel_min_volume_rat);
-
-    assert_eq!(&volume * &price, orderbook.bids[0].base_max_volume_rat);
-    assert_eq!(&min_volume * &price, orderbook.bids[0].base_min_volume_rat);
-}
-
-fn check_priv_key(mm: &MarketMakerIt, coin: &str, expected_priv_key: &str) {
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "show_priv_key",
-        "coin": coin
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!show_priv_key: {}", rc.1);
-    let privkey: Json = json::from_str(&rc.1).unwrap();
-    assert_eq!(privkey["result"]["priv_key"], Json::from(expected_priv_key))
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-// https://github.com/KomodoPlatform/atomicDEX-API/issues/519#issuecomment-589149811
-fn test_show_priv_key() {
-    let coins = json! ([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
-    ]);
-
-    let mm = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": "bob passphrase",
-            "coins": coins,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
-    )
-    .unwrap();
-
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    log! ({"enable_coins: {:?}", block_on (enable_coins_eth_electrum (&mm, &["http://195.201.0.6:8565"]))});
-
-    check_priv_key(&mm, "RICK", "UvCjJf4dKSs2vFGVtCnUTAhR5FTZGdg43DDRa9s7s5DV1sSDX14g");
-    check_priv_key(
-        &mm,
-        "ETH",
-        "0xb8c774f071de08c7fd8f62b97f1a5726f6ce9f1bcf141b70b86689254ed6714e",
-    );
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-// https://github.com/KomodoPlatform/atomicDEX-API/issues/586
-fn test_electrum_and_enable_response() {
-    let coins = json! ([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"},"mature_confirmations":101},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-    ]);
-
-    let mm = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": "bob passphrase",
-            "coins": coins,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
-    )
-    .unwrap();
-
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-
-    let electrum_rick = block_on(mm.rpc(json!({
+    let electrum_rick = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "electrum",
         "coin": "RICK",
@@ -2967,7 +2586,7 @@ fn test_electrum_and_enable_response() {
     assert_eq!(rick_response["mature_confirmations"], Json::from(101));
 
     // should change requires notarization at runtime
-    let requires_nota_rick = block_on(mm.rpc(json! ({
+    let requires_nota_rick = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "set_requires_notarization",
         "coin": "RICK",
@@ -2988,7 +2607,7 @@ fn test_electrum_and_enable_response() {
         Json::from(false)
     );
 
-    let enable_eth = block_on(mm.rpc(json! ({
+    let enable_eth = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "enable",
         "coin": "ETH",
@@ -3015,8 +2634,9 @@ fn test_electrum_and_enable_response() {
     assert_eq!(eth_response.get("mature_confirmations"), None);
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn check_too_low_volume_order_creation_fails(mm: &MarketMakerIt, base: &str, rel: &str) {
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": base,
@@ -3028,7 +2648,7 @@ fn check_too_low_volume_order_creation_fails(mm: &MarketMakerIt, base: &str, rel
     .unwrap();
     assert!(!rc.0.is_success(), "setprice success, but should be error {}", rc.1);
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": base,
@@ -3040,7 +2660,7 @@ fn check_too_low_volume_order_creation_fails(mm: &MarketMakerIt, base: &str, rel
     .unwrap();
     assert!(!rc.0.is_success(), "setprice success, but should be error {}", rc.1);
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "sell",
         "base": base,
@@ -3051,7 +2671,7 @@ fn check_too_low_volume_order_creation_fails(mm: &MarketMakerIt, base: &str, rel
     .unwrap();
     assert!(!rc.0.is_success(), "sell success, but should be error {}", rc.1);
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "buy",
         "base": base,
@@ -3097,9 +2717,10 @@ fn setprice_buy_sell_too_low_volume() {
     .unwrap();
 
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
+    log!("Log path: {}", mm.log_path.display());
 
-    log!([block_on(enable_coins_eth_electrum(&mm, &["http://195.201.0.6:8565"]))]);
+    let enable = block_on(enable_coins_eth_electrum(&mm, &["http://195.201.0.6:8565"]));
+    log!("{:?}", enable);
 
     check_too_low_volume_order_creation_fails(&mm, "MORTY", "ETH");
     check_too_low_volume_order_creation_fails(&mm, "ETH", "MORTY");
@@ -3108,13 +2729,12 @@ fn setprice_buy_sell_too_low_volume() {
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-// https://github.com/KomodoPlatform/atomicDEX-API/issues/473
-fn setprice_min_volume_should_be_displayed_in_orderbook() {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+fn test_fill_or_kill_taker_order_should_not_transform_to_maker() {
+    let bob_passphrase = get_passphrase(&".env.client", "BOB_PASSPHRASE").unwrap();
 
     let coins = json! ([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
         {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
         {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
     ]);
@@ -3122,120 +2742,72 @@ fn setprice_min_volume_should_be_displayed_in_orderbook() {
     let mm_bob = MarketMakerIt::start(
         json! ({
             "gui": "nogui",
-            "netid": 9998,
+            "netid": 8999,
+            "dht": "on",  // Enable DHT without delay.
             "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
             "rpcip": env::var ("BOB_TRADE_IP") .ok(),
             "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
             "passphrase": bob_passphrase,
             "coins": coins,
-            "rpc_password": "pass",
+            "rpc_password": "password",
             "i_am_seed": true,
         }),
-        "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
-    )
-    .unwrap();
-
-    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-
-    let mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "dht": "on",  // Enable DHT without delay.
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
-            "passphrase": "alice passphrase",
-            "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        "password".into(),
+        local_start!("bob"),
     )
     .unwrap();
 
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({"Alice log path: {}", mm_alice.log_path.display()});
-
-    log! ({"enable_coins (bob): {:?}", block_on (enable_coins_eth_electrum (&mm_bob, &["http://195.201.0.6:8565"]))});
-    log! ({"enable_coins (alice): {:?}", block_on (enable_coins_eth_electrum (&mm_alice, &["http://195.201.0.6:8565"]))});
-
-    // issue orderbook call on Alice side to trigger subscription to a topic
-    block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "orderbook",
-        "base": "ETH",
-        "rel": "JST",
-    })))
-    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "setprice",
-        "base": "ETH",
-        "rel": "JST",
-        "price": "1",
-        "volume": "10",
-        "min_volume": "1",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
-    thread::sleep(Duration::from_secs(2));
-    log!("Get ETH/JST orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("Issue bob ETH/JST sell request");
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
-        "method": "orderbook",
+        "method": "sell",
         "base": "ETH",
         "rel": "JST",
+        "price": 1,
+        "volume": 0.1,
+        "order_type": {
+            "type": "FillOrKill"
+        },
+        "timeout": 2,
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
-    let asks = orderbook["asks"].as_array().unwrap();
-    assert_eq!(asks.len(), 1, "Bob ETH/JST orderbook must have exactly 1 ask");
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+    let sell_json: Json = json::from_str(&rc.1).unwrap();
+    let order_type = sell_json["result"]["order_type"]["type"].as_str();
+    assert_eq!(order_type, Some("FillOrKill"));
 
-    let min_volume = asks[0]["min_volume"].as_str().unwrap();
-    assert_eq!(min_volume, "1", "Bob ETH/JST ask must display correct min_volume");
+    log!("Wait for 4 seconds for Bob order to be cancelled");
+    thread::sleep(Duration::from_secs(4));
 
-    log!("Get ETH/JST orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "orderbook",
-        "base": "ETH",
-        "rel": "JST",
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "my_orders",
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
-    let asks = orderbook["asks"].as_array().unwrap();
-    assert_eq!(asks.len(), 1, "Alice ETH/JST orderbook must have exactly 1 ask");
-
-    let min_volume = asks[0]["min_volume"].as_str().unwrap();
-    assert_eq!(min_volume, "1", "Alice ETH/JST ask must display correct min_volume");
+    assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
+    let my_orders: Json = json::from_str(&rc.1).unwrap();
+    let my_maker_orders: HashMap<String, Json> = json::from_value(my_orders["result"]["maker_orders"].clone()).unwrap();
+    let my_taker_orders: HashMap<String, Json> = json::from_value(my_orders["result"]["taker_orders"].clone()).unwrap();
+    assert!(my_maker_orders.is_empty(), "maker_orders must be empty");
+    assert!(my_taker_orders.is_empty(), "taker_orders must be empty");
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-// https://github.com/KomodoPlatform/atomicDEX-API/issues/670
-fn orderbook_should_work_without_coins_activation() {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+fn test_gtc_taker_order_should_transform_to_maker() {
+    let bob_passphrase = get_passphrase(&".env.client", "BOB_PASSPHRASE").unwrap();
 
     let coins = json! ([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
         {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
         {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
     ]);
@@ -3243,208 +2815,50 @@ fn orderbook_should_work_without_coins_activation() {
     let mm_bob = MarketMakerIt::start(
         json! ({
             "gui": "nogui",
-            "netid": 9998,
+            "netid": 8999,
+            "dht": "on",  // Enable DHT without delay.
             "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
             "rpcip": env::var ("BOB_TRADE_IP") .ok(),
             "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
             "passphrase": bob_passphrase,
             "coins": coins,
-            "rpc_password": "pass",
+            "rpc_password": "password",
             "i_am_seed": true,
         }),
-        "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
-    )
-    .unwrap();
-
-    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-
-    let mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "dht": "on",  // Enable DHT without delay.
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
-            "passphrase": "alice passphrase",
-            "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        "password".into(),
+        local_start!("bob"),
     )
     .unwrap();
 
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({"Alice log path: {}", mm_alice.log_path.display()});
-
-    log! ({"enable_coins (bob): {:?}", block_on (enable_coins_eth_electrum (&mm_bob, &["http://195.201.0.6:8565"]))});
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    log!("Issue bob ETH/JST sell request");
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
-        "method": "setprice",
+        "method": "sell",
         "base": "ETH",
         "rel": "JST",
-        "price": "1",
-        "volume": "10",
-        "min_volume": "1",
+        "price": 1,
+        "volume": 0.1,
+        "order_type": {
+            "type": "GoodTillCancelled"
+        },
+        "timeout": 2,
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-    log!("Get ETH/JST orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "orderbook",
-        "base": "ETH",
-        "rel": "JST",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-    let orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("orderbook "[orderbook]);
-    let asks = orderbook["asks"].as_array().unwrap();
-    assert_eq!(asks.len(), 1, "Alice ETH/JST orderbook must have exactly 1 ask");
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_fill_or_kill_taker_order_should_not_transform_to_maker() {
-    let bob_passphrase = get_passphrase(&".env.client", "BOB_PASSPHRASE").unwrap();
-
-    let coins = json! ([
-        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
-    ]);
-
-    let mm_bob = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 8999,
-            "dht": "on",  // Enable DHT without delay.
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
-            "coins": coins,
-            "rpc_password": "password",
-            "i_am_seed": true,
-        }),
-        "password".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
-
-    log!("Issue bob ETH/JST sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "sell",
-        "base": "ETH",
-        "rel": "JST",
-        "price": 1,
-        "volume": 0.1,
-        "order_type": {
-            "type": "FillOrKill"
-        },
-        "timeout": 2,
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!sell: {}", rc.1);
-    let sell_json: Json = json::from_str(&rc.1).unwrap();
-    let order_type = sell_json["result"]["order_type"]["type"].as_str();
-    assert_eq!(order_type, Some("FillOrKill"));
-
-    log!("Wait for 4 seconds for Bob order to be cancelled");
-    thread::sleep(Duration::from_secs(4));
-
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "my_orders",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
-    let my_orders: Json = json::from_str(&rc.1).unwrap();
-    let my_maker_orders: HashMap<String, Json> = json::from_value(my_orders["result"]["maker_orders"].clone()).unwrap();
-    let my_taker_orders: HashMap<String, Json> = json::from_value(my_orders["result"]["taker_orders"].clone()).unwrap();
-    assert!(my_maker_orders.is_empty(), "maker_orders must be empty");
-    assert!(my_taker_orders.is_empty(), "taker_orders must be empty");
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_gtc_taker_order_should_transform_to_maker() {
-    let bob_passphrase = get_passphrase(&".env.client", "BOB_PASSPHRASE").unwrap();
-
-    let coins = json! ([
-        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
-    ]);
-
-    let mm_bob = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 8999,
-            "dht": "on",  // Enable DHT without delay.
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
-            "coins": coins,
-            "rpc_password": "password",
-            "i_am_seed": true,
-        }),
-        "password".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
-
-    log!("Issue bob ETH/JST sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "sell",
-        "base": "ETH",
-        "rel": "JST",
-        "price": 1,
-        "volume": 0.1,
-        "order_type": {
-            "type": "GoodTillCancelled"
-        },
-        "timeout": 2,
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    let rc_json: Json = json::from_str(&rc.1).unwrap();
-    let uuid: Uuid = json::from_value(rc_json["result"]["uuid"].clone()).unwrap();
+    let rc_json: Json = json::from_str(&rc.1).unwrap();
+    let uuid: Uuid = json::from_value(rc_json["result"]["uuid"].clone()).unwrap();
 
     log!("Wait for 4 seconds for Bob order to be converted to maker");
     thread::sleep(Duration::from_secs(4));
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_orders",
     })))
@@ -3460,7 +2874,7 @@ fn test_gtc_taker_order_should_transform_to_maker() {
         hex::encode(rmd160_from_passphrase(&bob_passphrase)),
         uuid
     ));
-    log!("Order path "(order_path.display()));
+    log!("Order path {}", order_path.display());
     assert!(order_path.exists());
 }
 
@@ -3495,13 +2909,14 @@ fn test_set_price_must_save_order_to_db() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob ETH/JST sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -3552,13 +2967,14 @@ fn test_set_price_response_format() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob ETH/JST sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -3584,9 +3000,7 @@ fn test_set_price_response_format() {
 fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
     let coins = json!([
         {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0xc0eb7AeD740E1796992A08962c15661bDEB58003"}}}
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     // start bob and immediately place the order
@@ -3611,9 +3025,12 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
     // Enable coins on Bob side. Print the replies in case we need the "address".
-    log! ({"enable_coins (bob): {:?}", block_on (enable_coins_eth_electrum (&mm_bob, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
 
     let set_price_json = json! ({
         "userpass": mm_bob.userpass,
@@ -3624,7 +3041,7 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
         "volume": "0.9",
     });
     log!("Issue sell request on Bob side by setting base/rel price…");
-    let rc = block_on(mm_bob.rpc(set_price_json.clone())).unwrap();
+    let rc = block_on(mm_bob.rpc(&set_price_json)).unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
     let mm_alice = MarketMakerIt::start(
@@ -3636,7 +3053,7 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
         }),
         "pass".into(),
@@ -3648,13 +3065,16 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // Enable coins on Alice side. Print the replies in case we need the "address".
-    log! ({"enable_coins (alice): {:?}", block_on (enable_coins_eth_electrum (&mm_alice, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
 
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -3664,21 +3084,21 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Alice RICK/MORTY orderbook must have exactly 1 ask");
 
     log!("Issue sell request again on Bob side by setting base/rel price…");
-    let rc = block_on(mm_bob.rpc(set_price_json)).unwrap();
+    let rc = block_on(mm_bob.rpc(&set_price_json)).unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
     let pause = 2;
-    log!("Waiting (" (pause) " seconds) for Bob to broadcast messages…");
+    log!("Waiting ({} seconds) for Bob to broadcast messages…", pause);
     thread::sleep(Duration::from_secs(pause));
 
     // Bob orderbook must show 1 order
     log!("Get RICK/MORTY orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -3688,13 +3108,13 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
+    log!("Bob orderbook {:?}", bob_orderbook);
     let asks = bob_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Bob RICK/MORTY orderbook must have exactly 1 ask");
 
     // Alice orderbook must have 1 order
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -3704,7 +3124,7 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Alice RICK/MORTY orderbook must have exactly 1 ask");
 }
@@ -3741,7 +3161,7 @@ fn test_batch_requests() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
     let batch_json = json!([
         {
@@ -3767,9 +3187,9 @@ fn test_batch_requests() {
         },
     ]);
 
-    let rc = block_on(mm_bob.rpc(batch_json)).unwrap();
+    let rc = block_on(mm_bob.rpc(&batch_json)).unwrap();
     assert!(rc.0.is_success(), "!batch: {}", rc.1);
-    log!((rc.1));
+    log!("{}", rc.1);
     let responses = json::from_str::<Vec<Json>>(&rc.1).unwrap();
     assert_eq!(responses[0]["coin"], Json::from("RICK"));
     assert_eq!(
@@ -3786,8 +3206,9 @@ fn test_batch_requests() {
     assert!(responses[2]["error"].as_str().unwrap().contains("Userpass is invalid!"));
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn request_metrics(mm: &MarketMakerIt) -> MetricsJson {
-    let (status, metrics, _headers) = block_on(mm.rpc(json!({ "method": "metrics"}))).unwrap();
+    let (status, metrics, _headers) = block_on(mm.rpc(&json!({ "method": "metrics"}))).unwrap();
     assert_eq!(status, StatusCode::OK, "RPC «metrics» failed with status «{}»", status);
     json::from_str(&metrics).unwrap()
 }
@@ -3815,7 +3236,7 @@ fn test_metrics_method() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
 
     let _electrum = block_on(enable_electrum(&mm, "RICK", false, &[
         "electrum1.cipig.net:10017",
@@ -3827,7 +3248,7 @@ fn test_metrics_method() {
     assert!(!metrics.metrics.is_empty());
 
     log!("Received metrics:");
-    log!([metrics]);
+    log!("{:?}", metrics);
 
     find_metrics_in_json(metrics, "rpc_client.traffic.out", &[("coin", "RICK")])
         .expect(r#"Couldn't find a metric with key = "traffic.out" and label: coin = "RICK" in received json"#);
@@ -3871,7 +3292,7 @@ fn test_electrum_tx_history() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
 
     // Enable RICK electrum client with tx_history loop.
     let electrum = block_on(enable_electrum(&mm, "RICK", true, &[
@@ -3893,7 +3314,7 @@ fn test_electrum_tx_history() {
     // make a transaction to change balance
     let mut enable_res = HashMap::new();
     enable_res.insert("RICK", electrum);
-    log!("enable_coins: "[enable_res]);
+    log!("enable_coins: {:?}", enable_res);
     withdraw_and_send(
         &mm,
         "RICK",
@@ -3932,7 +3353,7 @@ fn spin_n_nodes(seednodes: &[&str], coins: &Json, n: usize) -> Vec<(MarketMakerI
         .unwrap();
 
         let (alice_dump_log, alice_dump_dashboard) = mm.mm_dump();
-        log!({ "Alice {} log path: {}", i, mm.log_path.display() });
+        log!("Alice {} log path: {}", i, mm.log_path.display());
         for seednode in seednodes.iter() {
             block_on(mm.wait_for_log(22., |log| log.contains(&format!("Dialed {}", seednode)))).unwrap();
         }
@@ -3943,10 +3364,10 @@ fn spin_n_nodes(seednodes: &[&str], coins: &Json, n: usize) -> Vec<(MarketMakerI
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_withdraw_cashaddresses() {
+fn test_convert_utxo_address() {
     let coins = json!([
         {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id": "0x40","protocol":{"type":"UTXO"},
-         "address_format":{"format":"cashaddress","network":"bchtest"}},
+         "address_format":{"format":"cashaddress","network":"bitcoincash"}},
     ]);
 
     let mm = MarketMakerIt::start(
@@ -3955,7 +3376,7 @@ fn test_withdraw_cashaddresses() {
             "netid": 9998,
             "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
             "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "passphrase": "face pin lock number add byte put seek mime test note password sin tab multiple",
+            "passphrase": "face pin block number add byte put seek mime test note password sin tab multiple",
             "coins": coins,
             "i_am_seed": true,
             "rpc_password": "pass",
@@ -3965,476 +3386,95 @@ fn test_withdraw_cashaddresses() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
+
+    let _electrum = block_on(enable_electrum(&mm, "BCH", false, &[
+        "electroncash.de:50003",
+        "tbch.loping.net:60001",
+        "blackie.c3-soft.com:60001",
+        "bch0.kister.net:51001",
+        "testnet.imaginary.cash:50001",
+    ]));
 
-    let electrum = block_on(mm.rpc(json! ({
+    // test standard to cashaddress
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
-        "method": "electrum",
+        "method": "convertaddress",
         "coin": "BCH",
-        "servers": [
-            {"url":"electroncash.de:50003"},
-            {"url":"tbch.loping.net:60001"},
-            {"url":"blackie.c3-soft.com:60001"},
-            {"url":"bch0.kister.net:51001"},
-            {"url":"testnet.imaginary.cash:50001"}
-        ],
-        "mm2": 1,
+        "from": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
+        "to_address_format":{"format":"cashaddress","network":"bitcoincash"},
     })))
     .unwrap();
-
     assert_eq!(
-        electrum.0,
+        rc.0,
         StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
+        "RPC «convertaddress» failed with status «{}»",
+        rc.0
     );
-    let electrum: Json = json::from_str(&electrum.1).unwrap();
-    log!([electrum]);
-
-    // make withdraw from cashaddress to cashaddress
-    let withdraw = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "withdraw",
-        "coin": "BCH",
-        "to": "bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597",
-        "amount": 0.00001,
-    })))
-    .unwrap();
-
-    assert!(withdraw.0.is_success(), "BCH withdraw: {}", withdraw.1);
-    let withdraw_json: Json = json::from_str(&withdraw.1).unwrap();
-    log!((withdraw_json));
-
-    // check "from" addresses
-    let from: Vec<&str> = withdraw_json["from"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(|v| v.as_str().unwrap())
-        .collect();
-    assert_eq!(from, vec!["bchtest:qqgp9xh3435xamv7ghct8emer2s2erzj8gx3gnhwkq"]);
-
-    // check "to" addresses
-    let to: Vec<&str> = withdraw_json["to"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(|v| v.as_str().unwrap())
-        .collect();
-    assert_eq!(to, vec!["bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597"]);
-
-    // send the transaction
-    let send_tx = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "send_raw_transaction",
-        "coin": "BCH",
-        "tx_hex": withdraw_json["tx_hex"],
-    })))
-    .unwrap();
-    assert!(send_tx.0.is_success(), "BCH send_raw_transaction: {}", send_tx.1);
-    log!((send_tx.1));
-
-    // Wait 5 seconds to avoid double spending
-    thread::sleep(Duration::from_secs(5));
-
-    // make withdraw from cashaddress to legacy
-    let withdraw = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "withdraw",
-        "coin": "BCH",
-        "to": "1WxswvLF2HdaDr4k77e92VjaXuPQA8Uji",
-        "amount": 0.00001,
-    })))
-    .unwrap();
-
-    assert!(withdraw.0.is_success(), "BCH withdraw: {}", withdraw.1);
-    let withdraw_json: Json = json::from_str(&withdraw.1).unwrap();
-    log!((withdraw_json));
-
-    // check "from" addresses
-    let from: Vec<&str> = withdraw_json["from"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(|v| v.as_str().unwrap())
-        .collect();
-    assert_eq!(from, vec!["bchtest:qqgp9xh3435xamv7ghct8emer2s2erzj8gx3gnhwkq"]);
+    let actual: Json = json::from_str(&rc.1).unwrap();
 
-    // check "to" addresses
-    let to: Vec<&str> = withdraw_json["to"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(|v| v.as_str().unwrap())
-        .collect();
-    assert_eq!(to, vec!["1WxswvLF2HdaDr4k77e92VjaXuPQA8Uji"]);
+    let expected = json!({
+        "result": {
+            "address": "bitcoincash:qzxqqt9lh4feptf0mplnk58gnajfepzwcq9f2rxk55",
+        },
+    });
+    assert_eq!(actual, expected);
 
-    // send the transaction
-    let send_tx = block_on(mm.rpc(json! ({
+    // test cashaddress to standard
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
-        "method": "send_raw_transaction",
+        "method": "convertaddress",
         "coin": "BCH",
-        "tx_hex": withdraw_json["tx_hex"],
+        "from": "bitcoincash:qzxqqt9lh4feptf0mplnk58gnajfepzwcq9f2rxk55",
+        "to_address_format":{"format":"standard"},
     })))
     .unwrap();
-    assert!(send_tx.0.is_success(), "BCH send_raw_transaction: {}", send_tx.1);
-    log!((send_tx.1));
-
-    // Wait 5 seconds to avoid double spending
-    thread::sleep(Duration::from_secs(5));
+    assert_eq!(
+        rc.0,
+        StatusCode::OK,
+        "RPC «convertaddress» failed with status «{}»",
+        rc.0
+    );
+    let actual: Json = json::from_str(&rc.1).unwrap();
 
-    //Disable BCH to enable in Legacy Mode
-    let rc = block_on(mm.rpc(json!({
-        "userpass": mm.userpass,
-        "method": "disable_coin",
-        "coin": "BCH",
-    })))
-    .unwrap();
-    assert_eq!(rc.0, StatusCode::OK, "RPC «disable_coin» failed with status «{}»", rc.0);
+    let expected = json!({
+        "result": {
+            "address": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
+        },
+    });
+    assert_eq!(actual, expected);
 
-    let electrum = block_on(mm.rpc(json! ({
+    // test standard to standard
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
-        "method": "electrum",
+        "method": "convertaddress",
         "coin": "BCH",
-        "servers": [
-            {"url":"electroncash.de:50003"},
-            {"url":"tbch.loping.net:60001"},
-            {"url":"blackie.c3-soft.com:60001"},
-            {"url":"bch0.kister.net:51001"},
-            {"url":"testnet.imaginary.cash:50001"}
-        ],
-        "address_format":{"format":"standard"},
-        "mm2": 1,
+        "from": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
+        "to_address_format":{"format":"standard"},
     })))
     .unwrap();
-
     assert_eq!(
-        electrum.0,
+        rc.0,
         StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
+        "RPC «convertaddress» failed with status «{}»",
+        rc.0
     );
-    let electrum: Json = json::from_str(&electrum.1).unwrap();
-    log!([electrum]);
+    let actual: Json = json::from_str(&rc.1).unwrap();
+
+    let expected = json!({
+        "result": {
+            "address": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
+        },
+    });
+    assert_eq!(actual, expected);
 
-    // make withdraw from Legacy to Cashaddress
-    let withdraw = block_on(mm.rpc(json! ({
+    // test invalid address
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
-        "method": "withdraw",
+        "method": "convertaddress",
         "coin": "BCH",
-        "to": "bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597",
-        "amount": 0.00001,
-    })))
-    .unwrap();
-
-    assert!(withdraw.0.is_success(), "BCH withdraw: {}", withdraw.1);
-    let withdraw_json: Json = json::from_str(&withdraw.1).unwrap();
-    log!((withdraw_json));
-
-    // check "from" addresses
-    let from: Vec<&str> = withdraw_json["from"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(|v| v.as_str().unwrap())
-        .collect();
-    assert_eq!(from, vec!["12Tz6nWqA7e5tV7m6d1EzMkNs6MQVW4UMw"]);
-
-    // check "to" addresses
-    let to: Vec<&str> = withdraw_json["to"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(|v| v.as_str().unwrap())
-        .collect();
-    assert_eq!(to, vec!["bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597"]);
-
-    // send the transaction
-    let send_tx = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "send_raw_transaction",
-        "coin": "BCH",
-        "tx_hex": withdraw_json["tx_hex"],
-    })))
-    .unwrap();
-    assert!(send_tx.0.is_success(), "BCH send_raw_transaction: {}", send_tx.1);
-    log!((send_tx.1));
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_withdraw_to_different_cashaddress_network_should_fail() {
-    let coins = json!([
-        {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id": "0x40","protocol":{"type":"UTXO"},
-         "address_format":{"format":"cashaddress","network":"bchtest"}},
-    ]);
-
-    let mm = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "passphrase": "face pin lock number add byte put seek mime test note password sin tab multiple",
-            "coins": coins,
-            "i_am_seed": true,
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
-
-    let electrum = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "electrum",
-        "coin": "BCH",
-        "servers": [
-            {"url":"electroncash.de:50003"},
-            {"url":"tbch.loping.net:60001"},
-            {"url":"blackie.c3-soft.com:60001"},
-            {"url":"bch0.kister.net:51001"},
-            {"url":"testnet.imaginary.cash:50001"}
-        ],
-        "mm2": 1,
-    })))
-    .unwrap();
-
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    let electrum: Json = json::from_str(&electrum.1).unwrap();
-    log!([electrum]);
-
-    // make withdraw to from bchtest to bitcoincash should fail
-    let withdraw = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "withdraw",
-        "coin": "BCH",
-        "to": "bitcoincash:qqyf96yqdrpa8f6pkf9f00ap068m5tgvly28qsfq9p",
-        "amount": 0.00001,
-    })))
-    .unwrap();
-
-    assert!(withdraw.0.is_server_error(), "BCH withdraw: {}", withdraw.1);
-    log!([withdraw.1]);
-
-    block_on(mm.stop()).unwrap();
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_common_cashaddresses() {
-    let coins = json!([
-        {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"protocol":{"type":"UTXO"},
-         "address_format":{"format":"cashaddress","network":"bchtest"}},
-    ]);
-
-    let mm = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "passphrase": "face pin block number add byte put seek mime test note password sin tab multiple",
-            "coins": coins,
-            "i_am_seed": true,
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
-
-    // Enable BCH electrum client with tx_history loop.
-    // Enable RICK electrum client with tx_history loop.
-    let electrum = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "electrum",
-        "coin": "BCH",
-        "servers": [
-            {"url":"electroncash.de:50003"},
-            {"url":"tbch.loping.net:60001"},
-            {"url":"blackie.c3-soft.com:60001"},
-            {"url":"bch0.kister.net:51001"},
-            {"url":"testnet.imaginary.cash:50001"}
-        ],
-        "mm2": 1,
-    })))
-    .unwrap();
-
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    let electrum: Json = json::from_str(&electrum.1).unwrap();
-    log!([electrum]);
-
-    assert_eq!(
-        electrum["address"].as_str().unwrap(),
-        "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la"
-    );
-
-    // check my_balance
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "my_balance",
-        "coin": "BCH",
-    })))
-    .unwrap();
-    assert_eq!(rc.0, StatusCode::OK, "RPC «my_balance» failed with status «{}»", rc.0);
-    let json: Json = json::from_str(&rc.1).unwrap();
-    let my_balance_address = json["address"].as_str().unwrap();
-    assert_eq!(my_balance_address, "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la");
-
-    // check get_enabled_coins
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "get_enabled_coins",
-    })))
-    .unwrap();
-    assert_eq!(
-        rc.0,
-        StatusCode::OK,
-        "RPC «get_enabled_coins» failed with status «{}»",
-        rc.0
-    );
-    let json: Json = json::from_str(&rc.1).unwrap();
-
-    let obj = &json["result"].as_array().unwrap()[0];
-    assert_eq!(obj["ticker"].as_str().unwrap(), "BCH");
-    assert_eq!(
-        obj["address"].as_str().unwrap(),
-        "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la"
-    );
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_convert_utxo_address() {
-    let coins = json!([
-        {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id": "0x40","protocol":{"type":"UTXO"},
-         "address_format":{"format":"cashaddress","network":"bitcoincash"}},
-    ]);
-
-    let mm = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "passphrase": "face pin block number add byte put seek mime test note password sin tab multiple",
-            "coins": coins,
-            "i_am_seed": true,
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
-
-    let _electrum = block_on(enable_electrum(&mm, "BCH", false, &[
-        "electroncash.de:50003",
-        "tbch.loping.net:60001",
-        "blackie.c3-soft.com:60001",
-        "bch0.kister.net:51001",
-        "testnet.imaginary.cash:50001",
-    ]));
-
-    // test standard to cashaddress
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "convertaddress",
-        "coin": "BCH",
-        "from": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
-        "to_address_format":{"format":"cashaddress","network":"bitcoincash"},
-    })))
-    .unwrap();
-    assert_eq!(
-        rc.0,
-        StatusCode::OK,
-        "RPC «convertaddress» failed with status «{}»",
-        rc.0
-    );
-    let actual: Json = json::from_str(&rc.1).unwrap();
-
-    let expected = json!({
-        "result": {
-            "address": "bitcoincash:qzxqqt9lh4feptf0mplnk58gnajfepzwcq9f2rxk55",
-        },
-    });
-    assert_eq!(actual, expected);
-
-    // test cashaddress to standard
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "convertaddress",
-        "coin": "BCH",
-        "from": "bitcoincash:qzxqqt9lh4feptf0mplnk58gnajfepzwcq9f2rxk55",
-        "to_address_format":{"format":"standard"},
-    })))
-    .unwrap();
-    assert_eq!(
-        rc.0,
-        StatusCode::OK,
-        "RPC «convertaddress» failed with status «{}»",
-        rc.0
-    );
-    let actual: Json = json::from_str(&rc.1).unwrap();
-
-    let expected = json!({
-        "result": {
-            "address": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
-        },
-    });
-    assert_eq!(actual, expected);
-
-    // test standard to standard
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "convertaddress",
-        "coin": "BCH",
-        "from": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
-        "to_address_format":{"format":"standard"},
-    })))
-    .unwrap();
-    assert_eq!(
-        rc.0,
-        StatusCode::OK,
-        "RPC «convertaddress» failed with status «{}»",
-        rc.0
-    );
-    let actual: Json = json::from_str(&rc.1).unwrap();
-
-    let expected = json!({
-        "result": {
-            "address": "1DmFp16U73RrVZtYUbo2Ectt8mAnYScpqM",
-        },
-    });
-    assert_eq!(actual, expected);
-
-    // test invalid address
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
-        "method": "convertaddress",
-        "coin": "BCH",
-        "from": "0000000000000000000000000000000000",
-        "to_address_format":{"format":"standard"},
+        "from": "0000000000000000000000000000000000",
+        "to_address_format":{"format":"standard"},
     })))
     .unwrap();
     assert!(
@@ -4483,7 +3523,7 @@ fn test_convert_segwit_address() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
 
     let _electrum = block_on(enable_electrum(&mm, "tBTC", false, &[
         "electrum1.cipig.net:10068",
@@ -4492,7 +3532,7 @@ fn test_convert_segwit_address() {
     ]));
 
     // test standard to segwit
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "tBTC",
@@ -4516,7 +3556,7 @@ fn test_convert_segwit_address() {
     assert_eq!(actual, expected);
 
     // test segwit to standard
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "tBTC",
@@ -4540,7 +3580,7 @@ fn test_convert_segwit_address() {
     assert_eq!(actual, expected);
 
     // test invalid tBTC standard address
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "tBTC",
@@ -4556,7 +3596,7 @@ fn test_convert_segwit_address() {
     assert!(rc.1.contains("Expected a valid P2PKH or P2SH prefix for tBTC"));
 
     // test invalid tBTC segwit address
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "tBTC",
@@ -4603,12 +3643,12 @@ fn test_convert_eth_address() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
 
     block_on(enable_native(&mm, "ETH", &["http://195.201.0.6:8565"]));
 
     // test single-case to mixed-case
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "ETH",
@@ -4632,7 +3672,7 @@ fn test_convert_eth_address() {
     assert_eq!(actual, expected);
 
     // test mixed-case to mixed-case (expect error)
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "ETH",
@@ -4656,7 +3696,7 @@ fn test_convert_eth_address() {
     assert_eq!(actual, expected);
 
     // test invalid address
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "ETH",
@@ -4674,25 +3714,239 @@ fn test_convert_eth_address() {
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_convert_qrc20_address() {
-    let passphrase = "cV463HpebE2djP9ugJry5wZ9st5cc6AbkHXGryZVPXMH1XJK8cVU";
-    let coins = json! ([
-        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"segwit": true,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
-         "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
-    ]);
-
+fn test_add_delegation_qtum() {
+    let coins = json!([{
+      "coin": "tQTUM",
+      "name": "qtumtest",
+      "fname": "Qtum test",
+      "rpcport": 13889,
+      "pubtype": 120,
+      "p2shtype": 110,
+      "wiftype": 239,
+      "txfee": 400000,
+      "mm2": 1,
+      "required_confirmations": 1,
+      "mature_confirmations": 2000,
+      "avg_blocktime": 0.53,
+      "protocol": {
+        "type": "QTUM"
+      }
+    }]);
     let mm = MarketMakerIt::start(
-        json! ({
+        json!({
             "gui": "nogui",
-            "netid": 8999,
-            "dht": "on",  // Enable DHT without delay.
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": passphrase,
-            "coins": coins,
-            "rpc_password": "password",
-            "i_am_seed": true,
+            "netid": 9998,
+            "myipaddr": env::var("BOB_TRADE_IP").ok(),
+            "rpcip": env::var("BOB_TRADE_IP").ok(),
+            "canbind": env::var("BOB_TRADE_PORT").ok().map(|s| s.parse::<i64>().unwrap()),
+            "passphrase": "asthma turtle lizard tone genuine tube hunt valley soap cloth urge alpha amazing frost faculty cycle mammal leaf normal bright topple avoid pulse buffalo",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let json = block_on(enable_electrum(&mm, "tQTUM", false, &[
+        "electrum1.cipig.net:10071",
+        "electrum2.cipig.net:10071",
+        "electrum3.cipig.net:10071",
+    ]));
+    println!("{}", json.balance);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": "pass",
+        "mmrpc": "2.0",
+        "method": "add_delegation",
+        "params": {
+            "coin": "tQTUM",
+            "staking_details": {
+                "type": "Qtum",
+                "address": "qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE"
+            }
+        },
+        "id": 0
+    })))
+    .unwrap();
+    assert_eq!(
+        rc.0,
+        StatusCode::OK,
+        "RPC «add_delegation» failed with status «{}»",
+        rc.0
+    );
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": "pass",
+        "mmrpc": "2.0",
+        "method": "add_delegation",
+        "params": {
+            "coin": "tQTUM",
+            "staking_details": {
+                "type": "Qtum",
+                "address": "fake_address"
+            }
+        },
+        "id": 0
+    })))
+    .unwrap();
+    assert!(
+        rc.0.is_client_error(),
+        "!add_delegation success but should be error: {}",
+        rc.1
+    );
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_remove_delegation_qtum() {
+    let coins = json!([{
+      "coin": "tQTUM",
+      "name": "qtumtest",
+      "fname": "Qtum test",
+      "rpcport": 13889,
+      "pubtype": 120,
+      "p2shtype": 110,
+      "wiftype": 239,
+      "txfee": 400000,
+      "mm2": 1,
+      "required_confirmations": 1,
+      "mature_confirmations": 2000,
+      "avg_blocktime": 0.53,
+      "protocol": {
+        "type": "QTUM"
+      }
+    }]);
+    let mm = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var("BOB_TRADE_IP").ok(),
+            "rpcip": env::var("BOB_TRADE_IP").ok(),
+            "canbind": env::var("BOB_TRADE_PORT").ok().map(|s| s.parse::<i64>().unwrap()),
+            "passphrase": "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let json = block_on(enable_electrum(&mm, "tQTUM", false, &[
+        "electrum1.cipig.net:10071",
+        "electrum2.cipig.net:10071",
+        "electrum3.cipig.net:10071",
+    ]));
+    println!("{}", json.balance);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": "pass",
+        "mmrpc": "2.0",
+        "method": "remove_delegation",
+        "params": {"coin": "tQTUM"},
+        "id": 0
+    })))
+    .unwrap();
+    assert_eq!(
+        rc.0,
+        StatusCode::OK,
+        "RPC «remove_delegation» failed with status «{}»",
+        rc.0
+    );
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_get_staking_infos_qtum() {
+    let coins = json!([{
+      "coin": "tQTUM",
+      "name": "qtumtest",
+      "fname": "Qtum test",
+      "rpcport": 13889,
+      "pubtype": 120,
+      "p2shtype": 110,
+      "wiftype": 239,
+      "txfee": 400000,
+      "mm2": 1,
+      "required_confirmations": 1,
+      "mature_confirmations": 2000,
+      "avg_blocktime": 0.53,
+      "protocol": {
+        "type": "QTUM"
+      }
+    }]);
+    let mm = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var("BOB_TRADE_IP").ok(),
+            "rpcip": env::var("BOB_TRADE_IP").ok(),
+            "canbind": env::var("BOB_TRADE_PORT").ok().map(|s| s.parse::<i64>().unwrap()),
+            "passphrase": "federal stay trigger hour exist success game vapor become comfort action phone bright ill target wild nasty crumble dune close rare fabric hen iron",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+        .unwrap();
+
+    let json = block_on(enable_electrum(&mm, "tQTUM", false, &[
+        "electrum1.cipig.net:10071",
+        "electrum2.cipig.net:10071",
+        "electrum3.cipig.net:10071",
+    ]));
+    println!("{}", json.balance);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": "pass",
+        "mmrpc": "2.0",
+        "method": "get_staking_infos",
+        "params": {"coin": "tQTUM"},
+        "id": 0
+    })))
+    .unwrap();
+    assert_eq!(
+        rc.0,
+        StatusCode::OK,
+        "RPC «get_staking_infos» failed with status «{}»",
+        rc.0
+    );
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_convert_qrc20_address() {
+    let passphrase = "cV463HpebE2djP9ugJry5wZ9st5cc6AbkHXGryZVPXMH1XJK8cVU";
+    let coins = json! ([
+        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
+         "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 8999,
+            "dht": "on",  // Enable DHT without delay.
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": passphrase,
+            "coins": coins,
+            "rpc_password": "password",
+            "i_am_seed": true,
         }),
         "password".into(),
         local_start!("bob"),
@@ -4700,16 +3954,20 @@ fn test_convert_qrc20_address() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm.mm_dump();
-    log! ({"Bob log path: {}", mm.log_path.display()});
+    log!("Bob log path: {}", mm.log_path.display());
     let _electrum = block_on(enable_qrc20(
         &mm,
         "QRC20",
-        &["95.217.83.126:10001"],
+        &[
+            "electrum1.cipig.net:10071",
+            "electrum2.cipig.net:10071",
+            "electrum3.cipig.net:10071",
+        ],
         "0xba8b71f3544b93e2f681f996da519a98ace0107a",
     ));
 
     // test wallet to contract
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "QRC20",
@@ -4733,7 +3991,7 @@ fn test_convert_qrc20_address() {
     assert_eq!(actual, expected);
 
     // test contract to wallet
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "QRC20",
@@ -4757,7 +4015,7 @@ fn test_convert_qrc20_address() {
     assert_eq!(actual, expected);
 
     // test wallet to wallet
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "QRC20",
@@ -4781,7 +4039,7 @@ fn test_convert_qrc20_address() {
     assert_eq!(actual, expected);
 
     // test invalid address (invalid prefixes)
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "QRC20",
@@ -4794,11 +4052,11 @@ fn test_convert_qrc20_address() {
         "!convertaddress success but should be error: {}",
         rc.1
     );
-    log!((rc.1));
+    log!("{}", rc.1);
     assert!(rc.1.contains("Address has invalid prefixes"));
 
     // test invalid address
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "convertaddress",
         "coin": "QRC20",
@@ -4849,12 +4107,15 @@ fn test_validateaddress() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm, &["http://195.201.0.6:8565"]))]);
+    log!("Log path: {}", mm.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm, &["http://195.201.0.6:8565"]))
+    );
 
     // test valid RICK address
 
-    let rc = block_on(mm.rpc(json!({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "validateaddress",
         "coin": "RICK",
@@ -4878,7 +4139,7 @@ fn test_validateaddress() {
 
     // test valid ETH address
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "validateaddress",
         "coin": "ETH",
@@ -4902,7 +4163,7 @@ fn test_validateaddress() {
 
     // test invalid RICK address (legacy address format activated)
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "validateaddress",
         "coin": "RICK",
@@ -4920,12 +4181,12 @@ fn test_validateaddress() {
 
     assert!(!result["is_valid"].as_bool().unwrap());
     let reason = result["reason"].as_str().unwrap();
-    log!((reason));
+    log!("{}", reason);
     assert!(reason.contains("Legacy address format activated for RICK, but CashAddress format used instead"));
 
     // test invalid RICK address (invalid prefixes)
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "validateaddress",
         "coin": "RICK",
@@ -4944,12 +4205,12 @@ fn test_validateaddress() {
 
     assert!(!result["is_valid"].as_bool().unwrap());
     let reason = result["reason"].as_str().unwrap();
-    log!((reason));
+    log!("{}", reason);
     assert!(reason.contains("Expected a valid P2PKH or P2SH prefix"));
 
     // test invalid ETH address
 
-    let rc = block_on(mm.rpc(json! ({
+    let rc = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "validateaddress",
         "coin": "ETH",
@@ -4967,7 +4228,7 @@ fn test_validateaddress() {
 
     assert!(!result["is_valid"].as_bool().unwrap());
     let reason = result["reason"].as_str().unwrap();
-    log!((reason));
+    log!("{}", reason);
     assert!(reason.contains("Address must be prefixed with 0x"));
 }
 
@@ -5019,12 +4280,12 @@ fn test_validateaddress_segwit() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log! ({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // wait until RPC API is active
 
     // Enable coins. Print the replies in case we need the address.
-    let electrum = block_on(mm_alice.rpc(json!({
+    let electrum = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "electrum",
         "coin": "tBTC",
@@ -5041,7 +4302,7 @@ fn test_validateaddress_segwit() {
         electrum.0,
         electrum.1
     );
-    log!("enable_coins (alice): "[electrum]);
+    log!("enable_coins (alice): {:?}", electrum);
 
     let electrum_response: EnableElectrumResponse =
         json::from_str(&electrum.1).expect("Expected 'EnableElectrumResponse'");
@@ -5049,7 +4310,7 @@ fn test_validateaddress_segwit() {
     enable_res.insert("tBTC", electrum_response);
 
     // test valid Segwit address
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "validateaddress",
         "coin": "tBTC",
@@ -5072,7 +4333,7 @@ fn test_validateaddress_segwit() {
     assert_eq!(actual, expected);
 
     // test invalid tBTC Segwit address (invalid hrp)
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "validateaddress",
         "coin": "tBTC",
@@ -5091,7 +4352,7 @@ fn test_validateaddress_segwit() {
 
     assert!(!result["is_valid"].as_bool().unwrap());
     let reason = result["reason"].as_str().unwrap();
-    log!((reason));
+    log!("{}", reason);
     assert!(reason.contains("Invalid address: bc1qdkwjk42dw6pryvs9sl0ht3pn3mxghuma64jst5"));
 
     block_on(mm_alice.stop()).unwrap();
@@ -5102,7 +4363,7 @@ fn test_validateaddress_segwit() {
 fn qrc20_activate_electrum() {
     let passphrase = "cV463HpebE2djP9ugJry5wZ9st5cc6AbkHXGryZVPXMH1XJK8cVU";
     let coins = json! ([
-        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"segwit": true,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
+        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
          "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
     ]);
 
@@ -5125,11 +4386,15 @@ fn qrc20_activate_electrum() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm.mm_dump();
-    log! ({"Bob log path: {}", mm.log_path.display()});
+    log!("Bob log path: {}", mm.log_path.display());
     let electrum_json = block_on(enable_qrc20(
         &mm,
         "QRC20",
-        &["95.217.83.126:10001"],
+        &[
+            "electrum1.cipig.net:10071",
+            "electrum2.cipig.net:10071",
+            "electrum3.cipig.net:10071",
+        ],
         "0xba8b71f3544b93e2f681f996da519a98ace0107a",
     ));
     assert_eq!(
@@ -5145,7 +4410,7 @@ fn test_qrc20_withdraw() {
     // corresponding private key: [3, 98, 177, 3, 108, 39, 234, 144, 131, 178, 103, 103, 127, 80, 230, 166, 53, 68, 147, 215, 42, 216, 144, 72, 172, 110, 180, 13, 123, 179, 10, 49]
     let passphrase = "cMhHM3PMpMrChygR4bLF7QsTdenhWpFrrmf2UezBG3eeFsz41rtL";
     let coins = json!([
-        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"segwit": true,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
+        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
          "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
     ]);
 
@@ -5168,25 +4433,29 @@ fn test_qrc20_withdraw() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm.mm_dump();
-    log!({ "Bob log path: {}", mm.log_path.display() });
+    log!("Bob log path: {}", mm.log_path.display());
 
     let electrum_json = block_on(enable_qrc20(
         &mm,
         "QRC20",
-        &["95.217.83.126:10001"],
+        &[
+            "electrum1.cipig.net:10071",
+            "electrum2.cipig.net:10071",
+            "electrum3.cipig.net:10071",
+        ],
         "0xba8b71f3544b93e2f681f996da519a98ace0107a",
     ));
     assert_eq!(
         electrum_json["address"].as_str(),
         Some("qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG")
     );
-    log!("electrum_json: "[electrum_json]);
+    log!("electrum_json: {:?}", electrum_json);
     let balance: f64 = electrum_json["balance"].as_str().unwrap().parse().unwrap();
-    log!("Balance "(balance));
+    log!("Balance {}", balance);
 
     let amount = 10;
 
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "withdraw",
         "coin": "QRC20",
@@ -5203,10 +4472,10 @@ fn test_qrc20_withdraw() {
     let withdraw_json: Json = json::from_str(&withdraw.1).unwrap();
     assert!(withdraw.0.is_success(), "QRC20 withdraw: {}", withdraw.1);
 
-    log!((withdraw_json));
+    log!("{}", withdraw_json);
     assert!(withdraw_json["tx_hex"].as_str().unwrap().contains("5403a02526012844a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca0014d362e096e873eb7907e205fadc6175c6fec7bc44c2"));
 
-    let send_tx = block_on(mm.rpc(json! ({
+    let send_tx = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "send_raw_transaction",
         "coin": "QRC20",
@@ -5214,7 +4483,7 @@ fn test_qrc20_withdraw() {
     })))
     .unwrap();
     assert!(send_tx.0.is_success(), "QRC20 send_raw_transaction: {}", send_tx.1);
-    log!((send_tx.1));
+    log!("{}", send_tx.1);
 }
 
 #[test]
@@ -5222,7 +4491,7 @@ fn test_qrc20_withdraw() {
 fn test_qrc20_withdraw_error() {
     let passphrase = "album hollow help heart use bird response large lounge fat elbow coral";
     let coins = json!([
-        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"segwit": true,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
+        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
          "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
     ]);
 
@@ -5244,19 +4513,23 @@ fn test_qrc20_withdraw_error() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
 
     let electrum_json = block_on(enable_qrc20(
         &mm,
         "QRC20",
-        &["95.217.83.126:10001"],
+        &[
+            "electrum1.cipig.net:10071",
+            "electrum2.cipig.net:10071",
+            "electrum3.cipig.net:10071",
+        ],
         "0xba8b71f3544b93e2f681f996da519a98ace0107a",
     ));
     let balance = electrum_json["balance"].as_str().unwrap();
     assert_eq!(balance, "10");
 
     // try to transfer more than balance
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "withdraw",
         "coin": "QRC20",
@@ -5269,13 +4542,13 @@ fn test_qrc20_withdraw_error() {
         "withdraw should have failed, but got {:?}",
         withdraw
     );
-    log!([withdraw.1]);
+    log!("{:?}", withdraw.1);
     assert!(withdraw
         .1
         .contains("Not enough QRC20 to withdraw: available 10, required at least 11"));
 
     // try to transfer with zero QTUM balance
-    let withdraw = block_on(mm.rpc(json! ({
+    let withdraw = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
         "method": "withdraw",
         "coin": "QRC20",
@@ -5293,23 +4566,21 @@ fn test_qrc20_withdraw_error() {
         "withdraw should have failed, but got {:?}",
         withdraw
     );
-    log!([withdraw.1]);
+    log!("{:?}", withdraw.1);
     // 0.04 = 100_000 * 40 / 100_000_000
     assert!(withdraw
         .1
         .contains("Not enough QTUM to withdraw: available 0, required at least 0.04"));
 }
 
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_qrc20_tx_history() {
+async fn test_qrc20_history_impl() {
     let passphrase = "daring blind measure rebuild grab boost fix favorite nurse stereo april rookie";
     let coins = json!([
-        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"segwit": true,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
+        {"coin":"QRC20","required_confirmations":0,"pubtype": 120,"p2shtype": 50,"wiftype": 128,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
          "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
     ]);
 
-    let mut mm = MarketMakerIt::start(
+    let mut mm = MarketMakerIt::start_async(
         json! ({
             "gui": "nogui",
             "netid": 9998,
@@ -5317,27 +4588,35 @@ fn test_qrc20_tx_history() {
             "rpcip": env::var ("BOB_TRADE_IP") .ok(),
             "passphrase": passphrase,
             "coins": coins,
-            "i_am_seed": true,
             "rpc_password": "pass",
             "metrics_interval": 30.,
         }),
         "pass".into(),
         local_start!("bob"),
     )
+    .await
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
 
-    let electrum = block_on(mm.rpc(json!({
-        "userpass": mm.userpass,
-        "method": "electrum",
-        "coin": "QRC20",
-        "servers": [{"url":"95.217.83.126:10001"}],
-        "mm2": 1,
-        "tx_history": true,
-        "swap_contract_address": "0xd362e096e873eb7907e205fadc6175c6fec7bc44",
-    })))
-    .unwrap();
+    #[cfg(not(target_arch = "wasm32"))]
+    common::log::info!("log path: {}", mm.log_path.display());
+
+    mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))
+        .await
+        .unwrap();
+
+    let electrum = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "electrum",
+            "coin": "QRC20",
+            "servers": qtum_electrums(),
+            "mm2": 1,
+            "tx_history": true,
+            "swap_contract_address": "0xd362e096e873eb7907e205fadc6175c6fec7bc44",
+        }))
+        .await
+        .unwrap();
     assert_eq!(
         electrum.0,
         StatusCode::OK,
@@ -5352,18 +4631,22 @@ fn test_qrc20_tx_history() {
     );
 
     // Wait till tx_history will not be loaded
-    block_on(mm.wait_for_log(22., |log| log.contains("history has been loaded successfully"))).unwrap();
+    mm.wait_for_log(22., |log| log.contains("history has been loaded successfully"))
+        .await
+        .unwrap();
 
     // let the MarketMaker save the history to the file
-    block_on(Timer::sleep(1.));
+    Timer::sleep(1.).await;
 
-    let tx_history = block_on(mm.rpc(json!({
-        "userpass": mm.userpass,
-        "method": "my_tx_history",
-        "coin": "QRC20",
-        "limit": 100,
-    })))
-    .unwrap();
+    let tx_history = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "my_tx_history",
+            "coin": "QRC20",
+            "limit": 100,
+        }))
+        .await
+        .unwrap();
     assert_eq!(
         tx_history.0,
         StatusCode::OK,
@@ -5371,7 +4654,7 @@ fn test_qrc20_tx_history() {
         tx_history.0,
         tx_history.1
     );
-    log!([tx_history.1]);
+    common::log::debug!("{:?}", tx_history.1);
     let tx_history_json: Json = json::from_str(&tx_history.1).unwrap();
     let tx_history_result = &tx_history_json["result"];
 
@@ -5406,19 +4689,16 @@ fn test_qrc20_tx_history() {
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_tx_history_segwit() {
-    let passphrase = "also shoot benefit prefer juice shell elder veteran woman mimic image kidney";
-    let coins = json!([
-        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}},
+fn test_get_raw_transaction() {
+    let coins = json! ([
+        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
     ]);
-
     let mm = MarketMakerIt::start(
         json! ({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "passphrase": passphrase,
+            "passphrase": "boob",
             "coins": coins,
             "i_am_seed": true,
             "rpc_password": "pass",
@@ -5429,63 +4709,269 @@ fn test_tx_history_segwit() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
+    // RICK
+    let _electrum = block_on(enable_electrum(&mm, "RICK", false, &[
+        "electrum3.cipig.net:10017",
+        "electrum2.cipig.net:10017",
+        "electrum1.cipig.net:10017",
+    ]));
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": "RICK",
+            "tx_hash": "989360b0225b4e05fa13643e2e306c8eb5c52fa611615dfd30195089010b1c7b",
+        },
+        "id": 0,
+    })))
+    .unwrap();
+    assert!(raw.0.is_success(), "get_raw_transaction for coin RICK: {}", raw.1);
+    let res: RpcSuccessResponse<RawTransactionResult> =
+        json::from_str(&raw.1).expect("Expected 'RpcSuccessResponse<RawTransactionResult>'");
+    let expected_hex = "0400008085202f89025655b6fec358091a4a6b34107e69b10bd7660056d8f2a1e5f8eef0db6aec960100000000494830450221008c89db5e2d93d7674fe152e37344dfd24a0b1d4d382a7e0bcfc5d8190a141d72022050ce4ef929429e7e1a6c4ebd3f72a1a2aa25da1e0df65553a2c657658077ed1d01feffffff79cc137b70c39c9c7c2b9230c818ec684ffe731bf1ae821f91ba9d3e526f55f00000000049483045022100868c71f4a8e1452a3bc8b1d053a846959ab7df63fb0d147e9173f69818bbb1f3022060c7e045a34cf6af61bc3a74dc2db7b8bfa4949bc5919acceed40fc07d8706d201feffffff0240043a0000000000232102afdbba3e3c90db5f0f4064118f79cf308f926c68afd64ea7afc930975663e4c4ac201efc01000000001976a914347f2aedf63bac168c2cc4f075a2850435e20ac188ac96d3c96036dd0e000000000000000000000000";
+    assert_eq!(res.result.tx_hex, expected_hex);
 
-    // enable tBTC to see that to/from segwit addresses are displayed correctly in tx_history
-    // and that tx_history is retrieved for the segwit address instead of legacy
-    let electrum = block_on(mm.rpc(json!({
+    // ETH
+    let eth = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
-        "method": "electrum",
-        "coin": "tBTC",
-        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
+        "method": "enable",
+        "coin": "ETH",
+        "urls": &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"],
+        // Dev chain swap contract address
+        "swap_contract_address": "0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd",
         "mm2": 1,
-        "tx_history": true,
-        "address_format": {
-            "format": "segwit",
+    })))
+    .unwrap();
+    assert_eq!(eth.0, StatusCode::OK, "'enable' failed: {}", eth.1);
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": "ETH",
+            // valid hash with 0x prefix
+            "tx_hash": "0xbdef3970c00752b0dc811cd93faadfd75a7a52e6b8e0b608c5519edcad801359",
         },
+        "id": 0,
     })))
-        .unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with status «{}», response «{}»",
-        electrum.0,
-        electrum.1
-    );
-    let electrum_json: Json = json::from_str(&electrum.1).unwrap();
-    assert_eq!(
-        electrum_json["address"].as_str(),
-        Some("tb1qdkwjk42dw6pryvs9sl0ht3pn3mxghuma64jst5")
-    );
-
-    block_on(wait_till_history_has_records(&mm, "tBTC", 13));
+    .unwrap();
+    assert!(raw.0.is_success(), "get_raw_transaction for coin ETH: {}", raw.1);
+    let res: RpcSuccessResponse<RawTransactionResult> =
+        json::from_str(&raw.1).expect("Expected 'RpcSuccessResponse<RawTransactionResult>'");
+    let expected_hex = "f8a975843b9aca0083024f8394fab46e002bbf0b4509813474841e0716e673013680b84440c10f190000000000000000000000003ef8b4a81ab3444864377dde648268f00e3cd0700000000000000000000000000000000000000000000000004563918244f4000029a0ee799246e00354e173c2236aac52dca3d9e75ac98d2ac48ce67fdab42712c82ca06c42b9db9ebf22fa2aeb85927ba8275ea057f5bffdc2d4bd923606415a18b58a";
+    assert_eq!(res.result.tx_hex, expected_hex);
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": "ETH",
+            // valid hash without 0x prefix
+            "tx_hash": "bdef3970c00752b0dc811cd93faadfd75a7a52e6b8e0b608c5519edcad801359",
+        },
+        "id": 0,
+    })))
+    .unwrap();
+    assert!(raw.0.is_success(), "get_raw_transaction for coin ETH: {}", raw.1);
+    let res: RpcSuccessResponse<RawTransactionResult> =
+        json::from_str(&raw.1).expect("Expected 'RpcSuccessResponse<RawTransactionResult>'");
+    let expected_hex = "f8a975843b9aca0083024f8394fab46e002bbf0b4509813474841e0716e673013680b84440c10f190000000000000000000000003ef8b4a81ab3444864377dde648268f00e3cd0700000000000000000000000000000000000000000000000004563918244f4000029a0ee799246e00354e173c2236aac52dca3d9e75ac98d2ac48ce67fdab42712c82ca06c42b9db9ebf22fa2aeb85927ba8275ea057f5bffdc2d4bd923606415a18b58a";
+    assert_eq!(res.result.tx_hex, expected_hex);
 
-    let tx_history = block_on(mm.rpc(json!({
+    // invalid coin
+    let zombi_coin = String::from("ZOMBI");
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
         "userpass": mm.userpass,
-        "method": "my_tx_history",
-        "coin": "tBTC",
-        "limit": 13,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": zombi_coin,
+            "tx_hash": "0xbdef3970c00752b0dc811cd93faadfd75a7a52e6b8e0b608c5519edcad801359",
+        },
+        "id": 1,
     })))
     .unwrap();
-    assert_eq!(
-        tx_history.0,
-        StatusCode::OK,
-        "RPC «my_tx_history» failed with status «{}», response «{}»",
-        tx_history.0,
-        tx_history.1
+    assert!(
+        raw.0.is_client_error(),
+        "get_raw_transaction should have failed, but got: {}",
+        raw.1
     );
-    log!([tx_history.1]);
-    let tx_history_json: Json = json::from_str(&tx_history.1).unwrap();
-    let tx_history_result = &tx_history_json["result"];
+    let error: RpcErrorResponse<raw_transaction_error::InvalidCoin> = json::from_str(&raw.1).unwrap();
+    let expected_error = raw_transaction_error::InvalidCoin { coin: zombi_coin };
+    assert_eq!(error.error_type, "NoSuchCoin");
+    assert_eq!(error.error_data, Some(expected_error));
 
-    let expected = vec![
-        // https://live.blockcypher.com/btc-testnet/tx/17505e47435d1522ebf34b48cf60eda5537539c7a13551f4c091c0bc3fd3181e/
-        "17505e47435d1522ebf34b48cf60eda5537539c7a13551f4c091c0bc3fd3181e",
-        // https://live.blockcypher.com/btc-testnet/tx/f410e82e8c736b92ea6ec59a148533c8a2c4ad50e871a4e85a77e4546f9b2788/
-        "f410e82e8c736b92ea6ec59a148533c8a2c4ad50e871a4e85a77e4546f9b2788",
-        // https://live.blockcypher.com/btc-testnet/tx/54a288d017fd24a5eb30dee3e70b77119ac450b90e7316d9a2a4fa01642ff880/
-        "54a288d017fd24a5eb30dee3e70b77119ac450b90e7316d9a2a4fa01642ff880",
-        // https://live.blockcypher.com/btc-testnet/tx/0ff4d93f358185fbc928be4ddec38cd01241224dc7c09ef297518732e40807d3/
+    // empty hash
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": "ETH",
+            "tx_hash": "",
+        },
+        "id": 2,
+    })))
+    .unwrap();
+    assert!(
+        raw.0.is_client_error(),
+        "get_raw_transaction should have failed, but got: {}",
+        raw.1
+    );
+    let error: RpcErrorResponse<String> = json::from_str(&raw.1).unwrap();
+    assert_eq!(error.error_type, "InvalidHashError");
+    // invalid hash
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": "ETH",
+            "tx_hash": "xx",
+        },
+        "id": 2,
+    })))
+    .unwrap();
+    assert!(
+        raw.0.is_client_error(),
+        "get_raw_transaction should have failed, but got: {}",
+        raw.1
+    );
+    let error: RpcErrorResponse<String> = json::from_str(&raw.1).unwrap();
+    assert_eq!(error.error_type, "InvalidHashError");
+
+    // valid hash but hash not exist
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": "ETH",
+            "tx_hash": "0xbdef3970c00752b0dc811cd93faadfd75a7a52e6b8e0b608c000000000000000",
+        },
+        "id": 3,
+    })))
+    .unwrap();
+    assert!(
+        raw.0.is_client_error(),
+        "get_raw_transaction should have failed, but got: {}",
+        raw.1
+    );
+    let error: RpcErrorResponse<String> = json::from_str(&raw.1).unwrap();
+    assert_eq!(error.error_type, "HashNotExist");
+    // valid hash but hash not exist without 0x prefix
+    let raw = block_on(mm.rpc(&json! ({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "get_raw_transaction",
+        "params": {
+            "coin": "ETH",
+            "tx_hash": "bdef3970c00752b0dc811cd93faadfd75a7a52e6b8e0b608c000000000000000",
+        },
+        "id": 2,
+    })))
+    .unwrap();
+    assert!(
+        raw.0.is_client_error(),
+        "get_raw_transaction should have failed, but got: {}",
+        raw.1
+    );
+    let error: RpcErrorResponse<String> = json::from_str(&raw.1).unwrap();
+    assert_eq!(error.error_type, "HashNotExist");
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_qrc20_tx_history() { block_on(test_qrc20_history_impl()); }
+
+#[wasm_bindgen_test]
+#[cfg(target_arch = "wasm32")]
+async fn test_qrc20_tx_history() { test_qrc20_history_impl().await }
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_tx_history_segwit() {
+    let passphrase = "also shoot benefit prefer juice shell elder veteran woman mimic image kidney";
+    let coins = json!([
+        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": passphrase,
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+            "metrics_interval": 30.,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    // enable tBTC to see that to/from segwit addresses are displayed correctly in tx_history
+    // and that tx_history is retrieved for the segwit address instead of legacy
+    let electrum = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "electrum",
+        "coin": "tBTC",
+        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
+        "mm2": 1,
+        "tx_history": true,
+        "address_format": {
+            "format": "segwit",
+        },
+    })))
+        .unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with status «{}», response «{}»",
+        electrum.0,
+        electrum.1
+    );
+    let electrum_json: Json = json::from_str(&electrum.1).unwrap();
+    assert_eq!(
+        electrum_json["address"].as_str(),
+        Some("tb1qdkwjk42dw6pryvs9sl0ht3pn3mxghuma64jst5")
+    );
+
+    block_on(wait_till_history_has_records(&mm, "tBTC", 13));
+
+    let tx_history = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "my_tx_history",
+        "coin": "tBTC",
+        "limit": 13,
+    })))
+    .unwrap();
+    assert_eq!(
+        tx_history.0,
+        StatusCode::OK,
+        "RPC «my_tx_history» failed with status «{}», response «{}»",
+        tx_history.0,
+        tx_history.1
+    );
+    log!("{:?}", tx_history.1);
+    let tx_history_json: Json = json::from_str(&tx_history.1).unwrap();
+    let tx_history_result = &tx_history_json["result"];
+
+    let expected = vec![
+        // https://live.blockcypher.com/btc-testnet/tx/17505e47435d1522ebf34b48cf60eda5537539c7a13551f4c091c0bc3fd3181e/
+        "17505e47435d1522ebf34b48cf60eda5537539c7a13551f4c091c0bc3fd3181e",
+        // https://live.blockcypher.com/btc-testnet/tx/f410e82e8c736b92ea6ec59a148533c8a2c4ad50e871a4e85a77e4546f9b2788/
+        "f410e82e8c736b92ea6ec59a148533c8a2c4ad50e871a4e85a77e4546f9b2788",
+        // https://live.blockcypher.com/btc-testnet/tx/54a288d017fd24a5eb30dee3e70b77119ac450b90e7316d9a2a4fa01642ff880/
+        "54a288d017fd24a5eb30dee3e70b77119ac450b90e7316d9a2a4fa01642ff880",
+        // https://live.blockcypher.com/btc-testnet/tx/0ff4d93f358185fbc928be4ddec38cd01241224dc7c09ef297518732e40807d3/
         "0ff4d93f358185fbc928be4ddec38cd01241224dc7c09ef297518732e40807d3",
         // https://live.blockcypher.com/btc-testnet/tx/e7a493f0370a36efbd5d8306de32dd6c354412c5ce4c81832648e7f9b91c1d27/
         "e7a493f0370a36efbd5d8306de32dd6c354412c5ce4c81832648e7f9b91c1d27",
@@ -5555,10 +5041,10 @@ fn test_tx_history_tbtc_non_segwit() {
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({ "log path: {}", mm.log_path.display() });
+    log!("log path: {}", mm.log_path.display());
 
     // enable tBTC in legacy first to see that to/from segwit addresses are displayed correctly in tx_history
-    let electrum = block_on(mm.rpc(json!({
+    let electrum = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "electrum",
         "coin": "tBTC",
@@ -5629,7 +5115,7 @@ fn test_tx_history_tbtc_non_segwit() {
 
     block_on(wait_till_history_has_records(&mm, "tBTC", expected.len()));
 
-    let tx_history = block_on(mm.rpc(json!({
+    let tx_history = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "my_tx_history",
         "coin": "tBTC",
@@ -5643,7 +5129,7 @@ fn test_tx_history_tbtc_non_segwit() {
         tx_history.0,
         tx_history.1
     );
-    log!([tx_history.1]);
+    log!("{:?}", tx_history.1);
     let tx_history_json: Json = json::from_str(&tx_history.1).unwrap();
     let tx_history_result = &tx_history_json["result"];
 
@@ -5698,13 +5184,14 @@ fn test_buy_conf_settings() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob buy request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "buy",
         "base": "ETH",
@@ -5726,7 +5213,7 @@ fn test_buy_conf_settings() {
 
     // must use coin config as defaults if not set in request
     log!("Issue bob buy request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "buy",
         "base": "ETH",
@@ -5774,13 +5261,14 @@ fn test_buy_response_format() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob buy request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "buy",
         "base": "ETH",
@@ -5828,13 +5316,14 @@ fn test_sell_response_format() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "sell",
         "base": "ETH",
@@ -5882,13 +5371,14 @@ fn test_my_orders_response_format() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob buy request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "buy",
         "base": "ETH",
@@ -5904,7 +5394,7 @@ fn test_my_orders_response_format() {
     assert!(rc.0.is_success(), "!buy: {}", rc.1);
 
     log!("Issue bob setprice request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -5920,7 +5410,7 @@ fn test_my_orders_response_format() {
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
     log!("Issue bob my_orders request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_orders",
     })))
@@ -5977,12 +5467,12 @@ fn test_my_orders_after_matched() {
 
     // Enable coins on Bob side. Print the replies in case we need the address.
     let rc = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
-    log! ({"enable_coins (bob): {:?}", rc});
+    log!("enable_coins (bob): {:?}", rc);
     // Enable coins on Alice side. Print the replies in case we need the address.
     let rc = block_on(enable_coins_eth_electrum(&mm_alice, &["http://195.201.0.6:8565"]));
-    log! ({"enable_coins (alice): {:?}", rc});
+    log!("enable_coins (alice): {:?}", rc);
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -5993,7 +5483,7 @@ fn test_my_orders_after_matched() {
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "ETH",
@@ -6008,7 +5498,7 @@ fn test_my_orders_after_matched() {
     block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop ETH/JST"))).unwrap();
 
     log!("Issue bob my_orders request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_orders",
     })))
@@ -6051,13 +5541,14 @@ fn test_sell_conf_settings() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "sell",
         "base": "ETH",
@@ -6079,7 +5570,7 @@ fn test_sell_conf_settings() {
 
     // must use coin config as defaults if not set in request
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "sell",
         "base": "ETH",
@@ -6127,13 +5618,14 @@ fn test_set_price_conf_settings() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -6155,7 +5647,7 @@ fn test_set_price_conf_settings() {
 
     // must use coin config as defaults if not set in request
     log!("Issue bob sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -6179,9 +5671,7 @@ fn test_update_maker_order() {
 
     let coins = json! ([
         {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}},"required_confirmations":2}
+        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     let mm_bob = MarketMakerIt::start(
@@ -6203,36 +5693,11 @@ fn test_update_maker_order() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
-
-    log!("Get bob balance");
-    let my_balance = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "my_balance",
-        "coin": "RICK",
-    })))
-    .unwrap();
-    assert!(my_balance.0.is_success(), "!my_balance: {}", my_balance.1);
-    let my_balance_json: Json = json::from_str(&my_balance.1).unwrap();
-    let balance: BigDecimal = json::from_value(my_balance_json["balance"].clone()).unwrap();
-
-    log!("Get RICK trade fee");
-    let get_trade_fee = block_on(mm_bob.rpc(json! ({
-        "userpass": mm_bob.userpass,
-        "method": "get_trade_fee",
-        "coin": "RICK",
-    })))
-    .unwrap();
-    assert!(get_trade_fee.0.is_success(), "!get_trade_fee: {}", get_trade_fee.1);
-    let get_trade_fee_json: Json = json::from_str(&get_trade_fee.1).unwrap();
-    let trade_fee: BigDecimal = json::from_value(get_trade_fee_json["result"]["amount"].clone()).unwrap();
-    let max_volume = balance - trade_fee;
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!("{:?}", block_on(enable_coins_rick_morty_electrum(&mm_bob)));
 
     log!("Issue bob sell request");
-    let setprice = block_on(mm_bob.rpc(json! ({
+    let setprice = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -6251,7 +5716,7 @@ fn test_update_maker_order() {
     let uuid: Uuid = json::from_value(setprice_json["result"]["uuid"].clone()).unwrap();
 
     log!("Issue bob update maker order request");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6269,7 +5734,7 @@ fn test_update_maker_order() {
     assert_eq!(update_maker_order_json["result"]["min_base_vol"], Json::from("1"));
 
     log!("Issue another bob update maker order request");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6286,8 +5751,39 @@ fn test_update_maker_order() {
     assert_eq!(update_maker_order_json["result"]["max_base_vol"], Json::from("4"));
     assert_eq!(update_maker_order_json["result"]["min_base_vol"], Json::from("1"));
 
+    log!("Get bob balance");
+    let my_balance = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "my_balance",
+        "coin": "RICK",
+    })))
+    .unwrap();
+    assert!(my_balance.0.is_success(), "!my_balance: {}", my_balance.1);
+    let my_balance_json: Json = json::from_str(&my_balance.1).unwrap();
+    let balance: BigDecimal = json::from_value(my_balance_json["balance"].clone()).unwrap();
+
+    log!("Get RICK trade fee");
+    let trade_preimage = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "RICK",
+            "rel": "MORTY",
+            "swap_method": "setprice",
+            "price": 2,
+            "max": true,
+        },
+    })))
+    .unwrap();
+    assert!(trade_preimage.0.is_success(), "!trade_preimage: {}", trade_preimage.1);
+    let get_trade_fee_json: Json = json::from_str(&trade_preimage.1).unwrap();
+    let trade_fee: BigDecimal =
+        json::from_value(get_trade_fee_json["result"]["base_coin_fee"]["amount"].clone()).unwrap();
+    let max_volume = balance - trade_fee;
+
     log!("Issue another bob update maker order request");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6304,6 +5800,8 @@ fn test_update_maker_order() {
         BigDecimal::from_str(update_maker_order_json["result"]["max_base_vol"].as_str().unwrap()).unwrap();
     assert_eq!(update_maker_order_json["result"]["price"], Json::from("2"));
     assert_eq!(max_base_vol, max_volume);
+
+    block_on(mm_bob.stop()).unwrap();
 }
 
 #[test]
@@ -6313,9 +5811,7 @@ fn test_update_maker_order_fail() {
 
     let coins = json! ([
         {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}},"required_confirmations":2}
+        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     let mm_bob = MarketMakerIt::start(
@@ -6337,13 +5833,11 @@ fn test_update_maker_order_fail() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!("{:?}", block_on(enable_coins_rick_morty_electrum(&mm_bob)));
 
     log!("Issue bob sell request");
-    let setprice = block_on(mm_bob.rpc(json! ({
+    let setprice = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -6361,7 +5855,7 @@ fn test_update_maker_order_fail() {
     let uuid: Uuid = json::from_value(setprice_json["result"]["uuid"].clone()).unwrap();
 
     log!("Issue bob update maker order request that should fail because price is too low");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6375,7 +5869,7 @@ fn test_update_maker_order_fail() {
     );
 
     log!("Issue bob update maker order request that should fail because New Volume is Less than Zero");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6389,7 +5883,7 @@ fn test_update_maker_order_fail() {
     );
 
     log!("Issue bob update maker order request that should fail because Min base vol is too low");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6404,7 +5898,7 @@ fn test_update_maker_order_fail() {
     );
 
     log!("Issue bob update maker order request that should fail because Max base vol is below Min base vol");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6419,7 +5913,7 @@ fn test_update_maker_order_fail() {
     );
 
     log!("Issue bob update maker order request that should fail because Max base vol is too low");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6434,7 +5928,7 @@ fn test_update_maker_order_fail() {
     );
 
     log!("Issue bob update maker order request that should fail because Max rel vol is too low");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6448,6 +5942,37 @@ fn test_update_maker_order_fail() {
         update_maker_order.1
     );
 
+    log!("Issue bob batch of 2 update maker order requests that should make the second request fail because the order state changed due to the first request");
+    let batch_json = json!([
+        {
+            "userpass": mm_bob.userpass,
+            "method": "update_maker_order",
+            "uuid": uuid,
+            "new_price": 3,
+            "volume_delta": 1,
+        },
+        {
+            "userpass": mm_bob.userpass,
+            "method": "update_maker_order",
+            "uuid": uuid,
+            "new_price": 2,
+            "volume_delta": 1,
+        },
+    ]);
+
+    let rc = block_on(mm_bob.rpc(&batch_json)).unwrap();
+    assert!(rc.0.is_success(), "!batch: {}", rc.1);
+    log!("{}", rc.1);
+    let err_msg = "Order state has changed after price/volume/balance checks. Please try to update the order again if it's still needed.";
+    let responses = json::from_str::<Vec<Json>>(&rc.1).unwrap();
+    if responses[0].get("error").is_some() {
+        assert!(responses[0]["error"].as_str().unwrap().contains(err_msg));
+        assert!(responses[1].get("result").is_some());
+    } else if responses[1].get("error").is_some() {
+        assert!(responses[0].get("result").is_some());
+        assert!(responses[1]["error"].as_str().unwrap().contains(err_msg));
+    }
+
     log!("Issue bob batch update maker order and cancel order request that should make update maker order fail because Order with UUID has been deleted");
     let batch_json = json!([
         {
@@ -6464,14 +5989,22 @@ fn test_update_maker_order_fail() {
         },
     ]);
 
-    let rc = block_on(mm_bob.rpc(batch_json)).unwrap();
+    let rc = block_on(mm_bob.rpc(&batch_json)).unwrap();
     assert!(rc.0.is_success(), "!batch: {}", rc.1);
-    log!((rc.1));
+    log!("{}", rc.1);
+    let err_msg = format!("Order with UUID: {} has been deleted", uuid);
     let responses = json::from_str::<Vec<Json>>(&rc.1).unwrap();
-    if responses[1]["result"] == *"success" {
-        assert_eq!(responses[0].get("result"), None);
+    if responses[0].get("error").is_some() {
+        assert!(responses[0]["error"].as_str().unwrap().contains(&err_msg));
+        assert!(responses[1].get("result").is_some());
+    } else if responses[1].get("error").is_some() {
+        assert!(responses[0].get("result").is_some());
+        assert!(responses[1]["error"].as_str().unwrap().contains(&err_msg));
     }
+
+    block_on(mm_bob.stop()).unwrap();
 }
+
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_update_maker_order_after_matched() {
@@ -6500,7 +6033,7 @@ fn test_update_maker_order_after_matched() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
     let mut mm_alice = MarketMakerIt::start(
         json! ({
@@ -6520,12 +6053,12 @@ fn test_update_maker_order_after_matched() {
 
     // Enable coins on Bob side. Print the replies in case we need the address.
     let rc = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
-    log! ({"enable_coins (bob): {:?}", rc});
+    log!("enable_coins (bob): {:?}", rc);
     // Enable coins on Alice side. Print the replies in case we need the address.
     let rc = block_on(enable_coins_eth_electrum(&mm_alice, &["http://195.201.0.6:8565"]));
-    log! ({"enable_coins (alice): {:?}", rc});
+    log!("enable_coins (alice): {:?}", rc);
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -6538,7 +6071,7 @@ fn test_update_maker_order_after_matched() {
     let setprice_json: Json = json::from_str(&rc.1).unwrap();
     let uuid: Uuid = json::from_value(setprice_json["result"]["uuid"].clone()).unwrap();
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "buy",
         "base": "ETH",
@@ -6553,7 +6086,7 @@ fn test_update_maker_order_after_matched() {
     block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop ETH/JST"))).unwrap();
 
     log!("Issue bob update maker order request that should fail because new volume is less than reserved amount");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6567,7 +6100,7 @@ fn test_update_maker_order_after_matched() {
     );
 
     log!("Issue another bob update maker order request");
-    let update_maker_order = block_on(mm_bob.rpc(json! ({
+    let update_maker_order = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "update_maker_order",
         "uuid": uuid,
@@ -6580,11 +6113,11 @@ fn test_update_maker_order_after_matched() {
         update_maker_order.1
     );
     let update_maker_order_json: Json = json::from_str(&update_maker_order.1).unwrap();
-    log!((update_maker_order.1));
+    log!("{}", update_maker_order.1);
     assert_eq!(update_maker_order_json["result"]["max_base_vol"], Json::from("4"));
 
     log!("Issue bob my_orders request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_orders",
     })))
@@ -6604,9 +6137,7 @@ fn test_update_maker_order_after_matched() {
 fn test_trade_fee_returns_numbers_in_various_formats() {
     let coins = json!([
         {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0xc0eb7AeD740E1796992A08962c15661bDEB58003"}}}
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     // start bob and immediately place the order
@@ -6631,12 +6162,10 @@ fn test_trade_fee_returns_numbers_in_various_formats() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-    block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b",
-    ]));
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    block_on(enable_coins_rick_morty_electrum(&mm_bob));
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "get_trade_fee",
         "coin": "RICK",
@@ -6653,9 +6182,7 @@ fn test_trade_fee_returns_numbers_in_various_formats() {
 #[cfg(not(target_arch = "wasm32"))]
 fn test_orderbook_is_mine_orders() {
     let coins = json!([{"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0xc0eb7AeD740E1796992A08962c15661bDEB58003"}}}
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     // start bob and immediately place the order
@@ -6680,11 +6207,14 @@ fn test_orderbook_is_mine_orders() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
     // Enable coins on Bob side. Print the replies in case we need the "address".
-    log! ({"enable_coins (bob): {:?}", block_on (enable_coins_eth_electrum (&mm_bob, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -6705,7 +6235,7 @@ fn test_orderbook_is_mine_orders() {
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
         }),
         "pass".into(),
@@ -6717,14 +6247,17 @@ fn test_orderbook_is_mine_orders() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({"Alice log path: {}", mm_alice.log_path.display()});
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     // Enable coins on Alice side. Print the replies in case we need the "address".
-    log! ({"enable_coins (alice): {:?}", block_on (enable_coins_eth_electrum (&mm_alice, &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"]))});
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
 
     // Bob orderbook must show 1 mine order
     log!("Get RICK/MORTY orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -6734,7 +6267,7 @@ fn test_orderbook_is_mine_orders() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
+    log!("Bob orderbook {:?}", bob_orderbook);
     let asks = bob_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Bob RICK/MORTY orderbook must have exactly 1 ask");
     let is_mine = asks[0]["is_mine"].as_bool().unwrap();
@@ -6742,7 +6275,7 @@ fn test_orderbook_is_mine_orders() {
 
     // Alice orderbook must show 1 not-mine order
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -6752,14 +6285,14 @@ fn test_orderbook_is_mine_orders() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     assert_eq!(asks.len(), 1, "Alice RICK/MORTY orderbook must have exactly 1 ask");
     let is_mine = asks[0]["is_mine"].as_bool().unwrap();
     assert_eq!(is_mine, false);
 
     // make another order by Alice
-    let rc = block_on(mm_alice.rpc(json! ({
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -6776,7 +6309,7 @@ fn test_orderbook_is_mine_orders() {
     // Bob orderbook must show 1 mine and 1 non-mine orders.
     // Request orderbook with reverse base and rel coins to check bids instead of asks
     log!("Get RICK/MORTY orderbook on Bob side");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "MORTY",
@@ -6786,7 +6319,7 @@ fn test_orderbook_is_mine_orders() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Bob orderbook "[bob_orderbook]);
+    log!("Bob orderbook {:?}", bob_orderbook);
     let asks = bob_orderbook["asks"].as_array().unwrap();
     let bids = bob_orderbook["bids"].as_array().unwrap();
     assert!(asks.is_empty(), "Bob MORTY/RICK orderbook must contain an empty asks");
@@ -6796,7 +6329,7 @@ fn test_orderbook_is_mine_orders() {
 
     // Alice orderbook must show 1 mine and 1 non-mine orders
     log!("Get RICK/MORTY orderbook on Alice side");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -6806,7 +6339,7 @@ fn test_orderbook_is_mine_orders() {
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
     let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-    log!("Alice orderbook "[alice_orderbook]);
+    log!("Alice orderbook {:?}", alice_orderbook);
     let asks = alice_orderbook["asks"].as_array().unwrap();
     let bids = alice_orderbook["bids"].as_array().unwrap();
     assert!(bids.is_empty(), "Alice MORTY/RICK orderbook must contain an empty bids");
@@ -6849,14 +6382,15 @@ fn test_sell_min_volume() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     let min_volume: BigDecimal = "0.1".parse().unwrap();
     log!("Issue bob ETH/JST sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "sell",
         "base": "ETH",
@@ -6879,7 +6413,7 @@ fn test_sell_min_volume() {
     log!("Wait for 4 seconds for Bob order to be converted to maker");
     thread::sleep(Duration::from_secs(4));
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_orders",
     })))
@@ -6902,9 +6436,7 @@ fn test_sell_min_volume_dust() {
 
     let coins = json! ([
         {"coin":"RICK","asset":"RICK","dust":10000000,"required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     let mm_bob = MarketMakerIt::start(
@@ -6926,13 +6458,11 @@ fn test_sell_min_volume_dust() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!("{:?}", block_on(enable_coins_rick_morty_electrum(&mm_bob)));
 
     log!("Issue bob RICK/MORTY sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "sell",
         "base": "RICK",
@@ -6957,9 +6487,7 @@ fn test_setprice_min_volume_dust() {
 
     let coins = json! ([
         {"coin":"RICK","asset":"RICK","dust":10000000,"required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
     let mm_bob = MarketMakerIt::start(
@@ -6981,13 +6509,11 @@ fn test_setprice_min_volume_dust() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!("{:?}", block_on(enable_coins_rick_morty_electrum(&mm_bob)));
 
     log!("Issue bob RICK/MORTY sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -7033,14 +6559,15 @@ fn test_buy_min_volume() {
     .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log! ({"Bob log path: {}", mm_bob.log_path.display()});
-    log!([block_on(enable_coins_eth_electrum(&mm_bob, &[
-        "http://195.201.0.6:8565"
-    ]))]);
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    log!(
+        "{:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
 
     let min_volume: BigDecimal = "0.1".parse().unwrap();
     log!("Issue bob ETH/JST sell request");
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "buy",
         "base": "ETH",
@@ -7061,7 +6588,7 @@ fn test_buy_min_volume() {
     log!("Wait for 4 seconds for Bob order to be converted to maker");
     thread::sleep(Duration::from_secs(4));
 
-    let rc = block_on(mm_bob.rpc(json! ({
+    let rc = block_on(mm_bob.rpc(&json! ({
         "userpass": mm_bob.userpass,
         "method": "my_orders",
     })))
@@ -7080,9 +6607,44 @@ fn test_buy_min_volume() {
     assert_eq!(expected_min_volume, maker_order.min_base_vol);
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+fn request_and_check_orderbook_depth(mm_alice: &MarketMakerIt) {
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook_depth",
+        "pairs": [("RICK", "MORTY"), ("RICK", "ETH"), ("MORTY", "ETH")],
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook_depth: {}", rc.1);
+    let response: OrderbookDepthResponse = json::from_str(&rc.1).unwrap();
+    let rick_morty = response
+        .result
+        .iter()
+        .find(|pair_depth| pair_depth.pair.0 == "RICK" && pair_depth.pair.1 == "MORTY")
+        .unwrap();
+    assert_eq!(3, rick_morty.depth.asks);
+    assert_eq!(2, rick_morty.depth.bids);
+
+    let rick_eth = response
+        .result
+        .iter()
+        .find(|pair_depth| pair_depth.pair.0 == "RICK" && pair_depth.pair.1 == "ETH")
+        .unwrap();
+    assert_eq!(1, rick_eth.depth.asks);
+    assert_eq!(1, rick_eth.depth.bids);
+
+    let morty_eth = response
+        .result
+        .iter()
+        .find(|pair_depth| pair_depth.pair.0 == "MORTY" && pair_depth.pair.1 == "ETH")
+        .unwrap();
+    assert_eq!(0, morty_eth.depth.asks);
+    assert_eq!(0, morty_eth.depth.bids);
+}
+
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_best_orders() {
+fn test_orderbook_depth() {
     let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
 
     let coins = json!([
@@ -7110,11 +6672,11 @@ fn test_best_orders() {
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
     // Enable coins on Bob side. Print the replies in case we need the "address".
     let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
-    log!({ "enable_coins (bob): {:?}", bob_coins });
+    log!("enable_coins (bob): {:?}", bob_coins);
     // issue sell request on Bob side by setting base/rel price
     log!("Issue bob sell requests");
 
@@ -7127,11 +6689,9 @@ fn test_best_orders() {
         ("MORTY", "RICK", "0.8", "0.9", None),
         ("MORTY", "RICK", "0.9", "0.9", None),
         ("ETH", "RICK", "0.8", "0.9", None),
-        ("MORTY", "ETH", "0.8", "0.8", None),
-        ("MORTY", "ETH", "0.7", "0.8", Some("0.8")),
     ];
     for (base, rel, price, volume, min_volume) in bob_orders.iter() {
-        let rc = block_on(mm_bob.rpc(json! ({
+        let rc = block_on(mm_bob.rpc(&json! ({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": base,
@@ -7153,7 +6713,7 @@ fn test_best_orders() {
             "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
+            "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
         }),
         "pass".into(),
@@ -7162,358 +6722,308 @@ fn test_best_orders() {
     .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
     block_on(mm_bob.wait_for_log(22., |log| {
         log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
     }))
     .unwrap();
 
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "buy",
-        "volume": "0.1",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let best_morty_orders = response.result.get("MORTY").unwrap();
-    assert_eq!(1, best_morty_orders.len());
-    let expected_price: BigDecimal = "0.8".parse().unwrap();
-    assert_eq!(expected_price, best_morty_orders[0].price);
-
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "buy",
-        "volume": "1.7",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    // MORTY
-    let best_morty_orders = response.result.get("MORTY").unwrap();
-    let expected_price: BigDecimal = "0.7".parse().unwrap();
-    let bob_morty_addr = addr_from_enable(&bob_coins, "MORTY");
-    assert_eq!(expected_price, best_morty_orders[0].price);
-    assert_eq!(bob_morty_addr, best_morty_orders[0].address);
-    let expected_price: BigDecimal = "0.8".parse().unwrap();
-    assert_eq!(expected_price, best_morty_orders[1].price);
-    assert_eq!(bob_morty_addr, best_morty_orders[1].address);
-    // ETH
-    let expected_price: BigDecimal = "0.8".parse().unwrap();
-    let best_eth_orders = response.result.get("ETH").unwrap();
-    assert_eq!(expected_price, best_eth_orders[0].price);
-
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "sell",
-        "volume": "0.1",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-
-    let expected_price: BigDecimal = "1.25".parse().unwrap();
-
-    let best_morty_orders = response.result.get("MORTY").unwrap();
-    assert_eq!(expected_price, best_morty_orders[0].price);
-    assert_eq!(1, best_morty_orders.len());
-
-    let best_eth_orders = response.result.get("ETH").unwrap();
-    assert_eq!(expected_price, best_eth_orders[0].price);
-
-    let rc = block_on(mm_alice.rpc(json! ({
+    request_and_check_orderbook_depth(&mm_alice);
+    // request RICK/MORTY orderbook to subscribe Alice
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "ETH",
-        "action": "sell",
-        "volume": "0.1",
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-
-    let expected_price: BigDecimal = "1.25".parse().unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
-    let best_morty_orders = response.result.get("MORTY").unwrap();
-    assert_eq!(expected_price, best_morty_orders[0].price);
-    assert_eq!("MORTY", best_morty_orders[0].coin);
-    assert_eq!(1, best_morty_orders.len());
+    request_and_check_orderbook_depth(&mm_alice);
 
     block_on(mm_bob.stop()).unwrap();
     block_on(mm_alice.stop()).unwrap();
 }
 
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/932
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_best_orders_duplicates_after_update() {
-    let eve_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+fn test_mm2_db_migration() {
+    let bob_passphrase = get_passphrase(&".env.client", "BOB_PASSPHRASE").unwrap();
 
-    let coins = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    let coins = json! ([
+        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
     ]);
 
-    // start bob as a seednode
-    let mut mm_bob = MarketMakerIt::start(
+    let mm2_folder = new_mm2_temp_folder_path(None);
+    let swaps_dir = mm2_folder.join(format!(
+        "{}/SWAPS/STATS/MAKER",
+        hex::encode(rmd160_from_passphrase(&bob_passphrase))
+    ));
+    std::fs::create_dir_all(&swaps_dir).unwrap();
+    let swap_path = swaps_dir.join("5d02843e-d1b4-488d-aad0-114d82020453.json");
+    let swap_json = r#"{"uuid":"5d02843e-d1b4-488d-aad0-114d82020453","events":[{"timestamp":1612780908136,"event":{"type":"Started","data":{"taker_coin":"MORTY-BEP20","maker_coin":"RICK-BEP20","taker":"ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fa","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"026bebc2e19c243d0940dd583c9573bf10377afd","my_persistent_pub":"037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5","lock_duration":7800,"maker_amount":"1","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1612796508,"uuid":"5d02843e-d1b4-488d-aad0-114d82020453","started_at":1612780908,"maker_coin_start_block":793472,"taker_coin_start_block":797356,"maker_payment_trade_fee":null,"taker_payment_spend_trade_fee":null}}},{"timestamp":1612780924142,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1612788708,"taker_pubkey":"03ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fa"}}},{"timestamp":1612780935156,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f8901f425fbefe21f33ccb7b487df251191b27dfa7b639b04f60e5493c7ea41dbf149000000006b483045022100d5ec3e542175479bd4bd011e19b76a75e99f19cc49867e5bca9541950322c33a02207a4d1ffd674fb9760de79bb4929af44d66344b5e182de3c377186deebf6bf376012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac5ce6f305000000001976a914d55f0df6cb82630ad21a4e6049522a6f2b6c9d4588ac7c152160000000000000000000000000000000","tx_hash":"75323ab7acd64bd35242611fabaec560d9acf2e1f9ca28d3a4aba47a79fb49c4"}}},{"timestamp":1612780935174,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f89028bef955e42107c562e4e02421f25c455723a701573f86c17b4d82e35a7d8f9f7020000006b483045022100b12fc9d95acca76bf5fd8d5c6acc288b454032ba4561b1c2b1f5f33b2cf2926d022017e561bc2cd93308848674b47b2e8ebd8f074ea78e32454d5fea6f08c0b1f1e40121037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ffffffff5dfd0b24c0f7c3cf235868cf9a26ec49574764d135796fc4e7d20e95d55a8653000000006a47304402207c752d14601d1c99892f9d6c88c8ff2f93211640a65b2ee69172a16b908b21e402206f0b66684158445888271a849ab46258ad722496ee64fde055a6f44e36ed2ccc0121037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ffffffff0300e1f5050000000017a9141b85c1a277f44f7d77d52b78e2ba70a0becc2ff9870000000000000000166a14026bebc2e19c243d0940dd583c9573bf10377afda7d26301000000001976a91486f747b28c60ad1130bdd3f84f48eeaf1801ca9888ac87152160000000000000000000000000000000","tx_hash":"27dafe553246553d54f909fbbded80e6d490fdb95ca7b6807d73eca45f0d7a22"}}},{"timestamp":1612780982221,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8902c449fb797aa4aba4d328caf9e1f2acd960c5aeab1f614252d34bd6acb73a3275010000006a47304402200438c96bf457bacf906e94c98f91783129cb1c3a8f3d9355e1c39a9857fb2c6b02201d3c71b3f243f7a3c91bb9a15e80bb26e47bed04e798106a8af8dac61082ec41012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fafffffffff425fbefe21f33ccb7b487df251191b27dfa7b639b04f60e5493c7ea41dbf149010000006b483045022100efa00c742159b0b05433678aa95f0c8900adaddf5011bfaf56d6a7679aed428b022043f68efc3cb386dd10a65a2a3e8a904541c8f1ddbd7dddbcda2ccdd7938c5934012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faffffffff0300e1f5050000000017a914bc8e8f2648f7bb4dbd612f2e71dd7b23c54880b7870000000000000000166a14026bebc2e19c243d0940dd583c9573bf10377afd74c3e90b000000001976a914d55f0df6cb82630ad21a4e6049522a6f2b6c9d4588acb5152160000000000000000000000000000000","tx_hash":"94c8a1244421465b618a36e7647a270c7b2ef20eff3cd1317761cc242c49cc99"}}},{"timestamp":1612780982222,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1612781042265,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1612781042272,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"0400008085202f890199cc492c24cc617731d13cff0ef22e7b0c277a64e7368a615b46214424a1c89400000000d84830450221008f38d29e7990bd694f2c4fd4c235fe00997da4e5133208d7c38e75e806d9be1702201ff1d598ceafc099dc4af7d4b91db535196f642cf31b5b5e386b28574a378b9b0120e8512e2afb02d3a90590d30095286e2293f51f9d4411ad87ef398ee8f566de43004c6b6304e4332160b1752103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faac6782012088a914026bebc2e19c243d0940dd583c9573bf10377afd8821037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ac68ffffffff0118ddf505000000001976a91486f747b28c60ad1130bdd3f84f48eeaf1801ca9888ace2072160000000000000000000000000000000","tx_hash":"d21173cca32b83ffe5d4cc327f7eff09496f52876614dbbfe7963284818ba9a1"}}},{"timestamp":1612781042273,"event":{"type":"TakerPaymentSpendConfirmStarted"}},{"timestamp":1612781207356,"event":{"type":"TakerPaymentSpendConfirmed"}},{"timestamp":1612781207357,"event":{"type":"Finished"}}],"maker_amount":"1","maker_coin":"RICK-BEP20","taker_amount":"1","taker_coin":"MORTY-BEP20","gui":"dexstats","mm_version":"19701cc87","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
+    std::fs::write(swap_path, swap_json.as_bytes()).unwrap();
+
+    // if there is an issue with migration the start will fail
+    MarketMakerIt::start(
         json! ({
             "gui": "nogui",
-            "netid": 9998,
+            "netid": 8999,
+            "dht": "on",  // Enable DHT without delay.
             "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
             "rpcip": env::var ("BOB_TRADE_IP") .ok(),
             "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": "bob",
+            "passphrase": bob_passphrase,
             "coins": coins,
-            "rpc_password": "pass",
+            "rpc_password": "password",
             "i_am_seed": true,
+            "dbdir": mm2_folder.display().to_string(),
         }),
-        "pass".into(),
-        local_start!("bob"),
+        "password".into(),
+        None,
     )
     .unwrap();
+}
 
-    // start eve and immediately place the order
-    let mm_eve = MarketMakerIt::start(
-        json! ({
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_get_public_key() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json!({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": eve_passphrase,
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
             "coins": coins,
-            "rpc_password": "pass",
-            "seednodes": [fomat!((mm_bob.ip))],
+            "i_am_seed": true,
         }),
-        "pass".into(),
-        local_start!("bob"),
+        "password".into(),
+        None,
     )
     .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+    fn get_public_key_bot_rpc(mm: &MarketMakerIt) -> (StatusCode, String, HeaderMap) {
+        block_on(mm.rpc(&json!({
+                 "userpass": "password",
+                 "mmrpc": "2.0",
+                 "method": "get_public_key",
+                 "params": {},
+                 "id": 0})))
+        .unwrap()
+    }
+    let resp = get_public_key_bot_rpc(&mm);
 
-    // Enable coins on Eve side. Print the replies in case we need the "address".
-    let eve_coins = block_on(enable_coins_eth_electrum(&mm_eve, &["http://195.201.0.6:8565"]));
-    log!({ "enable_coins (eve): {:?}", eve_coins });
-    // issue sell request on Eve side by setting base/rel price
-    log!("Issue eve sell request");
+    // Must be 200
+    assert_eq!(resp.0, 200);
+    let v: RpcV2Response<GetPublicKeyResult> = serde_json::from_str(&*resp.1).unwrap();
+    assert_eq!(
+        v.result.public_key,
+        "022cd3021a2197361fb70b862c412bc8e44cff6951fa1de45ceabfdd9b4c520420"
+    )
+}
 
-    let rc = block_on(mm_eve.rpc(json! ({
-        "userpass": mm_eve.userpass,
-        "method": "setprice",
-        "base": "RICK",
-        "rel": "MORTY",
-        "price": "1",
-        "volume": "1",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    let eve_order: SetPriceResponse = json::from_str(&rc.1).unwrap();
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_get_public_key_hash() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+    ]);
 
-    let mm_alice = MarketMakerIt::start(
-        json! ({
+    let mm = MarketMakerIt::start(
+        json!({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
-            "passphrase": "alice passphrase",
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
             "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
+            "i_am_seed": true,
         }),
-        "pass".into(),
-        local_start!("alice"),
+        "password".into(),
+        None,
     )
     .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+    let resp = block_on(mm.rpc(&json!({
+                 "userpass": "password",
+                 "mmrpc": "2.0",
+                 "method": "get_public_key_hash",
+                 "params": {},
+                 "id": 0})))
+    .unwrap();
 
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
+    // Must be 200
+    assert_eq!(resp.0, StatusCode::OK);
+    let v: RpcV2Response<GetPublicKeyHashResult> = serde_json::from_str(&*resp.1).unwrap();
+    // Public key hash must be "b506088aa2a3b4bb1da3a29bf00ce1a550ea1df9"
+    assert_eq!(v.result.public_key_hash, "b506088aa2a3b4bb1da3a29bf00ce1a550ea1df9")
+}
 
-    block_on(mm_bob.wait_for_log(22., |log| {
-        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
-    }))
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_get_orderbook_with_same_orderbook_ticker() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+        {"coin":"RICK-Utxo","asset":"RICK","orderbook_ticker":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+        // just a random contract address
+        {"coin":"RICK-ERC20","orderbook_ticker":"RICK","decimals": 18,"protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9"}}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
+            "coins": coins,
+            "i_am_seed": true,
+        }),
+        "password".into(),
+        None,
+    )
     .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
 
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "buy",
-        "volume": "0.1",
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "RICK-Utxo",
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let best_morty_orders = response.result.get("MORTY").unwrap();
-    assert_eq!(1, best_morty_orders.len());
-    let expected_price: BigDecimal = "1".parse().unwrap();
-    assert_eq!(expected_price, best_morty_orders[0].price);
-
-    for _ in 0..5 {
-        let rc = block_on(mm_eve.rpc(json!({
-            "userpass": mm_eve.userpass,
-            "method": "update_maker_order",
-            "uuid": eve_order.result.uuid,
-            "new_price": "1.1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        thread::sleep(Duration::from_secs(1));
-    }
-
-    for _ in 0..5 {
-        let rc = block_on(mm_eve.rpc(json!({
-            "userpass": mm_eve.userpass,
-            "method": "update_maker_order",
-            "uuid": eve_order.result.uuid,
-            "new_price": "1.2",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        thread::sleep(Duration::from_secs(1));
-    }
+    assert!(
+        rc.0.is_server_error(),
+        "orderbook succeed but should have failed {}",
+        rc.1
+    );
 
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "buy",
-        "volume": "500",
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "RICK-ERC20",
     })))
     .unwrap();
-
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let best_morty_orders = response.result.get("MORTY").unwrap();
-    assert_eq!(1, best_morty_orders.len());
-    let expected_price: BigDecimal = "1.2".parse().unwrap();
-    assert_eq!(expected_price, best_morty_orders[0].price);
-
-    block_on(mm_bob.stop()).unwrap();
-    block_on(mm_alice.stop()).unwrap();
-    block_on(mm_eve.stop()).unwrap();
+    assert!(rc.0.is_success(), "!orderbook {}", rc.1);
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_best_orders_filter_response() {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
-
-    let bob_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
-    ]);
-
-    // alice defined MORTY as "wallet_only" in config
-    let alice_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"wallet_only": true,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+fn test_conf_settings_in_orderbook() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"required_confirmations":10,"requires_notarization":true,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"required_confirmations":5,"requires_notarization":false,"protocol":{"type":"UTXO"}},
     ]);
 
-    // start bob and immediately place the orders
-    let mut mm_bob = MarketMakerIt::start(
-        json! ({
+    let mm_bob = MarketMakerIt::start(
+        json!({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
-            "coins": bob_coins_config,
-            "rpc_password": "pass",
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
+            "coins": coins,
             "i_am_seed": true,
         }),
-        "pass".into(),
-        local_start!("bob"),
+        "password".into(),
+        None,
     )
     .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Log path: {}", mm_bob.log_path.display());
 
-    // Enable coins on Bob side. Print the replies in case we need the "address".
-    let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
-    log!({ "enable_coins (bob): {:?}", bob_coins });
-    // issue sell request on Bob side by setting base/rel price
-    log!("Issue bob sell requests");
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
 
-    let bob_orders = [
-        // (base, rel, price, volume, min_volume)
-        ("RICK", "MORTY", "0.9", "0.9", None),
-        ("RICK", "MORTY", "0.8", "0.9", None),
-        ("RICK", "MORTY", "0.7", "0.9", Some("0.9")),
-        ("RICK", "ETH", "0.8", "0.9", None),
-        ("MORTY", "RICK", "0.8", "0.9", None),
-        ("MORTY", "RICK", "0.9", "0.9", None),
-        ("ETH", "RICK", "0.8", "0.9", None),
-        ("MORTY", "ETH", "0.8", "0.8", None),
-        ("MORTY", "ETH", "0.7", "0.8", Some("0.8")),
-    ];
-    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
-        let rc = block_on(mm_bob.rpc(json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": base,
-            "rel": rel,
-            "price": price,
-            "volume": volume,
-            "min_volume": min_volume.unwrap_or("0.00777"),
-            "cancel_previous": false,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    }
+    log!("Issue set_price request for RICK/MORTY on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": 0.9,
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    log!("Issue set_price request for MORTY/RICK on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MORTY",
+        "rel": "RICK",
+        "price": 0.9,
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
     let mm_alice = MarketMakerIt::start(
-        json! ({
+        json!({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
-            "coins": alice_coins_config,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
+            "rpc_password": "password",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
         }),
-        "pass".into(),
-        local_start!("alice"),
+        "password".into(),
+        None,
     )
     .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_alice.mm_dump();
+    log!("Log path: {}", mm_alice.log_path.display());
 
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
-
-    block_on(mm_bob.wait_for_log(22., |log| {
-        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
-    }))
-    .unwrap();
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
 
-    let rc = block_on(mm_alice.rpc(json! ({
+    log!("Get RICK/MORTY orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "buy",
-        "volume": "0.1",
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let empty_vec = Vec::new();
-    let best_morty_orders = response.result.get("MORTY").unwrap_or(&empty_vec);
-    assert_eq!(0, best_morty_orders.len());
-    let best_eth_orders = response.result.get("ETH").unwrap();
-    assert_eq!(1, best_eth_orders.len());
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Alice orderbook {:?}", alice_orderbook);
+
+    assert_eq!(
+        alice_orderbook.asks.len(),
+        1,
+        "Alice RICK/MORTY orderbook must have exactly 1 ask"
+    );
+    assert_eq!(alice_orderbook.asks[0].base_confs, 10);
+    assert_eq!(alice_orderbook.asks[0].base_nota, true);
+    assert_eq!(alice_orderbook.asks[0].rel_confs, 5);
+    assert_eq!(alice_orderbook.asks[0].rel_nota, false);
+
+    assert_eq!(
+        alice_orderbook.bids.len(),
+        1,
+        "Alice RICK/MORTY orderbook must have exactly 1 bid"
+    );
+    assert_eq!(alice_orderbook.bids[0].base_confs, 10);
+    assert_eq!(alice_orderbook.bids[0].base_nota, true);
+    assert_eq!(alice_orderbook.bids[0].rel_confs, 5);
+    assert_eq!(alice_orderbook.bids[0].rel_nota, false);
 
     block_on(mm_bob.stop()).unwrap();
     block_on(mm_alice.stop()).unwrap();
@@ -7521,635 +7031,106 @@ fn test_best_orders_filter_response() {
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_best_orders_segwit() {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
-
-    let bob_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
-    ]);
-
-    let alice_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"}}
+fn alice_can_see_confs_in_orderbook_after_sync() {
+    let bob_coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"required_confirmations":10,"requires_notarization":true,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"required_confirmations":5,"requires_notarization":false,"protocol":{"type":"UTXO"}},
     ]);
 
-    let mut mm_bob = MarketMakerIt::start(
-        json! ({
+    let mm_bob = MarketMakerIt::start(
+        json!({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
-            "coins": bob_coins_config,
-            "rpc_password": "pass",
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
+            "coins": bob_coins,
             "i_am_seed": true,
         }),
-        "pass".into(),
-        local_start!("bob"),
+        "password".into(),
+        None,
     )
     .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-
-    // Enable coins on Bob side. Print the replies in case we need the "address".
-    let electrum = block_on(mm_bob.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "tBTC",
-        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
-        "address_format":{"format":"segwit"},
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    log!({ "enable tBTC: {:?}", electrum });
-    let enable_tbtc_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
-    let tbtc_segwit_address = enable_tbtc_res.address;
+    // let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
-    let electrum = block_on(mm_bob.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "RICK",
-        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
     );
-    log!({ "enable RICK: {:?}", electrum });
-    let enable_rick_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
-    let rick_address = enable_rick_res.address;
-
-    // issue sell request on Bob side by setting base/rel price
-    log!("Issue bob sell requests");
-
-    let bob_orders = [
-        // (base, rel, price, volume, min_volume)
-        ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015")),
-        ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015")),
-    ];
-    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
-        let rc = block_on(mm_bob.rpc(json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": base,
-            "rel": rel,
-            "price": price,
-            "volume": volume,
-            "min_volume": min_volume.unwrap_or("0.00777"),
-            "cancel_previous": false,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    }
-
-    let mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
-            "passphrase": "alice passphrase",
-            "coins": alice_coins_config,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        local_start!("alice"),
-    )
-    .unwrap();
-
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
-
-    block_on(mm_bob.wait_for_log(22., |log| {
-        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
-    }))
-    .unwrap();
-
-    // checking buy and sell best_orders against ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015"))
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "tBTC",
-        "action": "buy",
-        "volume": "0.0002",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let best_orders = response.result.get("RICK").unwrap();
-    assert_eq!(1, best_orders.len());
-    assert_eq!(best_orders[0].coin, "RICK");
-    assert_eq!(best_orders[0].address, rick_address);
-
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "sell",
-        "volume": "0.0002",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let best_orders = response.result.get("tBTC").unwrap();
-    assert_eq!(1, best_orders.len());
-    assert_eq!(best_orders[0].coin, "tBTC");
-    assert_eq!(best_orders[0].address, tbtc_segwit_address);
 
-    // checking buy and sell best_orders against ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015"))
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "RICK",
-        "action": "buy",
-        "volume": "0.0002",
+    log!("Issue sell request on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": 0.9,
+        "volume": "0.9",
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let best_orders = response.result.get("tBTC").unwrap();
-    assert_eq!(1, best_orders.len());
-    assert_eq!(best_orders[0].coin, "tBTC");
-    assert_eq!(best_orders[0].address, tbtc_segwit_address);
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "best_orders",
-        "coin": "tBTC",
-        "action": "sell",
-        "volume": "0.0002",
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "mmrpc": "2.0",
+        "method": "get_public_key",
+        "params": {},
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
-    let best_orders = response.result.get("RICK").unwrap();
-    assert_eq!(1, best_orders.len());
-    assert_eq!(best_orders[0].coin, "RICK");
-    assert_eq!(best_orders[0].address, rick_address);
-
-    block_on(mm_bob.stop()).unwrap();
-    block_on(mm_alice.stop()).unwrap();
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_orderbook_segwit() {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+    assert!(rc.0.is_success(), "!get_public_key: {}", rc.1);
+    let get_public_key_res: RpcV2Response<GetPublicKeyResult> = serde_json::from_str(&rc.1).unwrap();
+    let bob_pubkey = get_public_key_res.result.public_key;
 
-    let bob_coins_config = json!([
+    // Alice coins don't have required_confirmations and requires_notarization set
+    let alice_coins = json!([
         {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
-    ]);
-
-    let alice_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"}}
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
     ]);
 
-    let mut mm_bob = MarketMakerIt::start(
-        json! ({
+    let mut mm_alice = MarketMakerIt::start(
+        json!({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
-            "coins": bob_coins_config,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-
-    // Enable coins on Bob side. Print the replies in case we need the "address".
-    let electrum = block_on(mm_bob.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "tBTC",
-        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
-        "address_format":{"format":"segwit"},
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    log!({ "enable tBTC: {:?}", electrum });
-    let enable_tbtc_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
-    let tbtc_segwit_address = enable_tbtc_res.address;
-
-    let electrum = block_on(mm_bob.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "RICK",
-        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    log!({ "enable RICK: {:?}", electrum });
-    let enable_rick_res: Json = json::from_str(&electrum.1).unwrap();
-    let rick_address = enable_rick_res["address"].as_str().unwrap();
-
-    // issue sell request on Bob side by setting base/rel price
-    log!("Issue bob sell requests");
-
-    let bob_orders = [
-        // (base, rel, price, volume, min_volume)
-        ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015")),
-        ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015")),
-    ];
-    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
-        let rc = block_on(mm_bob.rpc(json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": base,
-            "rel": rel,
-            "price": price,
-            "volume": volume,
-            "min_volume": min_volume.unwrap_or("0.00777"),
-            "cancel_previous": false,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    }
-
-    let mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
-            "passphrase": "alice passphrase",
-            "coins": alice_coins_config,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        local_start!("alice"),
-    )
-    .unwrap();
-
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
-
-    block_on(mm_bob.wait_for_log(22., |log| {
-        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
-    }))
-    .unwrap();
-
-    // checking orderbook on alice side
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "orderbook",
-        "base": "tBTC",
-        "rel": "RICK",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-    let response: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    assert_eq!(response.asks[0].address, tbtc_segwit_address);
-    assert_eq!(response.bids[0].address, rick_address);
-
-    block_on(mm_bob.stop()).unwrap();
-    block_on(mm_alice.stop()).unwrap();
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
-
-    let bob_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
-    ]);
-
-    let alice_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
-    ]);
-
-    let mut mm_bob = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
-            "coins": bob_coins_config,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-
-    // Enable coins on Bob side. Print the replies in case we need the "address".
-    let electrum = block_on(mm_bob.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "tBTC",
-        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
-        "address_format":{"format":"segwit"},
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    log!({ "enable tBTC: {:?}", electrum });
-    let enable_tbtc_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
-    let tbtc_segwit_address = enable_tbtc_res.address;
-
-    let electrum = block_on(mm_bob.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "RICK",
-        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    log!({ "enable RICK: {:?}", electrum });
-    let enable_rick_res: Json = json::from_str(&electrum.1).unwrap();
-    let rick_address = enable_rick_res["address"].as_str().unwrap();
-
-    // issue sell request on Bob side by setting base/rel price
-    log!("Issue bob sell requests");
-
-    let bob_orders = [
-        // (base, rel, price, volume, min_volume)
-        ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015")),
-        ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015")),
-    ];
-    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
-        let rc = block_on(mm_bob.rpc(json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": base,
-            "rel": rel,
-            "price": price,
-            "volume": volume,
-            "min_volume": min_volume.unwrap_or("0.00777"),
-            "cancel_previous": false,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    }
-
-    let mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
-            "passphrase": "alice passphrase",
-            "coins": alice_coins_config,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
-        }),
-        "pass".into(),
-        local_start!("alice"),
-    )
-    .unwrap();
-
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
-
-    block_on(mm_bob.wait_for_log(22., |log| {
-        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
-    }))
-    .unwrap();
-
-    let electrum = block_on(mm_alice.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "tBTC",
-        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
-        "address_format":{"format":"segwit"},
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    log!({ "enable Alice tBTC: {:?}", electrum });
-
-    let electrum = block_on(mm_alice.rpc(json!({
-        "userpass": "pass",
-        "method": "electrum",
-        "coin": "RICK",
-        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
-        "mm2": 1,
-    }))).unwrap();
-    assert_eq!(
-        electrum.0,
-        StatusCode::OK,
-        "RPC «electrum» failed with {} {}",
-        electrum.0,
-        electrum.1
-    );
-    log!({ "enable Alice RICK: {:?}", electrum });
-
-    // setting the price will trigger Alice's subscription to the orderbook topic
-    // but won't request the actual orderbook
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "setprice",
-        "base": "RICK",
-        "rel": "tBTC",
-        "price": "1",
-        "volume": "0.1",
-        "cancel_previous": false,
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-    // Waiting for 62 seconds required for Alice to sync the orderbook
-    thread::sleep(Duration::from_secs(62));
-
-    // checking orderbook on alice side
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "orderbook",
-        "base": "tBTC",
-        "rel": "RICK",
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-    let response: OrderbookResponse = json::from_str(&rc.1).unwrap();
-    assert_eq!(response.asks[0].address, tbtc_segwit_address);
-    assert_eq!(response.bids[0].address, rick_address);
-
-    block_on(mm_bob.stop()).unwrap();
-    block_on(mm_alice.stop()).unwrap();
-}
-
-fn request_and_check_orderbook_depth(mm_alice: &MarketMakerIt) {
-    let rc = block_on(mm_alice.rpc(json! ({
-        "userpass": mm_alice.userpass,
-        "method": "orderbook_depth",
-        "pairs": [("RICK", "MORTY"), ("RICK", "ETH"), ("MORTY", "ETH")],
-    })))
-    .unwrap();
-    assert!(rc.0.is_success(), "!orderbook_depth: {}", rc.1);
-    let response: OrderbookDepthResponse = json::from_str(&rc.1).unwrap();
-    let rick_morty = response
-        .result
-        .iter()
-        .find(|pair_depth| pair_depth.pair.0 == "RICK" && pair_depth.pair.1 == "MORTY")
-        .unwrap();
-    assert_eq!(3, rick_morty.depth.asks);
-    assert_eq!(2, rick_morty.depth.bids);
-
-    let rick_eth = response
-        .result
-        .iter()
-        .find(|pair_depth| pair_depth.pair.0 == "RICK" && pair_depth.pair.1 == "ETH")
-        .unwrap();
-    assert_eq!(1, rick_eth.depth.asks);
-    assert_eq!(1, rick_eth.depth.bids);
-
-    let morty_eth = response
-        .result
-        .iter()
-        .find(|pair_depth| pair_depth.pair.0 == "MORTY" && pair_depth.pair.1 == "ETH")
-        .unwrap();
-    assert_eq!(0, morty_eth.depth.asks);
-    assert_eq!(0, morty_eth.depth.bids);
-}
-
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_orderbook_depth() {
-    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
-
-    let coins = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
-    ]);
-
-    // start bob and immediately place the orders
-    let mut mm_bob = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
-            "coins": coins,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .unwrap();
-    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
-    log!({"Bob log path: {}", mm_bob.log_path.display()});
-
-    // Enable coins on Bob side. Print the replies in case we need the "address".
-    let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
-    log!({ "enable_coins (bob): {:?}", bob_coins });
-    // issue sell request on Bob side by setting base/rel price
-    log!("Issue bob sell requests");
-
-    let bob_orders = [
-        // (base, rel, price, volume, min_volume)
-        ("RICK", "MORTY", "0.9", "0.9", None),
-        ("RICK", "MORTY", "0.8", "0.9", None),
-        ("RICK", "MORTY", "0.7", "0.9", Some("0.9")),
-        ("RICK", "ETH", "0.8", "0.9", None),
-        ("MORTY", "RICK", "0.8", "0.9", None),
-        ("MORTY", "RICK", "0.9", "0.9", None),
-        ("ETH", "RICK", "0.8", "0.9", None),
-    ];
-    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
-        let rc = block_on(mm_bob.rpc(json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": base,
-            "rel": rel,
-            "price": price,
-            "volume": volume,
-            "min_volume": min_volume.unwrap_or("0.00777"),
-            "cancel_previous": false,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    }
-
-    let mm_alice = MarketMakerIt::start(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
             "passphrase": "alice passphrase",
-            "coins": coins,
-            "seednodes": [fomat!((mm_bob.ip))],
-            "rpc_password": "pass",
+            "rpc_password": "password",
+            "coins": alice_coins,
+            "seednodes": [mm_bob.ip.to_string()],
         }),
-        "pass".into(),
-        local_start!("alice"),
+        "password".into(),
+        None,
     )
     .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
 
-    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
-    log!({ "Alice log path: {}", mm_alice.log_path.display() });
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
 
-    block_on(mm_bob.wait_for_log(22., |log| {
-        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
-    }))
+    // setting the price will trigger Alice's subscription to the orderbook topic
+    // but won't request the actual orderbook
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": "1",
+        "volume": "0.1",
+        "cancel_previous": false,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    block_on(
+        mm_alice.wait_for_log((MIN_ORDER_KEEP_ALIVE_INTERVAL * 2) as f64, |log| {
+            log.contains(&format!("Inserting order OrderbookItem {{ pubkey: \"{}\"", bob_pubkey))
+        }),
+    )
     .unwrap();
 
-    request_and_check_orderbook_depth(&mm_alice);
-    // request RICK/MORTY orderbook to subscribe Alice
-    let rc = block_on(mm_alice.rpc(json! ({
+    log!("Get RICK/MORTY orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json! ({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -8158,242 +7139,360 @@ fn test_orderbook_depth() {
     .unwrap();
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
-    request_and_check_orderbook_depth(&mm_alice);
+    let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Alice orderbook {:?}", alice_orderbook);
+    assert_eq!(
+        alice_orderbook.asks.len(),
+        2,
+        "Alice RICK/MORTY orderbook must have exactly 2 ask"
+    );
+    let bob_order_in_orderbook = alice_orderbook
+        .asks
+        .iter()
+        .find(|entry| entry.pubkey == bob_pubkey)
+        .unwrap();
+    assert_eq!(bob_order_in_orderbook.base_confs, 10);
+    assert_eq!(bob_order_in_orderbook.base_nota, true);
+    assert_eq!(bob_order_in_orderbook.rel_confs, 5);
+    assert_eq!(bob_order_in_orderbook.rel_nota, false);
 
     block_on(mm_bob.stop()).unwrap();
     block_on(mm_alice.stop()).unwrap();
 }
 
-// https://github.com/KomodoPlatform/atomicDEX-API/issues/932
 #[test]
-fn test_mm2_db_migration() {
-    let bob_passphrase = get_passphrase(&".env.client", "BOB_PASSPHRASE").unwrap();
+#[cfg(not(target_arch = "wasm32"))]
+fn test_sign_verify_message_utxo() {
+    let seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
 
-    let coins = json! ([
-        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"MORTY","asset":"MORTY","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
-        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
-        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    let coins = json!([
+        {
+            "coin":"RICK",
+            "asset":"RICK",
+            "rpcport":8923,
+            "sign_message_prefix": "Komodo Signed Message:\n",
+            "txversion":4,
+            "overwintered":1,
+            "protocol":{"type":"UTXO"}
+        },
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
-    let mm2_folder = new_mm2_temp_folder_path(None);
-    let swaps_dir = mm2_folder.join(format!(
-        "{}/SWAPS/STATS/MAKER",
-        hex::encode(rmd160_from_passphrase(&bob_passphrase))
-    ));
-    std::fs::create_dir_all(&swaps_dir).unwrap();
-    let swap_path = swaps_dir.join("5d02843e-d1b4-488d-aad0-114d82020453.json");
-    let swap_json = r#"{"uuid":"5d02843e-d1b4-488d-aad0-114d82020453","events":[{"timestamp":1612780908136,"event":{"type":"Started","data":{"taker_coin":"MORTY-BEP20","maker_coin":"RICK-BEP20","taker":"ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fa","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"026bebc2e19c243d0940dd583c9573bf10377afd","my_persistent_pub":"037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5","lock_duration":7800,"maker_amount":"1","taker_amount":"1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1612796508,"uuid":"5d02843e-d1b4-488d-aad0-114d82020453","started_at":1612780908,"maker_coin_start_block":793472,"taker_coin_start_block":797356,"maker_payment_trade_fee":null,"taker_payment_spend_trade_fee":null}}},{"timestamp":1612780924142,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1612788708,"taker_pubkey":"03ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fa"}}},{"timestamp":1612780935156,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f8901f425fbefe21f33ccb7b487df251191b27dfa7b639b04f60e5493c7ea41dbf149000000006b483045022100d5ec3e542175479bd4bd011e19b76a75e99f19cc49867e5bca9541950322c33a02207a4d1ffd674fb9760de79bb4929af44d66344b5e182de3c377186deebf6bf376012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac5ce6f305000000001976a914d55f0df6cb82630ad21a4e6049522a6f2b6c9d4588ac7c152160000000000000000000000000000000","tx_hash":"75323ab7acd64bd35242611fabaec560d9acf2e1f9ca28d3a4aba47a79fb49c4"}}},{"timestamp":1612780935174,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f89028bef955e42107c562e4e02421f25c455723a701573f86c17b4d82e35a7d8f9f7020000006b483045022100b12fc9d95acca76bf5fd8d5c6acc288b454032ba4561b1c2b1f5f33b2cf2926d022017e561bc2cd93308848674b47b2e8ebd8f074ea78e32454d5fea6f08c0b1f1e40121037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ffffffff5dfd0b24c0f7c3cf235868cf9a26ec49574764d135796fc4e7d20e95d55a8653000000006a47304402207c752d14601d1c99892f9d6c88c8ff2f93211640a65b2ee69172a16b908b21e402206f0b66684158445888271a849ab46258ad722496ee64fde055a6f44e36ed2ccc0121037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ffffffff0300e1f5050000000017a9141b85c1a277f44f7d77d52b78e2ba70a0becc2ff9870000000000000000166a14026bebc2e19c243d0940dd583c9573bf10377afda7d26301000000001976a91486f747b28c60ad1130bdd3f84f48eeaf1801ca9888ac87152160000000000000000000000000000000","tx_hash":"27dafe553246553d54f909fbbded80e6d490fdb95ca7b6807d73eca45f0d7a22"}}},{"timestamp":1612780982221,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8902c449fb797aa4aba4d328caf9e1f2acd960c5aeab1f614252d34bd6acb73a3275010000006a47304402200438c96bf457bacf906e94c98f91783129cb1c3a8f3d9355e1c39a9857fb2c6b02201d3c71b3f243f7a3c91bb9a15e80bb26e47bed04e798106a8af8dac61082ec41012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fafffffffff425fbefe21f33ccb7b487df251191b27dfa7b639b04f60e5493c7ea41dbf149010000006b483045022100efa00c742159b0b05433678aa95f0c8900adaddf5011bfaf56d6a7679aed428b022043f68efc3cb386dd10a65a2a3e8a904541c8f1ddbd7dddbcda2ccdd7938c5934012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faffffffff0300e1f5050000000017a914bc8e8f2648f7bb4dbd612f2e71dd7b23c54880b7870000000000000000166a14026bebc2e19c243d0940dd583c9573bf10377afd74c3e90b000000001976a914d55f0df6cb82630ad21a4e6049522a6f2b6c9d4588acb5152160000000000000000000000000000000","tx_hash":"94c8a1244421465b618a36e7647a270c7b2ef20eff3cd1317761cc242c49cc99"}}},{"timestamp":1612780982222,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1612781042265,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1612781042272,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"0400008085202f890199cc492c24cc617731d13cff0ef22e7b0c277a64e7368a615b46214424a1c89400000000d84830450221008f38d29e7990bd694f2c4fd4c235fe00997da4e5133208d7c38e75e806d9be1702201ff1d598ceafc099dc4af7d4b91db535196f642cf31b5b5e386b28574a378b9b0120e8512e2afb02d3a90590d30095286e2293f51f9d4411ad87ef398ee8f566de43004c6b6304e4332160b1752103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faac6782012088a914026bebc2e19c243d0940dd583c9573bf10377afd8821037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ac68ffffffff0118ddf505000000001976a91486f747b28c60ad1130bdd3f84f48eeaf1801ca9888ace2072160000000000000000000000000000000","tx_hash":"d21173cca32b83ffe5d4cc327f7eff09496f52876614dbbfe7963284818ba9a1"}}},{"timestamp":1612781042273,"event":{"type":"TakerPaymentSpendConfirmStarted"}},{"timestamp":1612781207356,"event":{"type":"TakerPaymentSpendConfirmed"}},{"timestamp":1612781207357,"event":{"type":"Finished"}}],"maker_amount":"1","maker_coin":"RICK-BEP20","taker_amount":"1","taker_coin":"MORTY-BEP20","gui":"dexstats","mm_version":"19701cc87","success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]}"#;
-    std::fs::write(swap_path, swap_json.as_bytes()).unwrap();
-
-    // if there is an issue with migration the start will fail
-    MarketMakerIt::start(
+    // start bob and immediately place the order
+    let mm_bob = MarketMakerIt::start(
         json! ({
             "gui": "nogui",
-            "netid": 8999,
-            "dht": "on",  // Enable DHT without delay.
+            "netid": 9998,
             "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
             "rpcip": env::var ("BOB_TRADE_IP") .ok(),
             "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
-            "passphrase": bob_passphrase,
+            "passphrase": seed.to_string(),
             "coins": coins,
-            "rpc_password": "password",
+            "rpc_password": "pass",
             "i_am_seed": true,
-            "dbdir": mm2_folder.display().to_string(),
         }),
-        "password".into(),
-        None,
+        "pass".into(),
+        local_start!("bob"),
     )
     .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
+
+    let response = block_on(sign_message(&mm_bob, "RICK"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert_eq!(
+        response.signature,
+        "HzetbqVj9gnUOznon9bvE61qRlmjH5R+rNgkxu8uyce3UBbOu+2aGh7r/GGSVFGZjRnaYC60hdwtdirTKLb7bE4="
+    );
+
+    let response = block_on(verify_message(
+        &mm_bob,
+        "RICK",
+        "HzetbqVj9gnUOznon9bvE61qRlmjH5R+rNgkxu8uyce3UBbOu+2aGh7r/GGSVFGZjRnaYC60hdwtdirTKLb7bE4=",
+        "R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_get_public_key() {
+fn test_sign_verify_message_utxo_segwit() {
+    let seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
+
     let coins = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+        {
+            "coin":"RICK",
+            "asset":"RICK",
+            "rpcport":8923,
+            "sign_message_prefix": "Komodo Signed Message:\n",
+            "txversion":4,
+            "overwintered":1,
+            "segwit": true,
+            "address_format":{"format":"segwit"},
+            "bech32_hrp": "rck",
+            "protocol":{"type":"UTXO"}
+        },
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
     ]);
 
-    let mm = MarketMakerIt::start(
-        json!({
+    // start bob and immediately place the order
+    let mm_bob = MarketMakerIt::start(
+        json! ({
             "gui": "nogui",
             "netid": 9998,
-            "passphrase": "bob passphrase",
-            "rpc_password": "password",
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": seed.to_string(),
             "coins": coins,
+            "rpc_password": "pass",
             "i_am_seed": true,
         }),
-        "password".into(),
-        None,
+        "pass".into(),
+        local_start!("bob"),
     )
     .unwrap();
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
-    fn get_public_key_bot_rpc(mm: &MarketMakerIt) -> (StatusCode, String, HeaderMap) {
-        block_on(mm.rpc(json!({
-                 "userpass": "password",
-                 "mmrpc": "2.0",
-                 "method": "get_public_key",
-                 "params": {},
-                 "id": 0})))
-        .unwrap()
-    }
-    let resp = get_public_key_bot_rpc(&mm);
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
+
+    let response = block_on(sign_message(&mm_bob, "RICK"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
 
-    // Must be 200
-    assert_eq!(resp.0, 200);
-    let v: GetPublicKeyResponse = serde_json::from_str(&*resp.1).unwrap();
     assert_eq!(
-        v.result.public_key,
-        "022cd3021a2197361fb70b862c412bc8e44cff6951fa1de45ceabfdd9b4c520420"
-    )
+        response.signature,
+        "HzetbqVj9gnUOznon9bvE61qRlmjH5R+rNgkxu8uyce3UBbOu+2aGh7r/GGSVFGZjRnaYC60hdwtdirTKLb7bE4="
+    );
+
+    let response = block_on(verify_message(
+        &mm_bob,
+        "RICK",
+        "HzetbqVj9gnUOznon9bvE61qRlmjH5R+rNgkxu8uyce3UBbOu+2aGh7r/GGSVFGZjRnaYC60hdwtdirTKLb7bE4=",
+        "rck1qqk4t2dppvmu9jja0z7nan0h464n5gve8h7nhay",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
+
+    let response = block_on(verify_message(
+        &mm_bob,
+        "RICK",
+        "HzetbqVj9gnUOznon9bvE61qRlmjH5R+rNgkxu8uyce3UBbOu+2aGh7r/GGSVFGZjRnaYC60hdwtdirTKLb7bE4=",
+        "R9o9xTocqr6CeEDGDH6mEYpwLoMz6jNjMW",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_get_orderbook_with_same_orderbook_ticker() {
+fn test_sign_verify_message_eth() {
+    let seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
+
     let coins = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
-        {"coin":"RICK-Utxo","asset":"RICK","orderbook_ticker":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
-        // just a random contract address
-        {"coin":"RICK-ERC20","orderbook_ticker":"RICK","decimals": 18,"protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9"}}},
+        {
+            "coin": "ETH",
+            "name": "ethereum",
+            "fname": "Ethereum",
+            "sign_message_prefix": "Ethereum Signed Message:\n",
+            "rpcport": 80,
+            "mm2": 1,
+            "chain_id": 1,
+            "required_confirmations": 3,
+            "avg_blocktime": 0.25,
+            "protocol": {"type": "ETH"}
+        }
     ]);
 
-    let mm = MarketMakerIt::start(
-        json!({
+    // start bob and immediately place the order
+    let mm_bob = MarketMakerIt::start(
+        json! ({
             "gui": "nogui",
             "netid": 9998,
-            "passphrase": "bob passphrase",
-            "rpc_password": "password",
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": seed.to_string(),
             "coins": coins,
+            "rpc_password": "pass",
             "i_am_seed": true,
         }),
-        "password".into(),
-        None,
+        "pass".into(),
+        local_start!("bob"),
     )
     .unwrap();
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-    log!({"Log path: {}", mm.log_path.display()});
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
 
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_native(&mm_bob, "ETH", &["http://195.201.0.6:8565"]))
+    );
+
+    let response = block_on(sign_message(&mm_bob, "ETH"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert_eq!(
+        response.signature,
+        "0xcdf11a9c4591fb7334daa4b21494a2590d3f7de41c7d2b333a5b61ca59da9b311b492374cc0ba4fbae53933260fa4b1c18f15d95b694629a7b0620eec77a938600"
+    );
+
+    let response = block_on(verify_message(&mm_bob, "ETH", 
+    "0xcdf11a9c4591fb7334daa4b21494a2590d3f7de41c7d2b333a5b61ca59da9b311b492374cc0ba4fbae53933260fa4b1c18f15d95b694629a7b0620eec77a938600",
+    "0xbAB36286672fbdc7B250804bf6D14Be0dF69fa29"));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_no_login() {
+    let coins = json!([rick_conf(), morty_conf()]);
+    let seednode_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+    let seednode_conf = Mm2TestConf::seednode(&seednode_passphrase, &coins);
+    let seednode = MarketMakerIt::start(seednode_conf.conf, seednode_conf.rpc_password, seednode_conf.local).unwrap();
+    let (_dump_log, _dump_dashboard) = seednode.mm_dump();
+    log!("log path: {}", seednode.log_path.display());
+
+    let no_login_conf = Mm2TestConf::no_login_node(&coins, &[&seednode.ip.to_string()]);
+    let no_login_node =
+        MarketMakerIt::start(no_login_conf.conf, no_login_conf.rpc_password, no_login_conf.local).unwrap();
+    let (_dump_log, _dump_dashboard) = no_login_node.mm_dump();
+    log!("log path: {}", no_login_node.log_path.display());
+
+    block_on(enable_electrum_json(&seednode, RICK, false, rick_electrums()));
+    block_on(enable_electrum_json(&seednode, MORTY, false, morty_electrums()));
+
+    let orders = [
+        // (base, rel, price, volume, min_volume)
+        ("RICK", "MORTY", "0.9", "0.9", None),
+        ("RICK", "MORTY", "0.8", "0.9", None),
+        ("RICK", "MORTY", "0.7", "0.9", Some("0.9")),
+        ("MORTY", "RICK", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.9", "0.9", None),
+    ];
+
+    for (base, rel, price, volume, min_volume) in orders.iter() {
+        let rc = block_on(seednode.rpc(&json! ({
+            "userpass": seednode.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    let orderbook = block_on(no_login_node.rpc(&json! ({
+        "userpass": no_login_node.userpass,
         "method": "orderbook",
         "base": "RICK",
-        "rel": "RICK-Utxo",
+        "rel": "MORTY",
     })))
     .unwrap();
-    assert!(
-        rc.0.is_server_error(),
-        "orderbook succeed but should have failed {}",
-        rc.1
-    );
+    assert!(orderbook.0.is_success(), "!orderbook: {}", orderbook.1);
+    let orderbook: OrderbookResponse = json::from_str(&orderbook.1).unwrap();
+    assert_eq!(orderbook.asks.len(), 3);
+    assert_eq!(orderbook.bids.len(), 2);
 
-    let rc = block_on(mm.rpc(json! ({
-        "userpass": mm.userpass,
+    let orderbook_v2 = block_on(no_login_node.rpc(&json! ({
+        "userpass": no_login_node.userpass,
+        "mmrpc": "2.0",
         "method": "orderbook",
-        "base": "RICK",
-        "rel": "RICK-ERC20",
+        "params": {
+            "base": "RICK",
+            "rel": "MORTY",
+        },
     })))
     .unwrap();
-    assert!(rc.0.is_success(), "!orderbook {}", rc.1);
-}
+    assert!(orderbook_v2.0.is_success(), "!orderbook: {}", orderbook_v2.1);
+    let orderbook_v2: RpcV2Response<OrderbookV2Response> = json::from_str(&orderbook_v2.1).unwrap();
+    let orderbook_v2 = orderbook_v2.result;
+    assert_eq!(orderbook_v2.asks.len(), 3);
+    assert_eq!(orderbook_v2.bids.len(), 2);
 
-// HOWTO
-// 1. Install Firefox.
-// 2. Install wasm-bindgen-cli: cargo install wasm-bindgen-cli
-// 3. Download Gecko driver for your OS: https://github.com/mozilla/geckodriver/releases
-// 4. Run WASM_BINDGEN_TEST_TIMEOUT=120 GECKODRIVER=PATH_TO_GECKO_DRIVER_BIN cargo test --target wasm32-unknown-unknown
-#[cfg(target_arch = "wasm32")]
-mod wasm_bindgen_tests {
-    use super::*;
-    use futures01::Future;
-    use js_sys::Promise;
-    use lazy_static::lazy_static;
-    use wasm_bindgen::prelude::*;
-    use wasm_bindgen_futures::JsFuture;
-    use wasm_bindgen_test::*;
-    use web_sys::console;
-
-    wasm_bindgen_test_configure!(run_in_browser);
+    let best_orders = block_on(no_login_node.rpc(&json! ({
+        "userpass": no_login_node.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "buy",
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(best_orders.0.is_success(), "!best_orders: {}", best_orders.1);
+    let best_orders: BestOrdersResponse = json::from_str(&best_orders.1).unwrap();
+    let best_morty_orders = best_orders.result.get("MORTY").unwrap();
+    assert_eq!(1, best_morty_orders.len());
+    let expected_price: BigDecimal = "0.8".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price);
 
-    #[wasm_bindgen_test]
-    async fn test_swap() {
-        use crate::mm2::lp_swap::{run_maker_swap, run_taker_swap, MakerSwap, RunMakerSwapInput, RunTakerSwapInput,
-                                  SwapConfirmationsSettings, TakerSwap, PAYMENT_LOCKTIME};
-        use coins::lp_coininit;
-        use common::mm_ctx::MmCtxBuilder;
-        use common::new_uuid;
-        use common::now_ms;
-        use futures::future::join;
-        use futures::{Future, TryFutureExt};
-
-        let conf_settings = SwapConfirmationsSettings {
-            maker_coin_confs: 0,
-            maker_coin_nota: false,
-            taker_coin_confs: 0,
-            taker_coin_nota: false,
-        };
-        let uuid = new_uuid();
-        let key_pair_taker =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let key_pair_maker =
-            key_pair_from_seed("also shoot benefit prefer juice shell elder veteran woman mimic image kidney").unwrap();
-        let conf = json!({
-            "coins":[
-               {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80,"mm2":1},
-               {"coin":"JST","name":"jst","rpcport":80,"mm2":1,"protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
-            ]
-        });
-        let ctx_taker = MmCtxBuilder::new()
-            .with_conf(conf.clone())
-            .with_secp256k1_key_pair(key_pair_taker)
-            .into_mm_arc();
-        let ctx_maker = MmCtxBuilder::new()
-            .with_conf(conf)
-            .with_secp256k1_key_pair(key_pair_maker)
-            .into_mm_arc();
-        let taker_persistent_pub = (**ctx_taker.secp256k1_key_pair().public()).into();
-        let maker_persistent_pub = (**ctx_maker.secp256k1_key_pair().public()).into();
-
-        let req = json!({
-            "urls":["http://195.201.0.6:8565"],
-            "swap_contract_address":"0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd"
-        });
-        let eth_taker = lp_coininit(&ctx_taker, "ETH", &req).await.unwrap();
-        let jst_taker = lp_coininit(&ctx_taker, "JST", &req).await.unwrap();
-        let eth_maker = lp_coininit(&ctx_maker, "ETH", &req).await.unwrap();
-        let jst_maker = lp_coininit(&ctx_maker, "JST", &req).await.unwrap();
-        let taker_swap = TakerSwap::new(
-            ctx_taker.clone(),
-            [0; 32].into(),
-            1.into(),
-            1.into(),
-            taker_persistent_pub,
-            uuid,
-            None,
-            conf_settings.clone(),
-            eth_taker,
-            jst_taker,
-            PAYMENT_LOCKTIME,
-        );
+    let best_orders_v2 = block_on(no_login_node.rpc(&json! ({
+        "userpass": no_login_node.userpass,
+        "mmrpc": "2.0",
+        "method": "best_orders",
+        "params": {
+            "coin": "RICK",
+            "action": "buy",
+            "request_by": {
+                "type": "number",
+                "value": 1
+            }
+        },
+    })))
+    .unwrap();
+    assert!(best_orders_v2.0.is_success(), "!best_orders: {}", best_orders_v2.1);
+    let best_orders_v2: RpcV2Response<BestOrdersV2Response> = json::from_str(&best_orders_v2.1).unwrap();
+    let best_morty_orders = best_orders_v2.result.orders.get(MORTY).unwrap();
+    assert_eq!(1, best_morty_orders.len());
+    let expected_price: BigDecimal = "0.7".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price.decimal);
 
-        let maker_swap = MakerSwap::new(
-            ctx_maker.clone(),
-            [0; 32].into(),
-            1.into(),
-            1.into(),
-            maker_persistent_pub,
-            uuid,
-            None,
-            conf_settings,
-            eth_maker,
-            jst_maker,
-            PAYMENT_LOCKTIME,
-        );
+    let orderbook_depth = block_on(no_login_node.rpc(&json! ({
+        "userpass": no_login_node.userpass,
+        "method": "orderbook_depth",
+        "pairs":[["RICK","MORTY"]]
+    })))
+    .unwrap();
+    assert!(
+        orderbook_depth.0.is_success(),
+        "!orderbook_depth: {}",
+        orderbook_depth.1
+    );
+    let orderbook_depth: OrderbookDepthResponse = json::from_str(&orderbook_depth.1).unwrap();
+    let orderbook_depth = orderbook_depth.result;
+    assert_eq!(orderbook_depth[0].depth.asks, 3);
+    assert_eq!(orderbook_depth[0].depth.bids, 2);
 
-        let taker_swap_fut = run_taker_swap(RunTakerSwapInput::StartNew(taker_swap), ctx_taker);
-        let maker_swap_fut = run_maker_swap(RunMakerSwapInput::StartNew(maker_swap), ctx_maker);
-        join(taker_swap_fut, maker_swap_fut).await;
-    }
+    let version = block_on(no_login_node.rpc(&json! ({
+        "userpass": no_login_node.userpass,
+        "method": "version",
+    })))
+    .unwrap();
+    assert!(version.0.is_success(), "!version: {}", version.1);
 }
diff --git a/mm2src/mm2_main/src/mm2_tests/bch_and_slp_tests.rs b/mm2src/mm2_main/src/mm2_tests/bch_and_slp_tests.rs
new file mode 100644
index 0000000000..2c62d78f56
--- /dev/null
+++ b/mm2src/mm2_main/src/mm2_tests/bch_and_slp_tests.rs
@@ -0,0 +1,592 @@
+use super::*;
+use mm2_test_helpers::for_tests::{enable_bch_with_tokens, enable_slp, my_tx_history_v2, sign_message, verify_message,
+                                  UtxoRpcMode};
+
+const T_BCH_ELECTRUMS: &[&str] = &[
+    "electroncash.de:50003",
+    "tbch.loping.net:60001",
+    "blackie.c3-soft.com:60001",
+    "bch0.kister.net:51001",
+    "testnet.imaginary.cash:50001",
+];
+
+fn t_bch_electrums_legacy_json() -> Vec<Json> { T_BCH_ELECTRUMS.into_iter().map(|url| json!({ "url": url })).collect() }
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_withdraw_cashaddresses() {
+    let coins = json!([
+        {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id": "0x40","protocol":{"type":"UTXO"},
+         "address_format":{"format":"cashaddress","network":"bchtest"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": "face pin lock number add byte put seek mime test note password sin tab multiple",
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    let electrum = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "electrum",
+        "coin": "BCH",
+        "servers": t_bch_electrums_legacy_json(),
+        "mm2": 1,
+    })))
+    .unwrap();
+
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    let electrum: Json = json::from_str(&electrum.1).unwrap();
+    log!("{:?}", electrum);
+
+    // make withdraw from cashaddress to cashaddress
+    let withdraw = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "withdraw",
+        "coin": "BCH",
+        "to": "bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597",
+        "amount": 0.00001,
+    })))
+    .unwrap();
+
+    assert!(withdraw.0.is_success(), "BCH withdraw: {}", withdraw.1);
+    let withdraw_json: Json = json::from_str(&withdraw.1).unwrap();
+    log!("{}", withdraw_json);
+
+    // check "from" addresses
+    let from: Vec<&str> = withdraw_json["from"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|v| v.as_str().unwrap())
+        .collect();
+    assert_eq!(from, vec!["bchtest:qqgp9xh3435xamv7ghct8emer2s2erzj8gx3gnhwkq"]);
+
+    // check "to" addresses
+    let to: Vec<&str> = withdraw_json["to"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|v| v.as_str().unwrap())
+        .collect();
+    assert_eq!(to, vec!["bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597"]);
+
+    // send the transaction
+    let send_tx = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "send_raw_transaction",
+        "coin": "BCH",
+        "tx_hex": withdraw_json["tx_hex"],
+    })))
+    .unwrap();
+    assert!(send_tx.0.is_success(), "BCH send_raw_transaction: {}", send_tx.1);
+    log!("{}", send_tx.1);
+
+    // Wait 5 seconds to avoid double spending
+    thread::sleep(Duration::from_secs(5));
+
+    // make withdraw from cashaddress to legacy
+    let withdraw = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "withdraw",
+        "coin": "BCH",
+        "to": "1WxswvLF2HdaDr4k77e92VjaXuPQA8Uji",
+        "amount": 0.00001,
+    })))
+    .unwrap();
+
+    assert!(withdraw.0.is_success(), "BCH withdraw: {}", withdraw.1);
+    let withdraw_json: Json = json::from_str(&withdraw.1).unwrap();
+    log!("{}", withdraw_json);
+
+    // check "from" addresses
+    let from: Vec<&str> = withdraw_json["from"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|v| v.as_str().unwrap())
+        .collect();
+    assert_eq!(from, vec!["bchtest:qqgp9xh3435xamv7ghct8emer2s2erzj8gx3gnhwkq"]);
+
+    // check "to" addresses
+    let to: Vec<&str> = withdraw_json["to"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|v| v.as_str().unwrap())
+        .collect();
+    assert_eq!(to, vec!["1WxswvLF2HdaDr4k77e92VjaXuPQA8Uji"]);
+
+    // send the transaction
+    let send_tx = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "send_raw_transaction",
+        "coin": "BCH",
+        "tx_hex": withdraw_json["tx_hex"],
+    })))
+    .unwrap();
+    assert!(send_tx.0.is_success(), "BCH send_raw_transaction: {}", send_tx.1);
+    log!("{}", send_tx.1);
+
+    // Wait 5 seconds to avoid double spending
+    thread::sleep(Duration::from_secs(5));
+
+    //Disable BCH to enable in Legacy Mode
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "disable_coin",
+        "coin": "BCH",
+    })))
+    .unwrap();
+    assert_eq!(rc.0, StatusCode::OK, "RPC «disable_coin» failed with status «{}»", rc.0);
+
+    let electrum = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "electrum",
+        "coin": "BCH",
+        "servers": t_bch_electrums_legacy_json(),
+        "address_format":{"format":"standard"},
+        "mm2": 1,
+    })))
+    .unwrap();
+
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    let electrum: Json = json::from_str(&electrum.1).unwrap();
+    log!("{:?}", electrum);
+
+    // make withdraw from Legacy to Cashaddress
+    let withdraw = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "withdraw",
+        "coin": "BCH",
+        "to": "bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597",
+        "amount": 0.00001,
+    })))
+    .unwrap();
+
+    assert!(withdraw.0.is_success(), "BCH withdraw: {}", withdraw.1);
+    let withdraw_json: Json = json::from_str(&withdraw.1).unwrap();
+    log!("{}", withdraw_json);
+
+    // check "from" addresses
+    let from: Vec<&str> = withdraw_json["from"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|v| v.as_str().unwrap())
+        .collect();
+    assert_eq!(from, vec!["12Tz6nWqA7e5tV7m6d1EzMkNs6MQVW4UMw"]);
+
+    // check "to" addresses
+    let to: Vec<&str> = withdraw_json["to"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|v| v.as_str().unwrap())
+        .collect();
+    assert_eq!(to, vec!["bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597"]);
+
+    // send the transaction
+    let send_tx = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "send_raw_transaction",
+        "coin": "BCH",
+        "tx_hex": withdraw_json["tx_hex"],
+    })))
+    .unwrap();
+    assert!(send_tx.0.is_success(), "BCH send_raw_transaction: {}", send_tx.1);
+    log!("{}", send_tx.1);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_withdraw_to_different_cashaddress_network_should_fail() {
+    let coins = json!([
+        {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id": "0x40","protocol":{"type":"UTXO"},
+         "address_format":{"format":"cashaddress","network":"bchtest"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": "face pin lock number add byte put seek mime test note password sin tab multiple",
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    let electrum = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "electrum",
+        "coin": "BCH",
+        "servers": t_bch_electrums_legacy_json(),
+        "mm2": 1,
+    })))
+    .unwrap();
+
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    let electrum: Json = json::from_str(&electrum.1).unwrap();
+    log!("{:?}", electrum);
+
+    // make withdraw to from bchtest to bitcoincash should fail
+    let withdraw = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "withdraw",
+        "coin": "BCH",
+        "to": "bitcoincash:qqyf96yqdrpa8f6pkf9f00ap068m5tgvly28qsfq9p",
+        "amount": 0.00001,
+    })))
+    .unwrap();
+
+    assert!(withdraw.0.is_server_error(), "BCH withdraw: {}", withdraw.1);
+    log!("{:?}", withdraw.1);
+
+    block_on(mm.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_common_cashaddresses() {
+    let coins = json!([
+        {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"protocol":{"type":"UTXO"},
+         "address_format":{"format":"cashaddress","network":"bchtest"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": "face pin block number add byte put seek mime test note password sin tab multiple",
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    // Enable BCH electrum client with tx_history loop.
+    // Enable RICK electrum client with tx_history loop.
+    let electrum = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "electrum",
+        "coin": "BCH",
+        "servers": t_bch_electrums_legacy_json(),
+        "mm2": 1,
+    })))
+    .unwrap();
+
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    let electrum: Json = json::from_str(&electrum.1).unwrap();
+    log!("{:?}", electrum);
+
+    assert_eq!(
+        electrum["address"].as_str().unwrap(),
+        "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la"
+    );
+
+    // check my_balance
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "my_balance",
+        "coin": "BCH",
+    })))
+    .unwrap();
+    assert_eq!(rc.0, StatusCode::OK, "RPC «my_balance» failed with status «{}»", rc.0);
+    let json: Json = json::from_str(&rc.1).unwrap();
+    let my_balance_address = json["address"].as_str().unwrap();
+    assert_eq!(my_balance_address, "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la");
+
+    // check get_enabled_coins
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "get_enabled_coins",
+    })))
+    .unwrap();
+    assert_eq!(
+        rc.0,
+        StatusCode::OK,
+        "RPC «get_enabled_coins» failed with status «{}»",
+        rc.0
+    );
+    let json: Json = json::from_str(&rc.1).unwrap();
+
+    let obj = &json["result"].as_array().unwrap()[0];
+    assert_eq!(obj["ticker"].as_str().unwrap(), "BCH");
+    assert_eq!(
+        obj["address"].as_str().unwrap(),
+        "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la"
+    );
+}
+
+async fn wait_till_history_has_records(
+    mm: &MarketMakerIt,
+    expected_len: usize,
+    for_coin: &str,
+    paging: Option<common::PagingOptionsEnum<String>>,
+) -> StandardHistoryV2Res {
+    loop {
+        let history_json = my_tx_history_v2(mm, for_coin, expected_len, paging.clone()).await;
+        let history: RpcV2Response<StandardHistoryV2Res> = json::from_value(history_json).unwrap();
+        if history.result.transactions.len() >= expected_len {
+            break history.result;
+        }
+        Timer::sleep(1.).await;
+    }
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_bch_and_slp_testnet_history() {
+    let coins = json!([
+        {"coin":"tBCH","pubtype":0,"p2shtype":5,"mm2":1,"protocol":{"type":"BCH","protocol_data":{"slp_prefix":"slptest"}},
+         "address_format":{"format":"cashaddress","network":"bchtest"}},
+        {"coin":"USDF","protocol":{"type":"SLPTOKEN","protocol_data":{"decimals":4,"token_id":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7","platform":"tBCH","required_confirmations":1}}}
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": "BCH SLP test",
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    let rpc_mode = UtxoRpcMode::electrum(T_BCH_ELECTRUMS);
+    let tx_history = true;
+    let enable_bch = block_on(enable_bch_with_tokens(&mm, "tBCH", &[], rpc_mode, tx_history));
+    log!("enable_bch: {:?}", enable_bch);
+    let history = block_on(wait_till_history_has_records(&mm, 4, "tBCH", None));
+    log!("bch history: {:?}", history);
+
+    let expected_internal_ids = vec![
+        "eefb21290909cb7f2864ef066836bd98f8963731576f65a8c0ff590c3e91d439",
+        "6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69",
+        "c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce",
+        "091877294268b2b1734255067146f15c3ac5e6199e72cd4f68a8d9dec32bb0c0",
+    ];
+
+    let actual_ids: Vec<_> = history
+        .transactions
+        .iter()
+        .map(|tx| tx.tx.internal_id.as_str())
+        .collect();
+
+    assert_eq!(expected_internal_ids, actual_ids);
+
+    let enable_usdf = block_on(enable_slp(&mm, "USDF"));
+    log!("enable_usdf: {:?}", enable_usdf);
+
+    let paging =
+        common::PagingOptionsEnum::FromId("433b641bc89e1b59c22717918583c60ec98421805c8e85b064691705d9aeb970".into());
+    let slp_history = block_on(wait_till_history_has_records(&mm, 4, "USDF", Some(paging)));
+
+    log!("slp history: {:?}", slp_history);
+
+    let expected_slp_ids = vec![
+        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989",
+        "1c1e68357cf5a6dacb53881f13aa5d2048fe0d0fab24b76c9ec48f53884bed97",
+        "c4304b5ef4f1b88ed4939534a8ca9eca79f592939233174ae08002e8454e3f06",
+        "b0035434a1e7be5af2ed991ee2a21a90b271c5852a684a0b7d315c5a770d1b1c",
+    ];
+
+    let actual_slp_ids: Vec<_> = slp_history
+        .transactions
+        .iter()
+        .map(|tx| tx.tx.internal_id.as_str())
+        .collect();
+
+    assert_eq!(expected_slp_ids, actual_slp_ids);
+
+    for tx in slp_history.transactions {
+        assert_eq!("USDF", tx.tx.coin);
+
+        let fee_details: UtxoFeeDetails = json::from_value(tx.tx.fee_details).unwrap();
+        assert_eq!(fee_details.coin, Some("tBCH".to_owned()));
+    }
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_sign_verify_message_bch() {
+    let seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
+
+    let coins = json!([
+        {"coin":"BCH","pubtype":0,"p2shtype":5,"mm2":1,"fork_id": "0x40","sign_message_prefix": "Bitcoin Signed Message:\n","protocol":{"type":"UTXO"},
+         "address_format":{"format":"cashaddress","network":"bitcoincash"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": seed.to_string(),
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    let electrum = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "electrum",
+        "coin": "BCH",
+        "servers": t_bch_electrums_legacy_json(),
+        "mm2": 1,
+    })))
+    .unwrap();
+
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    let electrum: Json = json::from_str(&electrum.1).unwrap();
+    log!("{:?}", electrum);
+
+    let response = block_on(sign_message(&mm, "BCH"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert_eq!(
+        response.signature,
+        "HzNH58Xd+orz5jKewdH88/cGOVmsK6tTDEsJSag3pmVWMdjlw7gB6N6cNgRtWaeJIadsqQmhwv8DHWIjqGzOoE8="
+    );
+
+    let response = block_on(verify_message(
+        &mm,
+        "BCH",
+        "HzNH58Xd+orz5jKewdH88/cGOVmsK6tTDEsJSag3pmVWMdjlw7gB6N6cNgRtWaeJIadsqQmhwv8DHWIjqGzOoE8=",
+        "bitcoincash:qqz64df5y9n0sk2t4ut60kd77h2kw3pnyursltctnw",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_sign_verify_message_slp() {
+    let seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
+
+    let coins = json!([
+        {"coin":"tBCH","pubtype":0,"p2shtype":5,"mm2":1,"sign_message_prefix": "Bitcoin Signed Message:\n","protocol":{"type":"BCH","protocol_data":{"slp_prefix":"slptest"}},
+         "address_format":{"format":"cashaddress","network":"bchtest"}},
+        {"coin":"USDF","protocol":{"type":"SLPTOKEN","protocol_data":{"decimals":4,"token_id":"bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7","platform":"tBCH","required_confirmations":1}}}
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": seed.to_string(),
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    let rpc_mode = UtxoRpcMode::electrum(T_BCH_ELECTRUMS);
+    let enable_bch = block_on(enable_bch_with_tokens(&mm, "tBCH", &[], rpc_mode, false));
+    log!("enable_bch: {:?}", enable_bch);
+
+    let enable_usdf = block_on(enable_slp(&mm, "USDF"));
+    log!("enable_usdf: {:?}", enable_usdf);
+
+    let response = block_on(sign_message(&mm, "USDF"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert_eq!(
+        response.signature,
+        "HzNH58Xd+orz5jKewdH88/cGOVmsK6tTDEsJSag3pmVWMdjlw7gB6N6cNgRtWaeJIadsqQmhwv8DHWIjqGzOoE8="
+    );
+
+    let response = block_on(verify_message(
+        &mm,
+        "USDF",
+        "HzNH58Xd+orz5jKewdH88/cGOVmsK6tTDEsJSag3pmVWMdjlw7gB6N6cNgRtWaeJIadsqQmhwv8DHWIjqGzOoE8=",
+        "slptest:qqz64df5y9n0sk2t4ut60kd77h2kw3pnyuukuhqtx0",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/best_orders_tests.rs b/mm2src/mm2_main/src/mm2_tests/best_orders_tests.rs
new file mode 100644
index 0000000000..4508a2d65d
--- /dev/null
+++ b/mm2src/mm2_main/src/mm2_tests/best_orders_tests.rs
@@ -0,0 +1,1100 @@
+use super::*;
+
+#[cfg(feature = "zhtlc-native-tests")]
+use mm2_test_helpers::for_tests::best_orders_v2;
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_best_orders() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    ]);
+
+    // start bob and immediately place the orders
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
+    log!("enable_coins (bob): {:?}", bob_coins);
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell requests");
+
+    let bob_orders = [
+        // (base, rel, price, volume, min_volume)
+        ("RICK", "MORTY", "0.9", "0.9", None),
+        ("RICK", "MORTY", "0.8", "0.9", None),
+        ("RICK", "MORTY", "0.7", "0.9", Some("0.9")),
+        ("RICK", "ETH", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.9", "0.9", None),
+        ("ETH", "RICK", "0.8", "0.9", None),
+        ("MORTY", "ETH", "0.8", "0.8", None),
+        ("MORTY", "ETH", "0.7", "0.8", Some("0.8")),
+    ];
+    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
+        let rc = block_on(mm_bob.rpc(&json! ({
+            "userpass": mm_bob.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "buy",
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_morty_orders = response.result.get("MORTY").unwrap();
+    assert_eq!(1, best_morty_orders.len());
+    let expected_price: BigDecimal = "0.8".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "buy",
+        "volume": "1.7",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    // MORTY
+    let best_morty_orders = response.result.get("MORTY").unwrap();
+    let expected_price: BigDecimal = "0.7".parse().unwrap();
+    let bob_morty_addr = addr_from_enable(&bob_coins, "MORTY");
+    assert_eq!(expected_price, best_morty_orders[0].price);
+    assert_eq!(bob_morty_addr, best_morty_orders[0].address);
+    let expected_price: BigDecimal = "0.8".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[1].price);
+    assert_eq!(bob_morty_addr, best_morty_orders[1].address);
+    // ETH
+    let expected_price: BigDecimal = "0.8".parse().unwrap();
+    let best_eth_orders = response.result.get("ETH").unwrap();
+    assert_eq!(expected_price, best_eth_orders[0].price);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "sell",
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+
+    let expected_price: BigDecimal = "1.25".parse().unwrap();
+
+    let best_morty_orders = response.result.get("MORTY").unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price);
+    assert_eq!(1, best_morty_orders.len());
+
+    let best_eth_orders = response.result.get("ETH").unwrap();
+    assert_eq!(expected_price, best_eth_orders[0].price);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "ETH",
+        "action": "sell",
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+
+    let expected_price: BigDecimal = "1.25".parse().unwrap();
+
+    let best_morty_orders = response.result.get("MORTY").unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price);
+    assert_eq!("MORTY", best_morty_orders[0].coin);
+    assert_eq!(1, best_morty_orders.len());
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_best_orders_v2_by_number() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    ]);
+
+    // start bob and immediately place the orders
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {:?}", [mm_bob.log_path.display()]);
+
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
+    log!("enable_coins (bob) {:?}", [bob_coins]);
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell requests");
+
+    let bob_orders = [
+        // (base, rel, price, volume, min_volume)
+        ("RICK", "MORTY", "0.9", "0.9", None),
+        ("RICK", "MORTY", "0.8", "0.9", None),
+        ("RICK", "MORTY", "0.7", "0.9", Some("0.9")),
+        ("RICK", "ETH", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.9", "0.9", None),
+        ("ETH", "RICK", "0.8", "0.9", None),
+        ("MORTY", "ETH", "0.8", "0.8", None),
+        ("MORTY", "ETH", "0.7", "0.8", Some("0.8")),
+    ];
+    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
+        let rc = block_on(mm_bob.rpc(&json! ({
+            "userpass": mm_bob.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {:?}", [mm_alice.log_path.display()]);
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": "RICK",
+            "action": "buy",
+            "request_by": {
+                "type": "number",
+                "value": 1
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    log!("rc {:?}", [&rc]);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let best_morty_orders = response.result.orders.get("MORTY").unwrap();
+    log!("Best MORTY orders when buy RICK {:?}", [best_morty_orders]);
+    assert_eq!(1, best_morty_orders.len());
+    let expected_price: BigDecimal = "0.7".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price.decimal);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": "RICK",
+            "action": "buy",
+            "request_by": {
+                "type": "number",
+                "value": 2
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    log!("rc {:?}", [&rc]);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let best_morty_orders = response.result.orders.get("MORTY").unwrap();
+    log!("Best MORTY orders when buy RICK {:?}", [best_morty_orders]);
+    assert_eq!(2, best_morty_orders.len());
+    let expected_price: BigDecimal = "0.7".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price.decimal);
+    let expected_price: BigDecimal = "0.8".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[1].price.decimal);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": "RICK",
+            "action": "sell",
+            "request_by": {
+                "type": "number",
+                "value": 1
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    log!("rc {:?}", [&rc]);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let expected_price: BigDecimal = "1.25".parse().unwrap();
+    let best_morty_orders = response.result.orders.get("MORTY").unwrap();
+    log!("Best MORTY orders when sell RICK {:?}", [best_morty_orders]);
+    assert_eq!(1, best_morty_orders.len());
+    assert_eq!(expected_price, best_morty_orders[0].price.decimal);
+    let best_eth_orders = response.result.orders.get("ETH").unwrap();
+    log!("Best ETH orders when sell RICK {:?}", [best_eth_orders]);
+    assert_eq!(1, best_eth_orders.len());
+    assert_eq!(expected_price, best_eth_orders[0].price.decimal);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": "ETH",
+            "action": "sell",
+            "request_by": {
+                "type": "number",
+                "value": 1
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    log!("rc {:?}", [&rc]);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let best_rick_orders = response.result.orders.get("RICK").unwrap();
+    log!("Best RICK orders when sell ETH {:?}", [best_rick_orders]);
+    assert_eq!(1, best_rick_orders.len());
+    let expected_price: BigDecimal = "1.25".parse().unwrap();
+    assert_eq!(expected_price, best_rick_orders[0].price.decimal);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_best_orders_v2_by_volume() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    ]);
+
+    // start bob and immediately place the orders
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {:?}", [mm_bob.log_path.display()]);
+
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
+    log!("enable_coins (bob): {:?}", [bob_coins]);
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell requests");
+
+    let bob_orders = [
+        // (base, rel, price, volume, min_volume)
+        ("RICK", "MORTY", "0.9", "0.9", None),
+        ("RICK", "MORTY", "0.8", "0.9", None),
+        ("RICK", "MORTY", "0.7", "0.9", Some("0.9")),
+        ("RICK", "ETH", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.9", "0.9", None),
+        ("ETH", "RICK", "0.8", "0.9", None),
+        ("MORTY", "ETH", "0.8", "0.8", None),
+        ("MORTY", "ETH", "0.7", "0.8", Some("0.8")),
+    ];
+    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
+        let rc = block_on(mm_bob.rpc(&json! ({
+            "userpass": mm_bob.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {:?}", [mm_alice.log_path.display()]);
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": "RICK",
+            "action": "buy",
+            "request_by": {
+                "type": "volume",
+                "value": 1.7
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    log!("rc {:?}", [&rc]);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    // MORTY
+    let best_morty_orders = response.result.orders.get("MORTY").unwrap();
+    log!("Best MORTY orders when buy RICK {:?}", [best_morty_orders]);
+    let expected_price: BigDecimal = "0.7".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price.decimal);
+    let expected_price: BigDecimal = "0.8".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[1].price.decimal);
+    // ETH
+    let expected_price: BigDecimal = "0.8".parse().unwrap();
+    let best_eth_orders = response.result.orders.get("ETH").unwrap();
+    log!("Best ETH orders when buy RICK {:?}", [best_eth_orders]);
+    assert_eq!(expected_price, best_eth_orders[0].price.decimal);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": "RICK",
+            "action": "sell",
+            "request_by": {
+                "type": "volume",
+                "value": 0.1
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    log!("rc {:?}", [&rc]);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let expected_price: BigDecimal = "1.25".parse().unwrap();
+    let best_morty_orders = response.result.orders.get("MORTY").unwrap();
+    log!("Best MORTY orders when sell RICK {:?}", [best_morty_orders]);
+    assert_eq!(expected_price, best_morty_orders[0].price.decimal);
+    assert_eq!(1, best_morty_orders.len());
+    let best_eth_orders = response.result.orders.get("ETH").unwrap();
+    log!("Best ETH orders when sell RICK {:?}", [best_morty_orders]);
+    assert_eq!(expected_price, best_eth_orders[0].price.decimal);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": "ETH",
+            "action": "sell",
+            "request_by": {
+                "type": "volume",
+                "value": 0.1
+            }
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    log!("rc {:?}", [&rc]);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let expected_price: BigDecimal = "1.25".parse().unwrap();
+    let best_morty_orders = response.result.orders.get("MORTY").unwrap();
+    log!("Best MORTY orders when sell ETH {:?}", [best_morty_orders]);
+    assert_eq!(expected_price, best_morty_orders[0].price.decimal);
+    assert_eq!("MORTY", best_morty_orders[0].coin);
+    assert_eq!(1, best_morty_orders.len());
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_best_orders_duplicates_after_update() {
+    let eve_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
+    ]);
+
+    // start bob as a seednode
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": "bob",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+
+    // start eve and immediately place the order
+    let mm_eve = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": eve_passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "seednodes": [mm_bob.ip.to_string()],
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    // Enable coins on Eve side. Print the replies in case we need the "address".
+    let eve_coins = block_on(enable_coins_rick_morty_electrum(&mm_eve));
+    log!("enable_coins (eve): {:?}", eve_coins);
+    // issue sell request on Eve side by setting base/rel price
+    log!("Issue eve sell request");
+
+    let rc = block_on(mm_eve.rpc(&json! ({
+        "userpass": mm_eve.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": "1",
+        "volume": "1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    let eve_order: SetPriceResponse = json::from_str(&rc.1).unwrap();
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "buy",
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_morty_orders = response.result.get("MORTY").unwrap();
+    assert_eq!(1, best_morty_orders.len());
+    let expected_price: BigDecimal = "1".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price);
+
+    for _ in 0..5 {
+        let rc = block_on(mm_eve.rpc(&json!({
+            "userpass": mm_eve.userpass,
+            "method": "update_maker_order",
+            "uuid": eve_order.result.uuid,
+            "new_price": "1.1",
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+        thread::sleep(Duration::from_secs(1));
+    }
+
+    for _ in 0..5 {
+        let rc = block_on(mm_eve.rpc(&json!({
+            "userpass": mm_eve.userpass,
+            "method": "update_maker_order",
+            "uuid": eve_order.result.uuid,
+            "new_price": "1.2",
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+        thread::sleep(Duration::from_secs(1));
+    }
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "buy",
+        "volume": "500",
+    })))
+    .unwrap();
+
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_morty_orders = response.result.get("MORTY").unwrap();
+    assert_eq!(1, best_morty_orders.len());
+    let expected_price: BigDecimal = "1.2".parse().unwrap();
+    assert_eq!(expected_price, best_morty_orders[0].price);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_eve.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_best_orders_filter_response() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let bob_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    ]);
+
+    // alice defined MORTY as "wallet_only" in config
+    let alice_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"wallet_only": true,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"},"rpcport":80},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20", "protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    ]);
+
+    // start bob and immediately place the orders
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": bob_coins_config,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
+    log!("enable_coins (bob): {:?}", bob_coins);
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell requests");
+
+    let bob_orders = [
+        // (base, rel, price, volume, min_volume)
+        ("RICK", "MORTY", "0.9", "0.9", None),
+        ("RICK", "MORTY", "0.8", "0.9", None),
+        ("RICK", "MORTY", "0.7", "0.9", Some("0.9")),
+        ("RICK", "ETH", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.8", "0.9", None),
+        ("MORTY", "RICK", "0.9", "0.9", None),
+        ("ETH", "RICK", "0.8", "0.9", None),
+        ("MORTY", "ETH", "0.8", "0.8", None),
+        ("MORTY", "ETH", "0.7", "0.8", Some("0.8")),
+    ];
+    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
+        let rc = block_on(mm_bob.rpc(&json! ({
+            "userpass": mm_bob.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": alice_coins_config,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "buy",
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let empty_vec = Vec::new();
+    let best_morty_orders = response.result.get("MORTY").unwrap_or(&empty_vec);
+    assert_eq!(0, best_morty_orders.len());
+    let best_eth_orders = response.result.get("ETH").unwrap();
+    assert_eq!(1, best_eth_orders.len());
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_best_orders_address_and_confirmations() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let bob_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"required_confirmations":10,"requires_notarization":true,"protocol":{"type":"UTXO"}},
+        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":5,"requires_notarization":false,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
+    ]);
+
+    let alice_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"}}
+    ]);
+
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": bob_coins_config,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    let electrum = block_on(mm_bob.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "tBTC",
+        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
+        "address_format":{"format":"segwit"},
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable tBTC: {:?}", electrum);
+    let enable_tbtc_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
+    let tbtc_segwit_address = enable_tbtc_res.address;
+
+    let electrum = block_on(mm_bob.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "RICK",
+        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable RICK: {:?}", electrum);
+    let enable_rick_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
+    let rick_address = enable_rick_res.address;
+
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell requests");
+
+    let bob_orders = [
+        // (base, rel, price, volume, min_volume)
+        ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015")),
+        ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015")),
+    ];
+    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
+        let rc = block_on(mm_bob.rpc(&json! ({
+            "userpass": mm_bob.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": alice_coins_config,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    // checking buy and sell best_orders against ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015"))
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "tBTC",
+        "action": "buy",
+        "volume": "0.0002",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_orders = response.result.get("RICK").unwrap();
+    assert_eq!(1, best_orders.len());
+    assert_eq!(best_orders[0].coin, "RICK");
+    assert_eq!(best_orders[0].address, rick_address);
+    assert_eq!(best_orders[0].base_confs, 5);
+    assert_eq!(best_orders[0].base_nota, false);
+    assert_eq!(best_orders[0].rel_confs, 10);
+    assert_eq!(best_orders[0].rel_nota, true);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "sell",
+        "volume": "0.0002",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_orders = response.result.get("tBTC").unwrap();
+    assert_eq!(1, best_orders.len());
+    assert_eq!(best_orders[0].coin, "tBTC");
+    assert_eq!(best_orders[0].address, tbtc_segwit_address);
+    assert_eq!(best_orders[0].base_confs, 10);
+    assert_eq!(best_orders[0].base_nota, true);
+    assert_eq!(best_orders[0].rel_confs, 5);
+    assert_eq!(best_orders[0].rel_nota, false);
+
+    // checking buy and sell best_orders against ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015"))
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "RICK",
+        "action": "buy",
+        "volume": "0.0002",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_orders = response.result.get("tBTC").unwrap();
+    assert_eq!(1, best_orders.len());
+    assert_eq!(best_orders[0].coin, "tBTC");
+    assert_eq!(best_orders[0].address, tbtc_segwit_address);
+    assert_eq!(best_orders[0].base_confs, 10);
+    assert_eq!(best_orders[0].base_nota, true);
+    assert_eq!(best_orders[0].rel_confs, 5);
+    assert_eq!(best_orders[0].rel_nota, false);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "tBTC",
+        "action": "sell",
+        "volume": "0.0002",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
+    let response: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_orders = response.result.get("RICK").unwrap();
+    assert_eq!(1, best_orders.len());
+    assert_eq!(best_orders[0].coin, "RICK");
+    assert_eq!(best_orders[0].address, rick_address);
+    assert_eq!(best_orders[0].base_confs, 5);
+    assert_eq!(best_orders[0].base_nota, false);
+    assert_eq!(best_orders[0].rel_confs, 10);
+    assert_eq!(best_orders[0].rel_nota, true);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[cfg(feature = "zhtlc-native-tests")]
+#[test]
+fn zhtlc_best_orders() {
+    let bob_passphrase = get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+    let alice_passphrase = get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
+
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","required_confirmations":0,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ZOMBIE","asset":"ZOMBIE","fname":"ZOMBIE (TESTCOIN)","txversion":4,"overwintered":1,"mm2":1,"protocol":{"type":"ZHTLC"},"required_confirmations":0}
+    ]);
+
+    let mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let rmd = rmd160_from_passphrase(&bob_passphrase);
+    let bob_zombie_cache_path = mm_bob.folder.join("DB").join(hex::encode(rmd)).join("ZOMBIE_CACHE.db");
+    log!("bob_zombie_cache_path {}", bob_zombie_cache_path.display());
+    std::fs::copy("./mm2src/coins/for_tests/ZOMBIE_CACHE.db", bob_zombie_cache_path).unwrap();
+
+    block_on(enable_electrum_json(&mm_bob, "RICK", false, rick_electrums()));
+    block_on(enable_z_coin(&mm_bob, "ZOMBIE"));
+
+    let set_price_json = json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "ZOMBIE",
+        "rel": "RICK",
+        "price": 1,
+        "volume": "1",
+    });
+    log!("Issue sell request on Bob side by setting base/rel price…");
+    let rc = block_on(mm_bob.rpc(&set_price_json)).unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let bob_set_price_res: SetPriceResponse = json::from_str(&rc.1).unwrap();
+
+    let mm_alice = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "dht": "on",  // Enable DHT without delay.
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": alice_passphrase,
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "alice" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    let best_orders = block_on(best_orders_v2(&mm_alice, "RICK", "sell", "1"));
+    let best_orders: RpcV2Response<BestOrdersV2Response> = json::from_value(best_orders).unwrap();
+    let zombie_best_orders = best_orders.result.orders.get("ZOMBIE").unwrap();
+
+    assert_eq!(1, zombie_best_orders.len());
+    zombie_best_orders
+        .iter()
+        .find(|order| order.uuid == bob_set_price_res.result.uuid)
+        .unwrap();
+
+    let best_orders = block_on(best_orders_v2(&mm_alice, "ZOMBIE", "buy", "1"));
+    let best_orders: RpcV2Response<BestOrdersV2Response> = json::from_value(best_orders).unwrap();
+    let rick_best_orders = best_orders.result.orders.get("RICK").unwrap();
+
+    assert_eq!(1, rick_best_orders.len());
+    rick_best_orders
+        .iter()
+        .find(|order| order.uuid == bob_set_price_res.result.uuid)
+        .unwrap();
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/electrums.rs b/mm2src/mm2_main/src/mm2_tests/electrums.rs
new file mode 100644
index 0000000000..20728e4f23
--- /dev/null
+++ b/mm2src/mm2_main/src/mm2_tests/electrums.rs
@@ -0,0 +1,77 @@
+use serde_json::Value as Json;
+
+#[cfg(target_arch = "wasm32")]
+pub fn rick_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:30017", "protocol": "WSS" }),
+        json!({ "url": "electrum2.cipig.net:30017", "protocol": "WSS" }),
+        json!({ "url": "electrum3.cipig.net:30017", "protocol": "WSS" }),
+    ]
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn rick_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:10017" }),
+        json!({ "url": "electrum2.cipig.net:10017" }),
+        json!({ "url": "electrum3.cipig.net:10017" }),
+    ]
+}
+
+#[allow(dead_code)]
+#[cfg(target_arch = "wasm32")]
+pub fn morty_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:30018", "protocol": "WSS" }),
+        json!({ "url": "electrum2.cipig.net:30018", "protocol": "WSS" }),
+        json!({ "url": "electrum3.cipig.net:30018", "protocol": "WSS" }),
+    ]
+}
+
+#[allow(dead_code)]
+#[cfg(not(target_arch = "wasm32"))]
+pub fn morty_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:10018" }),
+        json!({ "url": "electrum2.cipig.net:10018" }),
+        json!({ "url": "electrum3.cipig.net:10018" }),
+    ]
+}
+
+#[allow(dead_code)]
+#[cfg(target_arch = "wasm32")]
+pub fn tbtc_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:30068", "protocol": "WSS" }),
+        json!({ "url": "electrum2.cipig.net:30068", "protocol": "WSS" }),
+        json!({ "url": "electrum3.cipig.net:30068", "protocol": "WSS" }),
+    ]
+}
+
+#[allow(dead_code)]
+#[cfg(not(target_arch = "wasm32"))]
+pub fn tbtc_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:10068" }),
+        json!({ "url": "electrum2.cipig.net:10068" }),
+        json!({ "url": "electrum3.cipig.net:10068" }),
+    ]
+}
+
+#[cfg(target_arch = "wasm32")]
+pub fn qtum_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:30071", "protocol": "WSS" }),
+        json!({ "url": "electrum2.cipig.net:30071", "protocol": "WSS" }),
+        json!({ "url": "electrum3.cipig.net:30071", "protocol": "WSS" }),
+    ]
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn qtum_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:10071" }),
+        json!({ "url": "electrum2.cipig.net:10071" }),
+        json!({ "url": "electrum3.cipig.net:10071" }),
+    ]
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/lightning_tests.rs b/mm2src/mm2_main/src/mm2_tests/lightning_tests.rs
new file mode 100644
index 0000000000..a44a4fe5bf
--- /dev/null
+++ b/mm2src/mm2_main/src/mm2_tests/lightning_tests.rs
@@ -0,0 +1,408 @@
+use super::*;
+use mm2_test_helpers::for_tests::{enable_lightning, sign_message, verify_message};
+
+const T_BTC_ELECTRUMS: &[&str] = &[
+    "electrum1.cipig.net:10068",
+    "electrum2.cipig.net:10068",
+    "electrum3.cipig.net:10068",
+];
+
+fn start_lightning_nodes() -> (MarketMakerIt, MarketMakerIt, String, String) {
+    let node_1_seed = "become nominee mountain person volume business diet zone govern voice debris hidden";
+    let node_2_seed = "february coast tortoise grab shadow vast volcano affair ordinary gesture brass oxygen";
+
+    let coins = json! ([
+        {
+            "coin": "tBTC-TEST-segwit",
+            "name": "tbitcoin",
+            "fname": "tBitcoin",
+            "rpcport": 18332,
+            "pubtype": 111,
+            "p2shtype": 196,
+            "wiftype": 239,
+            "segwit": true,
+            "bech32_hrp": "tb",
+            "address_format":{"format":"segwit"},
+            "orderbook_ticker": "tBTC-TEST",
+            "txfee": 0,
+            "estimate_fee_mode": "ECONOMICAL",
+            "mm2": 1,
+            "required_confirmations": 0,
+            "protocol": {
+              "type": "UTXO"
+            }
+          },
+          {
+            "coin": "tBTC-TEST-lightning",
+            "mm2": 1,
+            "decimals": 11,
+            "our_channels_config": {
+              "inbound_channels_confirmations": 1
+            },
+            "counterparty_channel_config_limits": {
+              "outbound_channels_confirmations": 1
+            },
+            "protocol": {
+              "type": "LIGHTNING",
+              "protocol_data":{
+                "platform": "tBTC-TEST-segwit",
+                "network": "testnet",
+                "confirmations": {
+                  "background": {
+                    "default_fee_per_kb": 1012,
+                    "n_blocks": 12
+                  },
+                  "normal": {
+                    "default_fee_per_kb": 8000,
+                    "n_blocks": 6
+                  },
+                  "high_priority": {
+                    "default_fee_per_kb": 20000,
+                    "n_blocks": 1
+                  }
+                }
+              }
+            }
+          }
+    ]);
+
+    let mm_node_1 = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": node_1_seed.to_string(),
+            "coins": coins,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_node_1.mm_dump();
+    log!("bob log path: {}", mm_node_1.log_path.display());
+
+    let _electrum = block_on(enable_electrum(&mm_node_1, "tBTC-TEST-segwit", false, T_BTC_ELECTRUMS));
+
+    let enable_lightning_1 = block_on(enable_lightning(&mm_node_1, "tBTC-TEST-lightning"));
+    let node_1_address = enable_lightning_1["result"]["address"].as_str().unwrap().to_string();
+
+    let mm_node_2 = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": node_2_seed.to_string(),
+            "coins": coins,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_node_2.mm_dump();
+    log!("alice log path: {}", mm_node_2.log_path.display());
+
+    let _electrum = block_on(enable_electrum(&mm_node_2, "tBTC-TEST-segwit", false, T_BTC_ELECTRUMS));
+
+    let enable_lightning_2 = block_on(enable_lightning(&mm_node_2, "tBTC-TEST-lightning"));
+    let node_2_address = enable_lightning_2["result"]["address"].as_str().unwrap().to_string();
+
+    (mm_node_1, mm_node_2, node_1_address, node_2_address)
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_enable_lightning() {
+    let seed = "valley embody about obey never adapt gesture trust screen tube glide bread";
+
+    let coins = json! ([
+        {
+            "coin": "tBTC-TEST-segwit",
+            "name": "tbitcoin",
+            "fname": "tBitcoin",
+            "rpcport": 18332,
+            "pubtype": 111,
+            "p2shtype": 196,
+            "wiftype": 239,
+            "segwit": true,
+            "bech32_hrp": "tb",
+            "address_format":{"format":"segwit"},
+            "orderbook_ticker": "tBTC-TEST",
+            "txfee": 0,
+            "estimate_fee_mode": "ECONOMICAL",
+            "mm2": 1,
+            "required_confirmations": 0,
+            "protocol": {
+              "type": "UTXO"
+            }
+          },
+          {
+            "coin": "tBTC-TEST-lightning",
+            "mm2": 1,
+            "decimals": 11,
+            "protocol": {
+              "type": "LIGHTNING",
+              "protocol_data":{
+                "platform": "tBTC-TEST-segwit",
+                "network": "testnet",
+                "confirmations": {
+                  "background": {
+                    "default_fee_per_kb": 1012,
+                    "n_blocks": 12
+                  },
+                  "normal": {
+                    "default_fee_per_kb": 8000,
+                    "n_blocks": 6
+                  },
+                  "high_priority": {
+                    "default_fee_per_kb": 20000,
+                    "n_blocks": 1
+                  }
+                }
+              }
+            }
+          }
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": seed.to_string(),
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    let _electrum = block_on(enable_electrum(&mm, "tBTC-TEST-segwit", false, T_BTC_ELECTRUMS));
+
+    let enable_lightning = block_on(enable_lightning(&mm, "tBTC-TEST-lightning"));
+    assert_eq!(enable_lightning["result"]["platform_coin"], "tBTC-TEST-segwit");
+    assert_eq!(
+        enable_lightning["result"]["address"],
+        "02ce55b18d617bf4ac27b0f045301a0bb4e71669ae45cb5f2529f2f217520ffca1"
+    );
+    assert_eq!(enable_lightning["result"]["balance"]["spendable"], "0");
+    assert_eq!(enable_lightning["result"]["balance"]["unspendable"], "0");
+
+    block_on(mm.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_connect_to_lightning_node() {
+    let (mm_node_1, mm_node_2, node_1_id, _) = start_lightning_nodes();
+    let node_1_address = format!("{}@{}:9735", node_1_id, mm_node_1.ip.to_string());
+
+    let connect = block_on(mm_node_2.rpc(&json! ({
+        "userpass": mm_node_2.userpass,
+        "mmrpc": "2.0",
+        "method": "connect_to_lightning_node",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_address": node_1_address,
+        },
+    })))
+    .unwrap();
+    assert!(connect.0.is_success(), "!connect_to_lightning_node: {}", connect.1);
+    let connect_res: Json = json::from_str(&connect.1).unwrap();
+    let expected = format!("Connected successfully to node : {}", node_1_address);
+    assert_eq!(connect_res["result"], expected);
+
+    block_on(mm_node_1.stop()).unwrap();
+    block_on(mm_node_2.stop()).unwrap();
+}
+
+#[test]
+#[ignore]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_open_channel() {
+    let (mm_node_1, mut mm_node_2, node_1_id, node_2_id) = start_lightning_nodes();
+    let node_1_address = format!("{}@{}:9735", node_1_id, mm_node_1.ip.to_string());
+
+    let open_channel = block_on(mm_node_2.rpc(&json! ({
+        "userpass": mm_node_2.userpass,
+        "mmrpc": "2.0",
+        "method": "open_channel",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_address": node_1_address,
+            "amount": {
+                "type":"Exact",
+                "value":0.00002,
+            },
+        },
+    })))
+    .unwrap();
+    assert!(open_channel.0.is_success(), "!open_channel: {}", open_channel.1);
+
+    block_on(mm_node_2.wait_for_log(60., |log| log.contains("Transaction broadcasted successfully"))).unwrap();
+
+    let list_channels_node_1 = block_on(mm_node_1.rpc(&json! ({
+        "userpass": mm_node_1.userpass,
+        "mmrpc": "2.0",
+        "method": "list_channels",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+        },
+    })))
+    .unwrap();
+    assert!(
+        list_channels_node_1.0.is_success(),
+        "!list_channels: {}",
+        list_channels_node_1.1
+    );
+    let list_channels_node_1_res: Json = json::from_str(&list_channels_node_1.1).unwrap();
+    log!("list_channels_node_1_res {:?}", list_channels_node_1_res);
+    assert_eq!(
+        list_channels_node_1_res["result"]["open_channels"][0]["counterparty_node_id"],
+        node_2_id
+    );
+    assert_eq!(
+        list_channels_node_1_res["result"]["open_channels"][0]["is_outbound"],
+        false
+    );
+    assert_eq!(
+        list_channels_node_1_res["result"]["open_channels"][0]["balance_msat"],
+        0
+    );
+
+    let list_channels_node_2 = block_on(mm_node_2.rpc(&json! ({
+      "userpass": mm_node_2.userpass,
+      "mmrpc": "2.0",
+      "method": "list_channels",
+      "params": {
+          "coin": "tBTC-TEST-lightning",
+      },
+    })))
+    .unwrap();
+    assert!(
+        list_channels_node_2.0.is_success(),
+        "!list_channels: {}",
+        list_channels_node_2.1
+    );
+    let list_channels_node_2_res: Json = json::from_str(&list_channels_node_2.1).unwrap();
+    assert_eq!(
+        list_channels_node_2_res["result"]["open_channels"][0]["counterparty_node_id"],
+        node_1_id
+    );
+    assert_eq!(
+        list_channels_node_2_res["result"]["open_channels"][0]["is_outbound"],
+        true
+    );
+    assert_eq!(
+        list_channels_node_2_res["result"]["open_channels"][0]["balance_msat"],
+        2000000
+    );
+
+    block_on(mm_node_1.stop()).unwrap();
+    block_on(mm_node_2.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_sign_verify_message_lightning() {
+    let seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
+
+    let coins = json! ([
+      {
+        "coin": "tBTC-TEST-segwit",
+        "name": "tbitcoin",
+        "fname": "tBitcoin",
+        "rpcport": 18332,
+        "pubtype": 111,
+        "p2shtype": 196,
+        "wiftype": 239,
+        "segwit": true,
+        "bech32_hrp": "tb",
+        "address_format":{"format":"segwit"},
+        "orderbook_ticker": "tBTC-TEST",
+        "txfee": 0,
+        "estimate_fee_mode": "ECONOMICAL",
+        "mm2": 1,
+        "required_confirmations": 0,
+        "protocol": {
+          "type": "UTXO"
+        }
+      },
+      {
+        "coin": "tBTC-TEST-lightning",
+        "mm2": 1,
+        "decimals": 11,
+        "sign_message_prefix": "Lightning Signed Message:",
+        "protocol": {
+          "type": "LIGHTNING",
+          "protocol_data":{
+            "platform": "tBTC-TEST-segwit",
+            "network": "testnet",
+            "confirmations": {
+              "background": {
+                "default_fee_per_kb": 1012,
+                "n_blocks": 12
+              },
+              "normal": {
+                "default_fee_per_kb": 8000,
+                "n_blocks": 6
+              },
+              "high_priority": {
+                "default_fee_per_kb": 20000,
+                "n_blocks": 1
+              }
+            }
+          }
+        }
+      }
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": seed.to_string(),
+            "coins": coins,
+            "i_am_seed": true,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("log path: {}", mm.log_path.display());
+
+    block_on(enable_electrum(&mm, "tBTC-TEST-segwit", false, T_BTC_ELECTRUMS));
+    block_on(enable_lightning(&mm, "tBTC-TEST-lightning"));
+
+    let response = block_on(sign_message(&mm, "tBTC-TEST-lightning"));
+    let response: RpcV2Response<SignatureResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert_eq!(
+        response.signature,
+        "dhmbgykwzy53uycr6u8mpp3us6poikc5qh7wgex5qn54msq7cs3ygebj3h9swaocboqzi89jazwo7i3mmqou15w4dcty666sq3yqhzhr"
+    );
+
+    let response = block_on(verify_message(
+        &mm,
+        "tBTC-TEST-lightning",
+        "dhmbgykwzy53uycr6u8mpp3us6poikc5qh7wgex5qn54msq7cs3ygebj3h9swaocboqzi89jazwo7i3mmqou15w4dcty666sq3yqhzhr",
+        "0367c7b9f42eb15205de39454ddf9fcfce70a129b01049d9fe1b3b34eac1d6b933",
+    ));
+    let response: RpcV2Response<VerificationResponse> = json::from_value(response).unwrap();
+    let response = response.result;
+
+    assert!(response.is_valid);
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/lp_bot_tests.rs b/mm2src/mm2_main/src/mm2_tests/lp_bot_tests.rs
new file mode 100644
index 0000000000..8d0ea37a8c
--- /dev/null
+++ b/mm2src/mm2_main/src/mm2_tests/lp_bot_tests.rs
@@ -0,0 +1,113 @@
+use crate::{mm2::lp_ordermatch::start_simple_market_maker_bot, mm2::lp_ordermatch::stop_simple_market_maker_bot,
+            mm2::lp_ordermatch::StartSimpleMakerBotRequest};
+use common::block_on;
+use crypto::privkey::key_pair_from_seed;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmCtxBuilder;
+use mm2_test_helpers::for_tests::MarketMakerIt;
+use serde_json::Value as Json;
+
+mod tests {
+    use super::*;
+    use http::HeaderMap;
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_start_and_stop_simple_market_maker_bot_from_ctx() {
+        let ctx = MmCtxBuilder::default()
+            .with_secp256k1_key_pair(
+                key_pair_from_seed("also shoot benefit prefer juice shell elder veteran woman mimic image kidney")
+                    .unwrap(),
+            )
+            .into_mm_arc();
+
+        let mut req = StartSimpleMakerBotRequest::new();
+        let cloned_ctx = ctx.clone();
+        let another_cloned_ctx = ctx.clone();
+        let answer = block_on(start_simple_market_maker_bot(ctx, req)).unwrap();
+        assert_eq!(answer.get_result(), "Success");
+        req = StartSimpleMakerBotRequest::new();
+        let answer = block_on(start_simple_market_maker_bot(cloned_ctx, req));
+        assert!(answer.is_err());
+        let answer = block_on(stop_simple_market_maker_bot(another_cloned_ctx, Json::default())).unwrap();
+        assert_eq!(answer.get_result(), "Success");
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn test_start_and_stop_simple_market_maker_bot() {
+        let coins = json!([
+            {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+        ]);
+
+        let mm = MarketMakerIt::start(
+            json!({
+                "gui": "nogui",
+                "netid": 9998,
+                "passphrase": "bob passphrase",
+                "rpc_password": "password",
+                "coins": coins,
+                "i_am_seed": true,
+            }),
+            "password".into(),
+            None,
+        )
+        .unwrap();
+        let (_dump_log, _dump_dashboard) = mm.mm_dump();
+        log!("Log path: {}", mm.log_path.display());
+        fn start_simple_market_maker_bot_rpc(mm: &MarketMakerIt) -> (StatusCode, String, HeaderMap) {
+            block_on(mm.rpc(&json!({
+                 "userpass": "password",
+                 "mmrpc": "2.0",
+                 "method": "start_simple_market_maker_bot",
+                 "params": {
+                 "cfg": {
+                    "KMD-BEP20/BUSD-BEP20": {
+                        "base": "KMD-BEP20",
+                        "rel": "BUSD-BEP20",
+                        "max": true,
+                        "min_volume": {"percentage": "0.25"},
+                        "spread": "1.025",
+                        "base_confs": 3,
+                        "base_nota": false,
+                        "rel_confs": 1,
+                        "rel_nota": false,
+                        "enable": true
+                    }
+                }
+            },
+            "id": 0
+            })))
+            .unwrap()
+        }
+        let mut start_simple_market_maker_bot = start_simple_market_maker_bot_rpc(&mm);
+
+        // Must be 200
+        assert_eq!(start_simple_market_maker_bot.0, 200);
+
+        // Let's repeat - should get an already started
+        start_simple_market_maker_bot = start_simple_market_maker_bot_rpc(&mm);
+
+        // Must be 400
+        assert_eq!(start_simple_market_maker_bot.0, 400);
+
+        fn stop_simple_market_maker_bot_rpc(mm: &MarketMakerIt) -> (StatusCode, String, HeaderMap) {
+            block_on(mm.rpc(&json!({
+                "userpass": "password",
+                "mmrpc": "2.0",
+                "method": "stop_simple_market_maker_bot",
+                "params": null,
+                "id": 0
+            })))
+            .unwrap()
+        }
+
+        let mut stop_simple_market_maker_bot = stop_simple_market_maker_bot_rpc(&mm);
+        // Must be 200
+        assert_eq!(stop_simple_market_maker_bot.0, 200);
+
+        stop_simple_market_maker_bot = stop_simple_market_maker_bot_rpc(&mm);
+
+        assert_eq!(stop_simple_market_maker_bot.0, 400);
+    }
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/orderbook_sync_tests.rs b/mm2src/mm2_main/src/mm2_tests/orderbook_sync_tests.rs
new file mode 100644
index 0000000000..13ee876fe9
--- /dev/null
+++ b/mm2src/mm2_main/src/mm2_tests/orderbook_sync_tests.rs
@@ -0,0 +1,1494 @@
+use super::*;
+use mm2_test_helpers::for_tests::{orderbook_v2, rick_conf, zombie_conf, Mm2TestConf, RICK, ZOMBIE_ELECTRUMS,
+                                  ZOMBIE_LIGHTWALLETD_URLS, ZOMBIE_TICKER};
+use mm2_test_helpers::get_passphrase;
+
+/// https://github.com/artemii235/SuperNET/issues/241
+#[test]
+fn alice_can_see_the_active_order_after_connection() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}}
+    ]);
+
+    // start bob and immediately place the order
+    let mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": "bob passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell request");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": 0.9,
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    // Bob orderbook must show the new order
+    log!("Get RICK/MORTY orderbook on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Bob orderbook {:?}", bob_orderbook);
+    assert!(!bob_orderbook.asks.is_empty(), "Bob RICK/MORTY asks are empty");
+    assert_eq!(BigDecimal::from_str("0.9").unwrap(), bob_orderbook.asks[0].max_volume);
+
+    // start eve and immediately place the order
+    let mm_eve = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": "eve passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+            "seednodes": [mm_bob.ip.to_string()],
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_eve_dump_log, _eve_dump_dashboard) = mm_eve.mm_dump();
+    log!("Eve log path: {}", mm_eve.log_path.display());
+    // Enable coins on Eve side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (eve): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_eve))
+    );
+    // issue sell request on Eve side by setting base/rel price
+    log!("Issue eve sell request");
+    let rc = block_on(mm_eve.rpc(&json! ({
+        "userpass": mm_eve.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": "1",
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    // issue sell request on Eve side by setting base/rel price
+    log!("Issue eve sell request");
+    let rc = block_on(mm_eve.rpc(&json! ({
+        "userpass": mm_eve.userpass,
+        "method": "setprice",
+        "base": "MORTY",
+        "rel": "RICK",
+        "price": "1",
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    log!("Get RICK/MORTY orderbook on Eve side");
+    let rc = block_on(mm_eve.rpc(&json! ({
+        "userpass": mm_eve.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let eve_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Eve orderbook {:?}", eve_orderbook);
+    assert_eq!(
+        eve_orderbook.asks.len(),
+        2,
+        "Eve RICK/MORTY orderbook must have exactly 2 asks"
+    );
+    assert_eq!(
+        eve_orderbook.bids.len(),
+        1,
+        "Eve RICK/MORTY orderbook must have exactly 1 bid"
+    );
+
+    log!("Give Bob 2 seconds to import Eve order");
+    thread::sleep(Duration::from_secs(2));
+    log!("Get RICK/MORTY orderbook on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Bob orderbook {:?}", bob_orderbook);
+    assert_eq!(
+        bob_orderbook.asks.len(),
+        2,
+        "Bob RICK/MORTY orderbook must have exactly 2 asks"
+    );
+    assert_eq!(
+        bob_orderbook.bids.len(),
+        1,
+        "Bob RICK/MORTY orderbook must have exactly 1 bid"
+    );
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    // Enable coins on Alice side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
+
+    log!("Get RICK/MORTY orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Alice orderbook {:?}", alice_orderbook);
+    assert_eq!(
+        alice_orderbook.asks.len(),
+        2,
+        "Alice RICK/MORTY orderbook must have exactly 2 asks"
+    );
+    assert_eq!(
+        alice_orderbook.bids.len(),
+        1,
+        "Alice RICK/MORTY orderbook must have exactly 1 bid"
+    );
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_eve.stop()).unwrap();
+}
+
+#[test]
+fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let bob_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
+    ]);
+
+    let alice_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
+    ]);
+
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": bob_coins_config,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    let electrum = block_on(mm_bob.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "tBTC",
+        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
+        "address_format":{"format":"segwit"},
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable tBTC: {:?}", electrum);
+    let enable_tbtc_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
+    let tbtc_segwit_address = enable_tbtc_res.address;
+
+    let electrum = block_on(mm_bob.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "RICK",
+        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable RICK: {:?}", electrum);
+    let enable_rick_res: Json = json::from_str(&electrum.1).unwrap();
+    let rick_address = enable_rick_res["address"].as_str().unwrap();
+
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell requests");
+
+    let bob_orders = [
+        // (base, rel, price, volume, min_volume)
+        ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015")),
+        ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015")),
+    ];
+    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
+        let rc = block_on(mm_bob.rpc(&json! ({
+            "userpass": mm_bob.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "mmrpc": "2.0",
+        "method": "get_public_key",
+        "params": {},
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!get_public_key: {}", rc.1);
+    let get_public_key_res: RpcV2Response<GetPublicKeyResult> = serde_json::from_str(&rc.1).unwrap();
+    let bob_pubkey = get_public_key_res.result.public_key;
+
+    let mut mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": alice_coins_config,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    let electrum = block_on(mm_alice.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "tBTC",
+        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
+        "address_format":{"format":"segwit"},
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable Alice tBTC: {:?}", electrum);
+
+    let electrum = block_on(mm_alice.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "RICK",
+        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable Alice RICK: {:?}", electrum);
+
+    // setting the price will trigger Alice's subscription to the orderbook topic
+    // but won't request the actual orderbook
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "tBTC",
+        "price": "1",
+        "volume": "0.1",
+        "cancel_previous": false,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    block_on(
+        mm_alice.wait_for_log((MIN_ORDER_KEEP_ALIVE_INTERVAL * 2) as f64, |log| {
+            log.contains(&format!("Inserting order OrderbookItem {{ pubkey: \"{}\"", bob_pubkey))
+        }),
+    )
+    .unwrap();
+
+    // checking orderbook on alice side
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "tBTC",
+        "rel": "RICK",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+    let response: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    assert_eq!(response.asks[0].address, tbtc_segwit_address);
+    assert_eq!(response.bids[0].address, rick_address);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_orderbook_segwit() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let bob_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"},"address_format":{"format":"segwit"}}
+    ]);
+
+    let alice_coins_config = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"tBTC","name":"tbitcoin","fname":"tBitcoin","rpcport":18332,"pubtype":111,"p2shtype":196,"wiftype":239,"segwit":true,"bech32_hrp":"tb","txfee":0,"estimate_fee_mode":"ECONOMICAL","mm2":1,"required_confirmations":0,"protocol":{"type":"UTXO"}}
+    ]);
+
+    let mut mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": bob_coins_config,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        local_start!("bob"),
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    // Enable coins on Bob side. Print the replies in case we need the "address".
+    let electrum = block_on(mm_bob.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "tBTC",
+        "servers": [{"url":"electrum1.cipig.net:10068"},{"url":"electrum2.cipig.net:10068"},{"url":"electrum3.cipig.net:10068"}],
+        "address_format":{"format":"segwit"},
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable tBTC: {:?}", electrum);
+    let enable_tbtc_res: EnableElectrumResponse = json::from_str(&electrum.1).unwrap();
+    let tbtc_segwit_address = enable_tbtc_res.address;
+
+    let electrum = block_on(mm_bob.rpc(&json!({
+        "userpass": "pass",
+        "method": "electrum",
+        "coin": "RICK",
+        "servers": [{"url":"electrum1.cipig.net:10017"},{"url":"electrum2.cipig.net:10017"},{"url":"electrum3.cipig.net:10017"}],
+        "mm2": 1,
+    }))).unwrap();
+    assert_eq!(
+        electrum.0,
+        StatusCode::OK,
+        "RPC «electrum» failed with {} {}",
+        electrum.0,
+        electrum.1
+    );
+    log!("enable RICK: {:?}", electrum);
+    let enable_rick_res: Json = json::from_str(&electrum.1).unwrap();
+    let rick_address = enable_rick_res["address"].as_str().unwrap();
+
+    // issue sell request on Bob side by setting base/rel price
+    log!("Issue bob sell requests");
+
+    let bob_orders = [
+        // (base, rel, price, volume, min_volume)
+        ("tBTC", "RICK", "0.7", "0.0002", Some("0.00015")),
+        ("RICK", "tBTC", "0.7", "0.0002", Some("0.00015")),
+    ];
+    for (base, rel, price, volume, min_volume) in bob_orders.iter() {
+        let rc = block_on(mm_bob.rpc(&json! ({
+            "userpass": mm_bob.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "min_volume": min_volume.unwrap_or("0.00777"),
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": alice_coins_config,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        local_start!("alice"),
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(mm_bob.wait_for_log(22., |log| {
+        log.contains("DEBUG Handling IncludedTorelaysMesh message for peer")
+    }))
+    .unwrap();
+
+    // checking orderbook on alice side
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "tBTC",
+        "rel": "RICK",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+    let response: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    assert_eq!(response.asks[0].address, tbtc_segwit_address);
+    assert_eq!(response.bids[0].address, rick_address);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_get_orderbook_with_same_orderbook_ticker() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+        {"coin":"RICK-Utxo","asset":"RICK","orderbook_ticker":"RICK","rpcport":8923,"txversion":4,"protocol":{"type":"UTXO"}},
+        // just a random contract address
+        {"coin":"RICK-ERC20","orderbook_ticker":"RICK","decimals": 18,"protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9"}}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
+            "coins": coins,
+            "i_am_seed": true,
+        }),
+        "password".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "RICK-Utxo",
+    })))
+    .unwrap();
+    assert!(
+        rc.0.is_server_error(),
+        "orderbook succeed but should have failed {}",
+        rc.1
+    );
+
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "RICK-ERC20",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook {}", rc.1);
+}
+
+#[test]
+fn test_conf_settings_in_orderbook() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"required_confirmations":10,"requires_notarization":true,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"required_confirmations":5,"requires_notarization":false,"protocol":{"type":"UTXO"}},
+    ]);
+
+    let mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
+            "coins": coins,
+            "i_am_seed": true,
+        }),
+        "password".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Log path: {}", mm_bob.log_path.display());
+
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
+
+    log!("Issue set_price request for RICK/MORTY on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": 0.9,
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    log!("Issue set_price request for MORTY/RICK on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MORTY",
+        "rel": "RICK",
+        "price": 0.9,
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let mm_alice = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "passphrase": "alice passphrase",
+            "rpc_password": "password",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+        }),
+        "password".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_alice.mm_dump();
+    log!("Log path: {}", mm_alice.log_path.display());
+
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
+
+    log!("Get RICK/MORTY orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Alice orderbook {:?}", alice_orderbook);
+
+    assert_eq!(
+        alice_orderbook.asks.len(),
+        1,
+        "Alice RICK/MORTY orderbook must have exactly 1 ask"
+    );
+    assert_eq!(alice_orderbook.asks[0].base_confs, 10);
+    assert_eq!(alice_orderbook.asks[0].base_nota, true);
+    assert_eq!(alice_orderbook.asks[0].rel_confs, 5);
+    assert_eq!(alice_orderbook.asks[0].rel_nota, false);
+
+    assert_eq!(
+        alice_orderbook.bids.len(),
+        1,
+        "Alice RICK/MORTY orderbook must have exactly 1 bid"
+    );
+    assert_eq!(alice_orderbook.bids[0].base_confs, 10);
+    assert_eq!(alice_orderbook.bids[0].base_nota, true);
+    assert_eq!(alice_orderbook.bids[0].rel_confs, 5);
+    assert_eq!(alice_orderbook.bids[0].rel_nota, false);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn alice_can_see_confs_in_orderbook_after_sync() {
+    let bob_coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"required_confirmations":10,"requires_notarization":true,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"required_confirmations":5,"requires_notarization":false,"protocol":{"type":"UTXO"}},
+    ]);
+
+    let mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "passphrase": "bob passphrase",
+            "rpc_password": "password",
+            "coins": bob_coins,
+            "i_am_seed": true,
+        }),
+        "password".into(),
+        None,
+    )
+    .unwrap();
+    // let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_bob))
+    );
+
+    log!("Issue sell request on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": 0.9,
+        "volume": "0.9",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "mmrpc": "2.0",
+        "method": "get_public_key",
+        "params": {},
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!get_public_key: {}", rc.1);
+    let get_public_key_res: RpcV2Response<GetPublicKeyResult> = serde_json::from_str(&rc.1).unwrap();
+    let bob_pubkey = get_public_key_res.result.public_key;
+
+    // Alice coins don't have required_confirmations and requires_notarization set
+    let alice_coins = json!([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+    ]);
+
+    let mut mm_alice = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "passphrase": "alice passphrase",
+            "rpc_password": "password",
+            "coins": alice_coins,
+            "seednodes": [mm_bob.ip.to_string()],
+        }),
+        "password".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_alice))
+    );
+
+    // setting the price will trigger Alice's subscription to the orderbook topic
+    // but won't request the actual orderbook
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": "1",
+        "volume": "0.1",
+        "cancel_previous": false,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    block_on(
+        mm_alice.wait_for_log((MIN_ORDER_KEEP_ALIVE_INTERVAL * 2) as f64, |log| {
+            log.contains(&format!("Inserting order OrderbookItem {{ pubkey: \"{}\"", bob_pubkey))
+        }),
+    )
+    .unwrap();
+
+    log!("Get RICK/MORTY orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("Alice orderbook {:?}", alice_orderbook);
+    assert_eq!(
+        alice_orderbook.asks.len(),
+        2,
+        "Alice RICK/MORTY orderbook must have exactly 2 ask"
+    );
+    let bob_order_in_orderbook = alice_orderbook
+        .asks
+        .iter()
+        .find(|entry| entry.pubkey == bob_pubkey)
+        .unwrap();
+    assert_eq!(bob_order_in_orderbook.base_confs, 10);
+    assert_eq!(bob_order_in_orderbook.base_nota, true);
+    assert_eq!(bob_order_in_orderbook.rel_confs, 5);
+    assert_eq!(bob_order_in_orderbook.rel_nota, false);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/859
+fn orderbook_extended_data() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","protocol":{"type":"UTXO"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": "bob passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = &mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+    block_on(enable_electrum(&mm, "RICK", false, &[
+        "electrum3.cipig.net:10017",
+        "electrum2.cipig.net:10017",
+        "electrum1.cipig.net:10017",
+    ]));
+    block_on(enable_electrum(&mm, "MORTY", false, &[
+        "electrum3.cipig.net:10018",
+        "electrum2.cipig.net:10018",
+        "electrum1.cipig.net:10018",
+    ]));
+
+    let bob_orders = &[
+        // (base, rel, price, volume)
+        ("RICK", "MORTY", "0.9", "0.9"),
+        ("RICK", "MORTY", "0.8", "0.9"),
+        ("RICK", "MORTY", "0.7", "0.9"),
+        ("MORTY", "RICK", "0.8", "0.9"),
+        ("MORTY", "RICK", "1", "0.9"),
+    ];
+
+    for (base, rel, price, volume) in bob_orders {
+        let rc = block_on(mm.rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": volume,
+            "cancel_previous": false,
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    thread::sleep(Duration::from_secs(1));
+    log!("Get RICK/MORTY orderbook");
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("orderbook {:?}", rc.1);
+    let expected_total_asks_base_vol = MmNumber::from("2.7");
+    assert_eq!(expected_total_asks_base_vol.to_decimal(), orderbook.total_asks_base_vol);
+
+    let expected_total_bids_base_vol = MmNumber::from("1.62");
+    assert_eq!(expected_total_bids_base_vol.to_decimal(), orderbook.total_bids_base_vol);
+
+    let expected_total_asks_rel_vol = MmNumber::from("2.16");
+    assert_eq!(expected_total_asks_rel_vol.to_decimal(), orderbook.total_asks_rel_vol);
+
+    let expected_total_bids_rel_vol = MmNumber::from("1.8");
+    assert_eq!(expected_total_bids_rel_vol.to_decimal(), orderbook.total_bids_rel_vol);
+
+    fn check_price_and_vol_aggr(
+        order: &OrderbookEntryAggregate,
+        price: &'static str,
+        base_aggr: &'static str,
+        rel_aggr: &'static str,
+    ) {
+        let price = MmNumber::from(price);
+        assert_eq!(price.to_decimal(), order.price);
+
+        let base_aggr = MmNumber::from(base_aggr);
+        assert_eq!(base_aggr.to_decimal(), order.base_max_volume_aggr);
+
+        let rel_aggr = MmNumber::from(rel_aggr);
+        assert_eq!(rel_aggr.to_decimal(), order.rel_max_volume_aggr);
+    }
+
+    check_price_and_vol_aggr(&orderbook.asks[0], "0.9", "2.7", "2.16");
+    check_price_and_vol_aggr(&orderbook.asks[1], "0.8", "1.8", "1.35");
+    check_price_and_vol_aggr(&orderbook.asks[2], "0.7", "0.9", "0.63");
+
+    check_price_and_vol_aggr(&orderbook.bids[0], "1.25", "0.72", "0.9");
+    check_price_and_vol_aggr(&orderbook.bids[1], "1", "1.62", "1.8");
+}
+
+#[test]
+fn orderbook_should_display_base_rel_volumes() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","protocol":{"type":"UTXO"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": "bob passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = &mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+    block_on(enable_electrum(&mm, "RICK", false, &[
+        "electrum3.cipig.net:10017",
+        "electrum2.cipig.net:10017",
+        "electrum1.cipig.net:10017",
+    ]));
+    block_on(enable_electrum(&mm, "MORTY", false, &[
+        "electrum3.cipig.net:10018",
+        "electrum2.cipig.net:10018",
+        "electrum1.cipig.net:10018",
+    ]));
+
+    let price = BigRational::new(2.into(), 1.into());
+    let volume = BigRational::new(1.into(), 1.into());
+
+    // create order with rational amount and price
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": price,
+        "volume": volume,
+        "cancel_previous": false,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    thread::sleep(Duration::from_secs(1));
+    log!("Get RICK/MORTY orderbook");
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("orderbook {:?}", orderbook);
+    assert_eq!(orderbook.asks.len(), 1, "RICK/MORTY orderbook must have exactly 1 ask");
+    let min_volume = BigRational::new(1.into(), 10000.into());
+    assert_eq!(volume, orderbook.asks[0].base_max_volume_rat);
+    assert_eq!(min_volume, orderbook.asks[0].base_min_volume_rat);
+
+    assert_eq!(&volume * &price, orderbook.asks[0].rel_max_volume_rat);
+    assert_eq!(&min_volume * &price, orderbook.asks[0].rel_min_volume_rat);
+
+    log!("Get MORTY/RICK orderbook");
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "MORTY",
+        "rel": "RICK",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    log!("orderbook {:?}", orderbook);
+    assert_eq!(orderbook.bids.len(), 1, "MORTY/RICK orderbook must have exactly 1 bid");
+    let min_volume = BigRational::new(1.into(), 10000.into());
+    assert_eq!(volume, orderbook.bids[0].rel_max_volume_rat);
+    assert_eq!(min_volume, orderbook.bids[0].rel_min_volume_rat);
+
+    assert_eq!(&volume * &price, orderbook.bids[0].base_max_volume_rat);
+    assert_eq!(&min_volume * &price, orderbook.bids[0].base_min_volume_rat);
+}
+
+#[test]
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/670
+fn orderbook_should_work_without_coins_activation() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let coins = json! ([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    ]);
+
+    let mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "dht": "on",  // Enable DHT without delay.
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "alice" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
+
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "ETH",
+        "rel": "JST",
+        "price": "1",
+        "volume": "10",
+        "min_volume": "1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    log!("Get ETH/JST orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "ETH",
+        "rel": "JST",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let orderbook: Json = json::from_str(&rc.1).unwrap();
+    log!("orderbook {:?}", orderbook);
+    let asks = orderbook["asks"].as_array().unwrap();
+    assert_eq!(asks.len(), 1, "Alice ETH/JST orderbook must have exactly 1 ask");
+}
+
+#[test]
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/511
+fn test_all_orders_per_pair_per_node_must_be_displayed_in_orderbook() {
+    let coins = json!([
+        {"coin":"RICK","asset":"RICK","protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","protocol":{"type":"UTXO"}},
+    ]);
+
+    let mm = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": "bob passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+    block_on(enable_electrum(&mm, "RICK", false, &[
+        "electrum3.cipig.net:10017",
+        "electrum2.cipig.net:10017",
+        "electrum1.cipig.net:10017",
+    ]));
+    block_on(enable_electrum(&mm, "MORTY", false, &[
+        "electrum3.cipig.net:10018",
+        "electrum2.cipig.net:10018",
+        "electrum1.cipig.net:10018",
+    ]));
+
+    // set 2 orders with different prices
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": 0.9,
+        "volume": "0.9",
+        "cancel_previous": false,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "MORTY",
+        "price": 1,
+        "volume": "0.9",
+        "cancel_previous": false,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    thread::sleep(Duration::from_secs(2));
+
+    log!("Get RICK/MORTY orderbook");
+    let rc = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "orderbook",
+        "base": "RICK",
+        "rel": "MORTY",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let orderbook: Json = json::from_str(&rc.1).unwrap();
+    log!("orderbook {:?}", orderbook);
+    let asks = orderbook["asks"].as_array().unwrap();
+    assert_eq!(asks.len(), 2, "RICK/MORTY orderbook must have exactly 2 asks");
+}
+
+#[test]
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/473
+fn setprice_min_volume_should_be_displayed_in_orderbook() {
+    let bob_passphrase = get_passphrase(&".env.seed", "BOB_PASSPHRASE").unwrap();
+
+    let coins = json! ([
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
+        {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}}
+    ]);
+
+    let mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "canbind": env::var ("BOB_TRADE_PORT") .ok().map (|s| s.parse::<i64>().unwrap()),
+            "passphrase": bob_passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "bob" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let mm_alice = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "dht": "on",  // Enable DHT without delay.
+            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "passphrase": "alice passphrase",
+            "coins": coins,
+            "seednodes": [mm_bob.ip.to_string()],
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        match var("LOCAL_THREAD_MM") {
+            Ok(ref e) if e == "alice" => Some(local_start()),
+            _ => None,
+        },
+    )
+    .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    log!(
+        "enable_coins (bob): {:?}",
+        block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
+    );
+    log!(
+        "enable_coins (alice): {:?}",
+        block_on(enable_coins_eth_electrum(&mm_alice, &["http://195.201.0.6:8565"]))
+    );
+
+    // issue orderbook call on Alice side to trigger subscription to a topic
+    block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "ETH",
+        "rel": "JST",
+    })))
+    .unwrap();
+
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "ETH",
+        "rel": "JST",
+        "price": "1",
+        "volume": "10",
+        "min_volume": "1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    thread::sleep(Duration::from_secs(2));
+    log!("Get ETH/JST orderbook on Bob side");
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "ETH",
+        "rel": "JST",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let orderbook: Json = json::from_str(&rc.1).unwrap();
+    log!("orderbook {:?}", orderbook);
+    let asks = orderbook["asks"].as_array().unwrap();
+    assert_eq!(asks.len(), 1, "Bob ETH/JST orderbook must have exactly 1 ask");
+
+    let min_volume = asks[0]["min_volume"].as_str().unwrap();
+    assert_eq!(min_volume, "1", "Bob ETH/JST ask must display correct min_volume");
+
+    log!("Get ETH/JST orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "ETH",
+        "rel": "JST",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let orderbook: Json = json::from_str(&rc.1).unwrap();
+    log!("orderbook {:?}", orderbook);
+    let asks = orderbook["asks"].as_array().unwrap();
+    assert_eq!(asks.len(), 1, "Alice ETH/JST orderbook must have exactly 1 ask");
+
+    let min_volume = asks[0]["min_volume"].as_str().unwrap();
+    assert_eq!(min_volume, "1", "Alice ETH/JST ask must display correct min_volume");
+}
+
+// ignored because it requires a long-running ZOMBIE initialization process
+#[test]
+#[ignore]
+fn zhtlc_orders_sync_alice_connected_before_creation() {
+    let bob_passphrase = get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+    let alice_passphrase = get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
+
+    let coins = json!([rick_conf(), zombie_conf()]);
+
+    let bob_conf = Mm2TestConf::seednode(&bob_passphrase, &coins);
+    let mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, bob_conf.local).unwrap();
+
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let alice_conf = Mm2TestConf::light_node(&alice_passphrase, &coins, &[&mm_bob.ip.to_string()]);
+    let mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, alice_conf.local).unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(enable_electrum_json(&mm_bob, RICK, false, rick_electrums()));
+    block_on(enable_z_coin_light(
+        &mm_bob,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm_bob, &bob_passphrase, ZOMBIE_TICKER),
+    ));
+
+    let set_price_json = json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": ZOMBIE_TICKER,
+        "rel": RICK,
+        "price": 1,
+        "volume": "1",
+    });
+    log!("Issue sell request on Bob side by setting base/rel price…");
+    let rc = block_on(mm_bob.rpc(&set_price_json)).unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let set_price_res: SetPriceResponse = json::from_str(&rc.1).unwrap();
+
+    let orderbook = block_on(orderbook_v2(&mm_alice, ZOMBIE_TICKER, RICK));
+    let orderbook: RpcV2Response<OrderbookV2Response> = json::from_value(orderbook).unwrap();
+    let orderbook = orderbook.result;
+
+    assert_eq!(1, orderbook.asks.len());
+    orderbook
+        .asks
+        .iter()
+        .find(|ask| ask.entry.uuid == set_price_res.result.uuid)
+        .unwrap();
+
+    thread::sleep(Duration::from_secs(MIN_ORDER_KEEP_ALIVE_INTERVAL * 3));
+
+    let orderbook = block_on(orderbook_v2(&mm_alice, ZOMBIE_TICKER, RICK));
+    let orderbook: RpcV2Response<OrderbookV2Response> = json::from_value(orderbook).unwrap();
+    let orderbook = orderbook.result;
+
+    assert_eq!(1, orderbook.asks.len());
+    orderbook
+        .asks
+        .iter()
+        .find(|ask| ask.entry.uuid == set_price_res.result.uuid)
+        .unwrap();
+}
+
+// ignored because it requires a long-running ZOMBIE initialization process
+#[test]
+#[ignore]
+fn zhtlc_orders_sync_alice_connected_after_creation() {
+    let bob_passphrase = get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+    let alice_passphrase = get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
+
+    let coins = json!([rick_conf(), zombie_conf()]);
+
+    let bob_conf = Mm2TestConf::seednode(&bob_passphrase, &coins);
+    let mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, bob_conf.local).unwrap();
+
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    block_on(enable_electrum_json(&mm_bob, "RICK", false, rick_electrums()));
+    block_on(enable_z_coin_light(
+        &mm_bob,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm_bob, &bob_passphrase, ZOMBIE_TICKER),
+    ));
+
+    let set_price_json = json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "ZOMBIE",
+        "rel": "RICK",
+        "price": 1,
+        "volume": "1",
+    });
+    log!("Issue sell request on Bob side by setting base/rel price…");
+    let rc = block_on(mm_bob.rpc(&set_price_json)).unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let bob_set_price_res: SetPriceResponse = json::from_str(&rc.1).unwrap();
+
+    let alice_conf = Mm2TestConf::light_node(&alice_passphrase, &coins, &[&mm_bob.ip.to_string()]);
+    let mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, alice_conf.local).unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    block_on(enable_electrum_json(&mm_alice, RICK, false, rick_electrums()));
+    block_on(enable_z_coin_light(
+        &mm_alice,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm_alice, &alice_passphrase, ZOMBIE_TICKER),
+    ));
+
+    let set_price_json = json!({
+        "userpass": mm_alice.userpass,
+        "method": "setprice",
+        "base": "RICK",
+        "rel": "ZOMBIE",
+        "price": 1,
+        "volume": "1",
+    });
+    log!("Issue sell request on Alice side to trigger subscription on orderbook topic");
+    let rc = block_on(mm_alice.rpc(&set_price_json)).unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    thread::sleep(Duration::from_secs(MIN_ORDER_KEEP_ALIVE_INTERVAL));
+
+    let orderbook = block_on(orderbook_v2(&mm_alice, ZOMBIE_TICKER, RICK));
+    let orderbook: RpcV2Response<OrderbookV2Response> = json::from_value(orderbook).unwrap();
+    let orderbook = orderbook.result;
+
+    assert_eq!(1, orderbook.asks.len());
+    orderbook
+        .asks
+        .iter()
+        .find(|ask| ask.entry.uuid == bob_set_price_res.result.uuid)
+        .unwrap();
+}
diff --git a/mm2src/mm2_tests/structs.rs b/mm2src/mm2_main/src/mm2_tests/structs.rs
similarity index 65%
rename from mm2src/mm2_tests/structs.rs
rename to mm2src/mm2_main/src/mm2_tests/structs.rs
index 75512ac10b..30b9ffdc67 100644
--- a/mm2src/mm2_tests/structs.rs
+++ b/mm2src/mm2_main/src/mm2_tests/structs.rs
@@ -3,12 +3,11 @@
 /// The helper structs used in testing of RPC responses, these should be separated from actual MM2 code to ensure
 /// backwards compatibility
 /// Use `#[serde(deny_unknown_fields)]` for all structs for tests to fail in case of adding new fields to the response
-use bigdecimal::BigDecimal;
-use common::mm_number::{Fraction, MmNumber};
-use num_rational::BigRational;
+use mm2_number::{BigDecimal, BigRational, Fraction, MmNumber};
 use rpc::v1::types::H256 as H256Json;
 use serde_json::Value as Json;
 use std::collections::{HashMap, HashSet};
+use std::num::NonZeroUsize;
 use uuid::Uuid;
 
 #[derive(Debug, Deserialize)]
@@ -287,6 +286,10 @@ pub struct OrderbookEntry {
     pub zcredits: u64,
     pub uuid: Uuid,
     pub is_mine: bool,
+    pub base_confs: u64,
+    pub base_nota: bool,
+    pub rel_confs: u64,
+    pub rel_nota: bool,
 }
 
 #[derive(Debug, Deserialize)]
@@ -327,6 +330,10 @@ pub struct OrderbookEntryAggregate {
     pub rel_max_volume_aggr: BigDecimal,
     pub rel_max_volume_aggr_rat: BigRational,
     pub rel_max_volume_aggr_fraction: Fraction,
+    pub base_confs: u64,
+    pub base_nota: bool,
+    pub rel_confs: u64,
+    pub rel_nota: bool,
 }
 
 #[derive(Deserialize)]
@@ -512,6 +519,29 @@ pub struct MaxTakerVolResponse {
     pub coin: String,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct RawTransactionResult {
+    /// Raw bytes of signed transaction in hexadecimal string, this should be sent as is to send_raw_transaction RPC to broadcast the transaction
+    pub tx_hex: String,
+}
+
+pub mod raw_transaction_error {
+    #[derive(Debug, Deserialize, PartialEq)]
+    #[serde(deny_unknown_fields)]
+    pub struct InvalidCoin {
+        pub coin: String,
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub enum TransactionType {
+    StakingDelegation,
+    RemoveDelegation,
+    StandardTransfer,
+    TokenTransfer(String),
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct TransactionDetails {
@@ -528,10 +558,101 @@ pub struct TransactionDetails {
     pub fee_details: Json,
     pub coin: String,
     pub internal_id: String,
+    pub transaction_type: TransactionType,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct MyBalanceResponse {
+    pub address: String,
+    pub balance: BigDecimal,
+    pub unspendable_balance: BigDecimal,
+    pub coin: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct IguanaWalletBalance {
+    pub address: String,
+    pub balance: CoinBalance,
+}
+
+#[derive(Debug, Deserialize)]
+pub enum Bip44Chain {
+    External = 0,
+    Internal = 1,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct HDWalletBalance {
+    pub accounts: Vec<HDAccountBalance>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct HDAccountBalance {
+    pub account_index: u32,
+    pub derivation_path: String,
+    pub total_balance: CoinBalance,
+    pub addresses: Vec<HDAddressBalance>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct HDAddressBalance {
+    pub address: String,
+    pub derivation_path: String,
+    pub chain: Bip44Chain,
+    pub balance: CoinBalance,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields, tag = "wallet_type")]
+pub enum EnableCoinBalance {
+    Iguana(IguanaWalletBalance),
+    HD(HDWalletBalance),
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ZcoinActivationResult {
+    pub ticker: String,
+    pub current_block: u64,
+    pub wallet_balance: EnableCoinBalance,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct InitTaskResult {
+    pub task_id: u64,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields, untagged)]
+pub enum MmRpcResult<T> {
+    Ok { result: T },
+    Err(Json),
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields, tag = "status", content = "details")]
+pub enum InitZcoinStatus {
+    Ready(MmRpcResult<ZcoinActivationResult>),
+    InProgress(Json),
+    UserActionRequired(Json),
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields, tag = "status", content = "details")]
+pub enum WithdrawStatus {
+    Ready(MmRpcResult<TransactionDetails>),
+    InProgress(Json),
+    UserActionRequired(Json),
 }
 
 pub mod withdraw_error {
-    use bigdecimal::BigDecimal;
+    use mm2_number::BigDecimal;
 
     #[derive(Debug, Deserialize, PartialEq)]
     #[serde(deny_unknown_fields)]
@@ -550,7 +671,7 @@ pub mod withdraw_error {
 }
 
 pub mod trade_preimage_error {
-    use bigdecimal::BigDecimal;
+    use mm2_number::BigDecimal;
 
     #[derive(Debug, Deserialize, PartialEq)]
     #[serde(deny_unknown_fields)]
@@ -591,12 +712,222 @@ pub mod trade_preimage_error {
 }
 
 #[derive(Debug, Serialize, Deserialize, Default)]
-pub struct GetPublicKeyResponse {
-    pub mmrpc: String,
-    pub result: GetPublicKeyResult,
+#[serde(deny_unknown_fields)]
+pub struct GetPublicKeyResult {
+    pub public_key: String,
 }
 
 #[derive(Debug, Serialize, Deserialize, Default)]
-pub struct GetPublicKeyResult {
-    pub public_key: String,
+#[serde(deny_unknown_fields)]
+pub struct GetPublicKeyHashResult {
+    pub public_key_hash: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct RpcV2Response<T> {
+    pub mmrpc: String,
+    pub id: Option<Json>,
+    pub result: T,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct CoinBalance {
+    pub spendable: BigDecimal,
+    pub unspendable: BigDecimal,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct EnableSlpResponse {
+    pub balances: HashMap<String, CoinBalance>,
+    pub token_id: H256Json,
+    pub platform_coin: String,
+    pub required_confirmations: u64,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct EnableSplResponse {
+    pub balances: HashMap<String, CoinBalance>,
+    pub token_contract_address: String,
+    pub platform_coin: String,
 }
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+#[serde(tag = "type", content = "data")]
+pub enum DerivationMethod {
+    Iguana,
+    HDWallet(String),
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct CoinAddressInfo<Balance> {
+    pub derivation_method: DerivationMethod,
+    pub pubkey: String,
+    pub balances: Balance,
+}
+
+pub type TokenBalances = HashMap<String, CoinBalance>;
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct EnableBchWithTokensResponse {
+    pub current_block: u64,
+    pub bch_addresses_infos: HashMap<String, CoinAddressInfo<CoinBalance>>,
+    pub slp_addresses_infos: HashMap<String, CoinAddressInfo<TokenBalances>>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct EnableSolanaWithTokensResponse {
+    pub current_block: u64,
+    pub solana_addresses_infos: HashMap<String, CoinAddressInfo<CoinBalance>>,
+    pub spl_addresses_infos: HashMap<String, CoinAddressInfo<TokenBalances>>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct HistoryTransactionDetails {
+    #[serde(flatten)]
+    pub tx: TransactionDetails,
+    pub confirmations: u64,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ZcoinTransactionDetails {
+    pub tx_hash: String,
+    pub from: HashSet<String>,
+    pub to: HashSet<String>,
+    pub spent_by_me: BigDecimal,
+    pub received_by_me: BigDecimal,
+    pub my_balance_change: BigDecimal,
+    pub block_height: u64,
+    pub timestamp: u64,
+    pub transaction_fee: BigDecimal,
+    pub coin: String,
+    pub internal_id: i64,
+    pub confirmations: u64,
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub enum PagingOptionsEnum<T> {
+    FromId(T),
+    PageNumber(NonZeroUsize),
+}
+
+pub type StandardHistoryV2Res = MyTxHistoryV2Response<HistoryTransactionDetails, String>;
+pub type ZcoinHistoryRes = MyTxHistoryV2Response<ZcoinTransactionDetails, i64>;
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct MyTxHistoryV2Response<Tx, Id> {
+    pub coin: String,
+    pub current_block: u64,
+    pub transactions: Vec<Tx>,
+    pub sync_status: Json,
+    pub limit: usize,
+    pub skipped: usize,
+    pub total: usize,
+    pub total_pages: usize,
+    pub paging_options: PagingOptionsEnum<Id>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct UtxoFeeDetails {
+    pub r#type: String,
+    pub coin: Option<String>,
+    pub amount: BigDecimal,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct MmVersion {
+    pub result: String,
+    pub datetime: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields, tag = "address_type", content = "address_data")]
+pub enum OrderbookAddress {
+    Transparent(String),
+    Shielded,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct RpcOrderbookEntryV2 {
+    pub coin: String,
+    pub address: OrderbookAddress,
+    pub price: MmNumberMultiRepr,
+    pub pubkey: String,
+    pub uuid: Uuid,
+    pub is_mine: bool,
+    pub base_max_volume: MmNumberMultiRepr,
+    pub base_min_volume: MmNumberMultiRepr,
+    pub rel_max_volume: MmNumberMultiRepr,
+    pub rel_min_volume: MmNumberMultiRepr,
+    pub conf_settings: Option<OrderConfirmationsSettings>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct AggregatedOrderbookEntryV2 {
+    #[serde(flatten)]
+    pub entry: RpcOrderbookEntryV2,
+    pub base_max_volume_aggr: MmNumberMultiRepr,
+    pub rel_max_volume_aggr: MmNumberMultiRepr,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct MmNumberMultiRepr {
+    pub decimal: BigDecimal,
+    pub rational: BigRational,
+    pub fraction: Fraction,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct OrderbookV2Response {
+    pub asks: Vec<AggregatedOrderbookEntryV2>,
+    pub base: String,
+    pub bids: Vec<AggregatedOrderbookEntryV2>,
+    pub net_id: u16,
+    pub num_asks: usize,
+    pub num_bids: usize,
+    pub rel: String,
+    pub timestamp: u64,
+    pub total_asks_base_vol: MmNumberMultiRepr,
+    pub total_asks_rel_vol: MmNumberMultiRepr,
+    pub total_bids_base_vol: MmNumberMultiRepr,
+    pub total_bids_rel_vol: MmNumberMultiRepr,
+}
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct BestOrdersV2Response {
+    pub orders: HashMap<String, Vec<RpcOrderbookEntryV2>>,
+    pub original_tickers: HashMap<String, HashSet<String>>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct SignatureResponse {
+    pub signature: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct VerificationResponse {
+    pub is_valid: bool,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct WithdrawResult {}
diff --git a/mm2src/mm2_main/src/mm2_tests/z_coin_tests.rs b/mm2src/mm2_main/src/mm2_tests/z_coin_tests.rs
new file mode 100644
index 0000000000..868a33ad29
--- /dev/null
+++ b/mm2src/mm2_main/src/mm2_tests/z_coin_tests.rs
@@ -0,0 +1,437 @@
+use super::*;
+use common::now_ms;
+use mm2_test_helpers::for_tests::{init_withdraw, rick_conf, send_raw_transaction, withdraw_status, z_coin_tx_history,
+                                  zombie_conf, Mm2TestConf, RICK, ZOMBIE_ELECTRUMS, ZOMBIE_LIGHTWALLETD_URLS,
+                                  ZOMBIE_TICKER};
+use std::collections::HashSet;
+use std::iter::FromIterator;
+use std::num::NonZeroUsize;
+
+const ZOMBIE_TEST_BALANCE_SEED: &str = "zombie test seed";
+const ZOMBIE_TEST_HISTORY_SEED: &str = "zombie test history seed";
+const ZOMBIE_TEST_WITHDRAW_SEED: &str = "zombie withdraw test seed";
+const ZOMBIE_TRADE_BOB_SEED: &str = "RICK ZOMBIE BOB";
+const ZOMBIE_TRADE_ALICE_SEED: &str = "RICK ZOMBIE ALICE";
+
+async fn withdraw(mm: &MarketMakerIt, coin: &str, to: &str, amount: &str) -> TransactionDetails {
+    let init = init_withdraw(mm, coin, to, amount).await;
+    let init: RpcV2Response<InitTaskResult> = json::from_value(init).unwrap();
+    let timeout = now_ms() + 150000;
+
+    loop {
+        if now_ms() > timeout {
+            panic!("{} init_withdraw timed out", coin);
+        }
+
+        let status = withdraw_status(mm, init.result.task_id).await;
+        println!("Withdraw status {}", json::to_string(&status).unwrap());
+        let status: RpcV2Response<WithdrawStatus> = json::from_value(status).unwrap();
+        if let WithdrawStatus::Ready(rpc_result) = status.result {
+            match rpc_result {
+                MmRpcResult::Ok { result } => break result,
+                MmRpcResult::Err(e) => panic!("{} withdraw error {:?}", coin, e),
+            }
+        }
+        Timer::sleep(1.).await;
+    }
+}
+
+// ignored because it requires a long-running Zcoin initialization process
+#[test]
+#[ignore]
+fn activate_z_coin_light() {
+    let coins = json!([zombie_conf()]);
+
+    let conf = Mm2TestConf::seednode(ZOMBIE_TEST_BALANCE_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, conf.local).unwrap();
+
+    let activation_result = block_on(enable_z_coin_light(
+        &mm,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm, ZOMBIE_TEST_BALANCE_SEED, ZOMBIE_TICKER),
+    ));
+
+    let balance = match activation_result.wallet_balance {
+        EnableCoinBalance::Iguana(iguana) => iguana,
+        _ => panic!("Expected EnableCoinBalance::Iguana"),
+    };
+    assert_eq!(balance.balance.spendable, BigDecimal::from_str("3.1").unwrap());
+}
+
+// ignored because it requires a long-running Zcoin initialization process
+#[test]
+#[ignore]
+fn test_z_coin_tx_history() {
+    let coins = json!([zombie_conf()]);
+
+    let conf = Mm2TestConf::seednode(ZOMBIE_TEST_HISTORY_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, conf.local).unwrap();
+
+    block_on(enable_z_coin_light(
+        &mm,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm, ZOMBIE_TEST_HISTORY_SEED, ZOMBIE_TICKER),
+    ));
+
+    let tx_history = block_on(z_coin_tx_history(&mm, ZOMBIE_TICKER, 5, None));
+    println!("History {}", json::to_string(&tx_history).unwrap());
+
+    let response: RpcV2Response<ZcoinHistoryRes> = json::from_value(tx_history).unwrap();
+
+    // all transactions have default fee
+    let expected_fee = BigDecimal::from_str("0.00001").unwrap();
+    for tx in response.result.transactions.iter() {
+        assert_eq!(tx.transaction_fee, expected_fee, "Invalid fee for tx {:?}", tx);
+    }
+
+    // withdraw transaction to the shielded address
+    let withdraw_tx = &response.result.transactions[0];
+    assert_eq!(withdraw_tx.internal_id, 5);
+    assert_eq!(withdraw_tx.block_height, 169530);
+    assert_eq!(withdraw_tx.timestamp, 1656939208);
+    assert_eq!(
+        withdraw_tx.tx_hash,
+        "893b648d2d46de09e24ec7b8b2a13958505656410d1b8ca7838f57a23ae66e4e"
+    );
+
+    let from = HashSet::from_iter([
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(withdraw_tx.from, from);
+
+    let to = HashSet::from_iter([
+        "zs1g6z7dcfp5wg085fuzqlauf8d85ct4hke7xmwxe0djnq48909yfsj66hzj0fjgfgzynddud8n04g".to_owned(),
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(withdraw_tx.to, to);
+
+    // transaction spent 2 inputs: 89985130 and 9999000 sats
+    let spent_by_me = BigDecimal::from_str("0.9998413").unwrap();
+    assert_eq!(withdraw_tx.spent_by_me, spent_by_me);
+    // change output 89983130 sats
+    let received_by_me = BigDecimal::from_str("0.8998313").unwrap();
+    assert_eq!(withdraw_tx.received_by_me, received_by_me);
+
+    // withdrew 0.1 and paid tx fee
+    let my_balance_change = BigDecimal::from_str("-0.1000100").unwrap();
+    assert_eq!(withdraw_tx.my_balance_change, my_balance_change);
+
+    // swap payment spent to our address
+    let htlc_spend_tx = &response.result.transactions[1];
+    assert_eq!(htlc_spend_tx.internal_id, 4);
+    assert_eq!(htlc_spend_tx.block_height, 169526);
+    assert_eq!(htlc_spend_tx.timestamp, 1656938980);
+    assert_eq!(
+        htlc_spend_tx.tx_hash,
+        "9fb1a1690ddcc37b67d61af509343b0b7d147fc59fe58f4e7f7ca68f0d12f6a2"
+    );
+    let from = HashSet::from_iter(["bVJG4mSRn5sBSwFWCyeE9EuiogQJtDy3NF".to_owned()]);
+    assert_eq!(htlc_spend_tx.from, from);
+
+    let to = HashSet::from_iter([
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(htlc_spend_tx.to, to);
+
+    // our address didn't spend any inputs
+    assert_eq!(htlc_spend_tx.spent_by_me, BigDecimal::default());
+    // received 9999000 sats
+    let received_by_me = BigDecimal::from_str("0.09999").unwrap();
+    assert_eq!(htlc_spend_tx.received_by_me, received_by_me);
+
+    let my_balance_change = BigDecimal::from_str("0.09999").unwrap();
+    assert_eq!(htlc_spend_tx.my_balance_change, my_balance_change);
+
+    // swap payment sent from our address
+    let htlc_send_tx = &response.result.transactions[2];
+    assert_eq!(htlc_send_tx.internal_id, 3);
+    assert_eq!(htlc_send_tx.block_height, 169521);
+    assert_eq!(htlc_send_tx.timestamp, 1656938572);
+    assert_eq!(
+        htlc_send_tx.tx_hash,
+        "9e7146c77419f8db6975180328cf85c1eac6b18e4e4190293e4c7104c837477d"
+    );
+
+    let from = HashSet::from_iter([
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(htlc_send_tx.from, from);
+
+    let to = HashSet::from_iter([
+        "bNyQ2YiiMo1H4GEum3nhymmTRZ8bmkVCFA".to_owned(),
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(htlc_send_tx.to, to);
+
+    // spent a single 99986130 sats output
+    let spent_by_me = BigDecimal::from_str("0.9998613").unwrap();
+    assert_eq!(htlc_send_tx.spent_by_me, spent_by_me);
+    // change output
+    let received_by_me = BigDecimal::from_str("0.8998513").unwrap();
+    assert_eq!(htlc_send_tx.received_by_me, received_by_me);
+
+    // 0.1 swap payment amount and transaction fee
+    let my_balance_change = BigDecimal::from_str("-0.1000100").unwrap();
+    assert_eq!(htlc_send_tx.my_balance_change, my_balance_change);
+
+    // dex fee sent from our address
+    let dex_fee_tx = &response.result.transactions[3];
+    assert_eq!(dex_fee_tx.internal_id, 2);
+    assert_eq!(dex_fee_tx.block_height, 169519);
+    assert_eq!(dex_fee_tx.timestamp, 1656938512);
+    assert_eq!(
+        dex_fee_tx.tx_hash,
+        "7d45e5941e8701a030b0c1c0786995e0f638ce9b82cd71cb614a4a1957f1a3ab"
+    );
+
+    let from = HashSet::from_iter([
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(dex_fee_tx.from, from);
+
+    let to = HashSet::from_iter([
+        "zs1rp6426e9r6jkq2nsanl66tkd34enewrmr0uvj0zelhkcwmsy0uvxz2fhm9eu9rl3ukxvgzy2v9f".to_owned(),
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(dex_fee_tx.to, to);
+
+    // spent a single 100000000 sats output
+    let spent_by_me = BigDecimal::from(1);
+    assert_eq!(dex_fee_tx.spent_by_me, spent_by_me);
+    // change output
+    let received_by_me = BigDecimal::from_str("0.9998613").unwrap();
+    assert_eq!(dex_fee_tx.received_by_me, received_by_me);
+
+    // 0.0001287 dex fee amount and transaction fee
+    let my_balance_change = BigDecimal::from_str("-0.0001387").unwrap();
+    assert_eq!(dex_fee_tx.my_balance_change, my_balance_change);
+
+    // incoming tx, 2 ZOMBIE received
+    let incoming_tx = &response.result.transactions[4];
+    assert_eq!(incoming_tx.internal_id, 1);
+    assert_eq!(incoming_tx.block_height, 169514);
+    assert_eq!(incoming_tx.timestamp, 1656938072);
+    assert_eq!(
+        incoming_tx.tx_hash,
+        "a18a991738fe8568feb7578201250daee7abb9567c247e2241b62149674238c2"
+    );
+
+    // from doesn't seem to be detectable for transactions from other shielded addresses
+    assert_eq!(incoming_tx.from, HashSet::new());
+
+    let to = HashSet::from_iter([
+        "zs1xa4lt5w85x4a7awhm5sfm2jz0raz3yqw4ttpyn2ekjcyya00j8l09llz6wpwazcgas6ekj3m054".to_owned(),
+    ]);
+    assert_eq!(incoming_tx.to, to);
+
+    assert_eq!(incoming_tx.spent_by_me, BigDecimal::default());
+
+    let received_by_me = BigDecimal::from(2);
+    assert_eq!(incoming_tx.received_by_me, received_by_me);
+
+    let my_balance_change = BigDecimal::from(2);
+    assert_eq!(incoming_tx.my_balance_change, my_balance_change);
+
+    // check paging by page number
+    let page = Some(common::PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap()));
+    let tx_history = block_on(z_coin_tx_history(&mm, ZOMBIE_TICKER, 2, page));
+    println!("History {}", json::to_string(&tx_history).unwrap());
+
+    let response: RpcV2Response<ZcoinHistoryRes> = json::from_value(tx_history).unwrap();
+    assert_eq!(response.result.transactions.len(), 2);
+
+    assert_eq!(
+        response.result.transactions[0].tx_hash,
+        "9e7146c77419f8db6975180328cf85c1eac6b18e4e4190293e4c7104c837477d"
+    );
+    assert_eq!(
+        response.result.transactions[1].tx_hash,
+        "7d45e5941e8701a030b0c1c0786995e0f638ce9b82cd71cb614a4a1957f1a3ab"
+    );
+    assert_eq!(response.result.skipped, 2);
+    assert_eq!(response.result.total, 5);
+    assert_eq!(response.result.limit, 2);
+    assert_eq!(response.result.total_pages, 3);
+
+    // check paging by from_id 3
+    let page = Some(common::PagingOptionsEnum::FromId(3));
+    let tx_history = block_on(z_coin_tx_history(&mm, ZOMBIE_TICKER, 3, page));
+    println!("History {}", json::to_string(&tx_history).unwrap());
+
+    let response: RpcV2Response<ZcoinHistoryRes> = json::from_value(tx_history).unwrap();
+    assert_eq!(response.result.transactions.len(), 2);
+
+    assert_eq!(
+        response.result.transactions[0].tx_hash,
+        "7d45e5941e8701a030b0c1c0786995e0f638ce9b82cd71cb614a4a1957f1a3ab"
+    );
+    assert_eq!(
+        response.result.transactions[1].tx_hash,
+        "a18a991738fe8568feb7578201250daee7abb9567c247e2241b62149674238c2"
+    );
+    assert_eq!(response.result.skipped, 3);
+    assert_eq!(response.result.total, 5);
+    assert_eq!(response.result.limit, 3);
+    assert_eq!(response.result.total_pages, 2);
+
+    // check paging by from_id 5
+    let page = Some(common::PagingOptionsEnum::FromId(5));
+    let tx_history = block_on(z_coin_tx_history(&mm, ZOMBIE_TICKER, 3, page));
+    println!("History {}", json::to_string(&tx_history).unwrap());
+
+    let response: RpcV2Response<ZcoinHistoryRes> = json::from_value(tx_history).unwrap();
+    assert_eq!(response.result.transactions.len(), 3);
+
+    assert_eq!(
+        response.result.transactions[0].tx_hash,
+        "9fb1a1690ddcc37b67d61af509343b0b7d147fc59fe58f4e7f7ca68f0d12f6a2"
+    );
+    assert_eq!(
+        response.result.transactions[1].tx_hash,
+        "9e7146c77419f8db6975180328cf85c1eac6b18e4e4190293e4c7104c837477d"
+    );
+    assert_eq!(
+        response.result.transactions[2].tx_hash,
+        "7d45e5941e8701a030b0c1c0786995e0f638ce9b82cd71cb614a4a1957f1a3ab"
+    );
+    assert_eq!(response.result.skipped, 1);
+    assert_eq!(response.result.total, 5);
+    assert_eq!(response.result.limit, 3);
+    assert_eq!(response.result.total_pages, 2);
+}
+
+// ignored because it requires a long-running Zcoin initialization process
+#[test]
+#[ignore]
+fn withdraw_z_coin_light() {
+    let coins = json!([zombie_conf()]);
+
+    let conf = Mm2TestConf::seednode(ZOMBIE_TEST_WITHDRAW_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, conf.local).unwrap();
+
+    let activation_result = block_on(enable_z_coin_light(
+        &mm,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm, ZOMBIE_TEST_WITHDRAW_SEED, ZOMBIE_TICKER),
+    ));
+
+    println!("{:?}", activation_result);
+
+    let withdraw_res = block_on(withdraw(
+        &mm,
+        ZOMBIE_TICKER,
+        "zs1hs0p406y5tntz6wlp7sc3qe4g6ycnnd46leeyt6nyxr42dfvf0dwjkhmjdveukem0x72kkx0tup",
+        "0.1",
+    ));
+    println!("{:?}", withdraw_res);
+
+    // withdrawing to myself, balance change is the fee
+    assert_eq!(
+        withdraw_res.my_balance_change,
+        BigDecimal::from_str("-0.00001").unwrap()
+    );
+
+    let send_raw_tx = block_on(send_raw_transaction(&mm, ZOMBIE_TICKER, &withdraw_res.tx_hex));
+    println!("{:?}", send_raw_tx);
+}
+
+// ignored because it requires a long-running Zcoin initialization process
+#[test]
+#[ignore]
+fn trade_rick_zombie_light() {
+    let coins = json!([zombie_conf(), rick_conf()]);
+    let bob_passphrase = ZOMBIE_TRADE_BOB_SEED;
+    let alice_passphrase = ZOMBIE_TRADE_ALICE_SEED;
+
+    let bob_conf = Mm2TestConf::seednode(bob_passphrase, &coins);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, bob_conf.local).unwrap();
+
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let zombie_activation = block_on(enable_z_coin_light(
+        &mm_bob,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm_bob, bob_passphrase, ZOMBIE_TICKER),
+    ));
+
+    println!("Bob ZOMBIE activation {:?}", zombie_activation);
+
+    let rick_activation = block_on(enable_electrum_json(&mm_bob, RICK, false, rick_electrums()));
+
+    println!("Bob RICK activation {:?}", rick_activation);
+
+    let rc = block_on(mm_bob.rpc(&json! ({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": RICK,
+        "rel": ZOMBIE_TICKER,
+        "price": 1,
+        "volume": "0.1"
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let alice_conf = Mm2TestConf::light_node(alice_passphrase, &coins, &[&mm_bob.ip.to_string()]);
+    let mut mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, alice_conf.local).unwrap();
+
+    thread::sleep(Duration::from_secs(1));
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    let zombie_activation = block_on(enable_z_coin_light(
+        &mm_alice,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+        &blocks_cache_path(&mm_alice, alice_passphrase, ZOMBIE_TICKER),
+    ));
+
+    println!("Alice ZOMBIE activation {:?}", zombie_activation);
+
+    let rick_activation = block_on(enable_electrum_json(&mm_alice, RICK, false, rick_electrums()));
+
+    println!("Alice RICK activation {:?}", rick_activation);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": RICK,
+        "rel": ZOMBIE_TICKER,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    thread::sleep(Duration::from_secs(1));
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": RICK,
+        "rel": ZOMBIE_TICKER,
+        "volume": "0.1",
+        "price": 1
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    let buy_json: Json = serde_json::from_str(&rc.1).unwrap();
+    let uuid = buy_json["result"]["uuid"].as_str().unwrap().to_owned();
+
+    block_on(mm_alice.wait_for_log(5., |log| log.contains("Entering the taker_swap_loop RICK/ZOMBIE"))).unwrap();
+
+    block_on(mm_bob.wait_for_log(5., |log| log.contains("Entering the maker_swap_loop RICK/ZOMBIE"))).unwrap();
+
+    block_on(mm_bob.wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))).unwrap();
+
+    block_on(mm_alice.wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))).unwrap();
+}
diff --git a/mm2src/mm2_main/src/notification/telegram/telegram.rs b/mm2src/mm2_main/src/notification/telegram/telegram.rs
new file mode 100644
index 0000000000..edfc5c15f7
--- /dev/null
+++ b/mm2src/mm2_main/src/notification/telegram/telegram.rs
@@ -0,0 +1,77 @@
+use crate::mm2::lp_message_service::{MessageResult, MessageServiceTraits};
+use async_trait::async_trait;
+use derive_more::Display;
+use mm2_net::transport::{post_json, SlurpError};
+use std::collections::HashMap;
+
+pub const TELEGRAM_BOT_API_ENDPOINT: &str = "https://api.telegram.org/bot";
+
+pub type ChatIdRegistry = HashMap<String, String>;
+
+#[derive(Debug, Deserialize)]
+pub struct SendMessageResponse {
+    pub ok: bool,
+}
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum TelegramError {
+    #[display(fmt = "{}", _0)]
+    RequestError(SlurpError),
+}
+
+impl From<SlurpError> for TelegramError {
+    fn from(err: SlurpError) -> Self { TelegramError::RequestError(err) }
+}
+
+#[derive(Clone)]
+pub struct TgClient {
+    url: String,
+    api_key: String,
+    chat_id_registry: ChatIdRegistry,
+}
+
+impl TgClient {
+    pub fn new(api_key: String, url: Option<String>, chat_id_registry: ChatIdRegistry) -> Self {
+        TgClient {
+            url: url.unwrap_or_else(|| TELEGRAM_BOT_API_ENDPOINT.to_string()),
+            api_key,
+            chat_id_registry,
+        }
+    }
+}
+
+#[async_trait]
+impl MessageServiceTraits for TgClient {
+    async fn send_message(&self, message: String, room_id: &str, disable_notification: bool) -> MessageResult<bool> {
+        let uri = self.url.to_owned() + self.api_key.as_str() + "/sendMessage";
+        if let Some(chat_id) = self.chat_id_registry.get(room_id) {
+            let json = json!({ "chat_id": chat_id, "text": message, "disable_notification": disable_notification });
+            let result = post_json::<SendMessageResponse>(uri.as_str(), json.to_string())
+                .await
+                .map_err(|e| TelegramError::RequestError(e.into_inner()))?;
+            return Ok(result.ok);
+        }
+        Ok(false)
+    }
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod telegram_tests {
+    use crate::mm2::lp_message_service::telegram::{ChatIdRegistry, TgClient};
+    use crate::mm2::lp_message_service::MessageServiceTraits;
+    use common::block_on;
+    use std::env::var;
+
+    #[test]
+    fn test_send_message() {
+        if let Ok(api_key) = var("TELEGRAM_API_KEY") {
+            let chat_registry: ChatIdRegistry = vec![("RustTestChatId".to_string(), "-645728650".to_string())]
+                .into_iter()
+                .collect();
+            let tg_client = TgClient::new(api_key, None, chat_registry);
+            let resp = block_on(tg_client.send_message("Hello from rust".to_string(), "RustTestChatId", true)).unwrap();
+            assert!(resp);
+        }
+    }
+}
diff --git a/mm2src/ordermatch_tests.rs b/mm2src/mm2_main/src/ordermatch_tests.rs
similarity index 87%
rename from mm2src/ordermatch_tests.rs
rename to mm2src/mm2_main/src/ordermatch_tests.rs
index 76992340ff..2b3988476b 100644
--- a/mm2src/ordermatch_tests.rs
+++ b/mm2src/mm2_main/src/ordermatch_tests.rs
@@ -1,13 +1,12 @@
 use super::*;
 use crate::mm2::lp_network::P2PContext;
-use crate::mm2::lp_ordermatch::new_protocol::PubkeyKeepAlive;
+use crate::mm2::lp_ordermatch::new_protocol::{MakerOrderUpdated, PubkeyKeepAlive};
 use coins::{MmCoin, TestCoin};
-use common::rusqlite::Connection;
-use common::{block_on,
-             executor::spawn,
-             mm_ctx::{MmArc, MmCtx, MmCtxBuilder},
-             privkey::key_pair_from_seed};
-use futures::{channel::mpsc, lock::Mutex as AsyncMutex, StreamExt};
+use common::{block_on, executor::spawn};
+use crypto::privkey::key_pair_from_seed;
+use db_common::sqlite::rusqlite::Connection;
+use futures::{channel::mpsc, StreamExt};
+use mm2_core::mm_ctx::{MmArc, MmCtx, MmCtxBuilder};
 use mm2_libp2p::atomicdex_behaviour::AdexBehaviourCmd;
 use mm2_libp2p::{decode_message, PeerId};
 use mocktopus::mocking::*;
@@ -34,6 +33,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let request = TakerRequest {
@@ -71,6 +71,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let request = TakerRequest {
@@ -108,6 +109,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let request = TakerRequest {
@@ -145,6 +147,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let request = TakerRequest {
@@ -182,6 +185,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let request = TakerRequest {
@@ -219,6 +223,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let request = TakerRequest {
@@ -258,6 +263,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
     let request = TakerRequest {
         base: "KMD".to_owned(),
@@ -297,6 +303,7 @@ fn test_match_maker_order_and_taker_request() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
     let request = TakerRequest {
         base: "REL".to_owned(),
@@ -367,6 +374,7 @@ fn test_maker_order_available_amount() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
     maker.matches.insert(Uuid::new_v4(), MakerMatch {
         request: TakerRequest {
@@ -467,6 +475,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -510,6 +519,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -553,6 +563,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -596,6 +607,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -639,6 +651,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -682,6 +695,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -725,6 +739,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -768,6 +783,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -811,6 +827,7 @@ fn test_taker_match_reserved() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -857,6 +874,7 @@ fn test_taker_order_cancellable() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     assert!(order.is_cancellable());
@@ -886,6 +904,7 @@ fn test_taker_order_cancellable() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     order.matches.insert(Uuid::new_v4(), TakerMatch {
@@ -921,60 +940,75 @@ fn prepare_for_cancel_by(ctx: &MmArc) -> mpsc::Receiver<AdexBehaviourCmd> {
     p2p_ctx.store_to_mm_arc(ctx);
 
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
-    let mut maker_orders = block_on(ordermatch_ctx.my_maker_orders.lock());
+    let mut maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
     let mut taker_orders = block_on(ordermatch_ctx.my_taker_orders.lock());
 
-    maker_orders.insert(Uuid::from_bytes([0; 16]), MakerOrder {
-        uuid: Uuid::from_bytes([0; 16]),
-        base: "RICK".into(),
-        rel: "MORTY".into(),
-        created_at: now_ms(),
-        updated_at: Some(now_ms()),
-        matches: HashMap::new(),
-        max_base_vol: 0.into(),
-        min_base_vol: 0.into(),
-        price: 0.into(),
-        started_swaps: vec![],
-        conf_settings: None,
-        changes_history: None,
-        save_in_history: false,
-        base_orderbook_ticker: None,
-        rel_orderbook_ticker: None,
-    });
-    maker_orders.insert(Uuid::from_bytes([1; 16]), MakerOrder {
-        uuid: Uuid::from_bytes([1; 16]),
-        base: "MORTY".into(),
-        rel: "RICK".into(),
-        created_at: now_ms(),
-        updated_at: Some(now_ms()),
-        matches: HashMap::new(),
-        max_base_vol: 0.into(),
-        min_base_vol: 0.into(),
-        price: 0.into(),
-        started_swaps: vec![],
-        conf_settings: None,
-        changes_history: None,
-        save_in_history: false,
-        base_orderbook_ticker: None,
-        rel_orderbook_ticker: None,
-    });
-    maker_orders.insert(Uuid::from_bytes([2; 16]), MakerOrder {
-        uuid: Uuid::from_bytes([2; 16]),
-        base: "MORTY".into(),
-        rel: "ETH".into(),
-        created_at: now_ms(),
-        updated_at: Some(now_ms()),
-        matches: HashMap::new(),
-        max_base_vol: 0.into(),
-        min_base_vol: 0.into(),
-        price: 0.into(),
-        started_swaps: vec![],
-        conf_settings: None,
-        changes_history: None,
-        save_in_history: false,
-        base_orderbook_ticker: None,
-        rel_orderbook_ticker: None,
-    });
+    maker_orders_ctx.add_order(
+        ctx.weak(),
+        MakerOrder {
+            uuid: Uuid::from_bytes([0; 16]),
+            base: "RICK".into(),
+            rel: "MORTY".into(),
+            created_at: now_ms(),
+            updated_at: Some(now_ms()),
+            matches: HashMap::new(),
+            max_base_vol: 0.into(),
+            min_base_vol: 0.into(),
+            price: 0.into(),
+            started_swaps: vec![],
+            conf_settings: None,
+            changes_history: None,
+            save_in_history: false,
+            base_orderbook_ticker: None,
+            rel_orderbook_ticker: None,
+            p2p_privkey: None,
+        },
+        None,
+    );
+    maker_orders_ctx.add_order(
+        ctx.weak(),
+        MakerOrder {
+            uuid: Uuid::from_bytes([1; 16]),
+            base: "MORTY".into(),
+            rel: "RICK".into(),
+            created_at: now_ms(),
+            updated_at: Some(now_ms()),
+            matches: HashMap::new(),
+            max_base_vol: 0.into(),
+            min_base_vol: 0.into(),
+            price: 0.into(),
+            started_swaps: vec![],
+            conf_settings: None,
+            changes_history: None,
+            save_in_history: false,
+            base_orderbook_ticker: None,
+            rel_orderbook_ticker: None,
+            p2p_privkey: None,
+        },
+        None,
+    );
+    maker_orders_ctx.add_order(
+        ctx.weak(),
+        MakerOrder {
+            uuid: Uuid::from_bytes([2; 16]),
+            base: "MORTY".into(),
+            rel: "ETH".into(),
+            created_at: now_ms(),
+            updated_at: Some(now_ms()),
+            matches: HashMap::new(),
+            max_base_vol: 0.into(),
+            min_base_vol: 0.into(),
+            price: 0.into(),
+            started_swaps: vec![],
+            conf_settings: None,
+            changes_history: None,
+            save_in_history: false,
+            base_orderbook_ticker: None,
+            rel_orderbook_ticker: None,
+            p2p_privkey: None,
+        },
+        None,
+    );
     taker_orders.insert(Uuid::from_bytes([3; 16]), TakerOrder {
         matches: HashMap::new(),
         created_at: now_ms(),
@@ -998,6 +1032,7 @@ fn prepare_for_cancel_by(ctx: &MmArc) -> mpsc::Receiver<AdexBehaviourCmd> {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     });
     rx
 }
@@ -1010,10 +1045,10 @@ fn test_cancel_by_single_coin() {
     let rx = prepare_for_cancel_by(&ctx);
 
     let connection = Connection::open_in_memory().unwrap();
-    let _ = ctx.sqlite_connection.pin(Mutex::new(connection));
+    let _ = ctx.sqlite_connection.pin(Arc::new(Mutex::new(connection)));
 
-    delete_my_maker_order.mock_safe(|_, _, _| MockResult::Return(()));
-    delete_my_taker_order.mock_safe(|_, _, _| MockResult::Return(()));
+    delete_my_maker_order.mock_safe(|_, _, _| MockResult::Return(Box::new(futures01::future::ok(()))));
+    delete_my_taker_order.mock_safe(|_, _, _| MockResult::Return(Box::new(futures01::future::ok(()))));
 
     let (cancelled, _) = block_on(cancel_orders_by(&ctx, CancelBy::Coin { ticker: "RICK".into() })).unwrap();
     block_on(rx.take(2).collect::<Vec<_>>());
@@ -1031,10 +1066,10 @@ fn test_cancel_by_pair() {
     let rx = prepare_for_cancel_by(&ctx);
 
     let connection = Connection::open_in_memory().unwrap();
-    let _ = ctx.sqlite_connection.pin(Mutex::new(connection));
+    let _ = ctx.sqlite_connection.pin(Arc::new(Mutex::new(connection)));
 
-    delete_my_maker_order.mock_safe(|_, _, _| MockResult::Return(()));
-    delete_my_taker_order.mock_safe(|_, _, _| MockResult::Return(()));
+    delete_my_maker_order.mock_safe(|_, _, _| MockResult::Return(Box::new(futures01::future::ok(()))));
+    delete_my_taker_order.mock_safe(|_, _, _| MockResult::Return(Box::new(futures01::future::ok(()))));
 
     let (cancelled, _) = block_on(cancel_orders_by(&ctx, CancelBy::Pair {
         base: "RICK".into(),
@@ -1056,10 +1091,10 @@ fn test_cancel_by_all() {
     let rx = prepare_for_cancel_by(&ctx);
 
     let connection = Connection::open_in_memory().unwrap();
-    let _ = ctx.sqlite_connection.pin(Mutex::new(connection));
+    let _ = ctx.sqlite_connection.pin(Arc::new(Mutex::new(connection)));
 
-    delete_my_maker_order.mock_safe(|_, _, _| MockResult::Return(()));
-    delete_my_taker_order.mock_safe(|_, _, _| MockResult::Return(()));
+    delete_my_maker_order.mock_safe(|_, _, _| MockResult::Return(Box::new(futures01::future::ok(()))));
+    delete_my_taker_order.mock_safe(|_, _, _| MockResult::Return(Box::new(futures01::future::ok(()))));
 
     let (cancelled, _) = block_on(cancel_orders_by(&ctx, CancelBy::All)).unwrap();
     block_on(rx.take(3).collect::<Vec<_>>());
@@ -1101,6 +1136,7 @@ fn test_taker_order_match_by() {
         save_in_history: false,
         base_orderbook_ticker: None,
         rel_orderbook_ticker: None,
+        p2p_privkey: None,
     };
 
     let reserved = MakerReserved {
@@ -1135,6 +1171,36 @@ fn test_taker_order_match_by() {
     assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved));
 }
 
+#[test]
+fn test_maker_order_was_updated() {
+    let created_at = now_ms();
+    let mut maker_order = MakerOrder {
+        base: "BASE".into(),
+        rel: "REL".into(),
+        created_at,
+        updated_at: Some(created_at),
+        max_base_vol: 10.into(),
+        min_base_vol: 0.into(),
+        price: 1.into(),
+        matches: HashMap::new(),
+        started_swaps: Vec::new(),
+        uuid: Uuid::new_v4(),
+        conf_settings: None,
+        changes_history: None,
+        save_in_history: false,
+        base_orderbook_ticker: None,
+        rel_orderbook_ticker: None,
+        p2p_privkey: None,
+    };
+    let mut update_msg = MakerOrderUpdated::new(maker_order.uuid);
+    update_msg.with_new_price(BigRational::from_integer(2.into()));
+
+    std::thread::sleep(Duration::from_secs(1));
+
+    maker_order.apply_updated(&update_msg);
+    assert!(maker_order.was_updated());
+}
+
 #[test]
 fn lp_connect_start_bob_should_not_be_invoked_if_order_match_already_connected() {
     let order_json = r#"{"max_base_vol":"1","max_base_vol_rat":[[1,[1]],[1,[1]]],"min_base_vol":"0","min_base_vol_rat":[[0,[]],[1,[1]]],"price":"1","price_rat":[[1,[1]],[1,[1]]],"created_at":1589265312093,"updated_at":1589265312093,"base":"ETH","rel":"JST","matches":{"2f9afe84-7a89-4194-8947-45fba563118f":{"request":{"base":"ETH","rel":"JST","base_amount":"0.1","base_amount_rat":[[1,[1]],[1,[10]]],"rel_amount":"0.2","rel_amount_rat":[[1,[1]],[1,[5]]],"action":"Buy","uuid":"2f9afe84-7a89-4194-8947-45fba563118f","method":"request","sender_pubkey":"031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3","dest_pub_key":"0000000000000000000000000000000000000000000000000000000000000000","match_by":{"type":"Any"}},"reserved":{"base":"ETH","rel":"JST","base_amount":"0.1","base_amount_rat":[[1,[1]],[1,[10]]],"rel_amount":"0.1","rel_amount_rat":[[1,[1]],[1,[10]]],"taker_order_uuid":"2f9afe84-7a89-4194-8947-45fba563118f","maker_order_uuid":"5f6516ea-ccaa-453a-9e37-e1c2c0d527e3","method":"reserved","sender_pubkey":"c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3ed","dest_pub_key":"031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3"},"connect":{"taker_order_uuid":"2f9afe84-7a89-4194-8947-45fba563118f","maker_order_uuid":"5f6516ea-ccaa-453a-9e37-e1c2c0d527e3","method":"connect","sender_pubkey":"031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3","dest_pub_key":"c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3ed"},"connected":{"taker_order_uuid":"2f9afe84-7a89-4194-8947-45fba563118f","maker_order_uuid":"5f6516ea-ccaa-453a-9e37-e1c2c0d527e3","method":"connected","sender_pubkey":"c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3ed","dest_pub_key":"031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3"},"last_updated":1589265314408}},"started_swaps":["2f9afe84-7a89-4194-8947-45fba563118f"],"uuid":"5f6516ea-ccaa-453a-9e37-e1c2c0d527e3"}"#;
@@ -1145,7 +1211,10 @@ fn lp_connect_start_bob_should_not_be_invoked_if_order_match_already_connected()
         )
         .into_mm_arc();
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    block_on(ordermatch_ctx.my_maker_orders.lock()).insert(maker_order.uuid, maker_order);
+    ordermatch_ctx
+        .maker_orders_ctx
+        .lock()
+        .add_order(ctx.weak(), maker_order, None);
 
     static mut CONNECT_START_CALLED: bool = false;
     lp_connect_start_bob.mock_safe(|_, _, _| {
@@ -1170,13 +1239,16 @@ fn should_process_request_only_once() {
         )
         .into_mm_arc();
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    block_on(ordermatch_ctx.my_maker_orders.lock()).insert(maker_order.uuid, maker_order);
+    ordermatch_ctx
+        .maker_orders_ctx
+        .lock()
+        .add_order(ctx.weak(), maker_order, None);
     let request: TakerRequest = json::from_str(
         r#"{"base":"ETH","rel":"JST","base_amount":"0.1","base_amount_rat":[[1,[1]],[1,[10]]],"rel_amount":"0.2","rel_amount_rat":[[1,[1]],[1,[5]]],"action":"Buy","uuid":"2f9afe84-7a89-4194-8947-45fba563118f","method":"request","sender_pubkey":"031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3","dest_pub_key":"0000000000000000000000000000000000000000000000000000000000000000","match_by":{"type":"Any"}}"#,
     ).unwrap();
     block_on(process_taker_request(ctx, Default::default(), request));
-    let maker_orders = block_on(ordermatch_ctx.my_maker_orders.lock());
-    let order = maker_orders.get(&uuid).unwrap();
+    let maker_orders = &ordermatch_ctx.maker_orders_ctx.lock().orders;
+    let order = block_on(maker_orders.get(&uuid).unwrap().lock());
     // when new request is processed match is replaced with new instance resetting
     // connect and connected to None so by checking is_some we check that request message is ignored
     assert!(order
@@ -1546,7 +1618,7 @@ fn test_choose_taker_confs_settings_sell_action() {
 }
 
 fn make_ctx_for_tests() -> (MmArc, String, [u8; 32]) {
-    let ctx = MmArc(Arc::new(MmCtx::default()));
+    let ctx = MmArc::new(MmCtx::default());
     ctx.init_metrics().unwrap();
     ctx.secp256k1_key_pair
         .pin(key_pair_from_seed("passphrase").unwrap())
@@ -1600,7 +1672,7 @@ fn p2p_context_mock() -> (mpsc::Sender<AdexBehaviourCmd>, mpsc::Receiver<AdexBeh
     let cmd_sender = cmd_tx.clone();
     P2PContext::fetch_from_mm_arc.mock_safe(move |_| {
         MockResult::Return(Arc::new(P2PContext {
-            cmd_tx: AsyncMutex::new(cmd_sender.clone()),
+            cmd_tx: PaMutex::new(cmd_sender.clone()),
         }))
     });
     (cmd_tx, cmd_rx)
@@ -1642,7 +1714,7 @@ fn test_process_get_orderbook_request() {
     let ordermatch_ctx_clone = ordermatch_ctx.clone();
     OrdermatchContext::from_ctx.mock_safe(move |_| MockResult::Return(Ok(ordermatch_ctx_clone.clone())));
 
-    let mut orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
 
     for order in orders_by_pubkeys.iter().map(|(_pubkey, orders)| orders).flatten() {
         orderbook.insert_or_update_order_update_trie(order.clone());
@@ -1651,13 +1723,9 @@ fn test_process_get_orderbook_request() {
     // avoid dead lock on orderbook as process_get_orderbook_request also acquires it
     drop(orderbook);
 
-    let encoded = block_on(process_get_orderbook_request(
-        ctx.clone(),
-        "RICK".into(),
-        "MORTY".into(),
-    ))
-    .unwrap()
-    .unwrap();
+    let encoded = process_get_orderbook_request(ctx.clone(), "RICK".into(), "MORTY".into())
+        .unwrap()
+        .unwrap();
 
     let orderbook = decode_message::<GetOrderbookRes>(&encoded).unwrap();
     for (pubkey, item) in orderbook.pubkey_orders {
@@ -1668,10 +1736,16 @@ fn test_process_get_orderbook_request() {
         let mut actual: Vec<OrderbookItem> = item
             .orders
             .iter()
-            .map(|(_uuid, order)| OrderbookItem::from_p2p_and_proto_info(order.clone(), BaseRelProtocolInfo::default()))
+            .map(|(_uuid, order)| {
+                OrderbookItem::from_p2p_and_info(
+                    order.clone(),
+                    BaseRelProtocolInfo::default(),
+                    Some(OrderConfirmationsSettings::default()),
+                )
+            })
             .collect();
         actual.sort_unstable_by(|x, y| x.uuid.cmp(&y.uuid));
-        log!([pubkey]"-"[actual.len()]);
+        log!("{:?}-{:?}", pubkey, actual.len());
         assert_eq!(actual, *expected);
     }
 }
@@ -1684,7 +1758,7 @@ fn test_process_get_orderbook_request_limit() {
     let ordermatch_ctx_clone = ordermatch_ctx.clone();
     OrdermatchContext::from_ctx.mock_safe(move |_| MockResult::Return(Ok(ordermatch_ctx_clone.clone())));
 
-    let mut orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
 
     let orders = make_random_orders(
         pubkey,
@@ -1701,15 +1775,11 @@ fn test_process_get_orderbook_request_limit() {
     // avoid dead lock on orderbook as process_get_orderbook_request also acquires it
     drop(orderbook);
 
-    let err = block_on(process_get_orderbook_request(
-        ctx.clone(),
-        "RICK".into(),
-        "MORTY".into(),
-    ))
-    .err()
-    .expect("Expected an error");
+    let err = process_get_orderbook_request(ctx.clone(), "RICK".into(), "MORTY".into())
+        .err()
+        .expect("Expected an error");
 
-    log!("error: "(err));
+    log!("error: {}", err);
     assert!(err.contains("Orderbook too large"));
 }
 
@@ -1743,7 +1813,7 @@ fn test_request_and_fill_orderbook() {
     {
         let (pubkey, secret) = &other_pubkeys[0];
         for extra_order in make_random_orders(pubkey.clone(), secret, "RICK".into(), "MORTY".into(), 2) {
-            block_on(insert_or_update_order(&ctx, extra_order));
+            insert_or_update_order(&ctx, extra_order);
         }
     }
 
@@ -1765,11 +1835,21 @@ fn test_request_and_fill_orderbook() {
         let actual = decode_message::<P2PRequest>(&req).unwrap();
         assert_eq!(actual, expected_request);
 
+        let mut conf_infos = HashMap::new();
         let result = orders
             .into_iter()
             .map(|(pubkey, orders)| {
+                let orders = orders
+                    .into_iter()
+                    .map(|(uuid, order)| {
+                        if let Some(conf_settings) = order.conf_settings {
+                            conf_infos.insert(uuid, conf_settings);
+                        }
+                        (uuid, order.into())
+                    })
+                    .collect();
                 let item = GetOrderbookPubkeyItem {
-                    orders: orders.into_iter().map(|(uuid, order)| (uuid, order.into())).collect(),
+                    orders,
                     last_keep_alive: now_ms() / 1000,
                     last_signed_pubkey_payload: vec![],
                 };
@@ -1779,6 +1859,7 @@ fn test_request_and_fill_orderbook() {
         let orderbook = GetOrderbookRes {
             pubkey_orders: result,
             protocol_infos: HashMap::new(),
+            conf_infos,
         };
         let encoded = encode_message(&orderbook).unwrap();
 
@@ -1790,7 +1871,7 @@ fn test_request_and_fill_orderbook() {
 
     // check if the best asks and bids are in the orderbook
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let orderbook = ordermatch_ctx.orderbook.lock();
 
     let expected = expected_orders
         .iter()
@@ -2172,7 +2253,7 @@ fn test_orderbook_insert_or_update_order() {
 
 fn pair_trie_root_by_pub(ctx: &MmArc, pubkey: &str, pair: &str) -> H64 {
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
-    let orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let orderbook = ordermatch_ctx.orderbook.lock();
     *orderbook
         .pubkeys_state
         .get(pubkey)
@@ -2184,13 +2265,13 @@ fn pair_trie_root_by_pub(ctx: &MmArc, pubkey: &str, pair: &str) -> H64 {
 
 fn clone_orderbook_memory_db(ctx: &MmArc) -> MemoryDB<Blake2Hasher64> {
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
-    let orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let orderbook = ordermatch_ctx.orderbook.lock();
     orderbook.memory_db.clone()
 }
 
 fn remove_order(ctx: &MmArc, uuid: Uuid) {
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
-    let mut orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
     orderbook.remove_order_trie_update(uuid);
 }
 
@@ -2200,7 +2281,7 @@ fn test_process_sync_pubkey_orderbook_state_after_new_orders_added() {
     let orders = make_random_orders(pubkey.clone(), &secret, "C1".into(), "C2".into(), 100);
 
     for order in orders {
-        block_on(insert_or_update_order(&ctx, order));
+        insert_or_update_order(&ctx, order);
     }
 
     let alb_ordered_pair = alb_ordered_pair("C1", "C2");
@@ -2212,16 +2293,12 @@ fn test_process_sync_pubkey_orderbook_state_after_new_orders_added() {
 
     let new_orders = make_random_orders(pubkey.clone(), &secret, "C1".into(), "C2".into(), 100);
     for order in new_orders {
-        block_on(insert_or_update_order(&ctx, order.clone()));
+        insert_or_update_order(&ctx, order.clone());
     }
 
-    let mut result = block_on(process_sync_pubkey_orderbook_state(
-        ctx.clone(),
-        pubkey.clone(),
-        prev_pairs_state,
-    ))
-    .unwrap()
-    .unwrap();
+    let mut result = process_sync_pubkey_orderbook_state(ctx.clone(), pubkey.clone(), prev_pairs_state)
+        .unwrap()
+        .unwrap();
 
     // check pair trie root
     let expected_root_hash = pair_trie_root_by_pub(&ctx, &pubkey, &alb_ordered_pair);
@@ -2238,7 +2315,7 @@ fn test_process_sync_pubkey_orderbook_state_after_new_orders_added() {
             (
                 *uuid.as_bytes(),
                 order.map(|o| {
-                    let o = OrderbookItem::from_p2p_and_proto_info(o, BaseRelProtocolInfo::default());
+                    let o = OrderbookItem::from_p2p_and_info(o, BaseRelProtocolInfo::default(), None);
                     o.trie_state_bytes()
                 }),
             )
@@ -2254,17 +2331,17 @@ fn test_diff_should_not_be_written_if_hash_not_changed_on_insert() {
     let orders = make_random_orders(pubkey.clone(), &secret, "C1".into(), "C2".into(), 100);
 
     for order in orders.clone() {
-        block_on(insert_or_update_order(&ctx, order));
+        insert_or_update_order(&ctx, order);
     }
 
     let alb_ordered_pair = alb_ordered_pair("C1", "C2");
     let pair_trie_root = pair_trie_root_by_pub(&ctx, &pubkey, &alb_ordered_pair);
     for order in orders.clone() {
-        block_on(insert_or_update_order(&ctx, order));
+        insert_or_update_order(&ctx, order);
     }
 
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let orderbook = ordermatch_ctx.orderbook.lock();
     let pubkey_state = orderbook.pubkeys_state.get(&pubkey).unwrap();
     assert!(!pubkey_state
         .order_pairs_trie_state_history
@@ -2279,7 +2356,7 @@ fn test_process_sync_pubkey_orderbook_state_after_orders_removed() {
     let orders = make_random_orders(pubkey.clone(), &secret, "C1".into(), "C2".into(), 100);
 
     for order in orders.clone() {
-        block_on(insert_or_update_order(&ctx, order));
+        insert_or_update_order(&ctx, order);
     }
 
     let alb_ordered_pair = alb_ordered_pair("C1", "C2");
@@ -2296,13 +2373,9 @@ fn test_process_sync_pubkey_orderbook_state_after_orders_removed() {
         remove_order(&ctx, order.uuid);
     }
 
-    let mut result = block_on(process_sync_pubkey_orderbook_state(
-        ctx.clone(),
-        pubkey.clone(),
-        prev_pairs_state,
-    ))
-    .unwrap()
-    .unwrap();
+    let mut result = process_sync_pubkey_orderbook_state(ctx.clone(), pubkey.clone(), prev_pairs_state)
+        .unwrap()
+        .unwrap();
 
     // check pair trie root
     let expected_root_hash = pair_trie_root_by_pub(&ctx, &pubkey, &alb_ordered_pair);
@@ -2329,7 +2402,7 @@ fn test_diff_should_not_be_written_if_hash_not_changed_on_remove() {
     let orders = make_random_orders(pubkey.clone(), &secret, "C1".into(), "C2".into(), 100);
 
     for order in orders.clone() {
-        block_on(insert_or_update_order(&ctx, order));
+        insert_or_update_order(&ctx, order);
     }
 
     let to_remove: Vec<_> = orders
@@ -2347,7 +2420,7 @@ fn test_diff_should_not_be_written_if_hash_not_changed_on_remove() {
     let pair_trie_root = pair_trie_root_by_pub(&ctx, &pubkey, &alb_ordered_pair);
 
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let orderbook = ordermatch_ctx.orderbook.lock();
     let pubkey_state = orderbook.pubkeys_state.get(&pubkey).unwrap();
     assert!(!pubkey_state
         .order_pairs_trie_state_history
@@ -2461,7 +2534,7 @@ fn test_process_sync_pubkey_orderbook_state_points_to_not_uptodate_trie_root() {
         .expect("Expected one order");
 
     for order in orders.iter() {
-        block_on(insert_or_update_order(&ctx, order.clone()));
+        insert_or_update_order(&ctx, order.clone());
     }
 
     let alb_pair = alb_ordered_pair("RICK", "MORTY");
@@ -2469,9 +2542,9 @@ fn test_process_sync_pubkey_orderbook_state_points_to_not_uptodate_trie_root() {
     // update trie root by adding a new order and do not update history
     let (old_root, _new_root) = {
         let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-        let mut orderbook = block_on(ordermatch_ctx.orderbook.lock());
+        let mut orderbook = ordermatch_ctx.orderbook.lock();
 
-        log!([pubkey]", found "[orderbook.pubkeys_state.keys()]);
+        log!("{:?}, found {:?}", pubkey, orderbook.pubkeys_state.keys());
         let old_root = *orderbook
             .pubkeys_state
             .get_mut(&pubkey)
@@ -2504,7 +2577,7 @@ fn test_process_sync_pubkey_orderbook_state_points_to_not_uptodate_trie_root() {
 
     let SyncPubkeyOrderbookStateRes {
         mut pair_orders_diff, ..
-    } = block_on(process_sync_pubkey_orderbook_state(ctx, pubkey, roots))
+    } = process_sync_pubkey_orderbook_state(ctx, pubkey, roots)
         .expect("!process_sync_pubkey_orderbook_state")
         .expect("Expected MORTY:RICK delta, returned None");
 
@@ -2608,13 +2681,13 @@ fn test_remove_and_purge_pubkey_pair_orders() {
     let rick_kmd_orders = make_random_orders(pubkey.clone(), &secret, "RICK".into(), "KMD".into(), 10);
 
     for order in rick_morty_orders.iter().chain(rick_kmd_orders.iter()) {
-        block_on(insert_or_update_order(&ctx, order.clone()));
+        insert_or_update_order(&ctx, order.clone());
     }
 
     let rick_morty_pair = alb_ordered_pair("RICK", "MORTY");
 
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let mut orderbook = block_on(ordermatch_ctx.orderbook.lock());
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
 
     remove_pubkey_pair_orders(&mut orderbook, &pubkey, &rick_morty_pair);
     check_if_orderbook_contains_only(&orderbook, &pubkey, &rick_kmd_orders);
@@ -2628,17 +2701,17 @@ fn test_orderbook_sync_trie_diff_time_cache() {
     let rick_morty_pair = alb_ordered_pair("RICK", "MORTY");
 
     for order in &rick_morty_orders[..5] {
-        block_on(insert_or_update_order(&ctx_bob, order.clone()));
+        insert_or_update_order(&ctx_bob, order.clone());
     }
 
     std::thread::sleep(Duration::from_secs(3));
 
     for order in &rick_morty_orders[5..10] {
-        block_on(insert_or_update_order(&ctx_bob, order.clone()));
+        insert_or_update_order(&ctx_bob, order.clone());
     }
 
     let ordermatch_ctx_bob = OrdermatchContext::from_ctx(&ctx_bob).unwrap();
-    let orderbook_bob = block_on(ordermatch_ctx_bob.orderbook.lock());
+    let orderbook_bob = ordermatch_ctx_bob.orderbook.lock();
     let bob_state = orderbook_bob.pubkeys_state.get(&pubkey_bob).unwrap();
     let rick_morty_history_bob = bob_state.order_pairs_trie_state_history.get(&rick_morty_pair).unwrap();
     assert_eq!(rick_morty_history_bob.len(), 5);
@@ -2647,11 +2720,11 @@ fn test_orderbook_sync_trie_diff_time_cache() {
     let (ctx_alice, ..) = make_ctx_for_tests();
 
     for order in &rick_morty_orders[..3] {
-        block_on(insert_or_update_order(&ctx_alice, order.clone()));
+        insert_or_update_order(&ctx_alice, order.clone());
     }
 
     let ordermatch_ctx_alice = OrdermatchContext::from_ctx(&ctx_alice).unwrap();
-    let mut orderbook_alice = block_on(ordermatch_ctx_alice.orderbook.lock());
+    let mut orderbook_alice = ordermatch_ctx_alice.orderbook.lock();
     let bob_state_on_alice_side = orderbook_alice.pubkeys_state.get(&pubkey_bob).unwrap();
 
     let alice_root = bob_state_on_alice_side.trie_roots.get(&rick_morty_pair).unwrap();
@@ -2671,15 +2744,19 @@ fn test_orderbook_sync_trie_diff_time_cache() {
         _ => panic!("Expected DeltaOrFullTrie::FullTrie"),
     };
 
+    let params = ProcessTrieParams {
+        pubkey: &pubkey_bob,
+        alb_pair: &rick_morty_pair,
+        protocol_infos: &HashMap::new(),
+        conf_infos: &HashMap::new(),
+    };
     let new_alice_root = process_pubkey_full_trie(
         &mut orderbook_alice,
-        &pubkey_bob,
-        &rick_morty_pair,
         full_trie
             .into_iter()
             .map(|(uuid, order)| (uuid, order.into()))
             .collect(),
-        &HashMap::new(),
+        params,
     );
 
     assert_eq!(new_alice_root, *bob_root);
@@ -2688,17 +2765,17 @@ fn test_orderbook_sync_trie_diff_time_cache() {
     drop(orderbook_alice);
 
     for order in &rick_morty_orders[10..] {
-        block_on(insert_or_update_order(&ctx_bob, order.clone()));
+        insert_or_update_order(&ctx_bob, order.clone());
     }
 
-    let mut orderbook_bob = block_on(ordermatch_ctx_bob.orderbook.lock());
+    let mut orderbook_bob = ordermatch_ctx_bob.orderbook.lock();
 
     orderbook_bob.remove_order_trie_update(rick_morty_orders[12].uuid);
 
     let bob_state = orderbook_bob.pubkeys_state.get(&pubkey_bob).unwrap();
     let rick_morty_history_bob = bob_state.order_pairs_trie_state_history.get(&rick_morty_pair).unwrap();
 
-    let mut orderbook_alice = block_on(ordermatch_ctx_alice.orderbook.lock());
+    let mut orderbook_alice = ordermatch_ctx_alice.orderbook.lock();
     let bob_state_on_alice_side = orderbook_alice.pubkeys_state.get(&pubkey_bob).unwrap();
 
     let alice_root = bob_state_on_alice_side.trie_roots.get(&rick_morty_pair).unwrap();
@@ -2719,15 +2796,19 @@ fn test_orderbook_sync_trie_diff_time_cache() {
         _ => panic!("Expected DeltaOrFullTrie::Delta"),
     };
 
+    let params = ProcessTrieParams {
+        pubkey: &pubkey_bob,
+        alb_pair: &rick_morty_pair,
+        protocol_infos: &HashMap::new(),
+        conf_infos: &HashMap::new(),
+    };
     let new_alice_root = process_trie_delta(
         &mut orderbook_alice,
-        &pubkey_bob,
-        &rick_morty_pair,
         trie_delta
             .into_iter()
             .map(|(uuid, order)| (uuid, order.map(From::from)))
             .collect(),
-        &HashMap::new(),
+        params,
     );
     assert_eq!(new_alice_root, *bob_root);
 }
@@ -2740,7 +2821,7 @@ fn test_orderbook_order_pairs_trie_state_history_updates_expiration_on_insert()
     let rick_morty_pair = alb_ordered_pair("RICK", "MORTY");
 
     for order in &rick_morty_orders[..5] {
-        block_on(insert_or_update_order(&ctx_bob, order.clone()));
+        insert_or_update_order(&ctx_bob, order.clone());
     }
 
     // After 3 seconds RICK:MORTY pair trie state history will time out and will be empty
@@ -2748,11 +2829,11 @@ fn test_orderbook_order_pairs_trie_state_history_updates_expiration_on_insert()
 
     // Insert some more orders to remove expired timecache RICK:MORTY key
     for order in &rick_morty_orders[5..10] {
-        block_on(insert_or_update_order(&ctx_bob, order.clone()));
+        insert_or_update_order(&ctx_bob, order.clone());
     }
 
     let ordermatch_ctx_bob = OrdermatchContext::from_ctx(&ctx_bob).unwrap();
-    let orderbook_bob = block_on(ordermatch_ctx_bob.orderbook.lock());
+    let orderbook_bob = ordermatch_ctx_bob.orderbook.lock();
     let bob_state = orderbook_bob.pubkeys_state.get(&pubkey_bob).unwrap();
 
     // Only the last inserted 5 orders are found
@@ -2771,11 +2852,11 @@ fn test_orderbook_order_pairs_trie_state_history_updates_expiration_on_insert()
 
     // On inserting 5 more orders expiration for RICK:MORTY pair trie state history will be reset
     for order in &rick_morty_orders[10..] {
-        block_on(insert_or_update_order(&ctx_bob, order.clone()));
+        insert_or_update_order(&ctx_bob, order.clone());
     }
 
     let ordermatch_ctx_bob = OrdermatchContext::from_ctx(&ctx_bob).unwrap();
-    let orderbook_bob = block_on(ordermatch_ctx_bob.orderbook.lock());
+    let orderbook_bob = ordermatch_ctx_bob.orderbook.lock();
     let bob_state = orderbook_bob.pubkeys_state.get(&pubkey_bob).unwrap();
 
     assert_eq!(
@@ -2792,7 +2873,7 @@ fn test_orderbook_order_pairs_trie_state_history_updates_expiration_on_insert()
     std::thread::sleep(Duration::from_secs(1));
 
     let ordermatch_ctx_bob = OrdermatchContext::from_ctx(&ctx_bob).unwrap();
-    let orderbook_bob = block_on(ordermatch_ctx_bob.orderbook.lock());
+    let orderbook_bob = ordermatch_ctx_bob.orderbook.lock();
     let bob_state = orderbook_bob.pubkeys_state.get(&pubkey_bob).unwrap();
 
     // After 3 seconds from inserting orders number 6-10 these orders have not expired due to updated expiration on inserting orders 11-15
@@ -2853,6 +2934,12 @@ fn test_trie_state_bytes() {
         created_at,
         base_protocol_info: vec![1, 2, 3],
         rel_protocol_info: vec![4, 5, 6],
+        conf_settings: Some(OrderConfirmationsSettings {
+            base_confs: 6,
+            base_nota: false,
+            rel_confs: 3,
+            rel_nota: true,
+        }),
     };
 
     let new_bytes = new.trie_state_bytes();
@@ -2911,25 +2998,72 @@ fn check_get_orderbook_p2p_res_serde() {
     let item = GetOrderbookPubkeyItemV1 {
         last_keep_alive: 100,
         last_signed_pubkey_payload: vec![1, 2, 3],
-        orders: orders.into_iter().map(|order| (order.uuid, order.into())).collect(),
+        orders: orders
+            .clone()
+            .into_iter()
+            .map(|order| (order.uuid, order.into()))
+            .collect(),
     };
 
-    let old = GetOrderbookResV1 {
+    let v1 = GetOrderbookResV1 {
         pubkey_orders: HashMap::from_iter(std::iter::once(("pubkey".into(), item))),
     };
 
-    let old_serialized = rmp_serde::to_vec(&old).unwrap();
+    let v1_serialized = rmp_serde::to_vec(&v1).unwrap();
 
-    let mut new: GetOrderbookRes = rmp_serde::from_read_ref(&old_serialized).unwrap();
+    let mut new: GetOrderbookRes = rmp_serde::from_read_ref(&v1_serialized).unwrap();
     new.protocol_infos.insert(Uuid::new_v4(), BaseRelProtocolInfo {
         base: vec![1],
         rel: vec![2],
     });
+    new.conf_infos.insert(Uuid::new_v4(), OrderConfirmationsSettings {
+        base_confs: 6,
+        base_nota: false,
+        rel_confs: 3,
+        rel_nota: true,
+    });
 
     let new_serialized = rmp_serde::to_vec(&new).unwrap();
 
-    let old_from_new: GetOrderbookResV1 = rmp_serde::from_read_ref(&new_serialized).unwrap();
-    assert_eq!(old, old_from_new);
+    let v1_from_new: GetOrderbookResV1 = rmp_serde::from_read_ref(&new_serialized).unwrap();
+    assert_eq!(v1, v1_from_new);
+
+    #[derive(Debug, Deserialize, PartialEq, Serialize)]
+    struct GetOrderbookResV2 {
+        /// Asks and bids grouped by pubkey.
+        pubkey_orders: HashMap<String, GetOrderbookPubkeyItem>,
+        #[serde(default)]
+        protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
+    }
+
+    let item = GetOrderbookPubkeyItem {
+        last_keep_alive: 100,
+        last_signed_pubkey_payload: vec![1, 2, 3],
+        orders: orders.into_iter().map(|order| (order.uuid, order.into())).collect(),
+    };
+
+    let v2 = GetOrderbookResV2 {
+        pubkey_orders: HashMap::from_iter(std::iter::once(("pubkey".into(), item))),
+        protocol_infos: HashMap::from_iter(std::iter::once((Uuid::new_v4(), BaseRelProtocolInfo {
+            base: vec![1],
+            rel: vec![2],
+        }))),
+    };
+
+    let v2_serialized = rmp_serde::to_vec(&v2).unwrap();
+
+    let mut new: GetOrderbookRes = rmp_serde::from_read_ref(&v2_serialized).unwrap();
+    new.conf_infos.insert(Uuid::new_v4(), OrderConfirmationsSettings {
+        base_confs: 6,
+        base_nota: false,
+        rel_confs: 3,
+        rel_nota: true,
+    });
+
+    let new_serialized = rmp_serde::to_vec(&new).unwrap();
+
+    let v2_from_new: GetOrderbookResV2 = rmp_serde::from_read_ref(&new_serialized).unwrap();
+    assert_eq!(v2, v2_from_new);
 }
 
 #[test]
@@ -2970,23 +3104,174 @@ fn check_sync_pubkey_state_p2p_res_serde() {
 
     let orders = make_random_orders("".into(), &[1; 32], "RICK".into(), "MORTY".into(), 10);
 
-    let old = SyncPubkeyOrderbookStateResV1 {
+    let v1 = SyncPubkeyOrderbookStateResV1 {
         last_signed_pubkey_payload: vec![1, 2, 3, 4],
         pair_orders_diff: HashMap::from_iter(iter::once((
             alb_ordered_pair("RICK", "MORTY"),
-            DeltaOrFullTrie::FullTrie(orders.into_iter().map(|order| (order.uuid, order.into())).collect()),
+            DeltaOrFullTrie::FullTrie(
+                orders
+                    .clone()
+                    .into_iter()
+                    .map(|order| (order.uuid, order.into()))
+                    .collect(),
+            ),
         ))),
     };
 
-    let old_serialized = rmp_serde::to_vec(&old).unwrap();
+    let v1_serialized = rmp_serde::to_vec(&v1).unwrap();
 
-    let mut new: SyncPubkeyOrderbookStateRes = rmp_serde::from_read_ref(&old_serialized).unwrap();
+    let mut new: SyncPubkeyOrderbookStateRes = rmp_serde::from_read_ref(&v1_serialized).unwrap();
     new.protocol_infos.insert(Uuid::new_v4(), BaseRelProtocolInfo {
         base: vec![1],
         rel: vec![2],
     });
+    new.conf_infos.insert(Uuid::new_v4(), OrderConfirmationsSettings {
+        base_confs: 6,
+        base_nota: false,
+        rel_confs: 3,
+        rel_nota: true,
+    });
+
+    let new_serialized = rmp_serde::to_vec(&new).unwrap();
+
+    let _v1_from_new: SyncPubkeyOrderbookStateResV1 = rmp_serde::from_read_ref(&new_serialized).unwrap();
+
+    #[derive(Debug, Deserialize, Serialize)]
+    struct SyncPubkeyOrderbookStateResV2 {
+        /// last signed OrdermatchMessage payload from pubkey
+        last_signed_pubkey_payload: Vec<u8>,
+        pair_orders_diff: HashMap<AlbOrderedOrderbookPair, DeltaOrFullTrie<Uuid, OrderbookP2PItem>>,
+        #[serde(default)]
+        protocol_infos: HashMap<Uuid, BaseRelProtocolInfo>,
+    }
+
+    let v2 = SyncPubkeyOrderbookStateResV2 {
+        last_signed_pubkey_payload: vec![1, 2, 3, 4],
+        pair_orders_diff: HashMap::from_iter(iter::once((
+            alb_ordered_pair("RICK", "MORTY"),
+            DeltaOrFullTrie::FullTrie(orders.into_iter().map(|order| (order.uuid, order.into())).collect()),
+        ))),
+        protocol_infos: HashMap::from_iter(std::iter::once((Uuid::new_v4(), BaseRelProtocolInfo {
+            base: vec![1],
+            rel: vec![2],
+        }))),
+    };
+
+    let v2_serialized = rmp_serde::to_vec(&v2).unwrap();
+
+    let mut new: SyncPubkeyOrderbookStateRes = rmp_serde::from_read_ref(&v2_serialized).unwrap();
+    new.conf_infos.insert(Uuid::new_v4(), OrderConfirmationsSettings {
+        base_confs: 6,
+        base_nota: false,
+        rel_confs: 3,
+        rel_nota: true,
+    });
 
     let new_serialized = rmp_serde::to_vec(&new).unwrap();
 
-    let _old_from_new: SyncPubkeyOrderbookStateResV1 = rmp_serde::from_read_ref(&new_serialized).unwrap();
+    let _v2_from_new: SyncPubkeyOrderbookStateResV2 = rmp_serde::from_read_ref(&new_serialized).unwrap();
+}
+
+#[test]
+fn check_order_serde() {
+    let order_json = include_str!("for_tests/check_order_serde_payload.json");
+    let _order: Order = json::from_str(order_json).unwrap();
+}
+
+#[test]
+fn test_maker_order_balance_loops() {
+    let ctx = MmCtxBuilder::default()
+        .with_secp256k1_key_pair(key_pair_from_seed("123").unwrap())
+        .into_mm_arc();
+
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
+    let mut maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
+
+    let rick_ticker = "RICK";
+    let morty_ticker = "MORTY";
+
+    let rick_order = MakerOrder {
+        uuid: Uuid::from_bytes([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        base: rick_ticker.into(),
+        rel: morty_ticker.into(),
+        created_at: now_ms(),
+        updated_at: Some(now_ms()),
+        matches: HashMap::new(),
+        max_base_vol: 0.into(),
+        min_base_vol: 0.into(),
+        price: 0.into(),
+        started_swaps: vec![],
+        conf_settings: None,
+        changes_history: None,
+        save_in_history: false,
+        base_orderbook_ticker: None,
+        rel_orderbook_ticker: None,
+        p2p_privkey: None,
+    };
+
+    let morty_order = MakerOrder {
+        uuid: Uuid::from_bytes([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]),
+        base: morty_ticker.into(),
+        rel: rick_ticker.into(),
+        created_at: now_ms(),
+        updated_at: Some(now_ms()),
+        matches: HashMap::new(),
+        max_base_vol: 0.into(),
+        min_base_vol: 0.into(),
+        price: 0.into(),
+        started_swaps: vec![],
+        conf_settings: None,
+        changes_history: None,
+        save_in_history: false,
+        base_orderbook_ticker: None,
+        rel_orderbook_ticker: None,
+        p2p_privkey: None,
+    };
+
+    assert!(!maker_orders_ctx.balance_loop_exists(rick_ticker));
+    assert!(!maker_orders_ctx.balance_loop_exists(morty_ticker));
+    assert_eq!(maker_orders_ctx.count_by_tickers.get(rick_ticker), None);
+    assert_eq!(maker_orders_ctx.count_by_tickers.get(morty_ticker), None);
+
+    maker_orders_ctx.add_order(ctx.weak(), rick_order.clone(), None);
+    assert!(maker_orders_ctx.balance_loop_exists(rick_ticker));
+    assert_eq!(*maker_orders_ctx.count_by_tickers.get(rick_ticker).unwrap(), 1);
+
+    maker_orders_ctx.add_order(ctx.weak(), morty_order.clone(), None);
+    assert!(maker_orders_ctx.balance_loop_exists(morty_ticker));
+    assert_eq!(*maker_orders_ctx.count_by_tickers.get(morty_ticker).unwrap(), 1);
+
+    let rick_order_2 = MakerOrder {
+        uuid: Uuid::from_bytes([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]),
+        base: rick_ticker.into(),
+        rel: "MORTY2".into(),
+        created_at: now_ms(),
+        updated_at: Some(now_ms()),
+        matches: HashMap::new(),
+        max_base_vol: 0.into(),
+        min_base_vol: 0.into(),
+        price: 0.into(),
+        started_swaps: vec![],
+        conf_settings: None,
+        changes_history: None,
+        save_in_history: false,
+        base_orderbook_ticker: None,
+        rel_orderbook_ticker: None,
+        p2p_privkey: None,
+    };
+
+    maker_orders_ctx.add_order(ctx.weak(), rick_order_2.clone(), None);
+    assert_eq!(*maker_orders_ctx.count_by_tickers.get(rick_ticker).unwrap(), 2);
+
+    maker_orders_ctx.remove_order(&rick_order_2.uuid);
+    assert!(maker_orders_ctx.balance_loop_exists(rick_ticker));
+    assert_eq!(*maker_orders_ctx.count_by_tickers.get(rick_ticker).unwrap(), 1);
+
+    maker_orders_ctx.remove_order(&rick_order.uuid);
+    assert!(!maker_orders_ctx.balance_loop_exists(rick_ticker));
+    assert_eq!(*maker_orders_ctx.count_by_tickers.get(rick_ticker).unwrap(), 0);
+
+    maker_orders_ctx.remove_order(&morty_order.uuid);
+    assert!(!maker_orders_ctx.balance_loop_exists(morty_ticker));
+    assert_eq!(*maker_orders_ctx.count_by_tickers.get(morty_ticker).unwrap(), 0);
 }
diff --git a/mm2src/rpc.rs b/mm2src/mm2_main/src/rpc.rs
similarity index 90%
rename from mm2src/rpc.rs
rename to mm2src/mm2_main/src/rpc.rs
index e48e0bc129..226a7783a4 100644
--- a/mm2src/rpc.rs
+++ b/mm2src/mm2_main/src/rpc.rs
@@ -1,27 +1,28 @@
 /******************************************************************************
- * Copyright © 2014-2018 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
  ******************************************************************************/
 //
 //  rpc.rs
 //
-//  Copyright © 2014-2018 SuperNET. All rights reserved.
+//  Copyright © 2022 AtomicDEX. All rights reserved.
 //
 
 use crate::mm2::rpc::rate_limiter::RateLimitError;
 #[cfg(not(target_arch = "wasm32"))] use common::log::warn;
 use common::log::{error, info};
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
 use common::{err_to_rpc_json_string, err_tp_rpc_json, HttpStatusCode};
 use derive_more::Display;
 use futures::future::{join_all, FutureExt};
@@ -31,21 +32,21 @@ use http::{Method, Request, Response, StatusCode};
 #[cfg(not(target_arch = "wasm32"))]
 use hyper::{self, Body, Server};
 use lazy_static::lazy_static;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_rpc::mm_protocol::{MmRpcBuilder, MmRpcResponse, MmRpcVersion};
 use regex::Regex;
 use serde::Serialize;
 use serde_json::{self as json, Value as Json};
 use std::borrow::Cow;
 use std::net::SocketAddr;
 
+#[path = "rpc/dispatcher/dispatcher.rs"] mod dispatcher;
 #[path = "rpc/dispatcher/dispatcher_legacy.rs"]
 mod dispatcher_legacy;
-
-#[path = "rpc/dispatcher/dispatcher_v2.rs"] mod dispatcher_v2;
-
-#[path = "rpc/get_public_key.rs"] mod get_public_key;
-#[path = "rpc/lp_commands.rs"] pub mod lp_commands;
-#[path = "rpc/lp_protocol.rs"] mod lp_protocol;
-use self::lp_protocol::{MmRpcBuilder, MmRpcResponse, MmRpcVersion};
+#[path = "rpc/lp_commands/lp_commands.rs"] pub mod lp_commands;
+#[path = "rpc/lp_commands/lp_commands_legacy.rs"]
+pub mod lp_commands_legacy;
 #[path = "rpc/rate_limiter.rs"] mod rate_limiter;
 
 /// Lists the RPC method not requiring the "userpass" authentication.  
@@ -221,7 +222,7 @@ async fn process_single_request(ctx: MmArc, req: Json, client: SocketAddr) -> Re
         },
     };
 
-    match dispatcher_v2::process_single_request(ctx, req, client, local_only).await {
+    match dispatcher::process_single_request(ctx, req, client, local_only).await {
         Ok(response) => Ok(response),
         Err(e) => {
             // return always serialized response
@@ -239,7 +240,7 @@ async fn rpc_service(req: Request<Body>, ctx_h: u32, client: SocketAddr) -> Resp
                 Ok(ok) => ok,
                 Err(err) => {
                     error!("RPC error response: {}", err);
-                    let ebody = err_to_rpc_json_string(&fomat!((err)));
+                    let ebody = err_to_rpc_json_string(&err.to_string());
                     // generate a `Response` with the headers specified in `$header_key` and `$header_val`
                     let response = Response::builder().status(500) $(.header($header_key, $header_val))* .body(Body::from(ebody)).unwrap();
                     return response;
@@ -359,8 +360,10 @@ pub extern "C" fn spawn_rpc(ctx_h: u32) {
 
     let rpc_ip_port = ctx.rpc_ip_port().unwrap();
     CORE.0.spawn({
-        info!(
-            ">>>>>>>>>> DEX stats {}:{} DEX stats API enabled at unixtime.{}  <<<<<<<<<",
+        log_tag!(
+            ctx,
+            "😉";
+            fmt = ">>>>>>>>>> DEX stats {}:{} DEX stats API enabled at unixtime.{}  <<<<<<<<<",
             rpc_ip_port.ip(),
             rpc_ip_port.port(),
             gstuff::now_ms() / 1000
@@ -372,8 +375,8 @@ pub extern "C" fn spawn_rpc(ctx_h: u32) {
 
 #[cfg(target_arch = "wasm32")]
 pub fn spawn_rpc(ctx_h: u32) {
-    use common::wasm_rpc;
     use futures::StreamExt;
+    use mm2_rpc::wasm_rpc;
     use std::sync::Mutex;
 
     let ctx = MmArc::from_ffi_handle(ctx_h).expect("No context");
@@ -387,10 +390,15 @@ pub fn spawn_rpc(ctx_h: u32) {
         .expect("'127.0.0.1:1' must be valid socket address");
 
     let (request_tx, mut request_rx) = wasm_rpc::channel();
-    let ctx_c = ctx.clone();
+    let ctx_weak = ctx.weak();
     let fut = async move {
         while let Some((request_json, response_tx)) = request_rx.next().await {
-            let response = process_json_request(ctx_c.clone(), request_json, client).await;
+            let ctx = match MmArc::from_weak(&ctx_weak) {
+                Some(ctx) => ctx,
+                None => break,
+            };
+
+            let response = process_json_request(ctx, request_json, client).await;
             if let Err(e) = response_tx.send(response) {
                 error!("Response is not processed: {:?}", e);
             }
@@ -408,8 +416,10 @@ pub fn spawn_rpc(ctx_h: u32) {
         return;
     }
 
-    info!(
-        ">>>>>>>>>> DEX stats API enabled at unixtime.{}  <<<<<<<<<",
+    log_tag!(
+        ctx,
+        "😉";
+        fmt = ">>>>>>>>>> DEX stats API enabled at unixtime.{}  <<<<<<<<<",
         common::now_ms() / 1000
     );
 }
diff --git a/mm2src/mm2_main/src/rpc/dispatcher/dispatcher.rs b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher.rs
new file mode 100644
index 0000000000..0629389beb
--- /dev/null
+++ b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher.rs
@@ -0,0 +1,193 @@
+use super::{DispatcherError, DispatcherResult, PUBLIC_METHODS};
+use crate::mm2::lp_native_dex::init_hw::{init_trezor, init_trezor_status, init_trezor_user_action};
+use crate::mm2::lp_ordermatch::{best_orders_rpc_v2, orderbook_rpc_v2, start_simple_market_maker_bot,
+                                stop_simple_market_maker_bot};
+use crate::mm2::rpc::rate_limiter::{process_rate_limit, RateLimitContext};
+use crate::{mm2::lp_stats::{add_node_to_version_stat, remove_node_from_version_stat, start_version_stat_collection,
+                            stop_version_stat_collection, update_version_stat_collection},
+            mm2::lp_swap::{recreate_swap_data, trade_preimage_rpc},
+            mm2::rpc::lp_commands::{get_public_key, get_public_key_hash}};
+use coins::hd_wallet::get_new_address;
+use coins::my_tx_history_v2::my_tx_history_v2_rpc;
+use coins::rpc_command::account_balance::account_balance;
+use coins::rpc_command::init_create_account::{init_create_new_account, init_create_new_account_status,
+                                              init_create_new_account_user_action};
+use coins::rpc_command::init_scan_for_new_addresses::{init_scan_for_new_addresses, init_scan_for_new_addresses_status};
+use coins::rpc_command::init_withdraw::{init_withdraw, withdraw_status, withdraw_user_action};
+use coins::utxo::bch::BchCoin;
+use coins::utxo::qtum::QtumCoin;
+use coins::utxo::slp::SlpToken;
+use coins::utxo::utxo_standard::UtxoStandardCoin;
+use coins::{add_delegation, get_raw_transaction, get_staking_infos, remove_delegation, sign_message, verify_message,
+            withdraw};
+use coins_activation::{enable_l2, enable_platform_coin_with_tokens, enable_token, init_standalone_coin,
+                       init_standalone_coin_status, init_standalone_coin_user_action};
+use common::log::{error, warn};
+use common::HttpStatusCode;
+use futures::Future as Future03;
+use http::Response;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_rpc::mm_protocol::{MmRpcBuilder, MmRpcRequest, MmRpcVersion};
+use serde::de::DeserializeOwned;
+use serde_json::{self as json, Value as Json};
+use std::net::SocketAddr;
+
+cfg_native! {
+    use coins::lightning::{close_channel, connect_to_lightning_node, generate_invoice, get_channel_details,
+        get_claimable_balances, get_payment_details, list_closed_channels_by_filter, list_open_channels_by_filter, list_payments_by_filter, open_channel,
+        send_payment, LightningCoin};
+    use coins::{SolanaCoin, SplToken};
+    use coins::z_coin::ZCoin;
+}
+
+pub async fn process_single_request(
+    ctx: MmArc,
+    req: Json,
+    client: SocketAddr,
+    local_only: bool,
+) -> DispatcherResult<Response<Vec<u8>>> {
+    let request: MmRpcRequest = json::from_value(req)?;
+
+    // https://github.com/artemii235/SuperNET/issues/368
+    let method_name = Some(request.method.as_str());
+    if local_only && !client.ip().is_loopback() && !PUBLIC_METHODS.contains(&method_name) {
+        return MmError::err(DispatcherError::LocalHostOnly);
+    }
+
+    let rate_limit_ctx = RateLimitContext::from_ctx(&ctx).unwrap();
+    if rate_limit_ctx.is_banned(client.ip()).await {
+        return MmError::err(DispatcherError::Banned);
+    }
+
+    auth(&request, &ctx, &client).await?;
+    match request.mmrpc {
+        MmRpcVersion::V2 => dispatcher_v2(request, ctx).await,
+    }
+}
+
+/// # Examples
+///
+/// ```rust
+/// async fn withdraw(request: WithdrawRequest) -> Result<TransactionDetails, MmError<WithdrawError>>
+/// ```
+///
+/// where
+///     `Request` = `WithdrawRequest`,
+///     `T` = `TransactionDetails`,
+///     `E` = `WithdrawError`
+async fn handle_mmrpc<Handler, Fut, Request, T, E>(
+    ctx: MmArc,
+    request: MmRpcRequest,
+    handler: Handler,
+) -> DispatcherResult<Response<Vec<u8>>>
+where
+    Handler: FnOnce(MmArc, Request) -> Fut,
+    Fut: Future03<Output = Result<T, MmError<E>>>,
+    Request: DeserializeOwned,
+    T: serde::Serialize + 'static,
+    E: SerMmErrorType + HttpStatusCode + 'static,
+{
+    let params = json::from_value(request.params)?;
+    let result = handler(ctx, params).await;
+    if let Err(ref e) = result {
+        error!("RPC error response: {}", e);
+    }
+
+    let response = MmRpcBuilder::from_result(result)
+        .version(request.mmrpc)
+        .id(request.id)
+        .build();
+    Ok(response.serialize_http_response())
+}
+
+async fn auth(request: &MmRpcRequest, ctx: &MmArc, client: &SocketAddr) -> DispatcherResult<()> {
+    if PUBLIC_METHODS.contains(&Some(request.method.as_str())) {
+        return Ok(());
+    }
+
+    let rpc_password = ctx.conf["rpc_password"].as_str().unwrap_or_else(|| {
+        warn!("'rpc_password' is not set in the config");
+        ""
+    });
+    match request.userpass {
+        Some(ref userpass) if userpass == rpc_password => Ok(()),
+        Some(_) => Err(process_rate_limit(ctx, client).await),
+        None => MmError::err(DispatcherError::UserpassIsNotSet),
+    }
+}
+
+async fn dispatcher_v2(request: MmRpcRequest, ctx: MmArc) -> DispatcherResult<Response<Vec<u8>>> {
+    match request.method.as_str() {
+        "account_balance" => handle_mmrpc(ctx, request, account_balance).await,
+        "add_delegation" => handle_mmrpc(ctx, request, add_delegation).await,
+        "add_node_to_version_stat" => handle_mmrpc(ctx, request, add_node_to_version_stat).await,
+        "best_orders" => handle_mmrpc(ctx, request, best_orders_rpc_v2).await,
+        "enable_bch_with_tokens" => handle_mmrpc(ctx, request, enable_platform_coin_with_tokens::<BchCoin>).await,
+        "enable_slp" => handle_mmrpc(ctx, request, enable_token::<SlpToken>).await,
+        "get_new_address" => handle_mmrpc(ctx, request, get_new_address).await,
+        "get_public_key" => handle_mmrpc(ctx, request, get_public_key).await,
+        "get_public_key_hash" => handle_mmrpc(ctx, request, get_public_key_hash).await,
+        "get_raw_transaction" => handle_mmrpc(ctx, request, get_raw_transaction).await,
+        "get_staking_infos" => handle_mmrpc(ctx, request, get_staking_infos).await,
+        "init_create_new_account" => handle_mmrpc(ctx, request, init_create_new_account).await,
+        "init_create_new_account_status" => handle_mmrpc(ctx, request, init_create_new_account_status).await,
+        "init_create_new_account_user_action" => handle_mmrpc(ctx, request, init_create_new_account_user_action).await,
+        "init_qtum" => handle_mmrpc(ctx, request, init_standalone_coin::<QtumCoin>).await,
+        "init_qtum_status" => handle_mmrpc(ctx, request, init_standalone_coin_status::<QtumCoin>).await,
+        "init_qtum_user_action" => handle_mmrpc(ctx, request, init_standalone_coin_user_action::<QtumCoin>).await,
+        "init_scan_for_new_addresses" => handle_mmrpc(ctx, request, init_scan_for_new_addresses).await,
+        "init_scan_for_new_addresses_status" => handle_mmrpc(ctx, request, init_scan_for_new_addresses_status).await,
+        "init_trezor" => handle_mmrpc(ctx, request, init_trezor).await,
+        "init_trezor_status" => handle_mmrpc(ctx, request, init_trezor_status).await,
+        "init_trezor_user_action" => handle_mmrpc(ctx, request, init_trezor_user_action).await,
+        "init_utxo" => handle_mmrpc(ctx, request, init_standalone_coin::<UtxoStandardCoin>).await,
+        "init_utxo_status" => handle_mmrpc(ctx, request, init_standalone_coin_status::<UtxoStandardCoin>).await,
+        "init_utxo_user_action" => {
+            handle_mmrpc(ctx, request, init_standalone_coin_user_action::<UtxoStandardCoin>).await
+        },
+        "init_withdraw" => handle_mmrpc(ctx, request, init_withdraw).await,
+        "my_tx_history" => handle_mmrpc(ctx, request, my_tx_history_v2_rpc).await,
+        "orderbook" => handle_mmrpc(ctx, request, orderbook_rpc_v2).await,
+        "recreate_swap_data" => handle_mmrpc(ctx, request, recreate_swap_data).await,
+        "remove_delegation" => handle_mmrpc(ctx, request, remove_delegation).await,
+        "remove_node_from_version_stat" => handle_mmrpc(ctx, request, remove_node_from_version_stat).await,
+        "sign_message" => handle_mmrpc(ctx, request, sign_message).await,
+        "start_simple_market_maker_bot" => handle_mmrpc(ctx, request, start_simple_market_maker_bot).await,
+        "start_version_stat_collection" => handle_mmrpc(ctx, request, start_version_stat_collection).await,
+        "stop_simple_market_maker_bot" => handle_mmrpc(ctx, request, stop_simple_market_maker_bot).await,
+        "stop_version_stat_collection" => handle_mmrpc(ctx, request, stop_version_stat_collection).await,
+        "trade_preimage" => handle_mmrpc(ctx, request, trade_preimage_rpc).await,
+        "update_version_stat_collection" => handle_mmrpc(ctx, request, update_version_stat_collection).await,
+        "verify_message" => handle_mmrpc(ctx, request, verify_message).await,
+        "withdraw" => handle_mmrpc(ctx, request, withdraw).await,
+        "withdraw_status" => handle_mmrpc(ctx, request, withdraw_status).await,
+        "withdraw_user_action" => handle_mmrpc(ctx, request, withdraw_user_action).await,
+        #[cfg(not(target_arch = "wasm32"))]
+        native_only_methods => match native_only_methods {
+            "close_channel" => handle_mmrpc(ctx, request, close_channel).await,
+            "connect_to_lightning_node" => handle_mmrpc(ctx, request, connect_to_lightning_node).await,
+            "enable_lightning" => handle_mmrpc(ctx, request, enable_l2::<LightningCoin>).await,
+            "generate_invoice" => handle_mmrpc(ctx, request, generate_invoice).await,
+            "get_channel_details" => handle_mmrpc(ctx, request, get_channel_details).await,
+            "get_claimable_balances" => handle_mmrpc(ctx, request, get_claimable_balances).await,
+            "get_payment_details" => handle_mmrpc(ctx, request, get_payment_details).await,
+            "init_z_coin" => handle_mmrpc(ctx, request, init_standalone_coin::<ZCoin>).await,
+            "init_z_coin_status" => handle_mmrpc(ctx, request, init_standalone_coin_status::<ZCoin>).await,
+            "init_z_coin_user_action" => handle_mmrpc(ctx, request, init_standalone_coin_user_action::<ZCoin>).await,
+            "list_closed_channels_by_filter" => handle_mmrpc(ctx, request, list_closed_channels_by_filter).await,
+            "list_open_channels_by_filter" => handle_mmrpc(ctx, request, list_open_channels_by_filter).await,
+            "list_payments_by_filter" => handle_mmrpc(ctx, request, list_payments_by_filter).await,
+            "open_channel" => handle_mmrpc(ctx, request, open_channel).await,
+            "send_payment" => handle_mmrpc(ctx, request, send_payment).await,
+            "enable_solana_with_tokens" => {
+                handle_mmrpc(ctx, request, enable_platform_coin_with_tokens::<SolanaCoin>).await
+            },
+            "enable_spl" => handle_mmrpc(ctx, request, enable_token::<SplToken>).await,
+            "z_coin_tx_history" => handle_mmrpc(ctx, request, coins::my_tx_history_v2::z_coin_tx_history_rpc).await,
+            _ => MmError::err(DispatcherError::NoSuchMethod),
+        },
+        #[cfg(target_arch = "wasm32")]
+        _ => MmError::err(DispatcherError::NoSuchMethod),
+    }
+}
diff --git a/mm2src/rpc/dispatcher/dispatcher_legacy.rs b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher_legacy.rs
similarity index 82%
rename from mm2src/rpc/dispatcher/dispatcher_legacy.rs
rename to mm2src/mm2_main/src/rpc/dispatcher/dispatcher_legacy.rs
index 5ce7128d4c..653c90452d 100644
--- a/mm2src/rpc/dispatcher/dispatcher_legacy.rs
+++ b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher_legacy.rs
@@ -1,19 +1,19 @@
 use super::PUBLIC_METHODS;
-use common::mm_ctx::MmArc;
 #[cfg(not(target_arch = "wasm32"))] use common::wio::CPUPOOL;
 use common::HyRes;
 use futures::compat::Future01CompatExt;
 use futures::{Future as Future03, FutureExt, TryFutureExt};
 use http::Response;
+use mm2_core::mm_ctx::MmArc;
 use serde_json::{self as json, Value as Json};
 use std::net::SocketAddr;
 
-use super::lp_commands::*;
-use crate::mm2::lp_ordermatch::{best_orders_rpc, buy, cancel_all_orders, cancel_order, my_orders, order_status,
-                                orderbook_depth_rpc, orderbook_rpc, orders_history_by_filter, sell, set_price,
-                                update_maker_order};
+use super::lp_commands_legacy::*;
+use crate::mm2::lp_ordermatch::{best_orders_rpc, buy, cancel_all_orders_rpc, cancel_order_rpc, my_orders,
+                                order_status, orderbook_depth_rpc, orderbook_rpc, orders_history_by_filter, sell,
+                                set_price, update_maker_order_rpc};
 use crate::mm2::lp_swap::{active_swaps_rpc, all_swaps_uuids_by_filter, ban_pubkey_rpc, coins_needed_for_kick_start,
-                          import_swaps, list_banned_pubkeys_rpc, max_taker_vol, my_recent_swaps, my_swap_status,
+                          import_swaps, list_banned_pubkeys_rpc, max_taker_vol, my_recent_swaps_rpc, my_swap_status,
                           recover_funds_of_swap, stats_swap_status, unban_pubkeys_rpc};
 use crate::mm2::rpc::rate_limiter::{process_rate_limit, RateLimitContext};
 use coins::{convert_address, convert_utxo_address, get_enabled_coins, get_trade_fee, kmd_rewards_info, my_tx_history,
@@ -61,12 +61,12 @@ pub fn dispatcher(req: Json, ctx: MmArc) -> DispatcherRes {
         // Sorted alphanumerically (on the first latter) for readability.
         // "autoprice" => lp_autoprice (ctx, req),
         "active_swaps" => hyres(active_swaps_rpc(ctx, req)),
-        "all_swaps_uuids_by_filter" => all_swaps_uuids_by_filter(ctx, req),
+        "all_swaps_uuids_by_filter" => hyres(all_swaps_uuids_by_filter(ctx, req)),
         "ban_pubkey" => hyres(ban_pubkey_rpc(ctx, req)),
         "best_orders" => hyres(best_orders_rpc(ctx, req)),
         "buy" => hyres(buy(ctx, req)),
-        "cancel_all_orders" => hyres(cancel_all_orders(ctx, req)),
-        "cancel_order" => hyres(cancel_order(ctx, req)),
+        "cancel_all_orders" => hyres(cancel_all_orders_rpc(ctx, req)),
+        "cancel_order" => hyres(cancel_order_rpc(ctx, req)),
         "coins_needed_for_kick_start" => hyres(coins_needed_for_kick_start(ctx)),
         "convertaddress" => hyres(convert_address(ctx, req)),
         "convert_utxo_address" => hyres(convert_utxo_address(ctx, req)),
@@ -83,16 +83,7 @@ pub fn dispatcher(req: Json, ctx: MmArc) -> DispatcherRes {
         "get_trade_fee" => hyres(get_trade_fee(ctx, req)),
         // "fundvalue" => lp_fundvalue (ctx, req, false),
         "help" => help(),
-        "import_swaps" => {
-            #[cfg(not(target_arch = "wasm32"))]
-            {
-                Box::new(CPUPOOL.spawn_fn(move || hyres(import_swaps(ctx, req))))
-            }
-            #[cfg(target_arch = "wasm32")]
-            {
-                return DispatcherRes::NoMatch(req);
-            }
-        },
+        "import_swaps" => spawn_highload_future(move || hyres(import_swaps(ctx, req))),
         "kmd_rewards_info" => hyres(kmd_rewards_info(ctx)),
         // "inventory" => inventory (ctx, req),
         "list_banned_pubkeys" => hyres(list_banned_pubkeys_rpc(ctx)),
@@ -101,35 +92,26 @@ pub fn dispatcher(req: Json, ctx: MmArc) -> DispatcherRes {
         "min_trading_vol" => hyres(min_trading_vol(ctx, req)),
         "my_balance" => hyres(my_balance(ctx, req)),
         "my_orders" => hyres(my_orders(ctx)),
-        "my_recent_swaps" => my_recent_swaps(ctx, req),
-        "my_swap_status" => my_swap_status(ctx, req),
+        "my_recent_swaps" => hyres(my_recent_swaps_rpc(ctx, req)),
+        "my_swap_status" => hyres(my_swap_status(ctx, req)),
         "my_tx_history" => hyres(my_tx_history(ctx, req)),
         "orders_history_by_filter" => hyres(orders_history_by_filter(ctx, req)),
         "order_status" => hyres(order_status(ctx, req)),
         "orderbook" => hyres(orderbook_rpc(ctx, req)),
         "orderbook_depth" => hyres(orderbook_depth_rpc(ctx, req)),
         "sim_panic" => hyres(sim_panic(req)),
-        "recover_funds_of_swap" => {
-            #[cfg(not(target_arch = "wasm32"))]
-            {
-                Box::new(CPUPOOL.spawn_fn(move || hyres(recover_funds_of_swap(ctx, req))))
-            }
-            #[cfg(target_arch = "wasm32")]
-            {
-                return DispatcherRes::NoMatch(req);
-            }
-        },
+        "recover_funds_of_swap" => spawn_highload_future(move || hyres(recover_funds_of_swap(ctx, req))),
         "sell" => hyres(sell(ctx, req)),
         "show_priv_key" => hyres(show_priv_key(ctx, req)),
         "send_raw_transaction" => hyres(send_raw_transaction(ctx, req)),
         "set_required_confirmations" => hyres(set_required_confirmations(ctx, req)),
         "set_requires_notarization" => hyres(set_requires_notarization(ctx, req)),
         "setprice" => hyres(set_price(ctx, req)),
-        "stats_swap_status" => stats_swap_status(ctx, req),
-        "stop" => stop(ctx),
+        "stats_swap_status" => hyres(stats_swap_status(ctx, req)),
+        "stop" => hyres(stop(ctx)),
         "trade_preimage" => hyres(into_legacy::trade_preimage(ctx, req)),
         "unban_pubkeys" => hyres(unban_pubkeys_rpc(ctx, req)),
-        "update_maker_order" => hyres(update_maker_order(ctx, req)),
+        "update_maker_order" => hyres(update_maker_order_rpc(ctx, req)),
         "validateaddress" => hyres(validate_address(ctx, req)),
         "version" => version(),
         "withdraw" => hyres(into_legacy::withdraw(ctx, req)),
@@ -137,6 +119,24 @@ pub fn dispatcher(req: Json, ctx: MmArc) -> DispatcherRes {
     })
 }
 
+/// There is no need to spawn the future in WASM
+/// because the `dispatcher` function is called in a spawned future already.
+#[cfg(target_arch = "wasm32")]
+fn spawn_highload_future<F>(f: F) -> HyRes
+where
+    F: FnOnce() -> HyRes + Send + 'static,
+{
+    f()
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn spawn_highload_future<F>(f: F) -> HyRes
+where
+    F: FnOnce() -> HyRes + Send + 'static,
+{
+    Box::new(CPUPOOL.spawn_fn(f))
+}
+
 pub async fn process_single_request(
     ctx: MmArc,
     req: Json,
diff --git a/mm2src/rpc/get_public_key.rs b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands.rs
similarity index 52%
rename from mm2src/rpc/get_public_key.rs
rename to mm2src/mm2_main/src/rpc/lp_commands/lp_commands.rs
index 5002682eba..6cad4b4dee 100644
--- a/mm2src/rpc/get_public_key.rs
+++ b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands.rs
@@ -1,23 +1,29 @@
-use common::mm_ctx::MmArc;
-use common::mm_error::MmError;
 use common::HttpStatusCode;
+use crypto::{CryptoCtx, CryptoInitError};
 use derive_more::Display;
 use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc::v1::types::H160 as H160Json;
 use serde_json::Value as Json;
 
+pub type GetPublicKeyRpcResult<T> = Result<T, MmError<GetPublicKeyError>>;
+
 #[derive(Serialize, Display, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum GetPublicKeyError {
     Internal(String),
 }
 
+impl From<CryptoInitError> for GetPublicKeyError {
+    fn from(_: CryptoInitError) -> Self { GetPublicKeyError::Internal("public_key not available".to_string()) }
+}
+
 #[derive(Serialize)]
 pub struct GetPublicKeyResponse {
     public_key: String,
 }
 
-pub type GetPublicKeyRpcResult<T> = Result<T, MmError<GetPublicKeyError>>;
-
 impl HttpStatusCode for GetPublicKeyError {
     fn status_code(&self) -> StatusCode {
         match self {
@@ -27,9 +33,16 @@ impl HttpStatusCode for GetPublicKeyError {
 }
 
 pub async fn get_public_key(ctx: MmArc, _req: Json) -> GetPublicKeyRpcResult<GetPublicKeyResponse> {
-    let public_key = match ctx.secp256k1_key_pair.as_option() {
-        None => return MmError::err(GetPublicKeyError::Internal("public_key not available".to_string())),
-        Some(keypair) => keypair.public().to_string(),
-    };
+    let public_key = CryptoCtx::from_ctx(&ctx)?.secp256k1_pubkey().to_string();
     Ok(GetPublicKeyResponse { public_key })
 }
+
+#[derive(Serialize)]
+pub struct GetPublicKeyHashResponse {
+    public_key_hash: H160Json,
+}
+
+pub async fn get_public_key_hash(ctx: MmArc, _req: Json) -> GetPublicKeyRpcResult<GetPublicKeyHashResponse> {
+    let public_key_hash = ctx.rmd160().to_owned().into();
+    Ok(GetPublicKeyHashResponse { public_key_hash })
+}
diff --git a/mm2src/rpc/lp_commands.rs b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs
similarity index 83%
rename from mm2src/rpc/lp_commands.rs
rename to mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs
index baf05a308c..d78d756f4a 100644
--- a/mm2src/rpc/lp_commands.rs
+++ b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs
@@ -1,13 +1,15 @@
 /******************************************************************************
- * Copyright © 2014-2018 The SuperNET Developers.                             *
+ * Copyright © 2022 Atomic Private Limited and its contributors               *
  *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * See the CONTRIBUTOR-LICENSE-AGREEMENT, COPYING, LICENSE-COPYRIGHT-NOTICE   *
+ * and DEVELOPER-CERTIFICATE-OF-ORIGIN files in the LEGAL directory in        *
  * the top-level directory of this distribution for the individual copyright  *
  * holder information and the developer policies on copyright and licensing.  *
  *                                                                            *
  * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
+ * AtomicDEX software, including this file may be copied, modified, propagated*
+ * or distributed except according to the terms contained in the              *
+ * LICENSE-COPYRIGHT-NOTICE file.                                             *
  *                                                                            *
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
@@ -17,21 +19,23 @@
 //  marketmaker
 //
 
-use bigdecimal::BigDecimal;
 use coins::{disable_coin as disable_coin_impl, lp_coinfind, lp_coininit, MmCoinEnum};
 use common::executor::{spawn, Timer};
 use common::log::error;
-use common::mm_ctx::MmArc;
 use common::mm_metrics::MetricsOps;
 use common::{rpc_err_response, rpc_response, HyRes};
 use futures::compat::Future01CompatExt;
 use http::Response;
+use mm2_core::mm_ctx::MmArc;
+use mm2_number::{construct_detailed, BigDecimal};
 use serde_json::{self as json, Value as Json};
 use std::borrow::Cow;
 
+use crate::mm2::lp_dispatcher::{dispatch_lp_event, StopCtxEvent};
+use crate::mm2::lp_network::subscribe_to_topic;
 use crate::mm2::lp_ordermatch::{cancel_orders_by, CancelBy};
-use crate::mm2::lp_swap::active_swaps_using_coin;
-use crate::mm2::{MM_DATETIME, MM_VERSION};
+use crate::mm2::lp_swap::{active_swaps_using_coin, tx_helper_topic};
+use crate::mm2::MmVersionResult;
 
 /// Attempts to disable the coin
 pub async fn disable_coin(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String> {
@@ -44,7 +48,7 @@ pub async fn disable_coin(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, St
     let swaps = try_s!(active_swaps_using_coin(&ctx, &ticker));
     if !swaps.is_empty() {
         let err = json!({
-            "error": fomat! ("There're active swaps using " (ticker)),
+            "error": format!("There're active swaps using {}", ticker),
             "swaps": swaps,
         });
         return Response::builder()
@@ -55,7 +59,7 @@ pub async fn disable_coin(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, St
     let (cancelled, still_matching) = try_s!(cancel_orders_by(&ctx, CancelBy::Coin { ticker: ticker.clone() }).await);
     if !still_matching.is_empty() {
         let err = json!({
-            "error": fomat! ("There're currently matching orders using " (ticker)),
+            "error": format!("There're currently matching orders using {}", ticker),
             "orders": {
                 "matching": still_matching,
                 "cancelled": cancelled,
@@ -127,7 +131,13 @@ pub async fn enable(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String>
         mature_confirmations: coin.mature_confirmations(),
     };
     let res = try_s!(json::to_vec(&res));
-    Ok(try_s!(Response::builder().body(res)))
+    let res = try_s!(Response::builder().body(res));
+
+    if coin.is_utxo_in_native_mode() {
+        subscribe_to_topic(&ctx, tx_helper_topic(coin.ticker()));
+    }
+
+    Ok(res)
 }
 
 #[cfg(target_arch = "wasm32")]
@@ -190,7 +200,8 @@ pub async fn my_balance(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, Stri
     Ok(try_s!(Response::builder().body(res)))
 }
 
-pub fn stop(ctx: MmArc) -> HyRes {
+pub async fn stop(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
+    dispatch_lp_event(ctx.clone(), StopCtxEvent.into()).await;
     // Should delay the shutdown a bit in order not to trip the "stop" RPC call in unit tests.
     // Stopping immediately leads to the "stop" RPC call failing with the "errno 10054" sometimes.
     spawn(async move {
@@ -199,7 +210,11 @@ pub fn stop(ctx: MmArc) -> HyRes {
             error!("Error stopping MmCtx: {}", e);
         }
     });
-    rpc_response(200, r#"{"result": "success"}"#)
+    let res = json!({
+        "result": "success"
+    });
+    let res = try_s!(json::to_vec(&res));
+    Ok(try_s!(Response::builder().body(res)))
 }
 
 pub async fn sim_panic(req: Json) -> Result<Response<Vec<u8>>, String> {
@@ -232,22 +247,13 @@ pub async fn sim_panic(req: Json) -> Result<Response<Vec<u8>>, String> {
     Ok(try_s!(Response::builder().body(js)))
 }
 
-pub fn version() -> HyRes {
-    rpc_response(
-        200,
-        json! ({
-            "result": MM_VERSION,
-            "datetime": MM_DATETIME
-        })
-        .to_string(),
-    )
-}
+pub fn version() -> HyRes { rpc_response(200, MmVersionResult::new().to_json().to_string()) }
 
 pub async fn get_peers_info(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
     use crate::mm2::lp_network::P2PContext;
     use mm2_libp2p::atomicdex_behaviour::get_peers_info;
     let ctx = P2PContext::fetch_from_mm_arc(&ctx);
-    let cmd_tx = ctx.cmd_tx.lock().await.clone();
+    let cmd_tx = ctx.cmd_tx.lock().clone();
     let result = get_peers_info(cmd_tx).await;
     let result = json!({
         "result": result,
@@ -260,7 +266,7 @@ pub async fn get_gossip_mesh(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
     use crate::mm2::lp_network::P2PContext;
     use mm2_libp2p::atomicdex_behaviour::get_gossip_mesh;
     let ctx = P2PContext::fetch_from_mm_arc(&ctx);
-    let cmd_tx = ctx.cmd_tx.lock().await.clone();
+    let cmd_tx = ctx.cmd_tx.lock().clone();
     let result = get_gossip_mesh(cmd_tx).await;
     let result = json!({
         "result": result,
@@ -273,7 +279,7 @@ pub async fn get_gossip_peer_topics(ctx: MmArc) -> Result<Response<Vec<u8>>, Str
     use crate::mm2::lp_network::P2PContext;
     use mm2_libp2p::atomicdex_behaviour::get_gossip_peer_topics;
     let ctx = P2PContext::fetch_from_mm_arc(&ctx);
-    let cmd_tx = ctx.cmd_tx.lock().await.clone();
+    let cmd_tx = ctx.cmd_tx.lock().clone();
     let result = get_gossip_peer_topics(cmd_tx).await;
     let result = json!({
         "result": result,
@@ -286,7 +292,7 @@ pub async fn get_gossip_topic_peers(ctx: MmArc) -> Result<Response<Vec<u8>>, Str
     use crate::mm2::lp_network::P2PContext;
     use mm2_libp2p::atomicdex_behaviour::get_gossip_topic_peers;
     let ctx = P2PContext::fetch_from_mm_arc(&ctx);
-    let cmd_tx = ctx.cmd_tx.lock().await.clone();
+    let cmd_tx = ctx.cmd_tx.lock().clone();
     let result = get_gossip_topic_peers(cmd_tx).await;
     let result = json!({
         "result": result,
@@ -299,7 +305,7 @@ pub async fn get_relay_mesh(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
     use crate::mm2::lp_network::P2PContext;
     use mm2_libp2p::atomicdex_behaviour::get_relay_mesh;
     let ctx = P2PContext::fetch_from_mm_arc(&ctx);
-    let cmd_tx = ctx.cmd_tx.lock().await.clone();
+    let cmd_tx = ctx.cmd_tx.lock().clone();
     let result = get_relay_mesh(cmd_tx).await;
     let result = json!({
         "result": result,
@@ -345,32 +351,3 @@ pub async fn min_trading_vol(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>,
     let res = try_s!(json::to_vec(&res));
     Ok(try_s!(Response::builder().body(res)))
 }
-
-// AP: Inventory is not documented and not used as of now, commented out
-/*
-pub fn inventory (ctx: MmArc, req: Json) -> HyRes {
-    let ticker = match req["coin"].as_str() {Some (s) => s, None => return rpc_err_response (500, "No 'coin' argument in request")};
-    let coin = match lp_coinfind (&ctx, ticker) {
-        Ok (Some (t)) => t,
-        Ok (None) => return rpc_err_response (500, &fomat! ("No such coin: " (ticker))),
-        Err (err) => return rpc_err_response (500, &fomat! ("!lp_coinfind(" (ticker) "): " (err)))
-    };
-    let ii = coin.iguana_info();
-
-    unsafe {lp::LP_address (ii, (*ii).smartaddr.as_mut_ptr())};
-    if unsafe {nonz (lp::G.LP_privkey.bytes)} {
-        unsafe {lp::LP_privkey_init (-1, ii, lp::G.LP_privkey, lp::G.LP_mypub25519)};
-    } else {
-        log! ("inventory] no LP_privkey");
-    }
-    let retjson = json! ({
-        "result": "success",
-        "coin": ticker,
-        "timestamp": now_ms() / 1000,
-        "alice": []  // LP_inventory(coin)
-        // "bob": LP_inventory(coin,1)
-    });
-    //LP_smartutxos_push(ptr);
-    rpc_response (200, try_h! (json::to_string (&retjson)))
-}
-*/
diff --git a/mm2src/rpc/rate_limiter.rs b/mm2src/mm2_main/src/rpc/rate_limiter.rs
similarity index 95%
rename from mm2src/rpc/rate_limiter.rs
rename to mm2src/mm2_main/src/rpc/rate_limiter.rs
index 5a0c7e1df2..9f07be2b46 100644
--- a/mm2src/rpc/rate_limiter.rs
+++ b/mm2src/mm2_main/src/rpc/rate_limiter.rs
@@ -1,9 +1,9 @@
 use crate::mm2::rpc::DispatcherError;
-use common::mm_ctx::from_ctx;
-use common::mm_ctx::MmArc;
-use common::mm_error::MmError;
 use derive_more::Display;
 use futures::lock::Mutex as AsyncMutex;
+use mm2_core::mm_ctx::from_ctx;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
 use std::collections::HashMap;
 use std::net::{IpAddr, SocketAddr};
 use std::sync::Arc;
diff --git a/mm2src/mm2_net/Cargo.toml b/mm2src/mm2_net/Cargo.toml
new file mode 100644
index 0000000000..1c08ae2282
--- /dev/null
+++ b/mm2src/mm2_net/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "mm2_net"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1"
+serde = "1"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+bytes = "1.1"
+cfg-if = "1.0"
+common = { path = "../common" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_core = { path = "../mm2_core" }
+derive_more = "0.99"
+http = "0.2"
+rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+lazy_static = "1.4"
+prost = "0.10"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+gstuff = { version = "0.7", features = ["nightly"] }
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
+wasm-bindgen-test = { version = "0.3.2" }
+wasm-bindgen-futures = "0.4.21"
+web-sys = { version = "0.3.55", features = ["console", "CloseEvent", "DomException", "ErrorEvent", "IdbDatabase", "IdbCursor", "IdbCursorWithValue", "IdbFactory", "IdbIndex", "IdbIndexParameters", "IdbObjectStore", "IdbObjectStoreParameters", "IdbOpenDbRequest", "IdbKeyRange", "IdbTransaction", "IdbTransactionMode", "IdbVersionChangeEvent", "MessageEvent", "WebSocket"] }
+js-sys = "0.3.27"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+hyper = { version = "0.14.11", features = ["client", "http2", "server", "tcp"] }
+gstuff = { version = "0.7", features = ["crossterm", "nightly"] }
diff --git a/mm2src/mm2_net/src/grpc_web.rs b/mm2src/mm2_net/src/grpc_web.rs
new file mode 100644
index 0000000000..5640df5d2f
--- /dev/null
+++ b/mm2src/mm2_net/src/grpc_web.rs
@@ -0,0 +1,169 @@
+/// The small module implementing gRPC-WEB support
+/// Implementation was taken from https://github.com/hyperium/tonic/blob/ddab65ede90f503360b7adb0d7afe6d5b7bb8b02/examples/src/grpc-web/client.rs
+/// with minor refactoring
+use crate::transport::SlurpError;
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+use common::{cfg_native, cfg_wasm32};
+use mm2_err_handle::prelude::*;
+use prost::DecodeError;
+
+cfg_native! {
+    use crate::transport::slurp_req;
+    use http::header::{ACCEPT, CONTENT_TYPE};
+}
+
+cfg_wasm32! {
+    use crate::wasm_http::FetchRequest;
+}
+
+// one byte for the compression flag plus four bytes for the length
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+const GRPC_HEADER_SIZE: usize = 5;
+
+#[derive(Debug)]
+pub enum EncodeBodyError {
+    Encode(prost::EncodeError),
+}
+
+impl From<prost::EncodeError> for EncodeBodyError {
+    fn from(err: prost::EncodeError) -> Self { EncodeBodyError::Encode(err) }
+}
+
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+fn encode_body<T>(msg: &T) -> Result<Vec<u8>, MmError<EncodeBodyError>>
+where
+    T: prost::Message,
+{
+    let mut buf = BytesMut::with_capacity(1024);
+
+    // first skip past the header
+    // cannot write it yet since we don't know the size of the
+    // encoded message
+    buf.put_slice(&[0; 5]);
+
+    // write the message
+    msg.encode(&mut buf)?;
+
+    // now we know the size of encoded message and can write the
+    // header
+    let len = buf.len() - GRPC_HEADER_SIZE;
+    {
+        let mut buf = &mut buf[..GRPC_HEADER_SIZE];
+
+        // compression flag, 0 means "no compression"
+        buf.put_u8(0);
+
+        buf.put_u32(len as u32);
+    }
+
+    Ok(buf.split_to(len + GRPC_HEADER_SIZE).freeze().to_vec())
+}
+
+#[derive(Debug)]
+pub enum DecodeBodyError {
+    PayloadTooShort,
+    DecodeError(prost::DecodeError),
+}
+
+impl From<prost::DecodeError> for DecodeBodyError {
+    fn from(err: DecodeError) -> Self { DecodeBodyError::DecodeError(err) }
+}
+
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+fn decode_body<T>(mut body: Bytes) -> Result<T, MmError<DecodeBodyError>>
+where
+    T: Default + prost::Message,
+{
+    if body.len() < GRPC_HEADER_SIZE {
+        return MmError::err(DecodeBodyError::PayloadTooShort);
+    }
+    // ignore the compression flag
+    body.advance(1);
+
+    let len = body.get_u32() as usize;
+    if body.len() < len {
+        return MmError::err(DecodeBodyError::PayloadTooShort);
+    }
+
+    let msg = T::decode(&mut body.split_to(len as usize))?;
+
+    Ok(msg)
+}
+
+#[derive(Debug)]
+pub enum PostGrpcWebErr {
+    InvalidRequest(String),
+    EncodeBody(String),
+    DecodeBody(String),
+    Transport { uri: String, error: String },
+    Internal(String),
+}
+
+impl From<EncodeBodyError> for PostGrpcWebErr {
+    fn from(err: EncodeBodyError) -> Self { PostGrpcWebErr::EncodeBody(format!("{:?}", err)) }
+}
+
+impl From<DecodeBodyError> for PostGrpcWebErr {
+    fn from(err: DecodeBodyError) -> Self { PostGrpcWebErr::DecodeBody(format!("{:?}", err)) }
+}
+
+/// `http::Error` can appear on an HTTP request [`http::Builder::build`] building.
+impl From<http::Error> for PostGrpcWebErr {
+    fn from(err: http::Error) -> Self { PostGrpcWebErr::InvalidRequest(err.to_string()) }
+}
+
+impl From<SlurpError> for PostGrpcWebErr {
+    fn from(e: SlurpError) -> Self {
+        let error = e.to_string();
+        match e {
+            SlurpError::ErrorDeserializing { .. } => PostGrpcWebErr::DecodeBody(error),
+            SlurpError::Transport { uri, .. } | SlurpError::Timeout { uri, .. } => {
+                PostGrpcWebErr::Transport { uri, error }
+            },
+            SlurpError::Internal(_) | SlurpError::InvalidRequest(_) => PostGrpcWebErr::Internal(error),
+        }
+    }
+}
+
+/// Send POST gRPC WEB HTTPS request and parse response
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn post_grpc_web<Req, Res>(url: &str, req: &Req) -> Result<Res, MmError<PostGrpcWebErr>>
+where
+    Req: prost::Message + Send + 'static,
+    Res: prost::Message + Default + Send + 'static,
+{
+    let request = http::Request::builder()
+        .version(http::Version::HTTP_11)
+        .method(http::Method::POST)
+        .uri(url)
+        .header(CONTENT_TYPE, "application/grpc-web")
+        .header(ACCEPT, "application/grpc-web")
+        .body(encode_body(req)?)?;
+
+    let response = slurp_req(request).await?;
+
+    let reply = decode_body(response.2.into())?;
+
+    Ok(reply)
+}
+
+#[cfg(target_arch = "wasm32")]
+pub async fn post_grpc_web<Req, Res>(url: &str, req: &Req) -> Result<Res, MmError<PostGrpcWebErr>>
+where
+    Req: prost::Message + Send + 'static,
+    Res: prost::Message + Default + Send + 'static,
+{
+    let body = encode_body(req)?;
+    let request = FetchRequest::post(url)
+        .body_bytes(body)
+        .header("content-type", "application/grpc-web+proto")
+        .header("accept", "application/grpc-web+proto")
+        // https://github.com/grpc/grpc-web/issues/85#issue-217223001
+        .header("x-grpc-web", "1");
+
+    let response = request.request_array().await?;
+
+    let reply = decode_body(response.1.into())?;
+
+    Ok(reply)
+}
diff --git a/mm2src/mm2_net/src/ip_addr.rs b/mm2src/mm2_net/src/ip_addr.rs
new file mode 100644
index 0000000000..5b46f54891
--- /dev/null
+++ b/mm2src/mm2_net/src/ip_addr.rs
@@ -0,0 +1,171 @@
+use crate::transport::slurp_url;
+use common::log;
+use gstuff::try_s;
+use gstuff::{ERR, ERRL};
+use mm2_core::mm_ctx::MmArc;
+use rand::rngs::SmallRng;
+use rand::{Rng, SeedableRng};
+use std::fs;
+use std::io::Read;
+use std::net::{IpAddr, Ipv4Addr};
+use std::path::Path;
+
+const IP_PROVIDERS: [&str; 2] = ["http://checkip.amazonaws.com/", "http://api.ipify.org"];
+
+/// Tries to serve on the given IP to check if it's available.  
+/// We need this check because our external IP, particularly under NAT,
+/// might be outside of the set of IPs we can open and run a server on.
+///
+/// Returns an error if the address did not work
+/// (like when the `ip` does not belong to a connected interface).
+///
+/// The primary concern of this function is to test the IP,
+/// but this opportunity is also used to start the HTTP fallback server,
+/// in order to improve the reliability of the said server (in the Lean "stop the line" manner).
+///
+/// If the IP has passed the communication check then a shutdown Sender is returned.
+/// Dropping or using that Sender will stop the HTTP fallback server.
+///
+/// Also the port of the HTTP fallback server is returned.
+#[cfg(not(target_arch = "wasm32"))]
+fn test_ip(ctx: &MmArc, ip: IpAddr) -> Result<(), String> {
+    let netid = ctx.netid();
+
+    // Try a few pseudo-random ports.
+    // `netid` is used as the seed in order for the port selection to be determenistic,
+    // similar to how the port selection and probing worked before (since MM1)
+    // and in order to reduce the likehood of *unexpected* port conflicts.
+    let mut attempts_left = 9;
+    let mut rng = SmallRng::seed_from_u64(netid as u64);
+    loop {
+        if attempts_left < 1 {
+            break ERR!("Out of attempts");
+        }
+        attempts_left -= 1;
+        // TODO: Avoid `mypubport`.
+        let port = rng.gen_range(1111, 65535);
+        log::info!("Trying to bind on {}:{}", ip, port);
+        match std::net::TcpListener::bind((ip, port)) {
+            Ok(_) => break Ok(()),
+            Err(err) => {
+                if attempts_left == 0 {
+                    break ERR!("{}", err);
+                }
+                continue;
+            },
+        }
+    }
+}
+
+fn simple_ip_extractor(ip: &str) -> Result<IpAddr, String> {
+    let ip = ip.trim();
+    Ok(match ip.parse() {
+        Ok(ip) => ip,
+        Err(err) => return ERR!("Error parsing IP address '{}': {}", ip, err),
+    })
+}
+
+/// Detect the outer IP address, visible to the internet.
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn fetch_external_ip() -> Result<IpAddr, String> {
+    for url in IP_PROVIDERS.iter() {
+        log::info!("Trying to fetch the real IP from '{}' ...", url);
+        let (status, _headers, ip) = match slurp_url(url).await {
+            Ok(t) => t,
+            Err(err) => {
+                log::error!("Failed to fetch IP from '{}': {}", url, err);
+                continue;
+            },
+        };
+        if !status.is_success() {
+            log::error!("Failed to fetch IP from '{}': status {:?}", url, status);
+            continue;
+        }
+        let ip = match std::str::from_utf8(&ip) {
+            Ok(ip) => ip,
+            Err(err) => {
+                log::error!("Failed to fetch IP from '{}', not UTF-8: {}", url, err);
+                continue;
+            },
+        };
+        match simple_ip_extractor(ip) {
+            Ok(ip) => return Ok(ip),
+            Err(err) => {
+                log::error!("Failed to parse IP '{}' fetched from '{}': {}", ip, url, err);
+                continue;
+            },
+        };
+    }
+    ERR!("Couldn't fetch the real IP")
+}
+
+/// Detect the real IP address.
+///
+/// We're detecting the outer IP address, visible to the internet.
+/// Later we'll try to *bind* on this IP address,
+/// and this will break under NAT or forwarding because the internal IP address will be different.
+/// Which might be a good thing, allowing us to detect the likehoodness of NAT early.
+#[cfg(not(target_arch = "wasm32"))]
+async fn detect_myipaddr(ctx: MmArc) -> Result<IpAddr, String> {
+    let ip = try_s!(fetch_external_ip().await);
+
+    // Try to bind on this IP.
+    // If we're not behind a NAT then the bind will likely succeed.
+    // If the bind fails then emit a user-visible warning and fall back to 0.0.0.0.
+    match test_ip(&ctx, ip) {
+        Ok(_) => {
+            let msg = format!(
+                "We've detected an external IP {} and we can bind on it, so probably a dedicated IP.",
+                ip
+            );
+            ctx.log.log("🙂", &[&"myipaddr"], &msg);
+            return Ok(ip);
+        },
+        Err(err) => log::error!("IP {} not available: {}", ip, err),
+    }
+    let all_interfaces = Ipv4Addr::new(0, 0, 0, 0).into();
+    if test_ip(&ctx, all_interfaces).is_ok() {
+        let error = format!(
+            "We couldn't bind on the external IP {}, so NAT is likely to be present. We'll be okay though.",
+            ip
+        );
+        ctx.log.log("😅", &[&"myipaddr"], &error);
+        return Ok(all_interfaces);
+    }
+    let localhost = Ipv4Addr::new(127, 0, 0, 1).into();
+    if test_ip(&ctx, localhost).is_ok() {
+        let error = format!(
+            "We couldn't bind on {} or 0.0.0.0! Looks like we can bind on 127.0.0.1 as a workaround, but that's not how we're supposed to work.",
+            ip
+        );
+        ctx.log.log("🤫", &[&"myipaddr"], &error);
+        return Ok(localhost);
+    }
+
+    let error = format!("Couldn't bind on {}, 0.0.0.0 or 127.0.0.1.", ip);
+    ctx.log.log("🤒", &[&"myipaddr"], &error);
+    // Seems like a better default than 127.0.0.1, might still work for other ports.
+    Ok(all_interfaces)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn myipaddr(ctx: MmArc) -> Result<IpAddr, String> {
+    let myipaddr: IpAddr = if Path::new("myipaddr").exists() {
+        match fs::File::open("myipaddr") {
+            Ok(mut f) => {
+                let mut buf = String::new();
+                if let Err(err) = f.read_to_string(&mut buf) {
+                    return ERR!("Can't read from 'myipaddr': {}", err);
+                }
+                try_s!(simple_ip_extractor(&buf))
+            },
+            Err(err) => return ERR!("Can't read from 'myipaddr': {}", err),
+        }
+    } else if !ctx.conf["myipaddr"].is_null() {
+        let s = try_s!(ctx.conf["myipaddr"].as_str().ok_or("'myipaddr' is not a string"));
+        try_s!(simple_ip_extractor(s))
+    } else {
+        try_s!(detect_myipaddr(ctx).await)
+    };
+    Ok(myipaddr)
+}
diff --git a/mm2src/mm2_net/src/lib.rs b/mm2src/mm2_net/src/lib.rs
new file mode 100644
index 0000000000..30a951a0fb
--- /dev/null
+++ b/mm2src/mm2_net/src/lib.rs
@@ -0,0 +1,7 @@
+pub mod grpc_web;
+pub mod transport;
+
+#[cfg(not(target_arch = "wasm32"))] pub mod ip_addr;
+#[cfg(not(target_arch = "wasm32"))] pub mod native_http;
+#[cfg(target_arch = "wasm32")] pub mod wasm_http;
+#[cfg(target_arch = "wasm32")] pub mod wasm_ws;
diff --git a/mm2src/mm2_net/src/native_http.rs b/mm2src/mm2_net/src/native_http.rs
new file mode 100644
index 0000000000..c6a1fccdc5
--- /dev/null
+++ b/mm2src/mm2_net/src/native_http.rs
@@ -0,0 +1,77 @@
+use crate::transport::{SlurpError, SlurpResult};
+use common::wio::{drive03, HYPER};
+use futures::channel::oneshot::Canceled;
+use http::{header, HeaderValue, Request};
+use hyper::Body;
+use mm2_err_handle::prelude::*;
+
+impl From<Canceled> for SlurpError {
+    fn from(_: Canceled) -> Self { SlurpError::Internal("Spawned Slurp future has been canceled".to_owned()) }
+}
+
+impl SlurpError {
+    fn from_hyper_error(e: hyper::Error, uri: String) -> SlurpError {
+        let error = e.to_string();
+        if e.is_parse() || e.is_parse_status() || e.is_parse_too_large() {
+            SlurpError::ErrorDeserializing { uri, error }
+        } else if e.is_user() {
+            SlurpError::InvalidRequest(error)
+        } else if e.is_timeout() {
+            SlurpError::Timeout { uri, error }
+        } else {
+            SlurpError::Transport { uri, error }
+        }
+    }
+}
+
+/// `http::Error` can appear on an HTTP request [`http::Builder::build`] building.
+impl From<http::Error> for SlurpError {
+    fn from(e: http::Error) -> Self { SlurpError::InvalidRequest(e.to_string()) }
+}
+
+/// Executes a Hyper request, returning the response status, headers and body.
+pub async fn slurp_req(request: Request<Vec<u8>>) -> SlurpResult {
+    let uri = request.uri().to_string();
+    let (head, body) = request.into_parts();
+    let request = Request::from_parts(head, Body::from(body));
+
+    let request_f = HYPER.request(request);
+    let response = drive03(request_f)
+        .await?
+        .map_to_mm(|e| SlurpError::from_hyper_error(e, uri.clone()))?;
+    let status = response.status();
+    let headers = response.headers().clone();
+    let body = response.into_body();
+    let output = hyper::body::to_bytes(body)
+        .await
+        .map_to_mm(|e| SlurpError::from_hyper_error(e, uri.clone()))?;
+    Ok((status, headers, output.to_vec()))
+}
+
+/// Executes a GET request, returning the response status, headers and body.
+pub async fn slurp_url(url: &str) -> SlurpResult {
+    let req = Request::builder().uri(url).body(Vec::new())?;
+    slurp_req(req).await
+}
+
+/// Executes a POST request, returning the response status, headers and body.
+pub async fn slurp_post_json(url: &str, body: String) -> SlurpResult {
+    let request = Request::builder()
+        .method("POST")
+        .uri(url)
+        .header(header::CONTENT_TYPE, HeaderValue::from_static("application/json"))
+        .body(body.into())?;
+    slurp_req(request).await
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::native_http::slurp_url;
+    use common::block_on;
+
+    #[test]
+    fn test_slurp_req() {
+        let (status, headers, body) = block_on(slurp_url("https://httpbin.org/get")).unwrap();
+        assert!(status.is_success(), "{:?} {:?} {:?}", status, headers, body);
+    }
+}
diff --git a/mm2src/mm2_net/src/transport.rs b/mm2src/mm2_net/src/transport.rs
new file mode 100644
index 0000000000..a76007b0f4
--- /dev/null
+++ b/mm2src/mm2_net/src/transport.rs
@@ -0,0 +1,50 @@
+use derive_more::Display;
+use http::{HeaderMap, StatusCode};
+use mm2_err_handle::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use crate::native_http::{slurp_post_json, slurp_req, slurp_url};
+
+#[cfg(target_arch = "wasm32")]
+pub use crate::wasm_http::{slurp_post_json, slurp_url};
+
+pub type SlurpResult = Result<(StatusCode, HeaderMap, Vec<u8>), MmError<SlurpError>>;
+
+#[derive(Debug, Deserialize, Display, Serialize)]
+pub enum SlurpError {
+    #[display(fmt = "Error deserializing '{}' response: {}", uri, error)]
+    ErrorDeserializing { uri: String, error: String },
+    #[display(fmt = "Invalid request: {}", _0)]
+    InvalidRequest(String),
+    #[display(fmt = "Request '{}' timeout: {}", uri, error)]
+    Timeout { uri: String, error: String },
+    #[display(fmt = "Transport '{}' error: {}", uri, error)]
+    Transport { uri: String, error: String },
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+/// Send POST JSON HTTPS request and parse response
+pub async fn post_json<T>(url: &str, json: String) -> Result<T, MmError<SlurpError>>
+where
+    T: serde::de::DeserializeOwned + Send + 'static,
+{
+    let result = slurp_post_json(url, json).await?;
+    serde_json::from_slice(&result.2).map_to_mm(|e| SlurpError::ErrorDeserializing {
+        uri: url.to_owned(),
+        error: e.to_string(),
+    })
+}
+
+/// Fetch URL by HTTPS and parse JSON response
+pub async fn fetch_json<T>(url: &str) -> Result<T, MmError<SlurpError>>
+where
+    T: serde::de::DeserializeOwned + Send + 'static,
+{
+    let result = slurp_url(url).await?;
+    serde_json::from_slice(&result.2).map_to_mm(|e| SlurpError::ErrorDeserializing {
+        uri: url.to_owned(),
+        error: e.to_string(),
+    })
+}
diff --git a/mm2src/mm2_net/src/wasm_http.rs b/mm2src/mm2_net/src/wasm_http.rs
new file mode 100644
index 0000000000..0e0fef551c
--- /dev/null
+++ b/mm2src/mm2_net/src/wasm_http.rs
@@ -0,0 +1,280 @@
+use crate::transport::{SlurpError, SlurpResult};
+use common::executor::spawn_local;
+use common::stringify_js_error;
+use futures::channel::oneshot;
+use http::{HeaderMap, StatusCode};
+use js_sys::Uint8Array;
+use mm2_err_handle::prelude::*;
+use std::collections::HashMap;
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::JsCast;
+use wasm_bindgen_futures::JsFuture;
+use web_sys::{Request, RequestInit, RequestMode, Response as JsResponse};
+
+/// The result containing either a pair of (HTTP status code, body) or a stringified error.
+pub type FetchResult<T> = Result<(StatusCode, T), MmError<SlurpError>>;
+
+/// Executes a GET request, returning the response status, headers and body.
+/// Please note the return header map is empty, because `wasm_bindgen` doesn't provide the way to extract all headers.
+pub async fn slurp_url(url: &str) -> SlurpResult {
+    FetchRequest::get(url)
+        .request_str()
+        .await
+        .map(|(status_code, response)| (status_code, HeaderMap::new(), response.into_bytes()))
+}
+
+/// Executes a POST request, returning the response status, headers and body.
+/// Please note the return header map is empty, because `wasm_bindgen` doesn't provide the way to extract all headers.
+pub async fn slurp_post_json(url: &str, body: String) -> SlurpResult {
+    FetchRequest::post(url)
+        .header("Content-Type", "application/json")
+        .body_utf8(body)
+        .request_str()
+        .await
+        .map(|(status_code, response)| (status_code, HeaderMap::new(), response.into_bytes()))
+}
+
+pub struct FetchRequest {
+    uri: String,
+    method: FetchMethod,
+    headers: HashMap<String, String>,
+    body: Option<RequestBody>,
+    mode: Option<RequestMode>,
+}
+
+impl FetchRequest {
+    pub fn get(uri: &str) -> FetchRequest {
+        FetchRequest {
+            uri: uri.to_owned(),
+            method: FetchMethod::Get,
+            headers: HashMap::new(),
+            body: None,
+            mode: None,
+        }
+    }
+
+    pub fn post(uri: &str) -> FetchRequest {
+        FetchRequest {
+            uri: uri.to_owned(),
+            method: FetchMethod::Post,
+            headers: HashMap::new(),
+            body: None,
+            mode: None,
+        }
+    }
+
+    pub fn body_utf8(mut self, body: String) -> FetchRequest {
+        self.body = Some(RequestBody::Utf8(body));
+        self
+    }
+
+    pub fn body_bytes(mut self, body: Vec<u8>) -> FetchRequest {
+        self.body = Some(RequestBody::Bytes(body));
+        self
+    }
+
+    /// Set the mode to [`RequestMode::Cors`].
+    /// The request is no-cors by default.
+    pub fn cors(mut self) -> FetchRequest {
+        self.mode = Some(RequestMode::Cors);
+        self
+    }
+
+    pub fn header(mut self, key: &str, val: &str) -> FetchRequest {
+        self.headers.insert(key.to_owned(), val.to_owned());
+        self
+    }
+
+    pub async fn request_str(self) -> FetchResult<String> {
+        let (tx, rx) = oneshot::channel();
+        Self::spawn_fetch_str(self, tx);
+        match rx.await {
+            Ok(res) => res,
+            Err(_e) => MmError::err(SlurpError::Internal("Spawned future has been canceled".to_owned())),
+        }
+    }
+
+    pub async fn request_array(self) -> FetchResult<Vec<u8>> {
+        let (tx, rx) = oneshot::channel();
+        Self::spawn_fetch_array(self, tx);
+        match rx.await {
+            Ok(res) => res,
+            Err(_e) => MmError::err(SlurpError::Internal("Spawned future has been canceled".to_owned())),
+        }
+    }
+
+    fn spawn_fetch_str(request: Self, tx: oneshot::Sender<FetchResult<String>>) {
+        let fut = async move {
+            let result = Self::fetch_str(request).await;
+            tx.send(result).ok();
+        };
+        spawn_local(fut);
+    }
+
+    fn spawn_fetch_array(request: Self, tx: oneshot::Sender<FetchResult<Vec<u8>>>) {
+        let fut = async move {
+            let result = Self::fetch_array(request).await;
+            tx.send(result).ok();
+        };
+        spawn_local(fut);
+    }
+
+    async fn fetch(request: Self) -> FetchResult<JsResponse> {
+        let window = web_sys::window().expect("!window");
+        let uri = request.uri;
+
+        let mut req_init = RequestInit::new();
+        req_init.method(request.method.as_str());
+        req_init.body(request.body.map(RequestBody::into_js_value).as_ref());
+
+        if let Some(mode) = request.mode {
+            req_init.mode(mode);
+        }
+
+        let js_request = Request::new_with_str_and_init(&uri, &req_init)
+            .map_to_mm(|e| SlurpError::Internal(stringify_js_error(&e)))?;
+        for (hkey, hval) in request.headers {
+            js_request
+                .headers()
+                .set(&hkey, &hval)
+                .map_to_mm(|e| SlurpError::Internal(stringify_js_error(&e)))?;
+        }
+
+        let request_promise = window.fetch_with_request(&js_request);
+
+        let future = JsFuture::from(request_promise);
+        let resp_value = future.await.map_to_mm(|e| SlurpError::Transport {
+            uri: uri.clone(),
+            error: stringify_js_error(&e),
+        })?;
+        let js_response: JsResponse = match resp_value.dyn_into() {
+            Ok(res) => res,
+            Err(origin_val) => {
+                let error = format!("Error casting {:?} to 'JsResponse'", origin_val);
+                return MmError::err(SlurpError::Internal(error));
+            },
+        };
+
+        let status_code = js_response.status();
+        let status_code = match StatusCode::from_u16(status_code) {
+            Ok(code) => code,
+            Err(e) => {
+                let error = format!("Unexpected HTTP status code, found {}: {}", status_code, e);
+                return MmError::err(SlurpError::ErrorDeserializing { uri, error });
+            },
+        };
+
+        Ok((status_code, js_response))
+    }
+
+    /// The private non-Send method that is called in a spawned future.
+    async fn fetch_str(request: Self) -> FetchResult<String> {
+        let uri = request.uri.clone();
+        let (status_code, js_response) = Self::fetch(request).await?;
+
+        let resp_txt_fut = match js_response.text() {
+            Ok(txt) => txt,
+            Err(e) => {
+                let error = format!("Expected text, found {:?}: {}", js_response, stringify_js_error(&e));
+                return MmError::err(SlurpError::ErrorDeserializing { uri, error });
+            },
+        };
+        let resp_txt = JsFuture::from(resp_txt_fut)
+            .await
+            .map_to_mm(|e| SlurpError::Transport {
+                uri: uri.clone(),
+                error: stringify_js_error(&e),
+            })?;
+
+        let resp_str = match resp_txt.as_string() {
+            Some(string) => string,
+            None => {
+                let error = format!("Expected a UTF-8 string JSON, found {:?}", resp_txt);
+                return MmError::err(SlurpError::ErrorDeserializing { uri, error });
+            },
+        };
+
+        Ok((status_code, resp_str))
+    }
+
+    /// The private non-Send method that is called in a spawned future.
+    async fn fetch_array(request: Self) -> FetchResult<Vec<u8>> {
+        let uri = request.uri.clone();
+        let (status_code, js_response) = Self::fetch(request).await?;
+
+        let resp_array_fut = match js_response.array_buffer() {
+            Ok(blob) => blob,
+            Err(e) => {
+                let error = format!(
+                    "Expected blob, found {:?}: {}",
+                    js_response,
+                    common::stringify_js_error(&e)
+                );
+                return MmError::err(SlurpError::ErrorDeserializing { uri, error });
+            },
+        };
+        let resp_array = JsFuture::from(resp_array_fut)
+            .await
+            .map_to_mm(|e| SlurpError::ErrorDeserializing {
+                uri: uri.clone(),
+                error: stringify_js_error(&e),
+            })?;
+
+        let array = Uint8Array::new(&resp_array);
+
+        Ok((status_code, array.to_vec()))
+    }
+}
+
+enum FetchMethod {
+    Get,
+    Post,
+}
+
+impl FetchMethod {
+    fn as_str(&self) -> &'static str {
+        match self {
+            FetchMethod::Get => "GET",
+            FetchMethod::Post => "POST",
+        }
+    }
+}
+
+enum RequestBody {
+    Utf8(String),
+    Bytes(Vec<u8>),
+}
+
+impl RequestBody {
+    fn into_js_value(self) -> JsValue {
+        match self {
+            RequestBody::Utf8(string) => JsValue::from_str(&string),
+            RequestBody::Bytes(bytes) => {
+                let js_array = Uint8Array::from(bytes.as_slice());
+                js_array.into()
+            },
+        }
+    }
+}
+
+mod tests {
+    use super::*;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn fetch_get_test() {
+        let (status, body) = FetchRequest::get(
+            "https://testnet.qtum.info/api/raw-tx/d71846e7881af5eee026f4de92765a4fc75d99fae5ebd33311c91e9719ddafa5",
+        )
+        .request_str()
+        .await
+        .expect("!FetchRequest::request_str");
+
+        let expected = "02000000017059c44c764ce06c22b1144d05a19b72358e75708836fc9472490a6f68862b79010000004847304402204ecc54f493c5c75efdbad0771f76173b3314ee7836c469f97a4659e1eef9de4a02200dfe70294e0aa0c6795ae349ddc858212c3293b8affd8c44a6bf6699abaef9d701ffffffff0300000000000000000016c3e748040000002321037d86ede18754defcd4759cf7fda52bff47703701a7feb66e2045e8b6c6aac236ace8b9df05000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88ac00000000".to_string();
+
+        assert!(status.is_success(), "{:?} {:?}", status, body);
+        assert_eq!(body, expected);
+    }
+}
diff --git a/mm2src/common/transport/wasm_ws.rs b/mm2src/mm2_net/src/wasm_ws.rs
similarity index 98%
rename from mm2src/common/transport/wasm_ws.rs
rename to mm2src/mm2_net/src/wasm_ws.rs
index aef581e888..d6b185966c 100644
--- a/mm2src/common/transport/wasm_ws.rs
+++ b/mm2src/mm2_net/src/wasm_ws.rs
@@ -1,12 +1,12 @@
-use crate::executor::spawn;
-use crate::log::{debug, error};
-use crate::mm_error::prelude::*;
-use crate::state_machine::prelude::*;
-use crate::stringify_js_error;
 use async_trait::async_trait;
+use common::log::{debug, error};
+use common::stringify_js_error;
+use common::{executor::spawn,
+             state_machine::{LastState, State, StateExt, StateMachine, StateResult, TransitionFrom}};
 use futures::channel::mpsc::{self, SendError, TrySendError};
 use futures::channel::oneshot;
 use futures::{FutureExt, SinkExt, Stream, StreamExt};
+use mm2_err_handle::prelude::*;
 use serde_json::{self as json, Value as Json};
 use std::future::Future;
 use std::pin::Pin;
@@ -115,6 +115,7 @@ impl Stream for WsEventReceiver {
 pub struct WsOutgoingSender {
     inner: mpsc::Sender<Json>,
     /// Is used to determine when all senders are dropped.
+    #[allow(dead_code)]
     shutdown_tx: OutgoingShutdownTx,
 }
 
@@ -674,10 +675,11 @@ where
 
 mod tests {
     use super::*;
-    use crate::custom_futures::FutureTimerExt;
-    use crate::for_tests::register_wasm_log;
-    use crate::log::LogLevel;
-    use crate::{WasmUnwrapErrExt, WasmUnwrapExt};
+    use common::log::wasm_log::register_wasm_log;
+    use common::{custom_futures::FutureTimerExt, log::debug};
+    use common::{WasmUnwrapErrExt, WasmUnwrapExt};
+    use lazy_static::lazy_static;
+    use serde_json::json;
     use std::sync::atomic::{AtomicUsize, Ordering};
     use wasm_bindgen_test::*;
 
@@ -689,7 +691,7 @@ mod tests {
 
     #[wasm_bindgen_test]
     async fn test_websocket() {
-        register_wasm_log(LogLevel::Debug);
+        register_wasm_log();
         let conn_idx = CONN_IDX.fetch_add(1, Ordering::Relaxed);
 
         let (mut outgoing_tx, mut incoming_rx) =
@@ -747,7 +749,7 @@ mod tests {
 
     #[wasm_bindgen_test]
     async fn test_websocket_unreachable_url() {
-        register_wasm_log(LogLevel::Debug);
+        register_wasm_log();
         let conn_idx = CONN_IDX.fetch_add(1, Ordering::Relaxed);
 
         // TODO check if outgoing messages are ignored non-open states
@@ -782,7 +784,7 @@ mod tests {
 
     #[wasm_bindgen_test]
     async fn test_websocket_invalid_url() {
-        register_wasm_log(LogLevel::Debug);
+        register_wasm_log();
         let conn_idx = CONN_IDX.fetch_add(1, Ordering::Relaxed);
 
         let error =
diff --git a/mm2src/mm2_number/Cargo.toml b/mm2src/mm2_number/Cargo.toml
new file mode 100644
index 0000000000..fb569ce4e3
--- /dev/null
+++ b/mm2src/mm2_number/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "mm2_number"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bigdecimal = { version = "0.3", features = ["serde"] }
+num-bigint = { version = "0.4", features = ["serde", "std"] }
+num-rational = { version = "0.4", features = ["serde"] }
+num-traits = "0.2"
+paste = "1.0"
+serde = "1"
+serde_json = "1"
diff --git a/mm2src/common/big_int_str.rs b/mm2src/mm2_number/src/big_int_str.rs
similarity index 100%
rename from mm2src/common/big_int_str.rs
rename to mm2src/mm2_number/src/big_int_str.rs
diff --git a/mm2src/mm2_number/src/fraction.rs b/mm2src/mm2_number/src/fraction.rs
new file mode 100644
index 0000000000..ae936adae5
--- /dev/null
+++ b/mm2src/mm2_number/src/fraction.rs
@@ -0,0 +1,66 @@
+use crate::big_int_str::BigIntStr;
+use crate::from_dec_to_ratio;
+use bigdecimal::BigDecimal;
+use num_bigint::BigInt;
+use num_rational::BigRational;
+use serde::Serialize;
+use serde::{de, Deserialize, Deserializer};
+
+/// Rational number representation de/serializable in human readable form
+/// Should simplify the visual perception and parsing in code
+#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+pub struct Fraction {
+    /// Numerator
+    pub(crate) numer: BigIntStr,
+    /// Denominator
+    pub(crate) denom: BigIntStr,
+}
+
+impl Fraction {
+    /// Numerator
+    pub fn numer(&self) -> &BigInt { self.numer.inner() }
+
+    /// Denominator
+    pub fn denom(&self) -> &BigInt { self.denom.inner() }
+}
+
+impl From<BigRational> for Fraction {
+    fn from(ratio: BigRational) -> Fraction {
+        let (numer, denom) = ratio.into();
+        Fraction {
+            numer: numer.into(),
+            denom: denom.into(),
+        }
+    }
+}
+
+impl From<Fraction> for BigRational {
+    fn from(fraction: Fraction) -> Self { BigRational::new(fraction.numer.into(), fraction.denom.into()) }
+}
+
+impl From<BigDecimal> for Fraction {
+    fn from(dec: BigDecimal) -> Fraction { from_dec_to_ratio(&dec).into() }
+}
+
+impl<'de> Deserialize<'de> for Fraction {
+    fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        #[derive(Deserialize)]
+        struct FractionHelper {
+            numer: BigIntStr,
+            denom: BigIntStr,
+        }
+
+        let maybe_fraction: FractionHelper = Deserialize::deserialize(deserializer)?;
+        if maybe_fraction.denom.inner() == &0.into() {
+            return Err(de::Error::custom("denom can not be 0"));
+        }
+
+        Ok(Fraction {
+            numer: maybe_fraction.numer,
+            denom: maybe_fraction.denom,
+        })
+    }
+}
diff --git a/mm2src/mm2_number/src/lib.rs b/mm2src/mm2_number/src/lib.rs
new file mode 100644
index 0000000000..51eb1b1a3a
--- /dev/null
+++ b/mm2src/mm2_number/src/lib.rs
@@ -0,0 +1,31 @@
+mod big_int_str;
+mod fraction;
+mod mm_number;
+mod mm_number_multi_repr;
+
+pub use fraction::Fraction;
+pub use mm_number::MmNumber;
+pub use mm_number_multi_repr::MmNumberMultiRepr;
+
+pub use bigdecimal;
+pub use num_bigint;
+pub use num_rational;
+
+pub use bigdecimal::BigDecimal;
+pub use num_bigint::{BigInt, BigUint};
+pub use num_rational::BigRational;
+pub use paste::paste;
+
+pub(crate) fn from_dec_to_ratio(d: &BigDecimal) -> BigRational {
+    let (num, scale) = d.as_bigint_and_exponent();
+    let ten = BigInt::from(10i32);
+    if scale >= 0 {
+        BigRational::new(num, ten.pow(scale as u32))
+    } else {
+        BigRational::new(num * ten.pow((-scale) as u32), 1.into())
+    }
+}
+
+pub(crate) fn from_ratio_to_dec(r: &BigRational) -> BigDecimal {
+    BigDecimal::from(r.numer().clone()) / BigDecimal::from(r.denom().clone())
+}
diff --git a/mm2src/common/mm_number.rs b/mm2src/mm2_number/src/mm_number.rs
similarity index 79%
rename from mm2src/common/mm_number.rs
rename to mm2src/mm2_number/src/mm_number.rs
index b200ccc49d..1d4ed18614 100644
--- a/mm2src/common/mm_number.rs
+++ b/mm2src/mm2_number/src/mm_number.rs
@@ -1,15 +1,15 @@
-use crate::big_int_str::BigIntStr;
+use crate::fraction::Fraction;
+use crate::{from_dec_to_ratio, from_ratio_to_dec};
+use bigdecimal::BigDecimal;
 use core::ops::{Add, AddAssign, Div, Mul, Sub};
-use num_traits::{Pow, Zero};
-use serde::{de, Deserialize, Deserializer, Serialize};
+use num_bigint::BigInt;
+use num_rational::BigRational;
+use num_traits::Zero;
+use serde::Serialize;
+use serde::{de, Deserialize, Deserializer};
 use serde_json::value::RawValue;
 use std::str::FromStr;
 
-pub use bigdecimal::BigDecimal;
-pub use num_bigint::{BigInt, Sign};
-pub use num_rational::BigRational;
-pub use paste::paste;
-
 /// Construct a `$name` detailed number that have decimal, fraction and rational representations.
 /// The macro takes the `$name` name of the structure and the `$base_name` that is used to generate three different fields:
 /// `<$base_name>`- decimal representation
@@ -20,6 +20,8 @@ pub use paste::paste;
 ///
 /// Example: `construct_detailed(MyVolume, volume)` will construct something like that:
 /// ```
+/// use mm2_number::{BigDecimal, BigRational, Fraction};
+///
 /// struct MyVolume {
 ///     volume: BigDecimal,
 ///     volume_fraction: Fraction,
@@ -29,16 +31,16 @@ pub use paste::paste;
 #[macro_export]
 macro_rules! construct_detailed {
     ($name: ident, $base_field: ident) => {
-        $crate::mm_number::paste! {
+        $crate::paste! {
             #[derive(Clone, Debug, Serialize)]
             pub struct $name {
-                $base_field: $crate::mm_number::BigDecimal,
-                [<$base_field _fraction>]: $crate::mm_number::Fraction,
-                [<$base_field _rat>]: $crate::mm_number::BigRational,
+                $base_field: $crate::BigDecimal,
+                [<$base_field _fraction>]: $crate::Fraction,
+                [<$base_field _rat>]: $crate::BigRational,
             }
 
-            impl From<$crate::mm_number::MmNumber> for $name {
-                fn from(mm_num: $crate::mm_number::MmNumber) -> Self {
+            impl From<$crate::MmNumber> for $name {
+                fn from(mm_num: $crate::MmNumber) -> Self {
                     Self {
                         $base_field: mm_num.to_decimal(),
                         [<$base_field _fraction>]: mm_num.to_fraction(),
@@ -49,7 +51,7 @@ macro_rules! construct_detailed {
 
             #[allow(dead_code)]
             impl $name {
-                pub fn as_ratio(&self) -> &$crate::mm_number::BigRational {
+                pub fn as_ratio(&self) -> &$crate::BigRational {
                     &self.[<$base_field _rat>]
                 }
             }
@@ -58,80 +60,7 @@ macro_rules! construct_detailed {
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Serialize)]
-pub struct MmNumber(BigRational);
-
-/// Rational number representation de/serializable in human readable form
-/// Should simplify the visual perception and parsing in code
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
-pub struct Fraction {
-    /// Numerator
-    numer: BigIntStr,
-    /// Denominator
-    denom: BigIntStr,
-}
-
-impl Fraction {
-    /// Numerator
-    pub fn numer(&self) -> &BigInt { self.numer.inner() }
-
-    /// Denominator
-    pub fn denom(&self) -> &BigInt { self.denom.inner() }
-}
-
-impl From<BigRational> for Fraction {
-    fn from(ratio: BigRational) -> Fraction {
-        let (numer, denom) = ratio.into();
-        Fraction {
-            numer: numer.into(),
-            denom: denom.into(),
-        }
-    }
-}
-
-impl From<Fraction> for BigRational {
-    fn from(fraction: Fraction) -> Self { BigRational::new(fraction.numer.into(), fraction.denom.into()) }
-}
-
-impl From<BigDecimal> for Fraction {
-    fn from(dec: BigDecimal) -> Fraction { from_dec_to_ratio(&dec).into() }
-}
-
-impl<'de> Deserialize<'de> for Fraction {
-    fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        struct FractionHelper {
-            numer: BigIntStr,
-            denom: BigIntStr,
-        }
-
-        let maybe_fraction: FractionHelper = Deserialize::deserialize(deserializer)?;
-        if maybe_fraction.denom.inner() == &0.into() {
-            return Err(de::Error::custom("denom can not be 0"));
-        }
-
-        Ok(Fraction {
-            numer: maybe_fraction.numer,
-            denom: maybe_fraction.denom,
-        })
-    }
-}
-
-pub fn from_ratio_to_dec(r: &BigRational) -> BigDecimal {
-    BigDecimal::from(r.numer().clone()) / BigDecimal::from(r.denom().clone())
-}
-
-pub fn from_dec_to_ratio(d: &BigDecimal) -> BigRational {
-    let (num, scale) = d.as_bigint_and_exponent();
-    let ten = BigInt::from(10);
-    if scale >= 0 {
-        BigRational::new(num, ten.pow(scale as u64))
-    } else {
-        BigRational::new(num * ten.pow((-scale) as u64), 1.into())
-    }
-}
+pub struct MmNumber(pub(crate) BigRational);
 
 /// Handwritten deserialization method allows the MmNumber to be deserialized from:
 /// 1. big rational representation,
@@ -316,7 +245,7 @@ impl From<&'static str> for MmNumber {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use serde_json as json;
+    use serde_json::{self as json, json};
     use std::str::FromStr;
 
     #[test]
diff --git a/mm2src/mm2_number/src/mm_number_multi_repr.rs b/mm2src/mm2_number/src/mm_number_multi_repr.rs
new file mode 100644
index 0000000000..2508c0016a
--- /dev/null
+++ b/mm2src/mm2_number/src/mm_number_multi_repr.rs
@@ -0,0 +1,34 @@
+use crate::fraction::Fraction;
+use crate::from_ratio_to_dec;
+use crate::mm_number::MmNumber;
+use bigdecimal::BigDecimal;
+use num_rational::BigRational;
+use serde::Serialize;
+
+/// MmNumber representation in all available forms.
+#[derive(Debug, Serialize)]
+pub struct MmNumberMultiRepr {
+    pub decimal: BigDecimal,
+    pub rational: BigRational,
+    pub fraction: Fraction,
+}
+
+impl From<MmNumber> for MmNumberMultiRepr {
+    fn from(num: MmNumber) -> Self {
+        MmNumberMultiRepr {
+            decimal: num.to_decimal(),
+            fraction: num.to_fraction(),
+            rational: num.0,
+        }
+    }
+}
+
+impl From<BigRational> for MmNumberMultiRepr {
+    fn from(rational: BigRational) -> Self {
+        MmNumberMultiRepr {
+            decimal: from_ratio_to_dec(&rational),
+            fraction: rational.clone().into(),
+            rational,
+        }
+    }
+}
diff --git a/mm2src/mm2_rpc/Cargo.toml b/mm2src/mm2_rpc/Cargo.toml
new file mode 100644
index 0000000000..7abf19ab99
--- /dev/null
+++ b/mm2src/mm2_rpc/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "mm2_rpc"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+common = { path = "../common" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+http = "0.2"
+serde = "1"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+ser_error = { path = "../derives/ser_error" }
+ser_error_derive = { path = "../derives/ser_error_derive" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+gstuff = { version = "0.7", features = ["nightly"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+gstuff = { version = "0.7", features = ["crossterm", "nightly"] }
diff --git a/mm2src/mm2_rpc/src/lib.rs b/mm2src/mm2_rpc/src/lib.rs
new file mode 100644
index 0000000000..4d9a07b918
--- /dev/null
+++ b/mm2src/mm2_rpc/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod mm_protocol;
+#[cfg(target_arch = "wasm32")] pub mod wasm_rpc;
diff --git a/mm2src/rpc/lp_protocol.rs b/mm2src/mm2_rpc/src/mm_protocol.rs
similarity index 84%
rename from mm2src/rpc/lp_protocol.rs
rename to mm2src/mm2_rpc/src/mm_protocol.rs
index b0e709c21c..bc032c1465 100644
--- a/mm2src/rpc/lp_protocol.rs
+++ b/mm2src/mm2_rpc/src/mm_protocol.rs
@@ -1,9 +1,9 @@
-use common::mm_error::prelude::*;
-use common::HttpStatusCode;
-use derive_more::Display;
+use common::{HttpStatusCode, SerializationError};
 use http::{Response, StatusCode};
+use mm2_err_handle::prelude::*;
 use serde::{Deserialize, Serialize};
-use serde_json::{self as json, Value as Json};
+use serde_json as json;
+use serde_json::Value as Json;
 
 /// Please note there is no standardized `1.0` version, so this enumeration should not be used in the legacy protocol context.
 #[derive(Clone, Copy, Deserialize, Serialize)]
@@ -18,6 +18,7 @@ pub struct MmRpcRequest {
     pub mmrpc: MmRpcVersion,
     pub userpass: Option<String>,
     pub method: String,
+    #[serde(default)]
     pub params: Json,
     pub id: Option<usize>,
 }
@@ -71,7 +72,7 @@ impl<T: Serialize, E: SerMmErrorType> MmRpcBuilder<T, E> {
     }
 }
 
-#[derive(Serialize)]
+#[derive(Debug, Clone, Serialize)]
 #[serde(untagged)]
 pub enum MmRpcResult<T: Serialize, E: SerMmErrorType> {
     Ok { result: T },
@@ -91,6 +92,31 @@ where
     }
 }
 
+impl<T: Serialize, E: SerMmErrorType> MmRpcResult<T, E> {
+    pub fn ok(result: T) -> MmRpcResult<T, E> { MmRpcResult::Ok { result } }
+
+    #[track_caller]
+    pub fn mm_err(error: E) -> MmRpcResult<T, E> { MmRpcResult::Err(MmError::new(error)) }
+}
+
+impl<T, E1> MmRpcResult<T, E1>
+where
+    T: Serialize,
+    E1: SerMmErrorType,
+{
+    #[track_caller]
+    pub fn map_err<E2, F>(self, f: F) -> MmRpcResult<T, E2>
+    where
+        F: FnOnce(E1) -> E2,
+        E2: SerMmErrorType,
+    {
+        match self {
+            MmRpcResult::Ok { result } => MmRpcResult::Ok { result },
+            MmRpcResult::Err(mm_e1) => MmRpcResult::Err(mm_e1.map(f)),
+        }
+    }
+}
+
 #[derive(Serialize)]
 pub struct MmRpcResponse<T: Serialize, E: SerMmErrorType> {
     mmrpc: MmRpcVersion,
@@ -110,13 +136,6 @@ impl<T: Serialize, E: SerMmErrorType> MmRpcResponse<T, E> {
     }
 
     fn error_to_json(&self, error: impl serde::ser::Error) -> Json {
-        #[derive(Display, Serialize, SerializeErrorType)]
-        #[serde(tag = "error_type", content = "error_data")]
-        enum SerializationError {
-            #[display(fmt = "Internal error: Couldn't serialize an RPC response: {}", _0)]
-            InternalError(String),
-        }
-
         let response: MmRpcResponse<(), _> = MmRpcResponse {
             mmrpc: self.mmrpc,
             result: MmRpcResult::Err(MmError::new(SerializationError::InternalError(error.to_string()))),
@@ -148,8 +167,14 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use serde::Serializer;
+    use derive_more::Display;
+    use mm2_err_handle::prelude::*;
+    use ser_error_derive::SerializeErrorType;
+    use serde::{Serialize, Serializer};
+    use serde_json as json;
+    use serde_json::{json, Value as Json};
+
+    use crate::mm_protocol::{MmRpcBuilder, MmRpcResponse};
 
     #[derive(Display, Serialize, SerializeErrorType)]
     #[serde(tag = "error_type", content = "error_data")]
@@ -185,8 +210,8 @@ mod tests {
         let expected = json!({
             "mmrpc": "2.0",
             "error": "Not sufficient balance. Top up your balance by 123",
-            "error_path": "lp_protocol",
-            "error_trace": format!("lp_protocol:{}]", err_line),
+            "error_path": "mm_protocol",
+            "error_trace": format!("mm_protocol:{}]", err_line),
             "error_type": "NotSufficientBalance",
             "error_data": {
                 "missing": 123,
diff --git a/mm2src/common/wasm_rpc.rs b/mm2src/mm2_rpc/src/wasm_rpc.rs
similarity index 98%
rename from mm2src/common/wasm_rpc.rs
rename to mm2src/mm2_rpc/src/wasm_rpc.rs
index 1747f5e37b..cda70a84d5 100644
--- a/mm2src/common/wasm_rpc.rs
+++ b/mm2src/mm2_rpc/src/wasm_rpc.rs
@@ -1,6 +1,7 @@
 use futures::channel::{mpsc, oneshot};
 use futures::lock::Mutex as AsyncMutex;
 use futures::Stream;
+use gstuff::{ERR, ERRL};
 use serde_json::Value as Json;
 use std::pin::Pin;
 use std::task::{Context, Poll};
diff --git a/mm2src/mm2_test_helpers/Cargo.toml b/mm2src/mm2_test_helpers/Cargo.toml
new file mode 100644
index 0000000000..23a355e305
--- /dev/null
+++ b/mm2src/mm2_test_helpers/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "mm2_test_helpers"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bytes = "1.1"
+cfg-if = "1.0"
+common = { path = "../common" }
+db_common = { path = "../db_common" }
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+http = "0.2"
+lazy_static = "1.4"
+mm2_core = { path = "../mm2_core" }
+mm2_io = { path = "../mm2_io" }
+mm2_net = { path = "../mm2_net" }
+mm2_number = { path = "../mm2_number" }
+rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
+regex = "1"
+serde = "1"
+serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+uuid = { version = "0.7", features = ["serde", "v4"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+chrono = { version = "0.4", features = ["wasmbind"] }
+gstuff = { version = "0.7", features = ["nightly"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+chrono = "0.4"
+crossterm = "0.20"
+gstuff = { version = "0.7", features = ["crossterm", "nightly"] }
diff --git a/mm2src/common/for_tests.rs b/mm2src/mm2_test_helpers/src/for_tests.rs
similarity index 50%
rename from mm2src/common/for_tests.rs
rename to mm2src/mm2_test_helpers/src/for_tests.rs
index 9d3d4e1e15..cee2c29dc2 100644
--- a/mm2src/common/for_tests.rs
+++ b/mm2src/mm2_test_helpers/src/for_tests.rs
@@ -1,31 +1,32 @@
 //! Helpers used in the unit and integration tests.
 
-use bigdecimal::BigDecimal;
-use chrono::{Local, TimeZone};
+use gstuff::{try_s, ERR, ERRL};
 use http::{HeaderMap, StatusCode};
+use lazy_static::lazy_static;
+use mm2_number::BigDecimal;
 use rand::Rng;
-use serde_json::{self as json, Value as Json};
+use serde::{Deserialize, Serialize};
+use serde_json::{self as json, json, Value as Json};
 use std::collections::HashMap;
-use std::net::{IpAddr, Ipv4Addr};
-use std::path::{Path, PathBuf};
+use std::net::IpAddr;
+use std::num::NonZeroUsize;
 use std::process::Child;
 use std::sync::Mutex;
 use uuid::Uuid;
 
-use crate::executor::Timer;
-use crate::mm_ctx::MmArc;
-use crate::mm_metrics::{MetricType, MetricsJson};
-use crate::{now_float, now_ms, slurp};
-
-cfg_wasm32! {
-    use crate::log::LogLevel;
-    use crate::helperᶜ;
-}
+use common::executor::Timer;
+use common::log;
+use common::mm_metrics::{MetricType, MetricsJson};
+use common::{cfg_native, now_float, now_ms, PagingOptionsEnum};
+use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
 
 cfg_native! {
-    use crate::block_on;
-    use crate::log::{dashboard_path, LogState};
-    use crate::wio::{slurp_req, POOL};
+    use common::block_on;
+    use common::log::dashboard_path;
+    use mm2_io::fs::slurp;
+    use mm2_net::transport::slurp_req;
+    use common::wio::POOL;
+    use chrono::{Local, TimeZone};
     use bytes::Bytes;
     use futures::channel::oneshot;
     use futures::task::SpawnExt;
@@ -34,9 +35,9 @@ cfg_native! {
     use regex::Regex;
     use std::env;
     use std::fs;
+    use std::net::Ipv4Addr;
+    use std::path::{Path, PathBuf};
     use std::process::Command;
-    use std::thread;
-    use std::time::Duration;
 }
 
 pub const MAKER_SUCCESS_EVENTS: [&str; 11] = [
@@ -98,6 +99,135 @@ pub const TAKER_ERROR_EVENTS: [&str; 13] = [
     "TakerPaymentRefundFailed",
 ];
 
+pub const RICK: &str = "RICK";
+pub const MORTY: &str = "MORTY";
+pub const ZOMBIE_TICKER: &str = "ZOMBIE";
+pub const ZOMBIE_ELECTRUMS: &[&str] = &["zombie.sirseven.me:10033"];
+pub const ZOMBIE_LIGHTWALLETD_URLS: &[&str] = &["http://zombie.sirseven.me:443"];
+const DEFAULT_RPC_PASSWORD: &str = "pass";
+
+pub struct Mm2TestConf {
+    pub conf: Json,
+    pub rpc_password: String,
+    /// This doesn't seem to be really used, so we will possibly remove it soon
+    pub local: Option<LocalStart>,
+}
+
+impl Mm2TestConf {
+    pub fn seednode(passphrase: &str, coins: &Json) -> Self {
+        Mm2TestConf {
+            conf: json!({
+                "gui": "nogui",
+                "netid": 9998,
+                "passphrase": passphrase,
+                "coins": coins,
+                "rpc_password": DEFAULT_RPC_PASSWORD,
+                "i_am_seed": true,
+            }),
+            rpc_password: DEFAULT_RPC_PASSWORD.into(),
+            local: None,
+        }
+    }
+
+    pub fn light_node(passphrase: &str, coins: &Json, seednodes: &[&str]) -> Self {
+        Mm2TestConf {
+            conf: json!({
+                "gui": "nogui",
+                "netid": 9998,
+                "passphrase": passphrase,
+                "coins": coins,
+                "rpc_password": DEFAULT_RPC_PASSWORD,
+                "seednodes": seednodes,
+            }),
+            rpc_password: DEFAULT_RPC_PASSWORD.into(),
+            local: None,
+        }
+    }
+
+    pub fn no_login_node(coins: &Json, seednodes: &[&str]) -> Self {
+        Mm2TestConf {
+            conf: json!({
+                "gui": "nogui",
+                "netid": 9998,
+                "coins": coins,
+                "rpc_password": DEFAULT_RPC_PASSWORD,
+                "seednodes": seednodes,
+            }),
+            rpc_password: DEFAULT_RPC_PASSWORD.into(),
+            local: None,
+        }
+    }
+}
+
+pub fn zombie_conf() -> Json {
+    json!({
+        "coin":"ZOMBIE",
+        "asset":"ZOMBIE",
+        "txversion":4,
+        "overwintered":1,
+        "mm2":1,
+        "protocol":{
+            "type":"ZHTLC",
+            "protocol_data": {
+                "consensus_params": {
+                    "overwinter_activation_height": 0,
+                    "sapling_activation_height": 1,
+                    "blossom_activation_height": null,
+                    "heartwood_activation_height": null,
+                    "canopy_activation_height": null,
+                    "coin_type": 133,
+                    "hrp_sapling_extended_spending_key": "secret-extended-key-main",
+                    "hrp_sapling_extended_full_viewing_key": "zxviews",
+                    "hrp_sapling_payment_address": "zs",
+                    "b58_pubkey_address_prefix": [ 28, 184 ],
+                    "b58_script_address_prefix": [ 28, 189 ]
+                }
+            }
+        },
+        "required_confirmations":0
+    })
+}
+
+pub fn rick_conf() -> Json {
+    json!({
+        "coin":"RICK",
+        "asset":"RICK",
+        "required_confirmations":0,
+        "txversion":4,
+        "overwintered":1,
+        "protocol":{
+            "type":"UTXO"
+        }
+    })
+}
+
+pub fn morty_conf() -> Json {
+    json!({
+        "coin":"MORTY",
+        "asset":"MORTY",
+        "required_confirmations":0,
+        "txversion":4,
+        "overwintered":1,
+        "protocol":{
+            "type":"UTXO"
+        }
+    })
+}
+
+#[cfg(target_arch = "wasm32")]
+pub fn mm_ctx_with_custom_db() -> MmArc { MmCtxBuilder::new().with_test_db_namespace().into_mm_arc() }
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn mm_ctx_with_custom_db() -> MmArc {
+    use db_common::sqlite::rusqlite::Connection;
+    use std::sync::Arc;
+
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let connection = Connection::open_in_memory().unwrap();
+    let _ = ctx.sqlite_connection.pin(Arc::new(Mutex::new(connection)));
+    ctx
+}
+
 /// Automatically kill a wrapped process.
 pub struct RaiiKill {
     pub handle: Child,
@@ -164,7 +294,7 @@ impl Drop for RaiiDump {
             )
             .expect("Printing to stdout failed");
         } else {
-            log! ({"vvv {:?} vvv\n{}", self.log_path, log});
+            log!("vvv {:?} vvv\n{}", self.log_path, log);
         }
     }
 }
@@ -200,9 +330,7 @@ pub struct MarketMakerIt {
 /// A MarketMaker instance started by and for an integration test.
 #[cfg(target_arch = "wasm32")]
 pub struct MarketMakerIt {
-    pub ctx: super::mm_ctx::MmArc,
-    /// Unique (to run multiple instances) IP, like "127.0.0.$x".
-    pub ip: IpAddr,
+    pub ctx: mm2_core::mm_ctx::MmArc,
     /// RPC API key.
     pub userpass: String,
 }
@@ -219,16 +347,17 @@ impl std::fmt::Debug for MarketMakerIt {
 }
 
 impl MarketMakerIt {
-    /// Create a new temporary directory and start a new MarketMaker process there.
-    ///
-    /// * `conf` - The command-line configuration passed to the MarketMaker.
-    ///            Unique local IP address is injected as "myipaddr" unless this field is already present.
-    /// * `userpass` - RPC API key. We should probably extract it automatically from the MM log.
-    /// * `local` - Function to start the MarketMaker in a local thread, instead of spawning a process.
-    /// It's required to manually add 127.0.0.* IPs aliases on Mac to make it properly work.
-    /// cf. https://superuser.com/a/458877, https://superuser.com/a/635327
+    /// Start a new MarketMaker node without any specific environment variables.
+    /// For more information see [`MarketMakerIt::start_with_envs`].
+    #[cfg(not(target_arch = "wasm32"))]
     pub fn start(conf: Json, userpass: String, local: Option<LocalStart>) -> Result<MarketMakerIt, String> {
-        MarketMakerIt::start_with_envs(conf, userpass, local, &[])
+        block_on(MarketMakerIt::start_with_envs(conf, userpass, local, &[]))
+    }
+
+    /// Start a new MarketMaker node asynchronously without any specific environment variables.
+    /// For more information see [`MarketMakerIt::start_with_envs`].
+    pub async fn start_async(conf: Json, userpass: String, local: Option<LocalStart>) -> Result<MarketMakerIt, String> {
+        MarketMakerIt::start_with_envs(conf, userpass, local, &[]).await
     }
 
     /// Create a new temporary directory and start a new MarketMaker process there.
@@ -240,133 +369,117 @@ impl MarketMakerIt {
     /// * `envs` - The enviroment variables passed to the process
     /// It's required to manually add 127.0.0.* IPs aliases on Mac to make it properly work.
     /// cf. https://superuser.com/a/458877, https://superuser.com/a/635327
-    pub fn start_with_envs(
+    #[cfg(not(target_arch = "wasm32"))]
+    pub async fn start_with_envs(
         mut conf: Json,
         userpass: String,
         local: Option<LocalStart>,
         envs: &[(&str, &str)],
     ) -> Result<MarketMakerIt, String> {
         conf["allow_weak_password"] = true.into();
-        let ip: IpAddr = if conf["myipaddr"].is_null() {
-            // Generate an unique IP.
-            let mut attempts = 0;
-            let mut rng = super::small_rng();
-            loop {
-                let ip4 = Ipv4Addr::new(127, 0, 0, rng.gen_range(1, 255));
-                if attempts > 128 {
-                    return ERR!("Out of local IPs?");
-                }
-                let ip: IpAddr = ip4.into();
-                let mut mm_ips = try_s!(MM_IPS.lock());
-                if mm_ips.contains_key(&ip) {
-                    attempts += 1;
-                    continue;
-                }
-                mm_ips.insert(ip, true);
-                conf["myipaddr"] = format!("{}", ip).into();
-                conf["rpcip"] = format!("{}", ip).into();
-                break ip;
-            }
-        } else {
-            // Just use the IP given in the `conf`.
-            let ip: IpAddr = try_s!(try_s!(conf["myipaddr"].as_str().ok_or("myipaddr is not a string")).parse());
-            let mut mm_ips = try_s!(MM_IPS.lock());
-            if mm_ips.contains_key(&ip) {
-                log! ({"MarketMakerIt] Warning, IP {} was already used.", ip})
-            }
-            mm_ips.insert(ip, true);
-            ip
+        let ip = try_s!(Self::myipaddr_from_conf(&mut conf));
+        let folder = new_mm2_temp_folder_path(Some(ip));
+        let db_dir = match conf["dbdir"].as_str() {
+            Some(path) => path.into(),
+            None => {
+                let dir = folder.join("DB");
+                conf["dbdir"] = dir.to_str().unwrap().into();
+                dir
+            },
         };
 
-        #[cfg(target_arch = "wasm32")]
-        {
-            let ctx = crate::mm_ctx::MmCtxBuilder::new().with_conf(conf).into_mm_arc();
-            let local = try_s!(local.ok_or("!local"));
-            local(ctx.clone());
-            Ok(MarketMakerIt { ctx, ip, userpass })
-        }
+        try_s!(fs::create_dir(&folder));
+        match fs::create_dir(db_dir) {
+            Ok(_) => (),
+            Err(ref ie) if ie.kind() == std::io::ErrorKind::AlreadyExists => (),
+            Err(e) => return ERR!("{}", e),
+        };
+        let log_path = match conf["log"].as_str() {
+            Some(path) => path.into(),
+            None => {
+                let path = folder.join("mm2.log");
+                conf["log"] = path.to_str().unwrap().into();
+                path
+            },
+        };
 
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let folder = new_mm2_temp_folder_path(Some(ip));
-            let db_dir = match conf["dbdir"].as_str() {
-                Some(path) => path.into(),
-                None => {
-                    let dir = folder.join("DB");
-                    conf["dbdir"] = dir.to_str().unwrap().into();
-                    dir
-                },
-            };
+        // If `local` is provided
+        // then instead of spawning a process we start the MarketMaker in a local thread,
+        // allowing us to easily *debug* the tested MarketMaker code.
+        // Note that this should only be used while running a single test,
+        // using this option while running multiple tests (or multiple MarketMaker instances) is currently UB.
+        let pc = if let Some(local) = local {
+            local(folder.clone(), log_path.clone(), conf.clone());
+            None
+        } else {
+            let executable = try_s!(env::args().next().ok_or("No program name"));
+            let executable = try_s!(Path::new(&executable).canonicalize());
+            let log = try_s!(fs::File::create(&log_path));
+            let child = try_s!(Command::new(&executable)
+                .arg("test_mm_start")
+                .arg("--nocapture")
+                .current_dir(&folder)
+                .env("_MM2_TEST_CONF", try_s!(json::to_string(&conf)))
+                .env("MM2_UNBUFFERED_OUTPUT", "1")
+                .env("RUST_LOG", "debug")
+                .envs(envs.to_vec())
+                .stdout(try_s!(log.try_clone()))
+                .stderr(log)
+                .spawn());
+            Some(RaiiKill::from_handle(child))
+        };
 
-            try_s!(fs::create_dir(&folder));
-            match fs::create_dir(db_dir) {
-                Ok(_) => (),
-                Err(ref ie) if ie.kind() == std::io::ErrorKind::AlreadyExists => (),
-                Err(e) => return ERR!("{}", e),
-            };
-            let log_path = match conf["log"].as_str() {
-                Some(path) => path.into(),
-                None => {
-                    let path = folder.join("mm2.log");
-                    conf["log"] = path.to_str().unwrap().into();
-                    path
-                },
-            };
+        let mut mm = MarketMakerIt {
+            folder,
+            ip,
+            log_path,
+            pc,
+            userpass,
+        };
 
-            // If `local` is provided
-            // then instead of spawning a process we start the MarketMaker in a local thread,
-            // allowing us to easily *debug* the tested MarketMaker code.
-            // Note that this should only be used while running a single test,
-            // using this option while running multiple tests (or multiple MarketMaker instances) is currently UB.
-            let pc = if let Some(local) = local {
-                local(folder.clone(), log_path.clone(), conf.clone());
-                None
-            } else {
-                let executable = try_s!(env::args().next().ok_or("No program name"));
-                let executable = try_s!(Path::new(&executable).canonicalize());
-                let log = try_s!(fs::File::create(&log_path));
-                let child = try_s!(Command::new(&executable)
-                    .arg("test_mm_start")
-                    .arg("--nocapture")
-                    .current_dir(&folder)
-                    .env("_MM2_TEST_CONF", try_s!(json::to_string(&conf)))
-                    .env("MM2_UNBUFFERED_OUTPUT", "1")
-                    .env("RUST_LOG", "debug")
-                    .envs(envs.to_vec())
-                    .stdout(try_s!(log.try_clone()))
-                    .stderr(log)
-                    .spawn());
-                Some(RaiiKill::from_handle(child))
-            };
+        try_s!(mm.startup_checks(&conf).await);
+        Ok(mm)
+    }
 
-            let mut mm = MarketMakerIt {
-                folder,
-                ip,
-                log_path,
-                pc,
-                userpass,
-            };
+    /// Start a new MarketMaker locally.
+    ///
+    /// * `conf` - The command-line configuration passed to the MarketMaker.
+    ///            Unique P2P in-memory port is injected as `p2p_in_memory_port` unless this field is already present.
+    /// * `userpass` - RPC API key. We should probably extract it automatically from the MM log.
+    /// * `local` - Function to start the MarketMaker locally. Required for nodes running in a browser.
+    /// * `envs` - The enviroment variables passed to the process.
+    ///            The argument is ignore for nodes running in a browser.
+    #[cfg(target_arch = "wasm32")]
+    pub async fn start_with_envs(
+        mut conf: Json,
+        userpass: String,
+        local: Option<LocalStart>,
+        _envs: &[(&str, &str)],
+    ) -> Result<MarketMakerIt, String> {
+        if conf["p2p_in_memory"].is_null() {
+            conf["p2p_in_memory"] = Json::Bool(true);
+        }
 
-            let skip_startup_checks = conf["skip_startup_checks"].as_bool().unwrap_or_default();
-            if !skip_startup_checks {
-                let is_seed = conf["i_am_seed"].as_bool().unwrap_or_default();
-                if is_seed {
-                    try_s!(block_on(mm.wait_for_log(22., |log| log.contains("INFO Listening on"))));
-                }
-                try_s!(block_on(
-                    mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))
-                ));
-
-                let skip_seednodes_check = conf["skip_seednodes_check"].as_bool().unwrap_or_default();
-                if conf["seednodes"].as_array().is_some() && !skip_seednodes_check {
-                    // wait for at least 1 node to be added to relay mesh
-                    try_s!(block_on(mm.wait_for_log(22., |log| {
-                        log.contains("Completed IAmrelay handling for peer")
-                    })));
-                }
-            }
-            Ok(mm)
+        let i_am_seed = conf["i_am_seed"].as_bool().unwrap_or_default();
+        let p2p_in_memory_port_missed = conf["p2p_in_memory_port"].is_null();
+        if i_am_seed && p2p_in_memory_port_missed {
+            let mut rng = common::small_rng();
+            let new_p2p_port: u64 = rng.gen();
+
+            log!("Set 'p2p_in_memory_port' to {:?}", new_p2p_port);
+            conf["p2p_in_memory_port"] = Json::Number(new_p2p_port.into());
         }
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::new()
+            .with_conf(conf.clone())
+            .with_test_db_namespace()
+            .into_mm_arc();
+        let local = try_s!(local.ok_or("!local"));
+        local(ctx.clone());
+
+        let mut mm = MarketMakerIt { ctx, userpass };
+        try_s!(mm.startup_checks(&conf).await);
+        Ok(mm)
     }
 
     #[cfg(not(target_arch = "wasm32"))]
@@ -394,7 +507,7 @@ impl MarketMakerIt {
             }
             if let Some(ref mut pc) = self.pc {
                 if !pc.running() {
-                    return ERR!("MM process terminated prematurely.");
+                    return ERR!("MM process terminated prematurely at: {:?}.", self.folder);
                 }
             }
             Timer::sleep(ms as f64 / 1000.).await
@@ -429,28 +542,18 @@ impl MarketMakerIt {
     where
         F: Fn(&str) -> bool,
     {
-        let start = now_float();
-        loop {
-            let tail = unsafe { std::str::from_utf8_unchecked(&crate::PROCESS_LOG_TAIL[..]) };
-            if pred(tail) {
-                return Ok(());
-            }
-            if now_float() - start > timeout_sec {
-                return ERR!("Timeout expired waiting for a log condition");
-            }
-            Timer::sleep(0.1).await
-        }
+        wait_for_log(&self.ctx, timeout_sec, pred).await
     }
 
     /// Invokes the locally running MM and returns its reply.
     #[cfg(target_arch = "wasm32")]
-    pub async fn rpc(&self, payload: Json) -> Result<(StatusCode, String, HeaderMap), String> {
+    pub async fn rpc(&self, payload: &Json) -> Result<(StatusCode, String, HeaderMap), String> {
         let wasm_rpc = self
             .ctx
             .wasm_rpc
             .as_option()
             .expect("'MmCtx::rpc' must be initialized already");
-        match wasm_rpc.request(payload).await {
+        match wasm_rpc.request(payload.clone()).await {
             // Please note a new type of error will be introduced soon.
             Ok(body) => {
                 let status_code = if body["error"].is_null() {
@@ -467,11 +570,11 @@ impl MarketMakerIt {
 
     /// Invokes the locally running MM and returns its reply.
     #[cfg(not(target_arch = "wasm32"))]
-    pub async fn rpc(&self, payload: Json) -> Result<(StatusCode, String, HeaderMap), String> {
+    pub async fn rpc(&self, payload: &Json) -> Result<(StatusCode, String, HeaderMap), String> {
         let uri = format!("http://{}:7783", self.ip);
-        log!("sending rpc request " (json::to_string(&payload).unwrap()) " to " (uri));
+        log!("sending rpc request {} to {}", json::to_string(payload).unwrap(), uri);
 
-        let payload = try_s!(json::to_vec(&payload));
+        let payload = try_s!(json::to_vec(payload));
         let request = try_s!(Request::builder().method("POST").uri(uri).body(payload));
 
         let (status, headers, body) = try_s!(slurp_req(request).await);
@@ -498,15 +601,30 @@ impl MarketMakerIt {
     #[cfg(target_arch = "wasm32")]
     pub fn mm_dump(&self) -> (RaiiDump, RaiiDump) { (RaiiDump {}, RaiiDump {}) }
 
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn my_seed_addr(&self) -> String { format!("{}", self.ip) }
+
+    /// # Panic
+    ///
+    /// Panic if this instance is not a seed.
+    #[cfg(target_arch = "wasm32")]
+    pub fn my_seed_addr(&self) -> String {
+        let p2p_port = self
+            .ctx
+            .p2p_in_memory_port()
+            .expect("This instance is not a seed, so 'p2p_in_memory_port' is None");
+        format!("/memory/{}", p2p_port)
+    }
+
     /// Send the "stop" request to the locally running MM.
     pub async fn stop(&self) -> Result<(), String> {
-        let (status, body, _headers) = match self.rpc(json! ({"userpass": self.userpass, "method": "stop"})).await {
+        let (status, body, _headers) = match self.rpc(&json! ({"userpass": self.userpass, "method": "stop"})).await {
             Ok(t) => t,
             Err(err) => {
                 // Downgrade the known errors into log warnings,
                 // in order not to spam the unit test logs with confusing panics, obscuring the real issue.
                 if err.contains("An existing connection was forcibly closed by the remote host") {
-                    log!("stop] MM already down? "(err));
+                    log!("stop] MM already down? {}", err);
                     return Ok(());
                 } else {
                     return ERR!("{}", err);
@@ -518,42 +636,118 @@ impl MarketMakerIt {
         }
         Ok(())
     }
+
+    /// Currently, we cannot wait for the `Completed IAmrelay handling for peer` log entry on WASM node,
+    /// because the P2P module logs to a global logger and doesn't log to the dashboard.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub async fn check_seednodes(&mut self) -> Result<(), String> {
+        // wait for at least 1 node to be added to relay mesh
+        self.wait_for_log(22., |log| log.contains("Completed IAmrelay handling for peer"))
+            .await
+            .map_err(|e| ERRL!("{}", e))
+    }
+
+    /// Wait for the node to start listening to new P2P connections.
+    /// Please note the node is expected to be a seed.
+    ///
+    /// Currently, we cannot wait for the `INFO Listening on` log entry on WASM node,
+    /// because the P2P module logs to a global logger and doesn't log to the dashboard.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub async fn wait_for_p2p_listen(&mut self) -> Result<(), String> {
+        self.wait_for_log(22., |log| log.contains("INFO Listening on"))
+            .await
+            .map_err(|e| ERRL!("{}", e))
+    }
+
+    /// Wait for the RPC to be up.
+    pub async fn wait_for_rpc_is_up(&mut self) -> Result<(), String> {
+        self.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))
+            .await
+            .map_err(|e| ERRL!("{}", e))
+    }
+
+    async fn startup_checks(&mut self, conf: &Json) -> Result<(), String> {
+        let skip_startup_checks = conf["skip_startup_checks"].as_bool().unwrap_or_default();
+        if skip_startup_checks {
+            return Ok(());
+        }
+
+        try_s!(self.wait_for_rpc_is_up().await);
+
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let is_seed = conf["i_am_seed"].as_bool().unwrap_or_default();
+            if is_seed {
+                try_s!(self.wait_for_p2p_listen().await);
+            }
+
+            let skip_seednodes_check = conf["skip_seednodes_check"].as_bool().unwrap_or_default();
+            if conf["seednodes"].as_array().is_some() && !skip_seednodes_check {
+                try_s!(self.check_seednodes().await);
+            }
+        }
+
+        Ok(())
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn myipaddr_from_conf(conf: &mut Json) -> Result<IpAddr, String> {
+        if conf["myipaddr"].is_null() {
+            // Generate an unique IP.
+            let mut attempts = 0;
+            let mut rng = common::small_rng();
+            loop {
+                if attempts > 128 {
+                    return ERR!("Out of local IPs?");
+                }
+                let ip4 = Ipv4Addr::new(127, 0, 0, rng.gen_range(1, 255));
+                let ip = IpAddr::from(ip4);
+                let mut mm_ips = try_s!(MM_IPS.lock());
+                if mm_ips.contains_key(&ip) {
+                    attempts += 1;
+                    continue;
+                }
+                mm_ips.insert(ip, true);
+                conf["myipaddr"] = format!("{}", ip).into();
+                conf["rpcip"] = format!("{}", ip).into();
+                return Ok(ip);
+            }
+        }
+
+        // Just use the IP given in the `conf`.
+
+        let ip: IpAddr = try_s!(try_s!(conf["myipaddr"].as_str().ok_or("myipaddr is not a string")).parse());
+        let mut mm_ips = try_s!(MM_IPS.lock());
+        if mm_ips.contains_key(&ip) {
+            log!("MarketMakerIt] Warning, IP {} was already used.", ip)
+        }
+        mm_ips.insert(ip, true);
+        Ok(ip)
+    }
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 impl Drop for MarketMakerIt {
     fn drop(&mut self) {
         if let Ok(mut mm_ips) = MM_IPS.lock() {
-            // The IP addresses might still be used by the libtorrent even after a context is dropped,
-            // hence we're not trying to reuse them but rather just mark them as fried.
-            if let Some(active) = mm_ips.get_mut(&self.ip) {
-                *active = false
-            }
+            mm_ips.remove(&self.ip);
         } else {
             log!("MarketMakerIt] Can't lock MM_IPS.")
         }
     }
 }
 
-#[macro_export]
-macro_rules! wait_log_re {
-    ($mm_it: expr, $timeout_sec: expr, $re_pred: expr) => {{
-        log! ("Waiting for “" ($re_pred) "”…");
-        let re = regex::Regex::new($re_pred).unwrap();
-        let rc = $mm_it.wait_for_log ($timeout_sec, |line| re.is_match (line)) .await;
-        if let Err (err) = rc {panic! ("{}: {}", $re_pred, err)}
-    }};
-}
-
 /// Busy-wait on the log until the `pred` returns `true` or `timeout_sec` expires.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn wait_for_log(log: &LogState, timeout_sec: f64, pred: &dyn Fn(&str) -> bool) -> Result<(), String> {
+pub async fn wait_for_log<F>(ctx: &MmArc, timeout_sec: f64, pred: F) -> Result<(), String>
+where
+    F: Fn(&str) -> bool,
+{
     let start = now_float();
-    let ms = 50.min((timeout_sec * 1000.) as u64 / 20 + 10);
+    let ms = 50.min((timeout_sec * 1000.) as u32 / 20 + 10);
     let mut buf = String::with_capacity(128);
     let mut found = false;
     loop {
-        log.with_tail(&mut |tail| {
+        ctx.log.with_tail(&mut |tail| {
             for en in tail {
                 if en.format(&mut buf).is_ok() && pred(&buf) {
                     found = true;
@@ -565,7 +759,7 @@ pub fn wait_for_log(log: &LogState, timeout_sec: f64, pred: &dyn Fn(&str) -> boo
             return Ok(());
         }
 
-        log.with_gravity_tail(&mut |tail| {
+        ctx.log.with_gravity_tail(&mut |tail| {
             for chunk in tail {
                 if pred(chunk) {
                     found = true;
@@ -580,7 +774,7 @@ pub fn wait_for_log(log: &LogState, timeout_sec: f64, pred: &dyn Fn(&str) -> boo
         if now_float() - start > timeout_sec {
             return ERR!("Timeout expired waiting for a log condition");
         }
-        thread::sleep(Duration::from_millis(ms));
+        Timer::sleep_ms(ms).await;
     }
 }
 
@@ -600,7 +794,8 @@ pub async fn common_wait_for_log_re(req: Bytes) -> Result<Vec<u8>, String> {
     // Run the blocking `wait_for_log` in the `POOL`.
     let (tx, rx) = oneshot::channel();
     try_s!(try_s!(POOL.lock()).spawn(async move {
-        let _ = tx.send(wait_for_log(&ctx.log, args.timeout_sec, &|line| re.is_match(line)));
+        let res = wait_for_log(&ctx, args.timeout_sec, |line| re.is_match(line)).await;
+        let _ = tx.send(res);
     }));
     try_s!(try_s!(rx.await));
 
@@ -610,23 +805,7 @@ pub async fn common_wait_for_log_re(req: Bytes) -> Result<Vec<u8>, String> {
 #[cfg(not(target_arch = "wasm32"))]
 pub async fn wait_for_log_re(ctx: &MmArc, timeout_sec: f64, re_pred: &str) -> Result<(), String> {
     let re = try_s!(Regex::new(re_pred));
-    wait_for_log(&ctx.log, timeout_sec, &|line| re.is_match(line))
-}
-
-#[cfg(target_arch = "wasm32")]
-pub async fn wait_for_log_re(ctx: &MmArc, timeout_sec: f64, re_pred: &str) -> Result<(), String> {
-    try_s!(
-        helperᶜ(
-            "common_wait_for_log_re",
-            try_s!(json::to_vec(&ToWaitForLogRe {
-                ctx: try_s!(ctx.ffi_handle()),
-                timeout_sec,
-                re_pred: re_pred.into()
-            }))
-        )
-        .await
-    );
-    Ok(())
+    wait_for_log(ctx, timeout_sec, |line| re.is_match(line)).await
 }
 
 /// Create RAII variables to the effect of dumping the log and the status dashboard at the end of the scope.
@@ -662,7 +841,7 @@ pub fn mm_spat(
             "rpc_password": "pass",
         })),
         "pass".into(),
-        match super::var("LOCAL_THREAD_MM") {
+        match common::var("LOCAL_THREAD_MM") {
             Ok(ref e) if e == "1" => Some(local_start),
             _ => None,
         },
@@ -680,21 +859,18 @@ pub fn mm_spat(
     unimplemented!()
 }
 
-#[cfg(target_arch = "wasm32")]
-pub fn register_wasm_log(level: LogLevel) {
-    use crate::log::{register_callback, WasmCallback, WasmLoggerBuilder};
-
-    register_callback(WasmCallback::console_log());
-    // a log is initialized already if [`WasmLoggerBuilder::try_init`] fails
-    let _ = WasmLoggerBuilder::default().level_filter(level).try_init();
+/// Asks MM to enable the given currency in electrum mode
+/// fresh list of servers at https://github.com/jl777/coins/blob/master/electrums/.
+pub async fn enable_electrum(mm: &MarketMakerIt, coin: &str, tx_history: bool, urls: &[&str]) -> Json {
+    let servers = urls.iter().map(|url| json!({ "url": url })).collect();
+    enable_electrum_json(mm, coin, tx_history, servers).await
 }
 
 /// Asks MM to enable the given currency in electrum mode
 /// fresh list of servers at https://github.com/jl777/coins/blob/master/electrums/.
-pub async fn enable_electrum(mm: &MarketMakerIt, coin: &str, tx_history: bool, urls: &[&str]) -> Json {
-    let servers: Vec<_> = urls.iter().map(|url| json!({ "url": url })).collect();
+pub async fn enable_electrum_json(mm: &MarketMakerIt, coin: &str, tx_history: bool, servers: Vec<Json>) -> Json {
     let electrum = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "userpass": mm.userpass,
             "method": "electrum",
             "coin": coin,
@@ -717,7 +893,7 @@ pub async fn enable_electrum(mm: &MarketMakerIt, coin: &str, tx_history: bool, u
 pub async fn enable_qrc20(mm: &MarketMakerIt, coin: &str, urls: &[&str], swap_contract_address: &str) -> Json {
     let servers: Vec<_> = urls.iter().map(|url| json!({ "url": url })).collect();
     let electrum = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "userpass": mm.userpass,
             "method": "electrum",
             "coin": coin,
@@ -758,13 +934,30 @@ pub fn from_env_file(env: Vec<u8>) -> (Option<String>, Option<String>) {
     (passphrase, userpass)
 }
 
+#[macro_export]
+#[cfg(target_arch = "wasm32")]
+macro_rules! get_passphrase {
+    ($_env_file:literal, $env:literal) => {
+        option_env!($env).ok_or_else(|| ERRL!("No such '{}' environment variable", $env))
+    };
+}
+
+#[macro_export]
+#[cfg(not(target_arch = "wasm32"))]
+macro_rules! get_passphrase {
+    ($env_file:literal, $env:literal) => {
+        $crate::for_tests::get_passphrase(&$env_file, $env)
+    };
+}
+
 /// Reads passphrase from file or environment.
+#[cfg(not(target_arch = "wasm32"))]
 pub fn get_passphrase(path: &dyn AsRef<Path>, env: &str) -> Result<String, String> {
     if let (Some(file_passphrase), _file_userpass) = from_env_file(try_s!(slurp(path))) {
         return Ok(file_passphrase);
     }
 
-    if let Ok(v) = super::var(env) {
+    if let Ok(v) = common::var(env) {
         Ok(v)
     } else {
         ERR!("No {} or {}", env, path.as_ref().display())
@@ -775,7 +968,7 @@ pub fn get_passphrase(path: &dyn AsRef<Path>, env: &str) -> Result<String, Strin
 /// Returns the RPC reply containing the corresponding wallet address.
 pub async fn enable_native(mm: &MarketMakerIt, coin: &str, urls: &[&str]) -> Json {
     let native = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "userpass": mm.userpass,
             "method": "enable",
             "coin": coin,
@@ -790,18 +983,227 @@ pub async fn enable_native(mm: &MarketMakerIt, coin: &str, urls: &[&str]) -> Jso
     json::from_str(&native.1).unwrap()
 }
 
+pub async fn enable_spl(mm: &MarketMakerIt, coin: &str) -> Json {
+    let req = json!({
+        "userpass": mm.userpass,
+        "method": "enable_spl",
+        "mmrpc": "2.0",
+        "params": {
+            "ticker": coin,
+            "activation_params": {}
+        }
+    });
+    let enable = mm.rpc(&req).await.unwrap();
+    assert_eq!(enable.0, StatusCode::OK, "'enable_spl' failed: {}", enable.1);
+    json::from_str(&enable.1).unwrap()
+}
+
+pub async fn enable_slp(mm: &MarketMakerIt, coin: &str) -> Json {
+    let enable = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "enable_slp",
+            "mmrpc": "2.0",
+            "params": {
+                "ticker": coin,
+                "activation_params": {}
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(enable.0, StatusCode::OK, "'enable_slp' failed: {}", enable.1);
+    json::from_str(&enable.1).unwrap()
+}
+
+#[derive(Serialize)]
+pub struct ElectrumRpcRequest {
+    pub url: String,
+}
+
+#[derive(Serialize)]
+#[serde(tag = "rpc", content = "rpc_data")]
+pub enum UtxoRpcMode {
+    Native,
+    Electrum { servers: Vec<ElectrumRpcRequest> },
+}
+
+fn electrum_servers_rpc(servers: &[&str]) -> Vec<ElectrumRpcRequest> {
+    servers
+        .iter()
+        .map(|url| ElectrumRpcRequest { url: url.to_string() })
+        .collect()
+}
+
+impl UtxoRpcMode {
+    pub fn electrum(servers: &[&str]) -> Self {
+        UtxoRpcMode::Electrum {
+            servers: electrum_servers_rpc(servers),
+        }
+    }
+}
+
+pub async fn enable_bch_with_tokens(
+    mm: &MarketMakerIt,
+    platform_coin: &str,
+    tokens: &[&str],
+    mode: UtxoRpcMode,
+    tx_history: bool,
+) -> Json {
+    let slp_requests: Vec<_> = tokens.iter().map(|ticker| json!({ "ticker": ticker })).collect();
+
+    let enable = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "enable_bch_with_tokens",
+            "mmrpc": "2.0",
+            "params": {
+                "ticker": platform_coin,
+                "allow_slp_unsafe_conf": true,
+                "bchd_urls": [],
+                "mode": mode,
+                "tx_history": tx_history,
+                "slp_tokens_requests": slp_requests,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(
+        enable.0,
+        StatusCode::OK,
+        "'enable_bch_with_tokens' failed: {}",
+        enable.1
+    );
+    json::from_str(&enable.1).unwrap()
+}
+
+pub async fn enable_solana_with_tokens(
+    mm: &MarketMakerIt,
+    platform_coin: &str,
+    tokens: &[&str],
+    solana_client_url: &str,
+    tx_history: bool,
+) -> Json {
+    let spl_requests: Vec<_> = tokens.iter().map(|ticker| json!({ "ticker": ticker })).collect();
+    let req = json! ({
+        "userpass": mm.userpass,
+        "method": "enable_solana_with_tokens",
+        "mmrpc": "2.0",
+        "params": {
+            "ticker": platform_coin,
+            "confirmation_commitment": "finalized",
+            "allow_slp_unsafe_conf": true,
+            "client_url": solana_client_url,
+            "tx_history": tx_history,
+            "spl_tokens_requests": spl_requests,
+        }
+    });
+
+    let enable = mm.rpc(&req).await.unwrap();
+    assert_eq!(
+        enable.0,
+        StatusCode::OK,
+        "'enable_bch_with_tokens' failed: {}",
+        enable.1
+    );
+    json::from_str(&enable.1).unwrap()
+}
+
+pub async fn my_tx_history_v2(
+    mm: &MarketMakerIt,
+    coin: &str,
+    limit: usize,
+    paging: Option<PagingOptionsEnum<String>>,
+) -> Json {
+    let paging = paging.unwrap_or(PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()));
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "my_tx_history",
+            "mmrpc": "2.0",
+            "params": {
+                "coin": coin,
+                "limit": limit,
+                "paging_options": paging,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'my_tx_history' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn z_coin_tx_history(
+    mm: &MarketMakerIt,
+    coin: &str,
+    limit: usize,
+    paging: Option<PagingOptionsEnum<i64>>,
+) -> Json {
+    let paging = paging.unwrap_or_default();
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "z_coin_tx_history",
+            "mmrpc": "2.0",
+            "params": {
+                "coin": coin,
+                "limit": limit,
+                "paging_options": paging,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'z_coin_tx_history' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn enable_native_bch(mm: &MarketMakerIt, coin: &str, bchd_urls: &[&str]) -> Json {
+    let native = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "enable",
+            "coin": coin,
+            "bchd_urls": bchd_urls,
+            "allow_slp_unsafe_conf": true,
+            "mm2": 1,
+        }))
+        .await
+        .unwrap();
+    assert_eq!(native.0, StatusCode::OK, "'enable' failed: {}", native.1);
+    json::from_str(&native.1).unwrap()
+}
+
+pub async fn enable_lightning(mm: &MarketMakerIt, coin: &str) -> Json {
+    let enable = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "enable_lightning",
+            "mmrpc": "2.0",
+            "params": {
+                "ticker": coin,
+                "activation_params": {
+                    "name": "test-node"
+                }
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(enable.0, StatusCode::OK, "'enable_lightning' failed: {}", enable.1);
+    json::from_str(&enable.1).unwrap()
+}
+
 /// Use a separate (unique) temporary folder for each MM.
 /// We could also remove the old folders after some time in order not to spam the temporary folder.
 /// Though we don't always want to remove them right away, allowing developers to check the files).
 /// Appends IpAddr if it is pre-known
+#[cfg(not(target_arch = "wasm32"))]
 pub fn new_mm2_temp_folder_path(ip: Option<IpAddr>) -> PathBuf {
-    let now = super::now_ms();
+    let now = common::now_ms();
     let now = Local.timestamp((now / 1000) as i64, (now % 1000) as u32 * 1_000_000);
     let folder = match ip {
         Some(ip) => format!("mm2_{}_{}", now.format("%Y-%m-%d_%H-%M-%S-%3f"), ip),
         None => format!("mm2_{}", now.format("%Y-%m-%d_%H-%M-%S-%3f")),
     };
-    super::temp_dir().join(folder)
+    common::temp_dir().join(folder)
 }
 
 pub fn find_metrics_in_json(
@@ -844,7 +1246,7 @@ pub async fn check_my_swap_status(
     taker_amount: BigDecimal,
 ) {
     let response = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "userpass": mm.userpass,
             "method": "my_swap_status",
             "params": {
@@ -877,7 +1279,7 @@ pub async fn check_my_swap_status_amounts(
     taker_amount: BigDecimal,
 ) {
     let response = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "userpass": mm.userpass,
             "method": "my_swap_status",
             "params": {
@@ -903,7 +1305,7 @@ pub async fn check_stats_swap_status(
     taker_expected_events: &[&str],
 ) {
     let response = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "method": "stats_swap_status",
             "params": {
                 "uuid": uuid,
@@ -929,7 +1331,7 @@ pub async fn check_stats_swap_status(
 
 pub async fn check_recent_swaps(mm: &MarketMakerIt, expected_len: usize) {
     let response = mm
-        .rpc(json! ({
+        .rpc(&json! ({
             "method": "my_recent_swaps",
             "userpass": mm.userpass,
         }))
@@ -947,7 +1349,7 @@ pub async fn wait_till_history_has_records(mm: &MarketMakerIt, coin: &str, expec
     let wait_until = now_ms() + to_wait * 1000;
     loop {
         let tx_history = mm
-            .rpc(json!({
+            .rpc(&json!({
                 "userpass": mm.userpass,
                 "method": "my_tx_history",
                 "coin": coin,
@@ -962,7 +1364,7 @@ pub async fn wait_till_history_has_records(mm: &MarketMakerIt, coin: &str, expec
             tx_history.0,
             tx_history.1
         );
-        log!([tx_history.1]);
+        log!("{:?}", tx_history.1);
         let tx_history_json: Json = json::from_str(&tx_history.1).unwrap();
         if tx_history_json["result"]["transactions"].as_array().unwrap().len() >= expected_len {
             break;
@@ -972,3 +1374,192 @@ pub async fn wait_till_history_has_records(mm: &MarketMakerIt, coin: &str, expec
         assert!(now_ms() <= wait_until, "wait_till_history_has_records timed out");
     }
 }
+
+pub async fn orderbook_v2(mm: &MarketMakerIt, base: &str, rel: &str) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "orderbook",
+            "mmrpc": "2.0",
+            "params": {
+                "base": base,
+                "rel": rel,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'orderbook' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn best_orders_v2(mm: &MarketMakerIt, coin: &str, action: &str, volume: &str) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "best_orders",
+            "mmrpc": "2.0",
+            "params": {
+                "coin": coin,
+                "action": action,
+                "volume": volume,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'best_orders' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn init_withdraw(mm: &MarketMakerIt, coin: &str, to: &str, amount: &str) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "init_withdraw",
+            "mmrpc": "2.0",
+            "params": {
+                "coin": coin,
+                "to": to,
+                "amount": amount,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'init_withdraw' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn withdraw_status(mm: &MarketMakerIt, task_id: u64) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "withdraw_status",
+            "mmrpc": "2.0",
+            "params": {
+                "task_id": task_id,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'withdraw_status' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn init_z_coin_native(mm: &MarketMakerIt, coin: &str) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "init_z_coin",
+            "mmrpc": "2.0",
+            "params": {
+                "ticker": coin,
+                "activation_params": {
+                    "mode": {
+                        "rpc": "Native",
+                    }
+                },
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'init_z_coin' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn init_z_coin_light(mm: &MarketMakerIt, coin: &str, electrums: &[&str], lightwalletd_urls: &[&str]) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "init_z_coin",
+            "mmrpc": "2.0",
+            "params": {
+                "ticker": coin,
+                "activation_params": {
+                    "mode": {
+                        "rpc": "Light",
+                        "rpc_data": {
+                            "electrum_servers": electrum_servers_rpc(electrums),
+                            "light_wallet_d_servers": lightwalletd_urls,
+                        },
+                    }
+                },
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'init_z_coin' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn init_z_coin_status(mm: &MarketMakerIt, task_id: u64) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "init_z_coin_status",
+            "mmrpc": "2.0",
+            "params": {
+                "task_id": task_id,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'init_z_coin_status' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn sign_message(mm: &MarketMakerIt, coin: &str) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method":"sign_message",
+            "mmrpc":"2.0",
+            "id": 0,
+            "params":{
+              "coin": coin,
+              "message":"test"
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'sign_message' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn verify_message(mm: &MarketMakerIt, coin: &str, signature: &str, address: &str) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method":"verify_message",
+            "mmrpc":"2.0",
+            "id": 0,
+            "params":{
+              "coin": coin,
+              "message":"test",
+              "signature": signature,
+              "address": address
+
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'verify_message' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn send_raw_transaction(mm: &MarketMakerIt, coin: &str, tx: &str) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "send_raw_transaction",
+            "coin": coin,
+            "tx_hex": tx,
+        }))
+        .await
+        .unwrap();
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'send_raw_transaction' failed: {}",
+        request.1
+    );
+    json::from_str(&request.1).unwrap()
+}
diff --git a/mm2src/mm2_test_helpers/src/lib.rs b/mm2src/mm2_test_helpers/src/lib.rs
new file mode 100644
index 0000000000..a7d5bfa6ac
--- /dev/null
+++ b/mm2src/mm2_test_helpers/src/lib.rs
@@ -0,0 +1 @@
+pub mod for_tests;
diff --git a/mm2src/rpc/dispatcher/dispatcher_v2.rs b/mm2src/rpc/dispatcher/dispatcher_v2.rs
deleted file mode 100644
index 692edfc830..0000000000
--- a/mm2src/rpc/dispatcher/dispatcher_v2.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use super::lp_protocol::{MmRpcBuilder, MmRpcRequest};
-use super::{DispatcherError, DispatcherResult, PUBLIC_METHODS};
-use crate::mm2::rpc::rate_limiter::{process_rate_limit, RateLimitContext};
-use crate::{mm2::lp_stats::{add_node_to_version_stat, remove_node_from_version_stat, start_version_stat_collection,
-                            stop_version_stat_collection, update_version_stat_collection},
-            mm2::lp_swap::trade_preimage_rpc,
-            mm2::rpc::get_public_key::get_public_key};
-use coins::withdraw;
-use common::log::{error, warn};
-use common::mm_ctx::MmArc;
-use common::mm_error::prelude::*;
-use common::HttpStatusCode;
-use futures::Future as Future03;
-use http::Response;
-use serde::de::DeserializeOwned;
-use serde_json::{self as json, Value as Json};
-use std::net::SocketAddr;
-
-pub async fn process_single_request(
-    ctx: MmArc,
-    req: Json,
-    client: SocketAddr,
-    local_only: bool,
-) -> DispatcherResult<Response<Vec<u8>>> {
-    let request: MmRpcRequest = json::from_value(req)?;
-
-    // https://github.com/artemii235/SuperNET/issues/368
-    let method_name = Some(request.method.as_str());
-    if local_only && !client.ip().is_loopback() && !PUBLIC_METHODS.contains(&method_name) {
-        return MmError::err(DispatcherError::LocalHostOnly);
-    }
-
-    let rate_limit_ctx = RateLimitContext::from_ctx(&ctx).unwrap();
-    if rate_limit_ctx.is_banned(client.ip()).await {
-        return MmError::err(DispatcherError::Banned);
-    }
-
-    auth(&request, &ctx, &client).await?;
-    dispatcher(request, ctx).await
-}
-
-/// # Example
-///
-/// ```rust
-/// async fn withdraw(request: WithdrawRequest) -> Result<TransactionDetails, MmError<WithdrawError>>
-/// ```
-///
-/// where
-///     `Request` = `WithdrawRequest`,
-///     `T` = `TransactionDetails`,
-///     `E` = `WithdrawError`
-async fn handle_mmrpc<Handler, Fut, Request, T, E>(
-    ctx: MmArc,
-    request: MmRpcRequest,
-    handler: Handler,
-) -> DispatcherResult<Response<Vec<u8>>>
-where
-    Handler: FnOnce(MmArc, Request) -> Fut,
-    Fut: Future03<Output = Result<T, MmError<E>>>,
-    Request: DeserializeOwned,
-    T: serde::Serialize + 'static,
-    E: SerMmErrorType + HttpStatusCode + 'static,
-{
-    let params = json::from_value(request.params)?;
-    let result = handler(ctx, params).await;
-    if let Err(ref e) = result {
-        error!("RPC error response: {}", e);
-    }
-
-    let response = MmRpcBuilder::from_result(result)
-        .version(request.mmrpc)
-        .id(request.id)
-        .build();
-    Ok(response.serialize_http_response())
-}
-
-async fn auth(request: &MmRpcRequest, ctx: &MmArc, client: &SocketAddr) -> DispatcherResult<()> {
-    if PUBLIC_METHODS.contains(&Some(request.method.as_str())) {
-        return Ok(());
-    }
-
-    let rpc_password = ctx.conf["rpc_password"].as_str().unwrap_or_else(|| {
-        warn!("'rpc_password' is not set in the config");
-        ""
-    });
-    match request.userpass {
-        Some(ref userpass) if userpass == rpc_password => Ok(()),
-        Some(_) => Err(process_rate_limit(ctx, client).await),
-        None => MmError::err(DispatcherError::UserpassIsNotSet),
-    }
-}
-
-async fn dispatcher(request: MmRpcRequest, ctx: MmArc) -> DispatcherResult<Response<Vec<u8>>> {
-    match request.method.as_str() {
-        "add_node_to_version_stat" => handle_mmrpc(ctx, request, add_node_to_version_stat).await,
-        "get_public_key" => handle_mmrpc(ctx, request, get_public_key).await,
-        "remove_node_from_version_stat" => handle_mmrpc(ctx, request, remove_node_from_version_stat).await,
-        "start_version_stat_collection" => handle_mmrpc(ctx, request, start_version_stat_collection).await,
-        "stop_version_stat_collection" => handle_mmrpc(ctx, request, stop_version_stat_collection).await,
-        "update_version_stat_collection" => handle_mmrpc(ctx, request, update_version_stat_collection).await,
-        "trade_preimage" => handle_mmrpc(ctx, request, trade_preimage_rpc).await,
-        "withdraw" => handle_mmrpc(ctx, request, withdraw).await,
-        _ => MmError::err(DispatcherError::NoSuchMethod),
-    }
-}
diff --git a/mm2src/rpc_task/Cargo.toml b/mm2src/rpc_task/Cargo.toml
new file mode 100644
index 0000000000..3e6cedb00b
--- /dev/null
+++ b/mm2src/rpc_task/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "rpc_task"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1"
+common = { path = "../common" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_rpc = { path = "../mm2_rpc" }
+derive_more = "0.99"
+futures = "0.3"
+ser_error = { path = "../derives/ser_error" }
+ser_error_derive = { path = "../derives/ser_error_derive" }
+serde = "1"
+serde_derive = "1"
diff --git a/mm2src/rpc_task/src/handle.rs b/mm2src/rpc_task/src/handle.rs
new file mode 100644
index 0000000000..42beb2fd5e
--- /dev/null
+++ b/mm2src/rpc_task/src/handle.rs
@@ -0,0 +1,80 @@
+use crate::manager::{RpcTaskManager, RpcTaskManagerWeak};
+use crate::{FinishedTaskResult, RpcTask, RpcTaskError, RpcTaskResult, TaskId, TaskStatus};
+use common::custom_futures::FutureTimerExt;
+use common::log::LogOnError;
+use futures::channel::oneshot;
+use mm2_err_handle::prelude::*;
+use std::sync::MutexGuard;
+use std::time::Duration;
+
+type TaskManagerLock<'a, Task> = MutexGuard<'a, RpcTaskManager<Task>>;
+
+pub struct RpcTaskHandle<Task: RpcTask> {
+    pub(crate) task_manager: RpcTaskManagerWeak<Task>,
+    pub(crate) task_id: TaskId,
+}
+
+impl<Task: RpcTask> RpcTaskHandle<Task> {
+    pub(crate) fn abort(self) {
+        self.lock_and_then(|mut task_manager| task_manager.cancel_task(self.task_id))
+            .ok();
+    }
+
+    fn lock_and_then<F, T>(&self, f: F) -> RpcTaskResult<T>
+    where
+        F: FnOnce(TaskManagerLock<Task>) -> RpcTaskResult<T>,
+    {
+        let arc = self
+            .task_manager
+            .upgrade()
+            .or_mm_err(|| RpcTaskError::Internal("RpcTaskManager is not available".to_owned()))?;
+        let lock = arc
+            .lock()
+            .map_to_mm(|e| RpcTaskError::Internal(format!("RpcTaskManager is not available: {}", e)))?;
+        f(lock)
+    }
+
+    fn update_task_status(&self, status: TaskStatus<Task>) -> RpcTaskResult<()> {
+        self.lock_and_then(|mut task_manager| task_manager.update_task_status(self.task_id, status))
+    }
+
+    pub fn update_in_progress_status(&self, in_progress: Task::InProgressStatus) -> RpcTaskResult<()> {
+        self.update_task_status(TaskStatus::InProgress(in_progress))
+    }
+
+    pub async fn wait_for_user_action(
+        &self,
+        timeout: Duration,
+        awaiting_status: Task::AwaitingStatus,
+    ) -> RpcTaskResult<Task::UserAction> {
+        let (user_action_tx, user_action_rx) = oneshot::channel();
+        // Set the status to 'UserActionRequired' to let the user know that we are waiting for an action.
+        self.update_task_status(TaskStatus::UserActionRequired {
+            awaiting_status,
+            user_action_tx,
+        })?;
+
+        // Wait for the user action.
+        user_action_rx
+            .timeout(timeout)
+            .await?
+            .map_to_mm(|_canceled| RpcTaskError::Canceled)
+    }
+
+    pub(crate) fn finish(self, result: Result<Task::Item, MmError<Task::Error>>) {
+        let task_result = Self::prepare_task_result(result);
+        self.lock_and_then(|mut task_manager| {
+            task_manager.update_task_status(self.task_id, TaskStatus::Ready(task_result))
+        })
+        .warn_log();
+    }
+
+    fn prepare_task_result(
+        result: Result<Task::Item, MmError<Task::Error>>,
+    ) -> FinishedTaskResult<Task::Item, Task::Error> {
+        match result {
+            Ok(task_item) => FinishedTaskResult::ok(task_item),
+            Err(task_error) => FinishedTaskResult::Err(task_error),
+        }
+    }
+}
diff --git a/mm2src/rpc_task/src/lib.rs b/mm2src/rpc_task/src/lib.rs
new file mode 100644
index 0000000000..e3efbafab4
--- /dev/null
+++ b/mm2src/rpc_task/src/lib.rs
@@ -0,0 +1,107 @@
+use common::custom_futures::TimeoutError;
+use derive_more::Display;
+use futures::channel::oneshot;
+use mm2_err_handle::prelude::*;
+use mm2_rpc::mm_protocol::MmRpcResult;
+use serde::Serialize;
+use std::sync::atomic::AtomicU64;
+use std::time::Duration;
+
+#[macro_use] extern crate ser_error_derive;
+#[macro_use] extern crate serde_derive;
+
+mod handle;
+mod manager;
+pub mod rpc_common;
+mod task;
+
+pub use handle::RpcTaskHandle;
+pub use manager::{RpcTaskManager, RpcTaskManagerShared};
+pub use task::{RpcTask, RpcTaskTypes};
+
+pub type FinishedTaskResult<Item, Error> = MmRpcResult<Item, Error>;
+pub type RpcTaskResult<T> = Result<T, MmError<RpcTaskError>>;
+pub type TaskId = u64;
+pub type RpcTaskStatusAlias<Task> = RpcTaskStatus<
+    <Task as RpcTaskTypes>::Item,
+    <Task as RpcTaskTypes>::Error,
+    <Task as RpcTaskTypes>::InProgressStatus,
+    <Task as RpcTaskTypes>::AwaitingStatus,
+>;
+
+type AtomicTaskId = AtomicU64;
+type TaskAbortHandle = oneshot::Sender<()>;
+type TaskAbortHandler = oneshot::Receiver<()>;
+type UserActionSender<UserAction> = oneshot::Sender<UserAction>;
+
+#[derive(Clone, Display)]
+pub enum RpcTaskError {
+    #[display(fmt = "RPC task timeout '{:?}'", _0)]
+    Timeout(Duration),
+    NoSuchTask(TaskId),
+    #[display(
+        fmt = "RPC '{}' task is in unexpected status. Actual: '{}', expected: '{}'",
+        task_id,
+        actual,
+        expected
+    )]
+    UnexpectedTaskStatus {
+        task_id: TaskId,
+        actual: TaskStatusError,
+        expected: TaskStatusError,
+    },
+    Canceled,
+    Internal(String),
+}
+
+#[derive(Clone, Display)]
+pub enum TaskStatusError {
+    Idle,
+    InProgress,
+    AwaitingUserAction,
+    Finished,
+}
+
+impl From<TimeoutError> for RpcTaskError {
+    fn from(e: TimeoutError) -> Self { RpcTaskError::Timeout(e.duration) }
+}
+
+/// We can't simplify the generic types because there are places where the [`RpcTaskStatus::map_err`] method is used.
+#[derive(Debug, Serialize)]
+#[serde(tag = "status", content = "details")]
+pub enum RpcTaskStatus<Item, Error, InProgressStatus, AwaitingStatus>
+where
+    Item: Serialize,
+    Error: SerMmErrorType,
+{
+    Ready(FinishedTaskResult<Item, Error>),
+    InProgress(InProgressStatus),
+    UserActionRequired(AwaitingStatus),
+}
+
+impl<Item, Error, InProgressStatus, AwaitingStatus> RpcTaskStatus<Item, Error, InProgressStatus, AwaitingStatus>
+where
+    Item: Serialize,
+    Error: SerMmErrorType,
+{
+    pub fn map_err<NewError, F>(self, f: F) -> RpcTaskStatus<Item, NewError, InProgressStatus, AwaitingStatus>
+    where
+        F: FnOnce(Error) -> NewError,
+        NewError: SerMmErrorType,
+    {
+        match self {
+            RpcTaskStatus::Ready(result) => RpcTaskStatus::Ready(result.map_err(f)),
+            RpcTaskStatus::InProgress(in_progress) => RpcTaskStatus::InProgress(in_progress),
+            RpcTaskStatus::UserActionRequired(awaiting) => RpcTaskStatus::UserActionRequired(awaiting),
+        }
+    }
+}
+
+enum TaskStatus<Task: RpcTaskTypes> {
+    Ready(FinishedTaskResult<Task::Item, Task::Error>),
+    InProgress(Task::InProgressStatus),
+    UserActionRequired {
+        awaiting_status: Task::AwaitingStatus,
+        user_action_tx: UserActionSender<Task::UserAction>,
+    },
+}
diff --git a/mm2src/rpc_task/src/manager.rs b/mm2src/rpc_task/src/manager.rs
new file mode 100644
index 0000000000..5b1617b181
--- /dev/null
+++ b/mm2src/rpc_task/src/manager.rs
@@ -0,0 +1,256 @@
+use crate::task::RpcTaskTypes;
+use crate::{AtomicTaskId, FinishedTaskResult, RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskResult, RpcTaskStatus,
+            RpcTaskStatusAlias, TaskAbortHandle, TaskAbortHandler, TaskId, TaskStatus, TaskStatusError,
+            UserActionSender};
+use common::executor::spawn;
+use common::log::{debug, warn};
+use futures::channel::oneshot;
+use futures::future::{select, Either};
+use mm2_err_handle::prelude::*;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::sync::atomic::Ordering;
+use std::sync::{Arc, Mutex, Weak};
+
+pub type RpcTaskManagerShared<Task> = Arc<Mutex<RpcTaskManager<Task>>>;
+pub(crate) type RpcTaskManagerWeak<Task> = Weak<Mutex<RpcTaskManager<Task>>>;
+
+static NEXT_RPC_TASK_ID: AtomicTaskId = AtomicTaskId::new(0);
+
+fn next_rpc_task_id() -> TaskId { NEXT_RPC_TASK_ID.fetch_add(1, Ordering::Relaxed) }
+
+pub struct RpcTaskManager<Task: RpcTask> {
+    tasks: HashMap<TaskId, TaskStatusExt<Task>>,
+}
+
+impl<Task: RpcTask> Default for RpcTaskManager<Task> {
+    fn default() -> Self { RpcTaskManager { tasks: HashMap::new() } }
+}
+
+impl<Task: RpcTask> RpcTaskManager<Task> {
+    /// Create new instance of `RpcTaskHandle` attached to the only one `RpcTask`.
+    /// This function registers corresponding RPC task in the `RpcTaskManager` and returns the task id.
+    pub fn spawn_rpc_task(this: &RpcTaskManagerShared<Task>, task: Task) -> RpcTaskResult<TaskId> {
+        let initial_task_status = task.initial_status();
+        let (task_id, task_abort_handler) = {
+            let mut task_manager = this
+                .lock()
+                .map_to_mm(|e| RpcTaskError::Internal(format!("RpcTaskManager is not available: {}", e)))?;
+            task_manager.register_task(initial_task_status)?
+        };
+        let task_handle = RpcTaskHandle {
+            task_manager: RpcTaskManagerShared::downgrade(this),
+            task_id,
+        };
+
+        let fut = async move {
+            debug!("Spawn RPC task '{}'", task_id);
+            let task_fut = task.run(&task_handle);
+            let task_result = match select(task_fut, task_abort_handler).await {
+                // The task has finished.
+                Either::Left((task_result, _abort_handler)) => Some(task_result),
+                // The task has been aborted from outside.
+                Either::Right((_aborted, _task)) => None,
+            };
+            // We can't finish or abort the task in the match statement above since `task_handle` is borrowed here:
+            // `task.run(&task_handle)`.
+            match task_result {
+                Some(task_result) => {
+                    debug!("RPC task '{}' has been finished", task_id);
+                    task_handle.finish(task_result);
+                },
+                None => {
+                    debug!("RPC task '{}' has been aborted", task_id);
+                    task_handle.abort();
+                },
+            }
+        };
+        spawn(fut);
+        Ok(task_id)
+    }
+
+    /// Returns a task status if it exists, otherwise returns `None`.
+    pub fn task_status(&mut self, task_id: TaskId, forget_if_ready: bool) -> Option<RpcTaskStatusAlias<Task>> {
+        let entry = match self.tasks.entry(task_id) {
+            Entry::Occupied(entry) => entry,
+            Entry::Vacant(_) => return None,
+        };
+        let rpc_status = match entry.get() {
+            TaskStatusExt::InProgress { status, .. } => RpcTaskStatus::InProgress(status.clone()),
+            TaskStatusExt::Awaiting { status, .. } => RpcTaskStatus::UserActionRequired(status.clone()),
+            TaskStatusExt::Ready(ready) => {
+                // I prefer cloning `ready` instead of removing `TaskStatusX` and matching/unwrapping it again.
+                let rpc_status = RpcTaskStatus::Ready(ready.clone());
+                if forget_if_ready {
+                    entry.remove();
+                }
+                rpc_status
+            },
+        };
+        Some(rpc_status)
+    }
+
+    pub fn new_shared() -> RpcTaskManagerShared<Task> { Arc::new(Mutex::new(Self::default())) }
+
+    pub fn contains(&self, task_id: TaskId) -> bool { self.tasks.contains_key(&task_id) }
+
+    /// Cancel task if it's in progress.
+    pub fn cancel_task(&mut self, task_id: TaskId) -> RpcTaskResult<()> {
+        self.tasks
+            .remove(&task_id)
+            .map(|_| ())
+            .or_mm_err(|| self.rpc_task_error_if_not_found(task_id, TaskStatusError::InProgress))
+    }
+
+    pub(crate) fn register_task(
+        &mut self,
+        task_initial_in_progress_status: Task::InProgressStatus,
+    ) -> RpcTaskResult<(TaskId, TaskAbortHandler)> {
+        let task_id = next_rpc_task_id();
+        let (abort_handle, abort_handler) = oneshot::channel();
+        match self.tasks.entry(task_id) {
+            Entry::Occupied(_entry) => MmError::err(RpcTaskError::UnexpectedTaskStatus {
+                task_id,
+                actual: TaskStatusError::InProgress,
+                expected: TaskStatusError::Idle,
+            }),
+            Entry::Vacant(entry) => {
+                entry.insert(TaskStatusExt::InProgress {
+                    status: task_initial_in_progress_status,
+                    abort_handle,
+                });
+                Ok((task_id, abort_handler))
+            },
+        }
+    }
+
+    pub(crate) fn update_task_status(&mut self, task_id: TaskId, status: TaskStatus<Task>) -> RpcTaskResult<()> {
+        match status {
+            TaskStatus::Ready(result) => self.on_task_finished(task_id, result),
+            TaskStatus::InProgress(in_progress) => self.update_in_progress_status(task_id, in_progress),
+            TaskStatus::UserActionRequired {
+                awaiting_status,
+                user_action_tx,
+            } => self.set_task_is_waiting_for_user_action(task_id, awaiting_status, user_action_tx),
+        }
+    }
+
+    fn rpc_task_error_if_not_found(&self, task_id: TaskId, expected: TaskStatusError) -> RpcTaskError {
+        let actual = match self.tasks.get(&task_id) {
+            Some(TaskStatusExt::InProgress { .. }) => TaskStatusError::InProgress,
+            Some(TaskStatusExt::Awaiting { .. }) => TaskStatusError::AwaitingUserAction,
+            Some(TaskStatusExt::Ready(_)) => TaskStatusError::Finished,
+            None => return RpcTaskError::NoSuchTask(task_id),
+        };
+        RpcTaskError::UnexpectedTaskStatus {
+            task_id,
+            actual,
+            expected,
+        }
+    }
+
+    fn on_task_finished(
+        &mut self,
+        task_id: TaskId,
+        task_result: FinishedTaskResult<Task::Item, Task::Error>,
+    ) -> RpcTaskResult<()> {
+        if self.tasks.insert(task_id, TaskStatusExt::Ready(task_result)).is_none() {
+            warn!("Finished task '{}' was not ongoing", task_id);
+        }
+        Ok(())
+    }
+
+    fn update_in_progress_status(&mut self, task_id: TaskId, status: Task::InProgressStatus) -> RpcTaskResult<()> {
+        match self.tasks.remove(&task_id) {
+            Some(TaskStatusExt::InProgress { abort_handle, .. })
+            | Some(TaskStatusExt::Awaiting { abort_handle, .. }) => {
+                // Insert new in-progress status to the tasks container.
+                self.tasks
+                    .insert(task_id, TaskStatusExt::InProgress { status, abort_handle });
+                Ok(())
+            },
+            Some(ready @ TaskStatusExt::Ready(_)) => {
+                // Return the task result to the tasks container.
+                self.tasks.insert(task_id, ready);
+                MmError::err(RpcTaskError::UnexpectedTaskStatus {
+                    task_id,
+                    actual: TaskStatusError::Finished,
+                    expected: TaskStatusError::InProgress,
+                })
+            },
+            None => MmError::err(RpcTaskError::NoSuchTask(task_id)),
+        }
+    }
+
+    fn set_task_is_waiting_for_user_action(
+        &mut self,
+        task_id: TaskId,
+        status: Task::AwaitingStatus,
+        action_sender: UserActionSender<Task::UserAction>,
+    ) -> RpcTaskResult<()> {
+        match self.tasks.remove(&task_id) {
+            Some(TaskStatusExt::InProgress {
+                status: next_in_progress_status,
+                abort_handle,
+            }) => {
+                // Insert new awaiting status to the tasks container.
+                self.tasks.insert(task_id, TaskStatusExt::Awaiting {
+                    status,
+                    abort_handle,
+                    action_sender,
+                    next_in_progress_status,
+                });
+                Ok(())
+            },
+            Some(unexpected) => {
+                // Return the status to the tasks container.
+                self.tasks.insert(task_id, unexpected);
+                MmError::err(self.rpc_task_error_if_not_found(task_id, TaskStatusError::InProgress))
+            },
+            None => MmError::err(RpcTaskError::NoSuchTask(task_id)),
+        }
+    }
+
+    /// Notify a spawned interrupted RPC task about the user action if it await the action.
+    pub fn on_user_action(&mut self, task_id: TaskId, user_action: Task::UserAction) -> RpcTaskResult<()> {
+        match self.tasks.remove(&task_id) {
+            Some(TaskStatusExt::Awaiting {
+                action_sender,
+                abort_handle,
+                next_in_progress_status: status,
+                ..
+            }) => {
+                let result = action_sender
+                    .send(user_action)
+                    // The task seems to be canceled/aborted for some reason.
+                    .map_to_mm(|_user_action| RpcTaskError::Canceled);
+                // Insert new in-progress status to the tasks container.
+                self.tasks
+                    .insert(task_id, TaskStatusExt::InProgress { status, abort_handle });
+                result
+            },
+            Some(unexpected) => {
+                // Return the unexpected status to the tasks container.
+                self.tasks.insert(task_id, unexpected);
+                MmError::err(self.rpc_task_error_if_not_found(task_id, TaskStatusError::AwaitingUserAction))
+            },
+            None => MmError::err(RpcTaskError::NoSuchTask(task_id)),
+        }
+    }
+}
+
+/// `TaskStatus` extended with `TaskAbortHandle`.
+/// This is stored in the [`RpcTaskManager::tasks`] container.
+enum TaskStatusExt<Task: RpcTaskTypes> {
+    InProgress {
+        status: Task::InProgressStatus,
+        abort_handle: TaskAbortHandle,
+    },
+    Awaiting {
+        status: Task::AwaitingStatus,
+        action_sender: UserActionSender<Task::UserAction>,
+        abort_handle: TaskAbortHandle,
+        next_in_progress_status: Task::InProgressStatus,
+    },
+    Ready(FinishedTaskResult<Task::Item, Task::Error>),
+}
diff --git a/mm2src/rpc_task/src/rpc_common.rs b/mm2src/rpc_task/src/rpc_common.rs
new file mode 100644
index 0000000000..35995beb8e
--- /dev/null
+++ b/mm2src/rpc_task/src/rpc_common.rs
@@ -0,0 +1,71 @@
+use super::{RpcTaskError, TaskId};
+use common::{true_f, HttpStatusCode, StatusCode};
+use derive_more::Display;
+
+/// In most cases, the RPC task status request may fail with either [`RpcTaskStatusError::NoSuchTask`] or [`RpcTaskStatusError::Internal`].
+/// Please do not add new error variants unless they are used in most cases.
+#[derive(Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum RpcTaskStatusError {
+    NoSuchTask(TaskId),
+    Internal(String),
+}
+
+impl HttpStatusCode for RpcTaskStatusError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            RpcTaskStatusError::NoSuchTask(_) => StatusCode::BAD_REQUEST,
+            RpcTaskStatusError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+/// In most cases, the RPC task action may fail with either [`RpcTaskStatusError::NoSuchTask`] or [`RpcTaskStatusError::Internal`].
+/// Please do not add new error variants unless they are used in most cases.
+#[derive(Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum RpcTaskUserActionError {
+    NoSuchTask(TaskId),
+    Internal(String),
+}
+
+impl From<RpcTaskError> for RpcTaskUserActionError {
+    fn from(rpc_err: RpcTaskError) -> Self {
+        match rpc_err {
+            RpcTaskError::NoSuchTask(task_id) => RpcTaskUserActionError::NoSuchTask(task_id),
+            rpc_err => RpcTaskUserActionError::Internal(rpc_err.to_string()),
+        }
+    }
+}
+
+impl HttpStatusCode for RpcTaskUserActionError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            RpcTaskUserActionError::NoSuchTask(_) => StatusCode::BAD_REQUEST,
+            RpcTaskUserActionError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+/// In most cases, the RPC task status request consists of `task_id` and `forget_if_finished` fields only.
+/// Please do not add new fields unless they are used in most cases.
+#[derive(Deserialize)]
+pub struct RpcTaskStatusRequest {
+    pub task_id: TaskId,
+    #[serde(default = "true_f")]
+    pub forget_if_finished: bool,
+}
+
+/// Please do not add new fields unless they are used in most cases.
+#[derive(Deserialize)]
+pub struct RpcTaskUserActionRequest<UserAction> {
+    pub task_id: TaskId,
+    pub user_action: UserAction,
+}
+
+/// In most cases, the response to the RPC task initialization consists of `task_id` only.
+/// Please do not add new fields unless they are used in most cases.
+#[derive(Serialize)]
+pub struct InitRpcTaskResponse {
+    pub task_id: TaskId,
+}
diff --git a/mm2src/rpc_task/src/task.rs b/mm2src/rpc_task/src/task.rs
new file mode 100644
index 0000000000..8ede7ffae1
--- /dev/null
+++ b/mm2src/rpc_task/src/task.rs
@@ -0,0 +1,19 @@
+use crate::handle::RpcTaskHandle;
+use async_trait::async_trait;
+use mm2_err_handle::prelude::*;
+use serde::Serialize;
+
+pub trait RpcTaskTypes {
+    type Item: Serialize + Clone + Send + Sync + 'static;
+    type Error: SerMmErrorType + Clone + Send + Sync + 'static;
+    type InProgressStatus: Clone + Send + Sync + 'static;
+    type AwaitingStatus: Clone + Send + Sync + 'static;
+    type UserAction: NotMmError + Send + Sync + 'static;
+}
+
+#[async_trait]
+pub trait RpcTask: RpcTaskTypes + Sized + Send + 'static {
+    fn initial_status(&self) -> Self::InProgressStatus;
+
+    async fn run(self, task_handle: &RpcTaskHandle<Self>) -> Result<Self::Item, MmError<Self::Error>>;
+}
diff --git a/mm2src/trezor/.gitignore b/mm2src/trezor/.gitignore
new file mode 100644
index 0000000000..6161678db8
--- /dev/null
+++ b/mm2src/trezor/.gitignore
@@ -0,0 +1,4 @@
+$ cat .gitignore
+
+target/
+!.gitignore
diff --git a/mm2src/trezor/Cargo.toml b/mm2src/trezor/Cargo.toml
new file mode 100644
index 0000000000..2c0a5e1b03
--- /dev/null
+++ b/mm2src/trezor/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "trezor"
+version = "0.1.1"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1"
+byteorder = "1.3.2"
+common = { path = "../common" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
+hw_common = { path = "../hw_common" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+prost = "0.10"
+rand = { version = "0.7", features = ["std", "wasm-bindgen"] }
+rpc_task = { path = "../rpc_task" }
+serde = "1.0"
+serde_derive = "1.0"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+js-sys = { version = "0.3.27" }
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
+wasm-bindgen-futures = { version = "0.4.1" }
+wasm-bindgen-test = { version = "0.3.1" }
+web-sys = { version = "0.3.55" }
diff --git a/mm2src/trezor/README.md b/mm2src/trezor/README.md
new file mode 100644
index 0000000000..fba4bb64bc
--- /dev/null
+++ b/mm2src/trezor/README.md
@@ -0,0 +1,6 @@
+This crate provides a Trezor Hardware Wallet API written in pure Rust.
+
+## Update Protobuf
+
+If it's needed to update Protobuf protocol, please fetch corresponding files from the official [repo](https://github.com/trezor/trezor-common/tree/master/protob)
+and put them to the `./proto/` directory.
diff --git a/mm2src/trezor/build.rs b/mm2src/trezor/build.rs
new file mode 100644
index 0000000000..c40792c165
--- /dev/null
+++ b/mm2src/trezor/build.rs
@@ -0,0 +1,11 @@
+#[allow(dead_code)]
+const PROTOS: [&str; 4] = [
+    "proto/messages.proto",
+    "proto/messages-common.proto",
+    "proto/messages-management.proto",
+    "proto/messages-bitcoin.proto",
+];
+
+fn main() {
+    // prost_build::compile_protos(&PROTOS, &["proto"]).unwrap();
+}
diff --git a/mm2src/trezor/proto/messages-bitcoin.proto b/mm2src/trezor/proto/messages-bitcoin.proto
new file mode 100644
index 0000000000..3b56741bc2
--- /dev/null
+++ b/mm2src/trezor/proto/messages-bitcoin.proto
@@ -0,0 +1,567 @@
+syntax = "proto2";
+package hw.trezor.messages.bitcoin;
+
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.lib.protobuf";
+option java_outer_classname = "TrezorMessageBitcoin";
+
+import "messages.proto";
+import "messages-common.proto";
+
+/**
+ * Type of script which will be used for transaction input
+ */
+enum InputScriptType {
+  SPENDADDRESS = 0;       // standard P2PKH address
+  SPENDMULTISIG = 1;      // P2SH multisig address
+  EXTERNAL = 2;           // reserved for external inputs (coinjoin)
+  SPENDWITNESS = 3;       // native SegWit
+  SPENDP2SHWITNESS = 4;   // SegWit over P2SH (backward compatible)
+}
+
+/**
+ * Type of script which will be used for transaction output
+ */
+enum OutputScriptType {
+  PAYTOADDRESS = 0;       // used for all addresses (bitcoin, p2sh, witness)
+  PAYTOSCRIPTHASH = 1;    // p2sh address (deprecated; use PAYTOADDRESS)
+  PAYTOMULTISIG = 2;      // only for change output
+  PAYTOOPRETURN = 3;      // op_return
+  PAYTOWITNESS = 4;       // only for change output
+  PAYTOP2SHWITNESS = 5;   // only for change output
+}
+
+/**
+ * Type of script which will be used for decred stake transaction input
+ */
+enum DecredStakingSpendType {
+  SSGen = 0;
+  SSRTX = 1;
+}
+
+/**
+ * Unit to be used when showing amounts on the display
+ */
+enum AmountUnit {
+  BITCOIN = 0;        // BTC
+  MILLIBITCOIN = 1;   // mBTC
+  MICROBITCOIN = 2;   // uBTC
+  SATOSHI = 3;        // sat
+}
+
+/**
+ * Type of redeem script used in input
+ * @embed
+ */
+message MultisigRedeemScriptType {
+  repeated HDNodePathType pubkeys = 1;    // pubkeys from multisig address (sorted lexicographically)
+  repeated bytes signatures = 2;          // existing signatures for partially signed input
+  required uint32 m = 3;                  // "m" from n, how many valid signatures is necessary for spending
+  repeated common.HDNodeType nodes = 4;    // simplified way how to specify pubkeys if they share the same address_n path
+  repeated uint32 address_n = 5;                              // use only field 1 or fields 4+5, if fields 4+5 are used, field 1 is ignored
+  /**
+  * Structure representing HDNode + Path
+  */
+  message HDNodePathType {
+    required common.HDNodeType node = 1; // BIP-32 node in deserialized form
+    repeated uint32 address_n = 2;                          // BIP-32 path to derive the key from node
+  }
+}
+
+/**
+ * Request: Ask device for public key corresponding to address_n path
+ * @start
+ * @next PublicKey
+ * @next Failure
+ */
+message GetPublicKey {
+  repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
+  optional string ecdsa_curve_name = 2;                               // ECDSA curve name to use
+  optional bool show_display = 3;                                     // optionally show on display before sending the result
+  optional string coin_name = 4 [default='Bitcoin'];                  // coin to use for verifying
+  optional InputScriptType script_type = 5 [default=SPENDADDRESS];    // used to distinguish between various address formats (non-segwit, segwit, etc.)
+  optional bool ignore_xpub_magic = 6;                                // ignore SLIP-0132 XPUB magic, use xpub/tpub prefix for all account types
+}
+
+/**
+ * Response: Contains public key derived from device private seed
+ * @end
+ */
+message PublicKey {
+  required common.HDNodeType node = 1;        // BIP32 public node
+  required string xpub = 2;                   // serialized form of public node
+  optional uint32 root_fingerprint = 3;       // master root node fingerprint
+}
+
+/**
+ * Request: Ask device for address corresponding to address_n path
+ * @start
+ * @next Address
+ * @next Failure
+ */
+message GetAddress {
+  repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
+  optional string coin_name = 2 [default='Bitcoin'];                  // coin to use
+  optional bool show_display = 3;                                     // optionally show on display before sending the result
+  optional MultisigRedeemScriptType multisig = 4;                     // filled if we are showing a multisig address
+  optional InputScriptType script_type = 5 [default=SPENDADDRESS];    // used to distinguish between various address formats (non-segwit, segwit, etc.)
+  optional bool ignore_xpub_magic = 6;                                // ignore SLIP-0132 XPUB magic, use xpub/tpub prefix for all account types
+}
+
+/**
+ * Response: Contains address derived from device private seed
+ * @end
+ */
+message Address {
+  required string address = 1;    // Coin address in Base58 encoding
+}
+
+/**
+ * Request: Ask device for ownership identifier corresponding to scriptPubKey for address_n path
+ * @start
+ * @next OwnershipId
+ * @next Failure
+ */
+message GetOwnershipId {
+  repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
+  optional string coin_name = 2 [default='Bitcoin'];                  // coin to use
+  optional MultisigRedeemScriptType multisig = 3;                     // filled if we are dealing with a multisig scriptPubKey
+  optional InputScriptType script_type = 4 [default=SPENDADDRESS];    // used to distinguish between various address formats (non-segwit, segwit, etc.)
+}
+
+/**
+ * Response: Contains the ownership identifier for the scriptPubKey and device private seed
+ * @end
+ */
+message OwnershipId {
+  required bytes ownership_id = 1;    // ownership identifier
+}
+
+/**
+ * Request: Ask device to sign message
+ * @start
+ * @next MessageSignature
+ * @next Failure
+ */
+message SignMessage {
+  repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
+  required bytes message = 2;                                         // message to be signed
+  optional string coin_name = 3 [default='Bitcoin'];                  // coin to use for signing
+  optional InputScriptType script_type = 4 [default=SPENDADDRESS];    // used to distinguish between various address formats (non-segwit, segwit, etc.)
+}
+
+/**
+ * Response: Signed message
+ * @end
+ */
+message MessageSignature {
+  required string address = 1;    // address used to sign the message
+  required bytes signature = 2;   // signature of the message
+}
+
+/**
+ * Request: Ask device to verify message
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message VerifyMessage {
+  required string address = 1;                        // address to verify
+  required bytes signature = 2;                       // signature to verify
+  required bytes message = 3;                         // message to verify
+  optional string coin_name = 4 [default='Bitcoin'];  // coin to use for verifying
+}
+
+/**
+ * Request: Ask device to sign transaction
+ * @start
+ * @next TxRequest
+ * @next Failure
+ */
+message SignTx {
+  required uint32 outputs_count = 1;                         // number of transaction outputs
+  required uint32 inputs_count = 2;                          // number of transaction inputs
+  optional string coin_name = 3 [default='Bitcoin'];         // coin to use
+  optional uint32 version = 4 [default=1];                   // transaction version
+  optional uint32 lock_time = 5 [default=0];                 // transaction lock_time
+  optional uint32 expiry = 6;                                // only for Decred and Zcash
+  optional bool overwintered = 7 [deprecated=true];          // deprecated in 2.3.2, the field is not needed as it can be derived from `version`
+  optional uint32 version_group_id = 8;                      // only for Zcash, nVersionGroupId
+  optional uint32 timestamp = 9;                             // only for Peercoin
+  optional uint32 branch_id = 10;                            // only for Zcash, BRANCH_ID
+  optional AmountUnit amount_unit = 11 [default=BITCOIN];    // show amounts in
+  optional bool decred_staking_ticket = 12 [default=false];  // only for Decred, this is signing a ticket purchase
+}
+
+/**
+ * Response: Device asks for information for signing transaction or returns the last result
+ * If request_index is set, device awaits TxAck<any> matching the request type.
+ * If signature_index is set, 'signature' contains signed input of signature_index's input
+ * @end
+ * @next TxAckInput
+ * @next TxAckOutput
+ * @next TxAckPrevMeta
+ * @next TxAckPrevInput
+ * @next TxAckPrevOutput
+ * @next TxAckPrevExtraData
+ */
+message TxRequest {
+  optional RequestType request_type = 1;              // what should be filled in TxAck message?
+  optional TxRequestDetailsType details = 2;          // request for tx details
+  optional TxRequestSerializedType serialized = 3;    // serialized data and request for next
+  /**
+  * Type of information required by transaction signing process
+  */
+  enum RequestType {
+    TXINPUT = 0;
+    TXOUTPUT = 1;
+    TXMETA = 2;
+    TXFINISHED = 3;
+    TXEXTRADATA = 4;
+    TXORIGINPUT = 5;
+    TXORIGOUTPUT = 6;
+  }
+  /**
+  * Structure representing request details
+  */
+  message TxRequestDetailsType {
+    optional uint32 request_index = 1;      // device expects TxAck message from the computer
+    optional bytes tx_hash = 2;             // tx_hash of requested transaction
+    optional uint32 extra_data_len = 3;     // length of requested extra data (only for Dash, Zcash)
+    optional uint32 extra_data_offset = 4;  // offset of requested extra data (only for Dash, Zcash)
+  }
+  /**
+  * Structure representing serialized data
+  */
+  message TxRequestSerializedType {
+    optional uint32 signature_index = 1;    // 'signature' field contains signed input of this index
+    optional bytes signature = 2;           // signature of the signature_index input
+    optional bytes serialized_tx = 3;       // part of serialized and signed transaction
+  }
+}
+
+/**
+ * Request: Reported transaction data (legacy)
+ *
+ * This message contains all possible field that can be sent in response to a TxRequest.
+ * Depending on the request_type, the host is supposed to fill some of these fields.
+ *
+ * The interface is wire-compatible with the new method of specialized TxAck subtypes,
+ * so it can be used in the old way. However, it is now recommended to use more
+ * specialized messages, which have better-configured constraints on field values.
+ *
+ * @next TxRequest
+ */
+message TxAck {
+  option deprecated = true;
+
+  optional TransactionType tx = 1;
+  /**
+  * Structure representing transaction
+  */
+  message TransactionType {
+    optional uint32 version = 1;
+    repeated TxInputType inputs = 2;
+    repeated TxOutputBinType bin_outputs = 3;
+    optional uint32 lock_time = 4;
+    repeated TxOutputType outputs = 5;
+    optional uint32 inputs_cnt = 6;
+    optional uint32 outputs_cnt = 7;
+    optional bytes extra_data = 8;          // only for Dash, Zcash
+    optional uint32 extra_data_len = 9;     // only for Dash, Zcash
+    optional uint32 expiry = 10;            // only for Decred and Zcash
+    optional bool overwintered = 11 [deprecated=true];   // Zcash only; deprecated in 2.3.2, the field is not needed, it can be derived from `version`
+    optional uint32 version_group_id = 12;  // only for Zcash, nVersionGroupId
+    optional uint32 timestamp = 13;         // only for Peercoin
+    optional uint32 branch_id = 14;         // only for Zcash, BRANCH_ID
+    /**
+    * Structure representing transaction input
+    */
+    message TxInputType {
+      repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
+      required bytes prev_hash = 2;                                       // hash of previous transaction output to spend by this input
+      required uint32 prev_index = 3;                                     // index of previous output to spend
+      optional bytes script_sig = 4;                                      // script signature, unset for tx to sign
+      optional uint32 sequence = 5 [default=4294967295];                  // sequence (default=0xffffffff)
+      optional InputScriptType script_type = 6 [default=SPENDADDRESS];    // defines template of input script
+      optional MultisigRedeemScriptType multisig = 7;                     // Filled if input is going to spend multisig tx
+      optional uint64 amount = 8;                                         // amount of previous transaction output (for segwit only)
+      optional uint32 decred_tree = 9;                                    // only for Decred, 0 is a normal transaction while 1 is a stake transaction
+      // optional uint32 decred_script_version = 10;                         // only for Decred  // deprecated -> only 0 is supported
+      // optional bytes prev_block_hash_bip115 = 11;     // BIP-115 support dropped
+      // optional uint32 prev_block_height_bip115 = 12;  // BIP-115 support dropped
+      optional bytes witness = 13;                                        // witness data, only set for EXTERNAL inputs
+      optional bytes ownership_proof = 14;                                // SLIP-0019 proof of ownership, only set for EXTERNAL inputs
+      optional bytes commitment_data = 15;                                // optional commitment data for the SLIP-0019 proof of ownership
+      optional bytes orig_hash = 16;                                      // tx_hash of the original transaction where this input was spent (used when creating a replacement transaction)
+      optional uint32 orig_index = 17;                                    // index of the input in the original transaction (used when creating a replacement transaction)
+      optional DecredStakingSpendType decred_staking_spend = 18;          // if not None this holds the type of stake spend: revocation or stake generation
+    }
+    /**
+    * Structure representing compiled transaction output
+    */
+    message TxOutputBinType {
+      required uint64 amount = 1;
+      required bytes script_pubkey = 2;
+      optional uint32 decred_script_version = 3;      // only for Decred, currently only 0 is supported
+    }
+    /**
+    * Structure representing transaction output
+    */
+    message TxOutputType {
+      optional string address = 1;                    // target coin address in Base58 encoding
+      repeated uint32 address_n = 2;                  // BIP-32 path to derive the key from master node; has higher priority than "address"
+      required uint64 amount = 3;                     // amount to spend in satoshis
+      optional OutputScriptType script_type = 4 [default=PAYTOADDRESS];      // output script type
+      optional MultisigRedeemScriptType multisig = 5; // defines multisig address; script_type must be PAYTOMULTISIG
+      optional bytes op_return_data = 6;              // defines op_return data; script_type must be PAYTOOPRETURN, amount must be 0
+      // optional uint32 decred_script_version = 7;      // only for Decred  // deprecated -> only 0 is supported
+      // optional bytes block_hash_bip115 = 8;        // BIP-115 support dropped
+      // optional uint32 block_height_bip115 = 9;     // BIP-115 support dropped
+      optional bytes orig_hash = 10;                  // tx_hash of the original transaction where this output was present (used when creating a replacement transaction)
+      optional uint32 orig_index = 11;                // index of the output in the original transaction (used when creating a replacement transaction)
+    }
+  }
+}
+
+/** Data type for transaction input to be signed.
+ *
+ * When adding fields, take care to not conflict with PrevInput
+ *
+ * @embed
+ */
+message TxInput {
+  repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
+  required bytes prev_hash = 2;                                       // hash of previous transaction output to spend by this input
+  required uint32 prev_index = 3;                                     // index of previous output to spend
+  optional bytes script_sig = 4;                                      // script signature, only set for EXTERNAL inputs
+  optional uint32 sequence = 5 [default=0xffffffff];                  // sequence
+  optional InputScriptType script_type = 6 [default=SPENDADDRESS];    // defines template of input script
+  optional MultisigRedeemScriptType multisig = 7;                     // Filled if input is going to spend multisig tx
+  required uint64 amount = 8;                                         // amount of previous transaction output
+  optional uint32 decred_tree = 9;                                    // only for Decred, 0 is a normal transaction while 1 is a stake transaction
+  reserved 10, 11, 12;                                                // fields which are in use, or have been in the past, in TxInputType
+  optional bytes witness = 13;                                        // witness data, only set for EXTERNAL inputs
+  optional bytes ownership_proof = 14;                                // SLIP-0019 proof of ownership, only set for EXTERNAL inputs
+  optional bytes commitment_data = 15;                                // optional commitment data for the SLIP-0019 proof of ownership
+  optional bytes orig_hash = 16;                                      // tx_hash of the original transaction where this input was spent (used when creating a replacement transaction)
+  optional uint32 orig_index = 17;                                    // index of the input in the original transaction (used when creating a replacement transaction)
+  optional DecredStakingSpendType decred_staking_spend = 18; 	        // if not None this holds the type of stake spend: revocation or stake generation
+}
+
+/** Data type for transaction output to be signed.
+ * @embed
+ */
+message TxOutput {
+  optional string address = 1;                    // destination address in Base58 encoding; script_type must be PAYTOADDRESS
+  repeated uint32 address_n = 2;                  // BIP-32 path to derive the destination (used for change addresses)
+  required uint64 amount = 3;                     // amount to spend in satoshis
+  optional OutputScriptType script_type = 4 [default=PAYTOADDRESS];      // output script type
+  optional MultisigRedeemScriptType multisig = 5; // defines multisig address; script_type must be PAYTOMULTISIG
+  optional bytes op_return_data = 6;              // defines op_return data; script_type must be PAYTOOPRETURN, amount must be 0
+  reserved 7, 8, 9;                               // fields which are in use, or have been in the past, in TxOutputType
+  optional bytes orig_hash = 10;                  // tx_hash of the original transaction where this output was present (used when creating a replacement transaction)
+  optional uint32 orig_index = 11;                // index of the output in the original transaction (used when creating a replacement transaction)
+}
+
+/** Data type for metadata about previous transaction which contains the UTXO being spent.
+ * @embed
+ */
+message PrevTx {
+  required uint32 version = 1;
+  required uint32 lock_time = 4;
+  required uint32 inputs_count = 6;
+  required uint32 outputs_count = 7;
+  optional uint32 extra_data_len = 9 [default=0];     // only for Dash, Zcash
+  optional uint32 expiry = 10;            // only for Decred and Zcash
+  optional uint32 version_group_id = 12;  // only for Zcash, nVersionGroupId
+  optional uint32 timestamp = 13;         // only for Peercoin
+  optional uint32 branch_id = 14;         // only for Zcash, BRANCH_ID
+
+  // fields which are in use, or have been in the past, in TransactionType
+  reserved 2, 3, 5, 8, 11;
+}
+
+/** Data type for inputs of previous transactions.
+ *
+ * When adding fields, take care to not conflict with TxInput
+ * @embed
+ */
+message PrevInput {
+  required bytes prev_hash = 2;                                       // hash of previous transaction output to spend by this input
+  required uint32 prev_index = 3;                                     // index of previous output to spend
+  required bytes script_sig = 4;                                      // script signature
+  required uint32 sequence = 5;                                       // sequence
+  optional uint32 decred_tree = 9;                                    // only for Decred
+
+  // fields that are in use, or have been in the past, in TxInputType
+  reserved 1, 6, 7, 8, 10, 11, 12, 13, 14, 15;
+}
+
+/** Data type for outputs of previous transactions.
+ * @embed
+ */
+message PrevOutput {
+  required uint64 amount = 1;                     // amount sent to this output
+  required bytes script_pubkey = 2;               // scriptPubkey of this output
+  optional uint32 decred_script_version = 3;      // only for Decred
+}
+
+/**
+ * Request: Data about input to be signed.
+ * Wire-alias of TxAck.
+ *
+ * Do not edit this type without considering compatibility with TxAck.
+ * Prefer to modify the inner TxInput type.
+ *
+ * @next TxRequest
+ */
+message TxAckInput {
+  option (wire_type) = 22;
+  option (include_in_bitcoin_only) = true;
+
+  required TxAckInputWrapper tx = 1;
+
+  message TxAckInputWrapper {
+    required TxInput input = 2;
+  }
+}
+
+/**
+ * Request: Data about output to be signed.
+ * Wire-alias of TxAck.
+ *
+ * Do not edit this type without considering compatibility with TxAck.
+ * Prefer to modify the inner TxOutput type.
+ *
+ * @next TxRequest
+ */
+message TxAckOutput {
+  option (wire_type) = 22;
+  option (include_in_bitcoin_only) = true;
+
+  required TxAckOutputWrapper tx = 1;
+
+  message TxAckOutputWrapper {
+    required TxOutput output = 5;
+  }
+}
+
+/**
+ * Request: Data about previous transaction metadata
+ * Wire-alias of TxAck.
+ *
+ * Do not edit this type without considering compatibility with TxAck.
+ * Prefer to modify the inner PrevTx type.
+ *
+ * @next TxRequest
+ */
+message TxAckPrevMeta {
+  option (wire_type) = 22;
+  option (include_in_bitcoin_only) = true;
+
+  required PrevTx tx = 1;
+}
+
+/**
+ * Request: Data about previous transaction input
+ * Wire-alias of TxAck.
+ *
+ * Do not edit this type without considering compatibility with TxAck.
+ * Prefer to modify the inner PrevInput type.
+ *
+ * @next TxRequest
+ */
+message TxAckPrevInput {
+  option (wire_type) = 22;
+  option (include_in_bitcoin_only) = true;
+
+  required TxAckPrevInputWrapper tx = 1;
+
+  message TxAckPrevInputWrapper {
+    required PrevInput input = 2;
+
+  }
+}
+
+/**
+ * Request: Data about previous transaction output
+ * Wire-alias of TxAck.
+ *
+ * Do not edit this type without considering compatibility with TxAck.
+ * Prefer to modify the inner PrevOutput type.
+ *
+ * @next TxRequest
+ */
+message TxAckPrevOutput {
+  option (wire_type) = 22;
+  option (include_in_bitcoin_only) = true;
+
+  required TxAckPrevOutputWrapper tx = 1;
+
+  message TxAckPrevOutputWrapper {
+    required PrevOutput output = 3;
+  }
+}
+
+/**
+ * Request: Content of the extra data of a previous transaction
+ * Wire-alias of TxAck.
+ *
+ * Do not edit this type without considering compatibility with TxAck.
+ *
+ * @next TxRequest
+ */
+message TxAckPrevExtraData {
+  option (wire_type) = 22;
+  option (include_in_bitcoin_only) = true;
+
+  required TxAckPrevExtraDataWrapper tx = 1;
+
+  message TxAckPrevExtraDataWrapper {
+    required bytes extra_data_chunk = 8;
+  }
+}
+
+/**
+ * Request: Ask device for a proof of ownership corresponding to address_n path
+ * @start
+ * @next OwnershipProof
+ * @next Failure
+ */
+message GetOwnershipProof {
+  repeated uint32 address_n = 1;                                      // BIP-32 path to derive the key from master node
+  optional string coin_name = 2 [default='Bitcoin'];                  // coin to use
+  optional InputScriptType script_type = 3 [default=SPENDWITNESS];    // used to distinguish between various scriptPubKey types
+  optional MultisigRedeemScriptType multisig = 4;                     // filled if proof is for a multisig address
+  optional bool user_confirmation = 5 [default=false];                // show a confirmation dialog and set the "user confirmation" bit in the proof
+  repeated bytes ownership_ids = 6;                                   // list of ownership identifiers in case of multisig
+  optional bytes commitment_data = 7 [default=''];                    // additional data to which the proof should commit
+}
+
+/**
+ * Response: Contains the proof of ownership
+ * @end
+ */
+message OwnershipProof {
+  required bytes ownership_proof = 1;     // SLIP-0019 proof of ownership
+  required bytes signature = 2;           // signature of the proof
+}
+
+/**
+ * Request: Ask device to prompt the user to authorize a CoinJoin transaction
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message AuthorizeCoinJoin {
+  option (unstable) = true;
+
+  required string coordinator = 1;                                    // coordinator identifier to approve as a prefix in commitment data (max. 18 ASCII characters)
+  required uint64 max_total_fee = 2;                                  // maximum total fees
+  optional uint32 fee_per_anonymity = 3 [default=0];                  // fee per anonymity set in units of 10^-9 percent
+  repeated uint32 address_n = 4;                                      // prefix of the BIP-32 path leading to the account (m / purpose' / coin_type' / account')
+  optional string coin_name = 5 [default='Bitcoin'];                  // coin to use
+  optional InputScriptType script_type = 6 [default=SPENDADDRESS];    // used to distinguish between various address formats (non-segwit, segwit, etc.)
+  optional AmountUnit amount_unit = 11 [default=BITCOIN];             // show amounts in
+}
diff --git a/mm2src/trezor/proto/messages-common.proto b/mm2src/trezor/proto/messages-common.proto
new file mode 100644
index 0000000000..dbdbc0171b
--- /dev/null
+++ b/mm2src/trezor/proto/messages-common.proto
@@ -0,0 +1,161 @@
+syntax = "proto2";
+package hw.trezor.messages.common;
+
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.lib.protobuf";
+option java_outer_classname = "TrezorMessageCommon";
+
+/**
+ * Response: Success of the previous request
+ * @end
+ */
+message Success {
+    optional string message = 1 [default=""]; // human readable description of action or request-specific payload
+}
+
+/**
+ * Response: Failure of the previous request
+ * @end
+ */
+message Failure {
+    optional FailureType code = 1;  // computer-readable definition of the error state
+    optional string message = 2;    // human-readable message of the error state
+    enum FailureType {
+        Failure_UnexpectedMessage = 1;
+        Failure_ButtonExpected = 2;
+        Failure_DataError = 3;
+        Failure_ActionCancelled = 4;
+        Failure_PinExpected = 5;
+        Failure_PinCancelled = 6;
+        Failure_PinInvalid = 7;
+        Failure_InvalidSignature = 8;
+        Failure_ProcessError = 9;
+        Failure_NotEnoughFunds = 10;
+        Failure_NotInitialized = 11;
+        Failure_PinMismatch = 12;
+        Failure_WipeCodeMismatch = 13;
+        Failure_InvalidSession = 14;
+        Failure_FirmwareError = 99;
+    }
+}
+
+/**
+ * Response: Device is waiting for HW button press.
+ * @auxstart
+ * @next ButtonAck
+ */
+message ButtonRequest {
+    optional ButtonRequestType code = 1;  // enum identifier of the screen
+    optional uint32 pages = 2;            // if the screen is paginated, number of pages
+    /**
+    * Type of button request
+    */
+    enum ButtonRequestType {
+        ButtonRequest_Other = 1;
+        ButtonRequest_FeeOverThreshold = 2;
+        ButtonRequest_ConfirmOutput = 3;
+        ButtonRequest_ResetDevice = 4;
+        ButtonRequest_ConfirmWord = 5;
+        ButtonRequest_WipeDevice = 6;
+        ButtonRequest_ProtectCall = 7;
+        ButtonRequest_SignTx = 8;
+        ButtonRequest_FirmwareCheck = 9;
+        ButtonRequest_Address = 10;
+        ButtonRequest_PublicKey = 11;
+        ButtonRequest_MnemonicWordCount = 12;
+        ButtonRequest_MnemonicInput = 13;
+        _Deprecated_ButtonRequest_PassphraseType = 14 [deprecated=true];
+        ButtonRequest_UnknownDerivationPath = 15;
+        ButtonRequest_RecoveryHomepage = 16;
+        ButtonRequest_Success = 17;
+        ButtonRequest_Warning = 18;
+        ButtonRequest_PassphraseEntry = 19;
+        ButtonRequest_PinEntry = 20;
+    }
+}
+
+/**
+ * Request: Computer agrees to wait for HW button press
+ * @auxend
+ */
+message ButtonAck {
+}
+
+/**
+ * Response: Device is asking computer to show PIN matrix and awaits PIN encoded using this matrix scheme
+ * @auxstart
+ * @next PinMatrixAck
+ */
+message PinMatrixRequest {
+    optional PinMatrixRequestType type = 1;
+    /**
+    * Type of PIN request
+    */
+    enum PinMatrixRequestType {
+        PinMatrixRequestType_Current = 1;
+        PinMatrixRequestType_NewFirst = 2;
+        PinMatrixRequestType_NewSecond = 3;
+        PinMatrixRequestType_WipeCodeFirst = 4;
+        PinMatrixRequestType_WipeCodeSecond = 5;
+    }
+}
+
+/**
+ * Request: Computer responds with encoded PIN
+ * @auxend
+ */
+message PinMatrixAck {
+    required string pin = 1;    // matrix encoded PIN entered by user
+}
+
+/**
+ * Response: Device awaits encryption passphrase
+ * @auxstart
+ * @next PassphraseAck
+ */
+message PassphraseRequest {
+    optional bool _on_device = 1 [deprecated=true];  // <2.3.0
+}
+
+/**
+ * Request: Send passphrase back
+ * @auxend
+ */
+message PassphraseAck {
+    optional string passphrase = 1;
+    optional bytes _state = 2 [deprecated=true];  // <2.3.0
+    optional bool on_device = 3;    // user wants to enter passphrase on the device
+}
+
+/**
+ * Response: Device awaits passphrase state
+ * Deprecated in 2.3.0
+ * @next Deprecated_PassphraseStateAck
+ */
+message Deprecated_PassphraseStateRequest {
+    option deprecated = true;
+    optional bytes state = 1;       // actual device state
+}
+
+/**
+ * Request: Send passphrase state back
+ * Deprecated in 2.3.0
+ * @auxend
+ */
+message Deprecated_PassphraseStateAck {
+    option deprecated = true;
+}
+
+/**
+ * Structure representing BIP32 (hierarchical deterministic) node
+ * Used for imports of private key into the device and exporting public key out of device
+ * @embed
+ */
+message HDNodeType {
+    required uint32 depth = 1;
+    required uint32 fingerprint = 2;
+    required uint32 child_num = 3;
+    required bytes chain_code = 4;
+    optional bytes private_key = 5;
+    required bytes public_key = 6;
+}
diff --git a/mm2src/trezor/proto/messages-management.proto b/mm2src/trezor/proto/messages-management.proto
new file mode 100644
index 0000000000..94f6135a40
--- /dev/null
+++ b/mm2src/trezor/proto/messages-management.proto
@@ -0,0 +1,419 @@
+syntax = "proto2";
+package hw.trezor.messages.management;
+
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.lib.protobuf";
+option java_outer_classname = "TrezorMessageManagement";
+
+import "messages.proto";
+
+/**
+ * Type of the mnemonic backup given/received by the device during reset/recovery.
+ */
+enum BackupType {
+    Bip39 = 0;              // also called "Single Backup", see BIP-0039
+    Slip39_Basic = 1;       // also called "Shamir Backup", see SLIP-0039
+    Slip39_Advanced = 2;    // also called "Super Shamir" or "Shamir with Groups", see SLIP-0039#two-level-scheme
+}
+
+/**
+ * Level of safety checks for unsafe actions like spending from invalid path namespace or setting high transaction fee.
+ */
+enum SafetyCheckLevel {
+    Strict = 0;             // disallow unsafe actions, this is the default
+    PromptAlways = 1;       // ask user before unsafe action
+    PromptTemporarily = 2;  // like PromptAlways but reverts to Strict after reboot
+}
+
+/**
+ * Request: Reset device to default state and ask for device details
+ * @start
+ * @next Features
+ */
+message Initialize {
+    optional bytes session_id = 1;           // assumed device session id; Trezor clears caches if it is different or empty
+}
+
+/**
+ * Request: Ask for device details (no device reset)
+ * @start
+ * @next Features
+ */
+message GetFeatures {
+}
+
+/**
+ * Response: Reports various information about the device
+ * @end
+ */
+message Features {
+    optional string vendor = 1;                 // name of the manufacturer, e.g. "trezor.io"
+    required uint32 major_version = 2;          // major version of the firmware/bootloader, e.g. 1
+    required uint32 minor_version = 3;          // minor version of the firmware/bootloader, e.g. 0
+    required uint32 patch_version = 4;          // patch version of the firmware/bootloader, e.g. 0
+    optional bool bootloader_mode = 5;          // is device in bootloader mode?
+    optional string device_id = 6;              // device's unique identifier
+    optional bool pin_protection = 7;           // is device protected by PIN?
+    optional bool passphrase_protection = 8;    // is node/mnemonic encrypted using passphrase?
+    optional string language = 9;               // device language
+    optional string label = 10;                 // device description label
+    optional bool initialized = 12;             // does device contain seed?
+    optional bytes revision = 13;               // SCM revision of firmware
+    optional bytes bootloader_hash = 14;        // hash of the bootloader
+    optional bool imported = 15;                // was storage imported from an external source?
+    optional bool unlocked = 16;                // is the device unlocked? called "pin_cached" previously
+    //    optional bool passphrase_cached = 17;       // is passphrase already cached in session?  DEPRECATED
+    optional bool firmware_present = 18;        // is valid firmware loaded?
+    optional bool needs_backup = 19;            // does storage need backup? (equals to Storage.needs_backup)
+    optional uint32 flags = 20;                 // device flags (equals to Storage.flags)
+    optional string model = 21;                 // device hardware model
+    optional uint32 fw_major = 22;              // reported firmware version if in bootloader mode
+    optional uint32 fw_minor = 23;              // reported firmware version if in bootloader mode
+    optional uint32 fw_patch = 24;              // reported firmware version if in bootloader mode
+    optional string fw_vendor = 25;             // reported firmware vendor if in bootloader mode
+    optional bytes fw_vendor_keys = 26;         // reported firmware vendor keys (their hash)
+    optional bool unfinished_backup = 27;       // report unfinished backup (equals to Storage.unfinished_backup)
+    optional bool no_backup = 28;               // report no backup (equals to Storage.no_backup)
+    optional bool recovery_mode = 29;           // is recovery mode in progress
+    repeated Capability capabilities = 30;      // list of supported capabilities
+    enum Capability {
+        option (has_bitcoin_only_values) = true;
+
+        Capability_Bitcoin = 1 [(bitcoin_only) = true];
+        Capability_Bitcoin_like = 2;                    // Altcoins based on the Bitcoin source code
+        Capability_Binance = 3;
+        Capability_Cardano = 4;
+        Capability_Crypto = 5 [(bitcoin_only) = true];  // generic crypto operations for GPG, SSH, etc.
+        Capability_EOS = 6;
+        Capability_Ethereum = 7;
+        Capability_Lisk = 8 [deprecated = true];
+        Capability_Monero = 9;
+        Capability_NEM = 10;
+        Capability_Ripple = 11;
+        Capability_Stellar = 12;
+        Capability_Tezos = 13;
+        Capability_U2F = 14;
+        Capability_Shamir = 15 [(bitcoin_only) = true];
+        Capability_ShamirGroups = 16 [(bitcoin_only) = true];
+        Capability_PassphraseEntry = 17 [(bitcoin_only) = true];  // the device is capable of passphrase entry directly on the device
+    }
+    optional BackupType backup_type = 31;       // type of device backup (BIP-39 / SLIP-39 basic / SLIP-39 advanced)
+    optional bool sd_card_present = 32;         // is SD card present
+    optional bool sd_protection = 33;           // is SD Protect enabled
+    optional bool wipe_code_protection = 34;    // is wipe code protection enabled
+    optional bytes session_id = 35;
+    optional bool passphrase_always_on_device = 36;  // device enforces passphrase entry on Trezor
+    optional SafetyCheckLevel safety_checks = 37;            // safety check level, set to Prompt to limit path namespace enforcement
+    optional uint32 auto_lock_delay_ms = 38;    // number of milliseconds after which the device locks itself
+    optional uint32 display_rotation = 39;      // in degrees from North
+    optional bool experimental_features = 40;   // are experimental message types enabled?
+}
+
+/**
+ * Request: soft-lock the device. Following actions will require PIN. Passphrases remain cached.
+ * @start
+ * @next Success
+ */
+message LockDevice {
+}
+
+/**
+ * Request: end the current sesson. Following actions must call Initialize again.
+ * Cache for the current session is discarded, other sessions remain intact.
+ * Device is not PIN-locked.
+ * @start
+ * @next Success
+ */
+message EndSession {
+}
+
+/**
+ * Request: change language and/or label of the device
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message ApplySettings {
+    optional string language = 1;
+    optional string label = 2;
+    optional bool use_passphrase = 3;
+    optional bytes homescreen = 4;
+    //    optional PassphraseSourceType passphrase_source = 5;  DEPRECATED
+    optional uint32 auto_lock_delay_ms = 6;
+    optional uint32 display_rotation = 7;  // in degrees from North
+    optional bool passphrase_always_on_device = 8;  // do not prompt for passphrase, enforce device entry
+    optional SafetyCheckLevel safety_checks = 9;  // Safety check level, set to Prompt to limit path namespace enforcement
+    optional bool experimental_features = 10;  // enable experimental message types
+}
+
+/**
+ * Request: set flags of the device
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message ApplyFlags {
+    required uint32 flags = 1;  // bitmask, can only set bits, not unset
+}
+
+/**
+ * Request: Starts workflow for setting/changing/removing the PIN
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message ChangePin {
+    optional bool remove = 1;   // is PIN removal requested?
+}
+
+/**
+ * Request: Starts workflow for setting/removing the wipe code
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message ChangeWipeCode {
+    optional bool remove = 1;   // is wipe code removal requested?
+}
+
+/**
+ * Request: Starts workflow for enabling/regenerating/disabling SD card protection
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message SdProtect {
+    required SdProtectOperationType operation = 1;
+    /**
+    * Structure representing SD card protection operation
+    */
+    enum SdProtectOperationType {
+        DISABLE = 0;
+        ENABLE = 1;
+        REFRESH = 2;
+    }
+}
+
+/**
+ * Request: Test if the device is alive, device sends back the message in Success response
+ * @start
+ * @next Success
+ */
+message Ping {
+    optional string message = 1 [default=""];   // message to send back in Success message
+    optional bool button_protection = 2;        // ask for button press
+}
+
+/**
+ * Request: Abort last operation that required user interaction
+ * @start
+ * @next Failure
+ */
+message Cancel {
+}
+
+/**
+ * Request: Request a sample of random data generated by hardware RNG. May be used for testing.
+ * @start
+ * @next Entropy
+ * @next Failure
+ */
+message GetEntropy {
+    required uint32 size = 1;       // size of requested entropy
+}
+
+/**
+ * Response: Reply with random data generated by internal RNG
+ * @end
+ */
+message Entropy {
+    required bytes entropy = 1;     // chunk of random generated bytes
+}
+
+/**
+ * Request: Request device to wipe all sensitive data and settings
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message WipeDevice {
+}
+
+/**
+ * Request: Load seed and related internal settings from the computer
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message LoadDevice {
+    repeated string mnemonics = 1;                          // seed encoded as mnemonic (12, 18 or 24 words for BIP39, 20 or 33 for SLIP39)
+    optional string pin = 3;                                // set PIN protection
+    optional bool passphrase_protection = 4;                // enable master node encryption using passphrase
+    optional string language = 5 [default='en-US'];         // device language (IETF BCP 47 language tag)
+    optional string label = 6;                              // device label
+    optional bool skip_checksum = 7;                        // do not test mnemonic for valid BIP-39 checksum
+    optional uint32 u2f_counter = 8;                        // U2F counter
+    optional bool needs_backup = 9;                         // set "needs backup" flag
+    optional bool no_backup = 10;                           // indicate that no backup is going to be made
+}
+
+/**
+ * Request: Ask device to do initialization involving user interaction
+ * @start
+ * @next EntropyRequest
+ * @next Failure
+ */
+message ResetDevice {
+    optional bool display_random = 1;                       // display entropy generated by the device before asking for additional entropy
+    optional uint32 strength = 2 [default=256];             // strength of seed in bits
+    optional bool passphrase_protection = 3;                // enable master node encryption using passphrase
+    optional bool pin_protection = 4;                       // enable PIN protection
+    optional string language = 5 [default='en-US'];         // device language (IETF BCP 47 language tag)
+    optional string label = 6;                              // device label
+    optional uint32 u2f_counter = 7;                        // U2F counter
+    optional bool skip_backup = 8;                          // postpone seed backup to BackupDevice workflow
+    optional bool no_backup = 9;                            // indicate that no backup is going to be made
+    optional BackupType backup_type = 10 [default=Bip39];   // type of the mnemonic backup
+}
+
+/**
+ * Request: Perform backup of the device seed if not backed up using ResetDevice
+ * @start
+ * @next Success
+ */
+message BackupDevice {
+}
+
+/**
+ * Response: Ask for additional entropy from host computer
+ * @next EntropyAck
+ */
+message EntropyRequest {
+}
+
+/**
+ * Request: Provide additional entropy for seed generation function
+ * @next Success
+ */
+message EntropyAck {
+    required bytes entropy = 1;     // 256 bits (32 bytes) of random data
+}
+
+/**
+ * Request: Start recovery workflow asking user for specific words of mnemonic
+ * Used to recovery device safely even on untrusted computer.
+ * @start
+ * @next WordRequest
+ */
+message RecoveryDevice {
+    optional uint32 word_count = 1;                     // number of words in BIP-39 mnemonic
+    optional bool passphrase_protection = 2;            // enable master node encryption using passphrase
+    optional bool pin_protection = 3;                   // enable PIN protection
+    optional string language = 4;                       // device language (IETF BCP 47 language tag)
+    optional string label = 5;                          // device label
+    optional bool enforce_wordlist = 6;                 // enforce BIP-39 wordlist during the process
+    // 7 reserved for unused recovery method
+    optional RecoveryDeviceType type = 8;               // supported recovery type
+    optional uint32 u2f_counter = 9;                    // U2F counter
+    optional bool dry_run = 10;                         // perform dry-run recovery workflow (for safe mnemonic validation)
+    /**
+     * Type of recovery procedure. These should be used as bitmask, e.g.,
+     * `RecoveryDeviceType_ScrambledWords | RecoveryDeviceType_Matrix`
+     * listing every method supported by the host computer.
+     *
+     * Note that ScrambledWords must be supported by every implementation
+     * for backward compatibility; there is no way to not support it.
+     */
+    enum RecoveryDeviceType {
+        // use powers of two when extending this field
+        RecoveryDeviceType_ScrambledWords = 0;        // words in scrambled order
+        RecoveryDeviceType_Matrix = 1;                // matrix recovery type
+    }
+}
+
+/**
+ * Response: Device is waiting for user to enter word of the mnemonic
+ * Its position is shown only on device's internal display.
+ * @next WordAck
+ */
+message WordRequest {
+    required WordRequestType type = 1;
+    /**
+    * Type of Recovery Word request
+    */
+    enum WordRequestType {
+        WordRequestType_Plain = 0;
+        WordRequestType_Matrix9 = 1;
+        WordRequestType_Matrix6 = 2;
+    }
+}
+
+/**
+ * Request: Computer replies with word from the mnemonic
+ * @next WordRequest
+ * @next Success
+ * @next Failure
+ */
+message WordAck {
+    required string word = 1;           // one word of mnemonic on asked position
+}
+
+/**
+ * Request: Set U2F counter
+ * @start
+ * @next Success
+ */
+message SetU2FCounter {
+    required uint32 u2f_counter = 1;
+}
+
+/**
+ * Request: Set U2F counter
+ * @start
+ * @next NextU2FCounter
+ */
+message GetNextU2FCounter {
+}
+
+/**
+ * Request: Set U2F counter
+ * @end
+ */
+message NextU2FCounter {
+    required uint32 u2f_counter = 1;
+}
+
+/**
+ * Request: Ask device to prepare for a preauthorized operation.
+ * @start
+ * @next PreauthorizedRequest
+ * @next Failure
+ */
+message DoPreauthorized {
+}
+
+/**
+ * Request: Device awaits a preauthorized operation.
+ * @start
+ * @next SignTx
+ * @next GetOwnershipProof
+ */
+message PreauthorizedRequest {
+}
+
+/**
+ * Request: Cancel any outstanding authorization in the current session.
+ * @start
+ * @next Success
+ * @next Failure
+ */
+message CancelAuthorization {
+}
+
+/**
+ * Request: Reboot firmware to bootloader
+ * @start
+ * @next Success
+ */
+message RebootToBootloader {
+}
diff --git a/mm2src/trezor/proto/messages.proto b/mm2src/trezor/proto/messages.proto
new file mode 100644
index 0000000000..2a9a4424a9
--- /dev/null
+++ b/mm2src/trezor/proto/messages.proto
@@ -0,0 +1,332 @@
+syntax = "proto2";
+package hw.trezor.messages;
+
+/**
+ * Messages for Trezor communication
+ */
+
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.lib.protobuf";
+option java_outer_classname = "TrezorMessage";
+
+import "google/protobuf/descriptor.proto";
+
+/************************* WARNING ***********************
+Due to the way extensions are accessed in pb2py, there needs to be a globally unique
+name-ID mapping for extensions. That means that two different extensions, e.g. for
+EnumValueOptions and FieldOptions, MUST NOT have the same ID.
+Using the same ID indicates the same purpose (protobuf does not allow multiple
+extensions with the same name), such as EnumValueOptions.bitcoin_only and
+MessageOptions.include_in_bitcoin_only. pb2py can then find the extension under
+either name.
+The convention to achieve this is as follows:
+ - extensions specific to a type have the same prefix:
+   * 50xxx for EnumValueOptions
+   * 51xxx for EnumOptions
+   * 52xxx for MessageOptions
+   * 53xxx for FieldOptions
+ - extensions that might be used across types have the same "global" prefix 60xxx
+*/
+/**
+ * Options for specifying message direction and type of wire (normal/debug)
+ */
+extend google.protobuf.EnumValueOptions {
+    optional bool wire_in = 50002;              // message can be transmitted via wire from PC to Trezor
+    optional bool wire_out = 50003;             // message can be transmitted via wire from Trezor to PC
+    optional bool wire_debug_in = 50004;        // message can be transmitted via debug wire from PC to Trezor
+    optional bool wire_debug_out = 50005;       // message can be transmitted via debug wire from Trezor to PC
+    optional bool wire_tiny = 50006;            // message is handled by Trezor when the USB stack is in tiny mode
+    optional bool wire_bootloader = 50007;      // message is only handled by Trezor Bootloader
+    optional bool wire_no_fsm = 50008;          // message is not handled by Trezor unless the USB stack is in tiny mode
+
+    optional bool bitcoin_only = 60000;         // enum value is available on BITCOIN_ONLY build
+    // (messages not marked bitcoin_only will be EXCLUDED)
+}
+
+/** Options for tagging enum types */
+extend google.protobuf.EnumOptions {
+    optional bool has_bitcoin_only_values = 51001;  // indicate that some values should be excluded on BITCOIN_ONLY builds
+}
+
+/** Options for tagging message types */
+extend google.protobuf.MessageOptions {
+    optional bool unstable = 52001;   // indicate that a message definition might change at any time
+    optional uint32 wire_type = 52002;   // override wire type specified in the MessageType enum
+
+    optional bool include_in_bitcoin_only = 60000;  // message is available on BITCOIN_ONLY build
+    // intentionally identical to `bitcoin_only` from enum
+}
+
+/** Options for tagging field types */
+extend google.protobuf.FieldOptions {
+    optional bool experimental = 53001;   // indicate that a field is intended for development and beta testing only
+}
+
+
+/**
+ * Mapping between Trezor wire identifier (uint) and a protobuf message
+ */
+enum MessageType {
+    option (has_bitcoin_only_values) = true;
+
+    // Management
+    MessageType_Initialize = 0 [(bitcoin_only) = true, (wire_in) = true, (wire_tiny) = true];
+    MessageType_Ping = 1 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_Success = 2 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_Failure = 3 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_ChangePin = 4 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_WipeDevice = 5 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_GetEntropy = 9 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_Entropy = 10 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_LoadDevice = 13 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_ResetDevice = 14 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_Features = 17 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_PinMatrixRequest = 18 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_PinMatrixAck = 19 [(bitcoin_only) = true, (wire_in) = true, (wire_tiny) = true, (wire_no_fsm) = true];
+    MessageType_Cancel = 20 [(bitcoin_only) = true, (wire_in) = true, (wire_tiny) = true];
+    MessageType_LockDevice = 24 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_ApplySettings = 25 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_ButtonRequest = 26 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_ButtonAck = 27 [(bitcoin_only) = true, (wire_in) = true, (wire_tiny) = true, (wire_no_fsm) = true];
+    MessageType_ApplyFlags = 28 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_BackupDevice = 34 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_EntropyRequest = 35 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_EntropyAck = 36 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_PassphraseRequest = 41 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_PassphraseAck = 42 [(bitcoin_only) = true, (wire_in) = true, (wire_tiny) = true, (wire_no_fsm) = true];
+    MessageType_RecoveryDevice = 45 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_WordRequest = 46 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_WordAck = 47 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_GetFeatures = 55 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_SdProtect = 79 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_ChangeWipeCode = 82 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_EndSession = 83 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_DoPreauthorized = 84 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_PreauthorizedRequest = 85 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_CancelAuthorization = 86 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_RebootToBootloader = 87 [(bitcoin_only) = true, (wire_in) = true];
+
+    MessageType_SetU2FCounter = 63 [(wire_in) = true];
+    MessageType_GetNextU2FCounter = 80 [(wire_in) = true];
+    MessageType_NextU2FCounter = 81 [(wire_out) = true];
+
+    // Deprecated messages, kept for protobuf compatibility.
+    // Both are marked wire_out so that we don't need to implement incoming handler for legacy
+    MessageType_Deprecated_PassphraseStateRequest = 77 [deprecated = true];
+    MessageType_Deprecated_PassphraseStateAck = 78 [deprecated = true];
+
+    // Bootloader
+    MessageType_FirmwareErase = 6 [(bitcoin_only) = true, (wire_in) = true, (wire_bootloader) = true];
+    MessageType_FirmwareUpload = 7 [(bitcoin_only) = true, (wire_in) = true, (wire_bootloader) = true];
+    MessageType_FirmwareRequest = 8 [(bitcoin_only) = true, (wire_out) = true, (wire_bootloader) = true];
+    MessageType_SelfTest = 32 [(bitcoin_only) = true, (wire_in) = true, (wire_bootloader) = true];
+
+    // Bitcoin
+    MessageType_GetPublicKey = 11 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_PublicKey = 12 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_SignTx = 15 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_TxRequest = 21 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_TxAck = 22 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_GetAddress = 29 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_Address = 30 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_SignMessage = 38 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_VerifyMessage = 39 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_MessageSignature = 40 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_GetOwnershipId = 43 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_OwnershipId = 44 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_GetOwnershipProof = 49 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_OwnershipProof = 50 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_AuthorizeCoinJoin = 51 [(bitcoin_only) = true, (wire_in) = true];
+
+    // Crypto
+    MessageType_CipherKeyValue = 23 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_CipheredKeyValue = 48 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_SignIdentity = 53 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_SignedIdentity = 54 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_GetECDHSessionKey = 61 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_ECDHSessionKey = 62 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_CosiCommit = 71 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_CosiCommitment = 72 [(bitcoin_only) = true, (wire_out) = true];
+    MessageType_CosiSign = 73 [(bitcoin_only) = true, (wire_in) = true];
+    MessageType_CosiSignature = 74 [(bitcoin_only) = true, (wire_out) = true];
+
+    // Debug
+    MessageType_DebugLinkDecision = 100 [(bitcoin_only) = true, (wire_debug_in) = true, (wire_tiny) = true, (wire_no_fsm) = true];
+    MessageType_DebugLinkGetState = 101 [(bitcoin_only) = true, (wire_debug_in) = true, (wire_tiny) = true];
+    MessageType_DebugLinkState = 102 [(bitcoin_only) = true, (wire_debug_out) = true];
+    MessageType_DebugLinkStop = 103 [(bitcoin_only) = true, (wire_debug_in) = true];
+    MessageType_DebugLinkLog = 104 [(bitcoin_only) = true, (wire_debug_out) = true];
+    MessageType_DebugLinkMemoryRead = 110 [(bitcoin_only) = true, (wire_debug_in) = true];
+    MessageType_DebugLinkMemory = 111 [(bitcoin_only) = true, (wire_debug_out) = true];
+    MessageType_DebugLinkMemoryWrite = 112 [(bitcoin_only) = true, (wire_debug_in) = true];
+    MessageType_DebugLinkFlashErase = 113 [(bitcoin_only) = true, (wire_debug_in) = true];
+    MessageType_DebugLinkLayout = 9001 [(bitcoin_only) = true, (wire_debug_out) = true];
+    MessageType_DebugLinkReseedRandom = 9002 [(bitcoin_only) = true, (wire_debug_in) = true];
+    MessageType_DebugLinkRecordScreen = 9003 [(bitcoin_only) = true, (wire_debug_in) = true];
+    MessageType_DebugLinkEraseSdCard = 9005 [(bitcoin_only) = true, (wire_debug_in) = true];
+    MessageType_DebugLinkWatchLayout = 9006 [(bitcoin_only) = true, (wire_debug_in) = true];
+
+    // Ethereum
+    MessageType_EthereumGetPublicKey = 450 [(wire_in) = true];
+    MessageType_EthereumPublicKey = 451 [(wire_out) = true];
+    MessageType_EthereumGetAddress = 56 [(wire_in) = true];
+    MessageType_EthereumAddress = 57 [(wire_out) = true];
+    MessageType_EthereumSignTx = 58 [(wire_in) = true];
+    MessageType_EthereumSignTxEIP1559 = 452 [(wire_in) = true];
+    MessageType_EthereumTxRequest = 59 [(wire_out) = true];
+    MessageType_EthereumTxAck = 60 [(wire_in) = true];
+    MessageType_EthereumSignMessage = 64 [(wire_in) = true];
+    MessageType_EthereumVerifyMessage = 65 [(wire_in) = true];
+    MessageType_EthereumMessageSignature = 66 [(wire_out) = true];
+
+    // NEM
+    MessageType_NEMGetAddress = 67 [(wire_in) = true];
+    MessageType_NEMAddress = 68 [(wire_out) = true];
+    MessageType_NEMSignTx = 69 [(wire_in) = true];
+    MessageType_NEMSignedTx = 70 [(wire_out) = true];
+    MessageType_NEMDecryptMessage = 75 [(wire_in) = true];
+    MessageType_NEMDecryptedMessage = 76 [(wire_out) = true];
+
+    // Lisk
+    /*
+    MessageType_LiskGetAddress = 114 [(wire_in) = true];
+    MessageType_LiskAddress = 115 [(wire_out) = true];
+    MessageType_LiskSignTx = 116 [(wire_in) = true];
+    MessageType_LiskSignedTx = 117 [(wire_out) = true];
+    MessageType_LiskSignMessage = 118 [(wire_in) = true];
+    MessageType_LiskMessageSignature = 119 [(wire_out) = true];
+    MessageType_LiskVerifyMessage = 120 [(wire_in) = true];
+    MessageType_LiskGetPublicKey = 121 [(wire_in) = true];
+    MessageType_LiskPublicKey = 122 [(wire_out) = true];
+    */
+    reserved 114 to 122;
+
+    // Tezos
+    MessageType_TezosGetAddress = 150 [(wire_in) = true];
+    MessageType_TezosAddress = 151 [(wire_out) = true];
+    MessageType_TezosSignTx = 152 [(wire_in) = true];
+    MessageType_TezosSignedTx = 153 [(wire_out) = true];
+    MessageType_TezosGetPublicKey = 154 [(wire_in) = true];
+    MessageType_TezosPublicKey = 155 [(wire_out) = true];
+
+    // Stellar
+    MessageType_StellarSignTx = 202 [(wire_in) = true];
+    MessageType_StellarTxOpRequest = 203 [(wire_out) = true];
+    MessageType_StellarGetAddress = 207 [(wire_in) = true];
+    MessageType_StellarAddress = 208 [(wire_out) = true];
+    MessageType_StellarCreateAccountOp = 210 [(wire_in) = true];
+    MessageType_StellarPaymentOp = 211 [(wire_in) = true];
+    MessageType_StellarPathPaymentOp = 212 [(wire_in) = true];
+    MessageType_StellarManageOfferOp = 213 [(wire_in) = true];
+    MessageType_StellarCreatePassiveOfferOp = 214 [(wire_in) = true];
+    MessageType_StellarSetOptionsOp = 215 [(wire_in) = true];
+    MessageType_StellarChangeTrustOp = 216 [(wire_in) = true];
+    MessageType_StellarAllowTrustOp = 217 [(wire_in) = true];
+    MessageType_StellarAccountMergeOp = 218 [(wire_in) = true];
+    // omitted: StellarInflationOp is not a supported operation, would be 219
+    MessageType_StellarManageDataOp = 220 [(wire_in) = true];
+    MessageType_StellarBumpSequenceOp = 221 [(wire_in) = true];
+    MessageType_StellarSignedTx = 230 [(wire_out) = true];
+
+    // Cardano
+    // dropped Sign/VerifyMessage ids 300-302
+    // dropped TxRequest/TxAck ids 304 and 309 (shelley update)
+    MessageType_CardanoSignTx = 303 [(wire_in) = true];
+    MessageType_CardanoGetPublicKey = 305 [(wire_in) = true];
+    MessageType_CardanoPublicKey = 306 [(wire_out) = true];
+    MessageType_CardanoGetAddress = 307 [(wire_in) = true];
+    MessageType_CardanoAddress = 308 [(wire_out) = true];
+    MessageType_CardanoSignedTx = 310 [(wire_out) = true];
+    MessageType_CardanoSignedTxChunk = 311 [(wire_out) = true];
+    MessageType_CardanoSignedTxChunkAck = 312 [(wire_in) = true];
+    MessageType_CardanoTxItemAck = 313 [(wire_out) = true];
+    MessageType_CardanoTxAuxiliaryDataSupplement = 314 [(wire_out) = true];
+    MessageType_CardanoTxWitnessRequest = 315 [(wire_in) = true];
+    MessageType_CardanoTxWitnessResponse = 316 [(wire_out) = true];
+    MessageType_CardanoTxHostAck = 317 [(wire_in) = true];
+    MessageType_CardanoTxBodyHash = 318 [(wire_out) = true];
+    MessageType_CardanoSignTxFinished = 319 [(wire_out) = true];
+    MessageType_CardanoSignTxInit = 320 [(wire_in) = true];
+    MessageType_CardanoTxInput = 321 [(wire_in) = true];
+    MessageType_CardanoTxOutput = 322 [(wire_in) = true];
+    MessageType_CardanoAssetGroup = 323 [(wire_in) = true];
+    MessageType_CardanoToken = 324 [(wire_in) = true];
+    MessageType_CardanoTxCertificate = 325 [(wire_in) = true];
+    MessageType_CardanoTxWithdrawal = 326 [(wire_in) = true];
+    MessageType_CardanoTxAuxiliaryData = 327 [(wire_in) = true];
+    MessageType_CardanoPoolOwner = 328 [(wire_in) = true];
+    MessageType_CardanoPoolRelayParameters = 329 [(wire_in) = true];
+
+
+    // Ripple
+    MessageType_RippleGetAddress = 400 [(wire_in) = true];
+    MessageType_RippleAddress = 401 [(wire_out) = true];
+    MessageType_RippleSignTx = 402 [(wire_in) = true];
+    MessageType_RippleSignedTx = 403 [(wire_in) = true];
+
+    // Monero
+    MessageType_MoneroTransactionInitRequest = 501 [(wire_out) = true];
+    MessageType_MoneroTransactionInitAck = 502 [(wire_out) = true];
+    MessageType_MoneroTransactionSetInputRequest = 503 [(wire_out) = true];
+    MessageType_MoneroTransactionSetInputAck = 504 [(wire_out) = true];
+    MessageType_MoneroTransactionInputsPermutationRequest = 505 [(wire_out) = true];
+    MessageType_MoneroTransactionInputsPermutationAck = 506 [(wire_out) = true];
+    MessageType_MoneroTransactionInputViniRequest = 507 [(wire_out) = true];
+    MessageType_MoneroTransactionInputViniAck = 508 [(wire_out) = true];
+    MessageType_MoneroTransactionAllInputsSetRequest = 509 [(wire_out) = true];
+    MessageType_MoneroTransactionAllInputsSetAck = 510 [(wire_out) = true];
+    MessageType_MoneroTransactionSetOutputRequest = 511 [(wire_out) = true];
+    MessageType_MoneroTransactionSetOutputAck = 512 [(wire_out) = true];
+    MessageType_MoneroTransactionAllOutSetRequest = 513 [(wire_out) = true];
+    MessageType_MoneroTransactionAllOutSetAck = 514 [(wire_out) = true];
+    MessageType_MoneroTransactionSignInputRequest = 515 [(wire_out) = true];
+    MessageType_MoneroTransactionSignInputAck = 516 [(wire_out) = true];
+    MessageType_MoneroTransactionFinalRequest = 517 [(wire_out) = true];
+    MessageType_MoneroTransactionFinalAck = 518 [(wire_out) = true];
+    MessageType_MoneroKeyImageExportInitRequest = 530 [(wire_out) = true];
+    MessageType_MoneroKeyImageExportInitAck = 531 [(wire_out) = true];
+    MessageType_MoneroKeyImageSyncStepRequest = 532 [(wire_out) = true];
+    MessageType_MoneroKeyImageSyncStepAck = 533 [(wire_out) = true];
+    MessageType_MoneroKeyImageSyncFinalRequest = 534 [(wire_out) = true];
+    MessageType_MoneroKeyImageSyncFinalAck = 535 [(wire_out) = true];
+    MessageType_MoneroGetAddress = 540 [(wire_in) = true];
+    MessageType_MoneroAddress = 541 [(wire_out) = true];
+    MessageType_MoneroGetWatchKey = 542 [(wire_in) = true];
+    MessageType_MoneroWatchKey = 543 [(wire_out) = true];
+    MessageType_DebugMoneroDiagRequest = 546 [(wire_in) = true];
+    MessageType_DebugMoneroDiagAck = 547 [(wire_out) = true];
+    MessageType_MoneroGetTxKeyRequest = 550 [(wire_in) = true];
+    MessageType_MoneroGetTxKeyAck = 551 [(wire_out) = true];
+    MessageType_MoneroLiveRefreshStartRequest = 552 [(wire_in) = true];
+    MessageType_MoneroLiveRefreshStartAck = 553 [(wire_out) = true];
+    MessageType_MoneroLiveRefreshStepRequest = 554 [(wire_in) = true];
+    MessageType_MoneroLiveRefreshStepAck = 555 [(wire_out) = true];
+    MessageType_MoneroLiveRefreshFinalRequest = 556 [(wire_in) = true];
+    MessageType_MoneroLiveRefreshFinalAck = 557 [(wire_out) = true];
+
+    // EOS
+    MessageType_EosGetPublicKey = 600 [(wire_in) = true];
+    MessageType_EosPublicKey = 601 [(wire_out) = true];
+    MessageType_EosSignTx = 602 [(wire_in) = true];
+    MessageType_EosTxActionRequest = 603 [(wire_out) = true];
+    MessageType_EosTxActionAck = 604 [(wire_in) = true];
+    MessageType_EosSignedTx = 605 [(wire_out) = true];
+
+    // Binance
+    MessageType_BinanceGetAddress = 700 [(wire_in) = true];
+    MessageType_BinanceAddress = 701 [(wire_out) = true];
+    MessageType_BinanceGetPublicKey = 702 [(wire_in) = true];
+    MessageType_BinancePublicKey = 703 [(wire_out) = true];
+    MessageType_BinanceSignTx = 704 [(wire_in) = true];
+    MessageType_BinanceTxRequest = 705 [(wire_out) = true];
+    MessageType_BinanceTransferMsg = 706 [(wire_in) = true];
+    MessageType_BinanceOrderMsg = 707 [(wire_in) = true];
+    MessageType_BinanceCancelMsg = 708 [(wire_in) = true];
+    MessageType_BinanceSignedTx = 709 [(wire_out) = true];
+
+    // WebAuthn
+    MessageType_WebAuthnListResidentCredentials = 800 [(wire_in) = true];
+    MessageType_WebAuthnCredentials = 801 [(wire_out) = true];
+    MessageType_WebAuthnAddResidentCredential = 802 [(wire_in) = true];
+    MessageType_WebAuthnRemoveResidentCredential = 803 [(wire_in) = true];
+}
\ No newline at end of file
diff --git a/mm2src/trezor/src/client.rs b/mm2src/trezor/src/client.rs
new file mode 100644
index 0000000000..e79aa594d4
--- /dev/null
+++ b/mm2src/trezor/src/client.rs
@@ -0,0 +1,112 @@
+//! This file is inspired by https://github.com/tezedge/tezedge-client/blob/master/trezor_api/src/client.rs
+
+use crate::error::OperationFailure;
+use crate::proto::messages::MessageType;
+use crate::proto::messages_common as proto_common;
+use crate::proto::messages_management as proto_management;
+use crate::proto::{ProtoMessage, TrezorMessage};
+use crate::response::TrezorResponse;
+use crate::result_handler::ResultHandler;
+use crate::transport::Transport;
+use crate::{TrezorError, TrezorResult};
+use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
+use mm2_err_handle::prelude::*;
+use std::sync::Arc;
+
+#[derive(Clone)]
+pub struct TrezorClient {
+    inner: Arc<AsyncMutex<TrezorClientImpl>>,
+}
+
+impl TrezorClient {
+    pub fn from_transport<T>(transport: T) -> TrezorClient
+    where
+        T: Transport + Send + Sync + 'static,
+    {
+        let transport = Box::new(transport);
+        let inner = Arc::new(AsyncMutex::new(TrezorClientImpl { transport }));
+        TrezorClient { inner }
+    }
+
+    /// Initialize a Trezor session by sending
+    /// [Initialize](https://docs.trezor.io/trezor-firmware/common/communication/sessions.html#examples).
+    pub async fn session(&self) -> TrezorResult<TrezorSession<'_>> {
+        let mut session = TrezorSession {
+            inner: self.inner.lock().await,
+        };
+        session.initialize_device().await?;
+        Ok(session)
+    }
+}
+
+pub struct TrezorClientImpl {
+    transport: Box<dyn Transport + Send + Sync + 'static>,
+}
+
+pub struct TrezorSession<'a> {
+    inner: AsyncMutexGuard<'a, TrezorClientImpl>,
+}
+
+impl<'a> TrezorSession<'a> {
+    /// Sends a message and returns a TrezorResponse with either the
+    /// expected response message, a failure or an interaction request.
+    pub async fn call<'b, T: 'static, S: TrezorMessage>(
+        &'b mut self,
+        message: S,
+        result_handler: ResultHandler<T>,
+    ) -> TrezorResult<TrezorResponse<'a, 'b, T>> {
+        let resp = self.call_raw(message).await?;
+        match resp.message_type() {
+            mt if mt == result_handler.message_type() => Ok(TrezorResponse::Ready(result_handler.handle_raw(resp)?)),
+            MessageType::Failure => {
+                let fail_msg: proto_common::Failure = resp.into_message()?;
+                MmError::err(TrezorError::Failure(OperationFailure::from(fail_msg)))
+            },
+            MessageType::ButtonRequest => {
+                let req_msg = resp.into_message()?;
+                Ok(TrezorResponse::new_button_request(self, req_msg, result_handler))
+            },
+            MessageType::PinMatrixRequest => {
+                let req_msg = resp.into_message()?;
+                Ok(TrezorResponse::new_pin_matrix_request(self, req_msg, result_handler))
+            },
+            mtype => MmError::err(TrezorError::UnexpectedMessageType(mtype)),
+        }
+    }
+
+    /// Sends a message and returns the raw ProtoMessage struct that was
+    /// responded by the device.
+    async fn call_raw<'b, S: TrezorMessage>(&'b mut self, message: S) -> TrezorResult<ProtoMessage> {
+        let mut buf = Vec::with_capacity(message.encoded_len());
+        message.encode(&mut buf)?;
+
+        let proto_msg = ProtoMessage::new(S::message_type(), buf);
+        self.inner.transport.write_message(proto_msg).await?;
+        self.inner.transport.read_message().await
+    }
+
+    /// Initialize the device.
+    ///
+    /// The Initialize packet will cause the device to stop what it is currently doing
+    /// and should work at any time.
+    /// Thus, it can also be used to recover from previous errors.
+    ///
+    /// # Usage
+    ///
+    /// Must be called before sending requests to Trezor.
+    async fn initialize_device<'b>(&'b mut self) -> TrezorResult<proto_management::Features> {
+        // Don't set the session_id since currently there is no need to restore the previous session.
+        // https://docs.trezor.io/trezor-firmware/common/communication/sessions.html#session-lifecycle
+        let req = proto_management::Initialize { session_id: None };
+
+        let result_handler = ResultHandler::<proto_management::Features>::new(Ok);
+        self.call(req, result_handler).await?.ok()
+    }
+
+    pub(crate) async fn cancel_last_op<'b>(&'b mut self) {
+        let req = proto_management::Cancel {};
+        let result_handler = ResultHandler::new(|_m: proto_common::Failure| Ok(()));
+        // Ignore result.
+        self.call(req, result_handler).await.ok();
+    }
+}
diff --git a/mm2src/trezor/src/error.rs b/mm2src/trezor/src/error.rs
new file mode 100644
index 0000000000..43a7a5a31b
--- /dev/null
+++ b/mm2src/trezor/src/error.rs
@@ -0,0 +1,91 @@
+use crate::proto::messages::MessageType;
+use crate::proto::messages_common::{failure::FailureType, Failure};
+use crate::user_interaction::TrezorUserInteraction;
+use derive_more::Display;
+use mm2_err_handle::prelude::*;
+use prost::{DecodeError, EncodeError};
+
+pub type TrezorResult<T> = Result<T, MmError<TrezorError>>;
+
+#[cfg(not(target_arch = "wasm32"))]
+use hw_common::transport::UsbError;
+#[cfg(target_arch = "wasm32")]
+use hw_common::transport::WebUsbError;
+
+#[derive(Debug, Display)]
+pub enum TrezorError {
+    #[display(fmt = "'{}' transport is not available on this platform", transport)]
+    TransportNotSupported {
+        transport: String,
+    },
+    /// Please note it's not the same as `PermissionDenied`.
+    /// This error may appear in a browser when the user didn't allow the app to get the list of devices.
+    ErrorRequestingAccessPermission(String),
+    /// TODO put a device info
+    DeviceDisconnected,
+    /// The error depends on transport implementation.
+    UnderlyingError(String),
+    ProtocolError(String),
+    #[display(fmt = "Received unexpected message type: {:?}", _0)]
+    UnexpectedMessageType(MessageType),
+    Failure(OperationFailure),
+    #[display(fmt = "Unexpected interaction request: {:?}", _0)]
+    UnexpectedInteractionRequest(TrezorUserInteraction),
+    Internal(String),
+}
+
+#[derive(Debug, Display)]
+pub enum OperationFailure {
+    InvalidPin,
+    /// TODO expand it to other types.
+    #[display(fmt = "Operation failed due to unknown reason: {}", _0)]
+    Other(String),
+}
+
+impl From<Failure> for OperationFailure {
+    fn from(failure: Failure) -> Self {
+        match failure.code.and_then(FailureType::from_i32) {
+            Some(FailureType::FailurePinInvalid) | Some(FailureType::FailurePinMismatch) => {
+                OperationFailure::InvalidPin
+            },
+            _ => OperationFailure::Other(format!("{:?}", failure)),
+        }
+    }
+}
+
+impl From<OperationFailure> for TrezorError {
+    fn from(failure: OperationFailure) -> Self { TrezorError::Failure(failure) }
+}
+
+impl From<DecodeError> for TrezorError {
+    fn from(e: DecodeError) -> Self { TrezorError::ProtocolError(e.to_string()) }
+}
+
+impl From<EncodeError> for TrezorError {
+    fn from(e: EncodeError) -> Self { TrezorError::Internal(e.to_string()) }
+}
+
+#[cfg(target_arch = "wasm32")]
+impl From<WebUsbError> for TrezorError {
+    fn from(e: WebUsbError) -> Self {
+        match e {
+            WebUsbError::NotSupported => TrezorError::TransportNotSupported {
+                transport: "WebUSB".to_owned(),
+            },
+            WebUsbError::ErrorRequestingDevice(e) => TrezorError::ErrorRequestingAccessPermission(e),
+            WebUsbError::Internal(e) => TrezorError::Internal(e),
+            e => TrezorError::UnderlyingError(e.to_string()),
+        }
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl From<UsbError> for TrezorError {
+    fn from(e: UsbError) -> Self {
+        match e {
+            UsbError::DeviceDisconnected => TrezorError::DeviceDisconnected,
+            UsbError::Internal(e) => TrezorError::Internal(e),
+            e => TrezorError::UnderlyingError(e.to_string()),
+        }
+    }
+}
diff --git a/mm2src/trezor/src/lib.rs b/mm2src/trezor/src/lib.rs
new file mode 100644
index 0000000000..8b61f37df2
--- /dev/null
+++ b/mm2src/trezor/src/lib.rs
@@ -0,0 +1,29 @@
+#[macro_use] extern crate serde_derive;
+
+pub mod client;
+pub mod error;
+mod proto;
+pub mod response;
+mod response_processor;
+mod result_handler;
+pub mod transport;
+pub mod trezor_rpc_task;
+pub mod user_interaction;
+pub mod utxo;
+
+pub use client::{TrezorClient, TrezorSession};
+pub use error::{OperationFailure, TrezorError, TrezorResult};
+pub use hw_common::primitives::{DerivationPath, EcdsaCurve};
+pub use response::{ButtonRequest, PinMatrixRequest, TrezorResponse};
+pub use response_processor::{ProcessTrezorResponse, TrezorProcessingError, TrezorRequestProcessor};
+pub use user_interaction::{TrezorPinMatrix3x3Response, TrezorUserInteraction};
+
+pub(crate) fn serialize_derivation_path(path: &DerivationPath) -> Vec<u32> {
+    path.iter().map(|index| index.0).collect()
+}
+
+pub(crate) fn ecdsa_curve_to_string(curve: EcdsaCurve) -> String {
+    match curve {
+        EcdsaCurve::Secp256k1 => "secp256k1".to_owned(),
+    }
+}
diff --git a/mm2src/trezor/src/proto/messages.rs b/mm2src/trezor/src/proto/messages.rs
new file mode 100644
index 0000000000..dcdaf783d9
--- /dev/null
+++ b/mm2src/trezor/src/proto/messages.rs
@@ -0,0 +1,235 @@
+///*
+/// Mapping between Trezor wire identifier (uint) and a protobuf message
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum MessageType {
+    /// Management
+    Initialize = 0,
+    Ping = 1,
+    Success = 2,
+    Failure = 3,
+    ChangePin = 4,
+    WipeDevice = 5,
+    GetEntropy = 9,
+    Entropy = 10,
+    LoadDevice = 13,
+    ResetDevice = 14,
+    Features = 17,
+    PinMatrixRequest = 18,
+    PinMatrixAck = 19,
+    Cancel = 20,
+    LockDevice = 24,
+    ApplySettings = 25,
+    ButtonRequest = 26,
+    ButtonAck = 27,
+    ApplyFlags = 28,
+    BackupDevice = 34,
+    EntropyRequest = 35,
+    EntropyAck = 36,
+    PassphraseRequest = 41,
+    PassphraseAck = 42,
+    RecoveryDevice = 45,
+    WordRequest = 46,
+    WordAck = 47,
+    GetFeatures = 55,
+    SdProtect = 79,
+    ChangeWipeCode = 82,
+    EndSession = 83,
+    DoPreauthorized = 84,
+    PreauthorizedRequest = 85,
+    CancelAuthorization = 86,
+    RebootToBootloader = 87,
+    SetU2fCounter = 63,
+    GetNextU2fCounter = 80,
+    NextU2fCounter = 81,
+    /// Deprecated messages, kept for protobuf compatibility.
+    /// Both are marked wire_out so that we don't need to implement incoming handler for legacy
+    DeprecatedPassphraseStateRequest = 77,
+    DeprecatedPassphraseStateAck = 78,
+    /// Bootloader
+    FirmwareErase = 6,
+    FirmwareUpload = 7,
+    FirmwareRequest = 8,
+    SelfTest = 32,
+    /// Bitcoin
+    GetPublicKey = 11,
+    PublicKey = 12,
+    SignTx = 15,
+    TxRequest = 21,
+    TxAck = 22,
+    GetAddress = 29,
+    Address = 30,
+    SignMessage = 38,
+    VerifyMessage = 39,
+    MessageSignature = 40,
+    GetOwnershipId = 43,
+    OwnershipId = 44,
+    GetOwnershipProof = 49,
+    OwnershipProof = 50,
+    AuthorizeCoinJoin = 51,
+    /// Crypto
+    CipherKeyValue = 23,
+    CipheredKeyValue = 48,
+    SignIdentity = 53,
+    SignedIdentity = 54,
+    GetEcdhSessionKey = 61,
+    EcdhSessionKey = 62,
+    CosiCommit = 71,
+    CosiCommitment = 72,
+    CosiSign = 73,
+    CosiSignature = 74,
+    /// Debug
+    DebugLinkDecision = 100,
+    DebugLinkGetState = 101,
+    DebugLinkState = 102,
+    DebugLinkStop = 103,
+    DebugLinkLog = 104,
+    DebugLinkMemoryRead = 110,
+    DebugLinkMemory = 111,
+    DebugLinkMemoryWrite = 112,
+    DebugLinkFlashErase = 113,
+    DebugLinkLayout = 9001,
+    DebugLinkReseedRandom = 9002,
+    DebugLinkRecordScreen = 9003,
+    DebugLinkEraseSdCard = 9005,
+    DebugLinkWatchLayout = 9006,
+    /// Ethereum
+    EthereumGetPublicKey = 450,
+    EthereumPublicKey = 451,
+    EthereumGetAddress = 56,
+    EthereumAddress = 57,
+    EthereumSignTx = 58,
+    EthereumSignTxEip1559 = 452,
+    EthereumTxRequest = 59,
+    EthereumTxAck = 60,
+    EthereumSignMessage = 64,
+    EthereumVerifyMessage = 65,
+    EthereumMessageSignature = 66,
+    /// NEM
+    NemGetAddress = 67,
+    NemAddress = 68,
+    NemSignTx = 69,
+    NemSignedTx = 70,
+    NemDecryptMessage = 75,
+    NemDecryptedMessage = 76,
+    /// Tezos
+    TezosGetAddress = 150,
+    TezosAddress = 151,
+    TezosSignTx = 152,
+    TezosSignedTx = 153,
+    TezosGetPublicKey = 154,
+    TezosPublicKey = 155,
+    /// Stellar
+    StellarSignTx = 202,
+    StellarTxOpRequest = 203,
+    StellarGetAddress = 207,
+    StellarAddress = 208,
+    StellarCreateAccountOp = 210,
+    StellarPaymentOp = 211,
+    StellarPathPaymentOp = 212,
+    StellarManageOfferOp = 213,
+    StellarCreatePassiveOfferOp = 214,
+    StellarSetOptionsOp = 215,
+    StellarChangeTrustOp = 216,
+    StellarAllowTrustOp = 217,
+    StellarAccountMergeOp = 218,
+    /// omitted: StellarInflationOp is not a supported operation, would be 219
+    StellarManageDataOp = 220,
+    StellarBumpSequenceOp = 221,
+    StellarSignedTx = 230,
+    /// Cardano
+    /// dropped Sign/VerifyMessage ids 300-302
+    /// dropped TxRequest/TxAck ids 304 and 309 (shelley update)
+    CardanoSignTx = 303,
+    CardanoGetPublicKey = 305,
+    CardanoPublicKey = 306,
+    CardanoGetAddress = 307,
+    CardanoAddress = 308,
+    CardanoSignedTx = 310,
+    CardanoSignedTxChunk = 311,
+    CardanoSignedTxChunkAck = 312,
+    CardanoTxItemAck = 313,
+    CardanoTxAuxiliaryDataSupplement = 314,
+    CardanoTxWitnessRequest = 315,
+    CardanoTxWitnessResponse = 316,
+    CardanoTxHostAck = 317,
+    CardanoTxBodyHash = 318,
+    CardanoSignTxFinished = 319,
+    CardanoSignTxInit = 320,
+    CardanoTxInput = 321,
+    CardanoTxOutput = 322,
+    CardanoAssetGroup = 323,
+    CardanoToken = 324,
+    CardanoTxCertificate = 325,
+    CardanoTxWithdrawal = 326,
+    CardanoTxAuxiliaryData = 327,
+    CardanoPoolOwner = 328,
+    CardanoPoolRelayParameters = 329,
+    /// Ripple
+    RippleGetAddress = 400,
+    RippleAddress = 401,
+    RippleSignTx = 402,
+    RippleSignedTx = 403,
+    /// Monero
+    MoneroTransactionInitRequest = 501,
+    MoneroTransactionInitAck = 502,
+    MoneroTransactionSetInputRequest = 503,
+    MoneroTransactionSetInputAck = 504,
+    MoneroTransactionInputsPermutationRequest = 505,
+    MoneroTransactionInputsPermutationAck = 506,
+    MoneroTransactionInputViniRequest = 507,
+    MoneroTransactionInputViniAck = 508,
+    MoneroTransactionAllInputsSetRequest = 509,
+    MoneroTransactionAllInputsSetAck = 510,
+    MoneroTransactionSetOutputRequest = 511,
+    MoneroTransactionSetOutputAck = 512,
+    MoneroTransactionAllOutSetRequest = 513,
+    MoneroTransactionAllOutSetAck = 514,
+    MoneroTransactionSignInputRequest = 515,
+    MoneroTransactionSignInputAck = 516,
+    MoneroTransactionFinalRequest = 517,
+    MoneroTransactionFinalAck = 518,
+    MoneroKeyImageExportInitRequest = 530,
+    MoneroKeyImageExportInitAck = 531,
+    MoneroKeyImageSyncStepRequest = 532,
+    MoneroKeyImageSyncStepAck = 533,
+    MoneroKeyImageSyncFinalRequest = 534,
+    MoneroKeyImageSyncFinalAck = 535,
+    MoneroGetAddress = 540,
+    MoneroAddress = 541,
+    MoneroGetWatchKey = 542,
+    MoneroWatchKey = 543,
+    DebugMoneroDiagRequest = 546,
+    DebugMoneroDiagAck = 547,
+    MoneroGetTxKeyRequest = 550,
+    MoneroGetTxKeyAck = 551,
+    MoneroLiveRefreshStartRequest = 552,
+    MoneroLiveRefreshStartAck = 553,
+    MoneroLiveRefreshStepRequest = 554,
+    MoneroLiveRefreshStepAck = 555,
+    MoneroLiveRefreshFinalRequest = 556,
+    MoneroLiveRefreshFinalAck = 557,
+    /// EOS
+    EosGetPublicKey = 600,
+    EosPublicKey = 601,
+    EosSignTx = 602,
+    EosTxActionRequest = 603,
+    EosTxActionAck = 604,
+    EosSignedTx = 605,
+    /// Binance
+    BinanceGetAddress = 700,
+    BinanceAddress = 701,
+    BinanceGetPublicKey = 702,
+    BinancePublicKey = 703,
+    BinanceSignTx = 704,
+    BinanceTxRequest = 705,
+    BinanceTransferMsg = 706,
+    BinanceOrderMsg = 707,
+    BinanceCancelMsg = 708,
+    BinanceSignedTx = 709,
+    /// WebAuthn
+    WebAuthnListResidentCredentials = 800,
+    WebAuthnCredentials = 801,
+    WebAuthnAddResidentCredential = 802,
+    WebAuthnRemoveResidentCredential = 803,
+}
diff --git a/mm2src/trezor/src/proto/messages_bitcoin.rs b/mm2src/trezor/src/proto/messages_bitcoin.rs
new file mode 100644
index 0000000000..8826c9a997
--- /dev/null
+++ b/mm2src/trezor/src/proto/messages_bitcoin.rs
@@ -0,0 +1,868 @@
+///*
+/// Type of redeem script used in input
+/// @embed
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MultisigRedeemScriptType {
+    /// pubkeys from multisig address (sorted lexicographically)
+    #[prost(message, repeated, tag = "1")]
+    pub pubkeys: ::prost::alloc::vec::Vec<multisig_redeem_script_type::HdNodePathType>,
+    /// existing signatures for partially signed input
+    #[prost(bytes = "vec", repeated, tag = "2")]
+    pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// "m" from n, how many valid signatures is necessary for spending
+    #[prost(uint32, required, tag = "3")]
+    pub m: u32,
+    /// simplified way how to specify pubkeys if they share the same address_n path
+    #[prost(message, repeated, tag = "4")]
+    pub nodes: ::prost::alloc::vec::Vec<super::common::HdNodeType>,
+    /// use only field 1 or fields 4+5, if fields 4+5 are used, field 1 is ignored
+    #[prost(uint32, repeated, packed = "false", tag = "5")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+}
+/// Nested message and enum types in `MultisigRedeemScriptType`.
+pub mod multisig_redeem_script_type {
+    ///*
+    /// Structure representing HDNode + Path
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct HdNodePathType {
+        /// BIP-32 node in deserialized form
+        #[prost(message, required, tag = "1")]
+        pub node: super::super::common::HdNodeType,
+        /// BIP-32 path to derive the key from node
+        #[prost(uint32, repeated, packed = "false", tag = "2")]
+        pub address_n: ::prost::alloc::vec::Vec<u32>,
+    }
+}
+///*
+/// Request: Ask device for public key corresponding to address_n path
+/// @start
+/// @next PublicKey
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetPublicKey {
+    /// BIP-32 path to derive the key from master node
+    #[prost(uint32, repeated, packed = "false", tag = "1")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// ECDSA curve name to use
+    #[prost(string, optional, tag = "2")]
+    pub ecdsa_curve_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// optionally show on display before sending the result
+    #[prost(bool, optional, tag = "3")]
+    pub show_display: ::core::option::Option<bool>,
+    /// coin to use for verifying
+    #[prost(string, optional, tag = "4", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// used to distinguish between various address formats (non-segwit, segwit, etc.)
+    #[prost(enumeration = "InputScriptType", optional, tag = "5", default = "Spendaddress")]
+    pub script_type: ::core::option::Option<i32>,
+    /// ignore SLIP-0132 XPUB magic, use xpub/tpub prefix for all account types
+    #[prost(bool, optional, tag = "6")]
+    pub ignore_xpub_magic: ::core::option::Option<bool>,
+}
+///*
+/// Response: Contains public key derived from device private seed
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PublicKey {
+    /// BIP32 public node
+    #[prost(message, required, tag = "1")]
+    pub node: super::common::HdNodeType,
+    /// serialized form of public node
+    #[prost(string, required, tag = "2")]
+    pub xpub: ::prost::alloc::string::String,
+    /// master root node fingerprint
+    #[prost(uint32, optional, tag = "3")]
+    pub root_fingerprint: ::core::option::Option<u32>,
+}
+///*
+/// Request: Ask device for address corresponding to address_n path
+/// @start
+/// @next Address
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetAddress {
+    /// BIP-32 path to derive the key from master node
+    #[prost(uint32, repeated, packed = "false", tag = "1")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// coin to use
+    #[prost(string, optional, tag = "2", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// optionally show on display before sending the result
+    #[prost(bool, optional, tag = "3")]
+    pub show_display: ::core::option::Option<bool>,
+    /// filled if we are showing a multisig address
+    #[prost(message, optional, tag = "4")]
+    pub multisig: ::core::option::Option<MultisigRedeemScriptType>,
+    /// used to distinguish between various address formats (non-segwit, segwit, etc.)
+    #[prost(enumeration = "InputScriptType", optional, tag = "5", default = "Spendaddress")]
+    pub script_type: ::core::option::Option<i32>,
+    /// ignore SLIP-0132 XPUB magic, use xpub/tpub prefix for all account types
+    #[prost(bool, optional, tag = "6")]
+    pub ignore_xpub_magic: ::core::option::Option<bool>,
+}
+///*
+/// Response: Contains address derived from device private seed
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Address {
+    /// Coin address in Base58 encoding
+    #[prost(string, required, tag = "1")]
+    pub address: ::prost::alloc::string::String,
+}
+///*
+/// Request: Ask device for ownership identifier corresponding to scriptPubKey for address_n path
+/// @start
+/// @next OwnershipId
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetOwnershipId {
+    /// BIP-32 path to derive the key from master node
+    #[prost(uint32, repeated, packed = "false", tag = "1")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// coin to use
+    #[prost(string, optional, tag = "2", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// filled if we are dealing with a multisig scriptPubKey
+    #[prost(message, optional, tag = "3")]
+    pub multisig: ::core::option::Option<MultisigRedeemScriptType>,
+    /// used to distinguish between various address formats (non-segwit, segwit, etc.)
+    #[prost(enumeration = "InputScriptType", optional, tag = "4", default = "Spendaddress")]
+    pub script_type: ::core::option::Option<i32>,
+}
+///*
+/// Response: Contains the ownership identifier for the scriptPubKey and device private seed
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct OwnershipId {
+    /// ownership identifier
+    #[prost(bytes = "vec", required, tag = "1")]
+    pub ownership_id: ::prost::alloc::vec::Vec<u8>,
+}
+///*
+/// Request: Ask device to sign message
+/// @start
+/// @next MessageSignature
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SignMessage {
+    /// BIP-32 path to derive the key from master node
+    #[prost(uint32, repeated, packed = "false", tag = "1")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// message to be signed
+    #[prost(bytes = "vec", required, tag = "2")]
+    pub message: ::prost::alloc::vec::Vec<u8>,
+    /// coin to use for signing
+    #[prost(string, optional, tag = "3", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// used to distinguish between various address formats (non-segwit, segwit, etc.)
+    #[prost(enumeration = "InputScriptType", optional, tag = "4", default = "Spendaddress")]
+    pub script_type: ::core::option::Option<i32>,
+}
+///*
+/// Response: Signed message
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MessageSignature {
+    /// address used to sign the message
+    #[prost(string, required, tag = "1")]
+    pub address: ::prost::alloc::string::String,
+    /// signature of the message
+    #[prost(bytes = "vec", required, tag = "2")]
+    pub signature: ::prost::alloc::vec::Vec<u8>,
+}
+///*
+/// Request: Ask device to verify message
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct VerifyMessage {
+    /// address to verify
+    #[prost(string, required, tag = "1")]
+    pub address: ::prost::alloc::string::String,
+    /// signature to verify
+    #[prost(bytes = "vec", required, tag = "2")]
+    pub signature: ::prost::alloc::vec::Vec<u8>,
+    /// message to verify
+    #[prost(bytes = "vec", required, tag = "3")]
+    pub message: ::prost::alloc::vec::Vec<u8>,
+    /// coin to use for verifying
+    #[prost(string, optional, tag = "4", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+}
+///*
+/// Request: Ask device to sign transaction
+/// @start
+/// @next TxRequest
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SignTx {
+    /// number of transaction outputs
+    #[prost(uint32, required, tag = "1")]
+    pub outputs_count: u32,
+    /// number of transaction inputs
+    #[prost(uint32, required, tag = "2")]
+    pub inputs_count: u32,
+    /// coin to use
+    #[prost(string, optional, tag = "3", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// transaction version
+    #[prost(uint32, optional, tag = "4", default = "1")]
+    pub version: ::core::option::Option<u32>,
+    /// transaction lock_time
+    #[prost(uint32, optional, tag = "5", default = "0")]
+    pub lock_time: ::core::option::Option<u32>,
+    /// only for Decred and Zcash
+    #[prost(uint32, optional, tag = "6")]
+    pub expiry: ::core::option::Option<u32>,
+    /// deprecated in 2.3.2, the field is not needed as it can be derived from `version`
+    #[deprecated]
+    #[prost(bool, optional, tag = "7")]
+    pub overwintered: ::core::option::Option<bool>,
+    /// only for Zcash, nVersionGroupId
+    #[prost(uint32, optional, tag = "8")]
+    pub version_group_id: ::core::option::Option<u32>,
+    /// only for Peercoin
+    #[prost(uint32, optional, tag = "9")]
+    pub timestamp: ::core::option::Option<u32>,
+    /// only for Zcash, BRANCH_ID
+    #[prost(uint32, optional, tag = "10")]
+    pub branch_id: ::core::option::Option<u32>,
+    /// show amounts in
+    #[prost(enumeration = "AmountUnit", optional, tag = "11", default = "Bitcoin")]
+    pub amount_unit: ::core::option::Option<i32>,
+    /// only for Decred, this is signing a ticket purchase
+    #[prost(bool, optional, tag = "12", default = "false")]
+    pub decred_staking_ticket: ::core::option::Option<bool>,
+}
+///*
+/// Response: Device asks for information for signing transaction or returns the last result
+/// If request_index is set, device awaits TxAck<any> matching the request type.
+/// If signature_index is set, 'signature' contains signed input of signature_index's input
+/// @end
+/// @next TxAckInput
+/// @next TxAckOutput
+/// @next TxAckPrevMeta
+/// @next TxAckPrevInput
+/// @next TxAckPrevOutput
+/// @next TxAckPrevExtraData
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxRequest {
+    /// what should be filled in TxAck message?
+    #[prost(enumeration = "tx_request::RequestType", optional, tag = "1")]
+    pub request_type: ::core::option::Option<i32>,
+    /// request for tx details
+    #[prost(message, optional, tag = "2")]
+    pub details: ::core::option::Option<tx_request::TxRequestDetailsType>,
+    /// serialized data and request for next
+    #[prost(message, optional, tag = "3")]
+    pub serialized: ::core::option::Option<tx_request::TxRequestSerializedType>,
+}
+/// Nested message and enum types in `TxRequest`.
+pub mod tx_request {
+    ///*
+    /// Structure representing request details
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TxRequestDetailsType {
+        /// device expects TxAck message from the computer
+        #[prost(uint32, optional, tag = "1")]
+        pub request_index: ::core::option::Option<u32>,
+        /// tx_hash of requested transaction
+        #[prost(bytes = "vec", optional, tag = "2")]
+        pub tx_hash: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+        /// length of requested extra data (only for Dash, Zcash)
+        #[prost(uint32, optional, tag = "3")]
+        pub extra_data_len: ::core::option::Option<u32>,
+        /// offset of requested extra data (only for Dash, Zcash)
+        #[prost(uint32, optional, tag = "4")]
+        pub extra_data_offset: ::core::option::Option<u32>,
+    }
+    ///*
+    /// Structure representing serialized data
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TxRequestSerializedType {
+        /// 'signature' field contains signed input of this index
+        #[prost(uint32, optional, tag = "1")]
+        pub signature_index: ::core::option::Option<u32>,
+        /// signature of the signature_index input
+        #[prost(bytes = "vec", optional, tag = "2")]
+        pub signature: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+        /// part of serialized and signed transaction
+        #[prost(bytes = "vec", optional, tag = "3")]
+        pub serialized_tx: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    }
+    ///*
+    /// Type of information required by transaction signing process
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum RequestType {
+        Txinput = 0,
+        Txoutput = 1,
+        Txmeta = 2,
+        Txfinished = 3,
+        Txextradata = 4,
+        Txoriginput = 5,
+        Txorigoutput = 6,
+    }
+}
+///*
+/// Request: Reported transaction data (legacy)
+///
+/// This message contains all possible field that can be sent in response to a TxRequest.
+/// Depending on the request_type, the host is supposed to fill some of these fields.
+///
+/// The interface is wire-compatible with the new method of specialized TxAck subtypes,
+/// so it can be used in the old way. However, it is now recommended to use more
+/// specialized messages, which have better-configured constraints on field values.
+///
+/// @next TxRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxAck {
+    #[prost(message, optional, tag = "1")]
+    pub tx: ::core::option::Option<tx_ack::TransactionType>,
+}
+/// Nested message and enum types in `TxAck`.
+pub mod tx_ack {
+    ///*
+    /// Structure representing transaction
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TransactionType {
+        #[prost(uint32, optional, tag = "1")]
+        pub version: ::core::option::Option<u32>,
+        #[prost(message, repeated, tag = "2")]
+        pub inputs: ::prost::alloc::vec::Vec<transaction_type::TxInputType>,
+        #[prost(message, repeated, tag = "3")]
+        pub bin_outputs: ::prost::alloc::vec::Vec<transaction_type::TxOutputBinType>,
+        #[prost(uint32, optional, tag = "4")]
+        pub lock_time: ::core::option::Option<u32>,
+        #[prost(message, repeated, tag = "5")]
+        pub outputs: ::prost::alloc::vec::Vec<transaction_type::TxOutputType>,
+        #[prost(uint32, optional, tag = "6")]
+        pub inputs_cnt: ::core::option::Option<u32>,
+        #[prost(uint32, optional, tag = "7")]
+        pub outputs_cnt: ::core::option::Option<u32>,
+        /// only for Dash, Zcash
+        #[prost(bytes = "vec", optional, tag = "8")]
+        pub extra_data: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+        /// only for Dash, Zcash
+        #[prost(uint32, optional, tag = "9")]
+        pub extra_data_len: ::core::option::Option<u32>,
+        /// only for Decred and Zcash
+        #[prost(uint32, optional, tag = "10")]
+        pub expiry: ::core::option::Option<u32>,
+        /// Zcash only; deprecated in 2.3.2, the field is not needed, it can be derived from `version`
+        #[deprecated]
+        #[prost(bool, optional, tag = "11")]
+        pub overwintered: ::core::option::Option<bool>,
+        /// only for Zcash, nVersionGroupId
+        #[prost(uint32, optional, tag = "12")]
+        pub version_group_id: ::core::option::Option<u32>,
+        /// only for Peercoin
+        #[prost(uint32, optional, tag = "13")]
+        pub timestamp: ::core::option::Option<u32>,
+        /// only for Zcash, BRANCH_ID
+        #[prost(uint32, optional, tag = "14")]
+        pub branch_id: ::core::option::Option<u32>,
+    }
+    /// Nested message and enum types in `TransactionType`.
+    pub mod transaction_type {
+        ///*
+        /// Structure representing transaction input
+        #[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct TxInputType {
+            /// BIP-32 path to derive the key from master node
+            #[prost(uint32, repeated, packed = "false", tag = "1")]
+            pub address_n: ::prost::alloc::vec::Vec<u32>,
+            /// hash of previous transaction output to spend by this input
+            #[prost(bytes = "vec", required, tag = "2")]
+            pub prev_hash: ::prost::alloc::vec::Vec<u8>,
+            /// index of previous output to spend
+            #[prost(uint32, required, tag = "3")]
+            pub prev_index: u32,
+            /// script signature, unset for tx to sign
+            #[prost(bytes = "vec", optional, tag = "4")]
+            pub script_sig: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+            /// sequence (default=0xffffffff)
+            #[prost(uint32, optional, tag = "5", default = "4294967295")]
+            pub sequence: ::core::option::Option<u32>,
+            /// defines template of input script
+            #[prost(
+                enumeration = "super::super::InputScriptType",
+                optional,
+                tag = "6",
+                default = "Spendaddress"
+            )]
+            pub script_type: ::core::option::Option<i32>,
+            /// Filled if input is going to spend multisig tx
+            #[prost(message, optional, tag = "7")]
+            pub multisig: ::core::option::Option<super::super::MultisigRedeemScriptType>,
+            /// amount of previous transaction output (for segwit only)
+            #[prost(uint64, optional, tag = "8")]
+            pub amount: ::core::option::Option<u64>,
+            /// only for Decred, 0 is a normal transaction while 1 is a stake transaction
+            #[prost(uint32, optional, tag = "9")]
+            pub decred_tree: ::core::option::Option<u32>,
+            /// optional uint32 decred_script_version = 10;                         // only for Decred  // deprecated -> only 0 is supported
+            /// optional bytes prev_block_hash_bip115 = 11;     // BIP-115 support dropped
+            /// optional uint32 prev_block_height_bip115 = 12;  // BIP-115 support dropped
+            ///
+            /// witness data, only set for EXTERNAL inputs
+            #[prost(bytes = "vec", optional, tag = "13")]
+            pub witness: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+            /// SLIP-0019 proof of ownership, only set for EXTERNAL inputs
+            #[prost(bytes = "vec", optional, tag = "14")]
+            pub ownership_proof: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+            /// optional commitment data for the SLIP-0019 proof of ownership
+            #[prost(bytes = "vec", optional, tag = "15")]
+            pub commitment_data: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+            /// tx_hash of the original transaction where this input was spent (used when creating a replacement transaction)
+            #[prost(bytes = "vec", optional, tag = "16")]
+            pub orig_hash: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+            /// index of the input in the original transaction (used when creating a replacement transaction)
+            #[prost(uint32, optional, tag = "17")]
+            pub orig_index: ::core::option::Option<u32>,
+            /// if not None this holds the type of stake spend: revocation or stake generation
+            #[prost(enumeration = "super::super::DecredStakingSpendType", optional, tag = "18")]
+            pub decred_staking_spend: ::core::option::Option<i32>,
+        }
+        ///*
+        /// Structure representing compiled transaction output
+        #[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct TxOutputBinType {
+            #[prost(uint64, required, tag = "1")]
+            pub amount: u64,
+            #[prost(bytes = "vec", required, tag = "2")]
+            pub script_pubkey: ::prost::alloc::vec::Vec<u8>,
+            /// only for Decred, currently only 0 is supported
+            #[prost(uint32, optional, tag = "3")]
+            pub decred_script_version: ::core::option::Option<u32>,
+        }
+        ///*
+        /// Structure representing transaction output
+        #[derive(Clone, PartialEq, ::prost::Message)]
+        pub struct TxOutputType {
+            /// target coin address in Base58 encoding
+            #[prost(string, optional, tag = "1")]
+            pub address: ::core::option::Option<::prost::alloc::string::String>,
+            /// BIP-32 path to derive the key from master node; has higher priority than "address"
+            #[prost(uint32, repeated, packed = "false", tag = "2")]
+            pub address_n: ::prost::alloc::vec::Vec<u32>,
+            /// amount to spend in satoshis
+            #[prost(uint64, required, tag = "3")]
+            pub amount: u64,
+            /// output script type
+            #[prost(
+                enumeration = "super::super::OutputScriptType",
+                optional,
+                tag = "4",
+                default = "Paytoaddress"
+            )]
+            pub script_type: ::core::option::Option<i32>,
+            /// defines multisig address; script_type must be PAYTOMULTISIG
+            #[prost(message, optional, tag = "5")]
+            pub multisig: ::core::option::Option<super::super::MultisigRedeemScriptType>,
+            /// defines op_return data; script_type must be PAYTOOPRETURN, amount must be 0
+            #[prost(bytes = "vec", optional, tag = "6")]
+            pub op_return_data: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+            /// optional uint32 decred_script_version = 7;      // only for Decred  // deprecated -> only 0 is supported
+            /// optional bytes block_hash_bip115 = 8;        // BIP-115 support dropped
+            /// optional uint32 block_height_bip115 = 9;     // BIP-115 support dropped
+            ///
+            /// tx_hash of the original transaction where this output was present (used when creating a replacement transaction)
+            #[prost(bytes = "vec", optional, tag = "10")]
+            pub orig_hash: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+            /// index of the output in the original transaction (used when creating a replacement transaction)
+            #[prost(uint32, optional, tag = "11")]
+            pub orig_index: ::core::option::Option<u32>,
+        }
+    }
+}
+///* Data type for transaction input to be signed.
+///
+/// When adding fields, take care to not conflict with PrevInput
+///
+/// @embed
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxInput {
+    /// BIP-32 path to derive the key from master node
+    #[prost(uint32, repeated, packed = "false", tag = "1")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// hash of previous transaction output to spend by this input
+    #[prost(bytes = "vec", required, tag = "2")]
+    pub prev_hash: ::prost::alloc::vec::Vec<u8>,
+    /// index of previous output to spend
+    #[prost(uint32, required, tag = "3")]
+    pub prev_index: u32,
+    /// script signature, only set for EXTERNAL inputs
+    #[prost(bytes = "vec", optional, tag = "4")]
+    pub script_sig: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// sequence
+    #[prost(uint32, optional, tag = "5", default = "4294967295")]
+    pub sequence: ::core::option::Option<u32>,
+    /// defines template of input script
+    #[prost(enumeration = "InputScriptType", optional, tag = "6", default = "Spendaddress")]
+    pub script_type: ::core::option::Option<i32>,
+    /// Filled if input is going to spend multisig tx
+    #[prost(message, optional, tag = "7")]
+    pub multisig: ::core::option::Option<MultisigRedeemScriptType>,
+    /// amount of previous transaction output
+    #[prost(uint64, required, tag = "8")]
+    pub amount: u64,
+    /// only for Decred, 0 is a normal transaction while 1 is a stake transaction
+    #[prost(uint32, optional, tag = "9")]
+    pub decred_tree: ::core::option::Option<u32>,
+    /// witness data, only set for EXTERNAL inputs
+    #[prost(bytes = "vec", optional, tag = "13")]
+    pub witness: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// SLIP-0019 proof of ownership, only set for EXTERNAL inputs
+    #[prost(bytes = "vec", optional, tag = "14")]
+    pub ownership_proof: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// optional commitment data for the SLIP-0019 proof of ownership
+    #[prost(bytes = "vec", optional, tag = "15")]
+    pub commitment_data: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// tx_hash of the original transaction where this input was spent (used when creating a replacement transaction)
+    #[prost(bytes = "vec", optional, tag = "16")]
+    pub orig_hash: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// index of the input in the original transaction (used when creating a replacement transaction)
+    #[prost(uint32, optional, tag = "17")]
+    pub orig_index: ::core::option::Option<u32>,
+    /// if not None this holds the type of stake spend: revocation or stake generation
+    #[prost(enumeration = "DecredStakingSpendType", optional, tag = "18")]
+    pub decred_staking_spend: ::core::option::Option<i32>,
+}
+///* Data type for transaction output to be signed.
+/// @embed
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxOutput {
+    /// destination address in Base58 encoding; script_type must be PAYTOADDRESS
+    #[prost(string, optional, tag = "1")]
+    pub address: ::core::option::Option<::prost::alloc::string::String>,
+    /// BIP-32 path to derive the destination (used for change addresses)
+    #[prost(uint32, repeated, packed = "false", tag = "2")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// amount to spend in satoshis
+    #[prost(uint64, required, tag = "3")]
+    pub amount: u64,
+    /// output script type
+    #[prost(enumeration = "OutputScriptType", optional, tag = "4", default = "Paytoaddress")]
+    pub script_type: ::core::option::Option<i32>,
+    /// defines multisig address; script_type must be PAYTOMULTISIG
+    #[prost(message, optional, tag = "5")]
+    pub multisig: ::core::option::Option<MultisigRedeemScriptType>,
+    /// defines op_return data; script_type must be PAYTOOPRETURN, amount must be 0
+    #[prost(bytes = "vec", optional, tag = "6")]
+    pub op_return_data: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// tx_hash of the original transaction where this output was present (used when creating a replacement transaction)
+    #[prost(bytes = "vec", optional, tag = "10")]
+    pub orig_hash: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// index of the output in the original transaction (used when creating a replacement transaction)
+    #[prost(uint32, optional, tag = "11")]
+    pub orig_index: ::core::option::Option<u32>,
+}
+///* Data type for metadata about previous transaction which contains the UTXO being spent.
+/// @embed
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PrevTx {
+    #[prost(uint32, required, tag = "1")]
+    pub version: u32,
+    #[prost(uint32, required, tag = "4")]
+    pub lock_time: u32,
+    #[prost(uint32, required, tag = "6")]
+    pub inputs_count: u32,
+    #[prost(uint32, required, tag = "7")]
+    pub outputs_count: u32,
+    /// only for Dash, Zcash
+    #[prost(uint32, optional, tag = "9", default = "0")]
+    pub extra_data_len: ::core::option::Option<u32>,
+    /// only for Decred and Zcash
+    #[prost(uint32, optional, tag = "10")]
+    pub expiry: ::core::option::Option<u32>,
+    /// only for Zcash, nVersionGroupId
+    #[prost(uint32, optional, tag = "12")]
+    pub version_group_id: ::core::option::Option<u32>,
+    /// only for Peercoin
+    #[prost(uint32, optional, tag = "13")]
+    pub timestamp: ::core::option::Option<u32>,
+    /// only for Zcash, BRANCH_ID
+    #[prost(uint32, optional, tag = "14")]
+    pub branch_id: ::core::option::Option<u32>,
+}
+///* Data type for inputs of previous transactions.
+///
+/// When adding fields, take care to not conflict with TxInput
+/// @embed
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PrevInput {
+    /// hash of previous transaction output to spend by this input
+    #[prost(bytes = "vec", required, tag = "2")]
+    pub prev_hash: ::prost::alloc::vec::Vec<u8>,
+    /// index of previous output to spend
+    #[prost(uint32, required, tag = "3")]
+    pub prev_index: u32,
+    /// script signature
+    #[prost(bytes = "vec", required, tag = "4")]
+    pub script_sig: ::prost::alloc::vec::Vec<u8>,
+    /// sequence
+    #[prost(uint32, required, tag = "5")]
+    pub sequence: u32,
+    /// only for Decred
+    #[prost(uint32, optional, tag = "9")]
+    pub decred_tree: ::core::option::Option<u32>,
+}
+///* Data type for outputs of previous transactions.
+/// @embed
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PrevOutput {
+    /// amount sent to this output
+    #[prost(uint64, required, tag = "1")]
+    pub amount: u64,
+    /// scriptPubkey of this output
+    #[prost(bytes = "vec", required, tag = "2")]
+    pub script_pubkey: ::prost::alloc::vec::Vec<u8>,
+    /// only for Decred
+    #[prost(uint32, optional, tag = "3")]
+    pub decred_script_version: ::core::option::Option<u32>,
+}
+///*
+/// Request: Data about input to be signed.
+/// Wire-alias of TxAck.
+///
+/// Do not edit this type without considering compatibility with TxAck.
+/// Prefer to modify the inner TxInput type.
+///
+/// @next TxRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxAckInput {
+    #[prost(message, required, tag = "1")]
+    pub tx: tx_ack_input::TxAckInputWrapper,
+}
+/// Nested message and enum types in `TxAckInput`.
+pub mod tx_ack_input {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TxAckInputWrapper {
+        #[prost(message, required, tag = "2")]
+        pub input: super::TxInput,
+    }
+}
+///*
+/// Request: Data about output to be signed.
+/// Wire-alias of TxAck.
+///
+/// Do not edit this type without considering compatibility with TxAck.
+/// Prefer to modify the inner TxOutput type.
+///
+/// @next TxRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxAckOutput {
+    #[prost(message, required, tag = "1")]
+    pub tx: tx_ack_output::TxAckOutputWrapper,
+}
+/// Nested message and enum types in `TxAckOutput`.
+pub mod tx_ack_output {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TxAckOutputWrapper {
+        #[prost(message, required, tag = "5")]
+        pub output: super::TxOutput,
+    }
+}
+///*
+/// Request: Data about previous transaction metadata
+/// Wire-alias of TxAck.
+///
+/// Do not edit this type without considering compatibility with TxAck.
+/// Prefer to modify the inner PrevTx type.
+///
+/// @next TxRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxAckPrevMeta {
+    #[prost(message, required, tag = "1")]
+    pub tx: PrevTx,
+}
+///*
+/// Request: Data about previous transaction input
+/// Wire-alias of TxAck.
+///
+/// Do not edit this type without considering compatibility with TxAck.
+/// Prefer to modify the inner PrevInput type.
+///
+/// @next TxRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxAckPrevInput {
+    #[prost(message, required, tag = "1")]
+    pub tx: tx_ack_prev_input::TxAckPrevInputWrapper,
+}
+/// Nested message and enum types in `TxAckPrevInput`.
+pub mod tx_ack_prev_input {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TxAckPrevInputWrapper {
+        #[prost(message, required, tag = "2")]
+        pub input: super::PrevInput,
+    }
+}
+///*
+/// Request: Data about previous transaction output
+/// Wire-alias of TxAck.
+///
+/// Do not edit this type without considering compatibility with TxAck.
+/// Prefer to modify the inner PrevOutput type.
+///
+/// @next TxRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxAckPrevOutput {
+    #[prost(message, required, tag = "1")]
+    pub tx: tx_ack_prev_output::TxAckPrevOutputWrapper,
+}
+/// Nested message and enum types in `TxAckPrevOutput`.
+pub mod tx_ack_prev_output {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TxAckPrevOutputWrapper {
+        #[prost(message, required, tag = "3")]
+        pub output: super::PrevOutput,
+    }
+}
+///*
+/// Request: Content of the extra data of a previous transaction
+/// Wire-alias of TxAck.
+///
+/// Do not edit this type without considering compatibility with TxAck.
+///
+/// @next TxRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TxAckPrevExtraData {
+    #[prost(message, required, tag = "1")]
+    pub tx: tx_ack_prev_extra_data::TxAckPrevExtraDataWrapper,
+}
+/// Nested message and enum types in `TxAckPrevExtraData`.
+pub mod tx_ack_prev_extra_data {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct TxAckPrevExtraDataWrapper {
+        #[prost(bytes = "vec", required, tag = "8")]
+        pub extra_data_chunk: ::prost::alloc::vec::Vec<u8>,
+    }
+}
+///*
+/// Request: Ask device for a proof of ownership corresponding to address_n path
+/// @start
+/// @next OwnershipProof
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetOwnershipProof {
+    /// BIP-32 path to derive the key from master node
+    #[prost(uint32, repeated, packed = "false", tag = "1")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// coin to use
+    #[prost(string, optional, tag = "2", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// used to distinguish between various scriptPubKey types
+    #[prost(enumeration = "InputScriptType", optional, tag = "3", default = "Spendwitness")]
+    pub script_type: ::core::option::Option<i32>,
+    /// filled if proof is for a multisig address
+    #[prost(message, optional, tag = "4")]
+    pub multisig: ::core::option::Option<MultisigRedeemScriptType>,
+    /// show a confirmation dialog and set the "user confirmation" bit in the proof
+    #[prost(bool, optional, tag = "5", default = "false")]
+    pub user_confirmation: ::core::option::Option<bool>,
+    /// list of ownership identifiers in case of multisig
+    #[prost(bytes = "vec", repeated, tag = "6")]
+    pub ownership_ids: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// additional data to which the proof should commit
+    #[prost(bytes = "vec", optional, tag = "7", default = "b\"\"")]
+    pub commitment_data: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+}
+///*
+/// Response: Contains the proof of ownership
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct OwnershipProof {
+    /// SLIP-0019 proof of ownership
+    #[prost(bytes = "vec", required, tag = "1")]
+    pub ownership_proof: ::prost::alloc::vec::Vec<u8>,
+    /// signature of the proof
+    #[prost(bytes = "vec", required, tag = "2")]
+    pub signature: ::prost::alloc::vec::Vec<u8>,
+}
+///*
+/// Request: Ask device to prompt the user to authorize a CoinJoin transaction
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AuthorizeCoinJoin {
+    /// coordinator identifier to approve as a prefix in commitment data (max. 18 ASCII characters)
+    #[prost(string, required, tag = "1")]
+    pub coordinator: ::prost::alloc::string::String,
+    /// maximum total fees
+    #[prost(uint64, required, tag = "2")]
+    pub max_total_fee: u64,
+    /// fee per anonymity set in units of 10^-9 percent
+    #[prost(uint32, optional, tag = "3", default = "0")]
+    pub fee_per_anonymity: ::core::option::Option<u32>,
+    /// prefix of the BIP-32 path leading to the account (m / purpose' / coin_type' / account')
+    #[prost(uint32, repeated, packed = "false", tag = "4")]
+    pub address_n: ::prost::alloc::vec::Vec<u32>,
+    /// coin to use
+    #[prost(string, optional, tag = "5", default = "Bitcoin")]
+    pub coin_name: ::core::option::Option<::prost::alloc::string::String>,
+    /// used to distinguish between various address formats (non-segwit, segwit, etc.)
+    #[prost(enumeration = "InputScriptType", optional, tag = "6", default = "Spendaddress")]
+    pub script_type: ::core::option::Option<i32>,
+    /// show amounts in
+    #[prost(enumeration = "AmountUnit", optional, tag = "11", default = "Bitcoin")]
+    pub amount_unit: ::core::option::Option<i32>,
+}
+///*
+/// Type of script which will be used for transaction input
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum InputScriptType {
+    /// standard P2PKH address
+    Spendaddress = 0,
+    /// P2SH multisig address
+    Spendmultisig = 1,
+    /// reserved for external inputs (coinjoin)
+    External = 2,
+    /// native SegWit
+    Spendwitness = 3,
+    /// SegWit over P2SH (backward compatible)
+    Spendp2shwitness = 4,
+}
+///*
+/// Type of script which will be used for transaction output
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum OutputScriptType {
+    /// used for all addresses (bitcoin, p2sh, witness)
+    Paytoaddress = 0,
+    /// p2sh address (deprecated; use PAYTOADDRESS)
+    Paytoscripthash = 1,
+    /// only for change output
+    Paytomultisig = 2,
+    /// op_return
+    Paytoopreturn = 3,
+    /// only for change output
+    Paytowitness = 4,
+    /// only for change output
+    Paytop2shwitness = 5,
+}
+///*
+/// Type of script which will be used for decred stake transaction input
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum DecredStakingSpendType {
+    SsGen = 0,
+    Ssrtx = 1,
+}
+///*
+/// Unit to be used when showing amounts on the display
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum AmountUnit {
+    /// BTC
+    Bitcoin = 0,
+    /// mBTC
+    Millibitcoin = 1,
+    /// uBTC
+    Microbitcoin = 2,
+    /// sat
+    Satoshi = 3,
+}
diff --git a/mm2src/trezor/src/proto/messages_common.rs b/mm2src/trezor/src/proto/messages_common.rs
new file mode 100644
index 0000000000..97fc718595
--- /dev/null
+++ b/mm2src/trezor/src/proto/messages_common.rs
@@ -0,0 +1,184 @@
+///*
+/// Response: Success of the previous request
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Success {
+    /// human readable description of action or request-specific payload
+    #[prost(string, optional, tag = "1", default = "")]
+    pub message: ::core::option::Option<::prost::alloc::string::String>,
+}
+///*
+/// Response: Failure of the previous request
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Failure {
+    /// computer-readable definition of the error state
+    #[prost(enumeration = "failure::FailureType", optional, tag = "1")]
+    pub code: ::core::option::Option<i32>,
+    /// human-readable message of the error state
+    #[prost(string, optional, tag = "2")]
+    pub message: ::core::option::Option<::prost::alloc::string::String>,
+}
+/// Nested message and enum types in `Failure`.
+pub mod failure {
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    #[allow(clippy::enum_variant_names)]
+    pub enum FailureType {
+        FailureUnexpectedMessage = 1,
+        FailureButtonExpected = 2,
+        FailureDataError = 3,
+        FailureActionCancelled = 4,
+        FailurePinExpected = 5,
+        FailurePinCancelled = 6,
+        FailurePinInvalid = 7,
+        FailureInvalidSignature = 8,
+        FailureProcessError = 9,
+        FailureNotEnoughFunds = 10,
+        FailureNotInitialized = 11,
+        FailurePinMismatch = 12,
+        FailureWipeCodeMismatch = 13,
+        FailureInvalidSession = 14,
+        FailureFirmwareError = 99,
+    }
+}
+///*
+/// Response: Device is waiting for HW button press.
+/// @auxstart
+/// @next ButtonAck
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ButtonRequest {
+    /// enum identifier of the screen
+    #[prost(enumeration = "button_request::ButtonRequestType", optional, tag = "1")]
+    pub code: ::core::option::Option<i32>,
+    /// if the screen is paginated, number of pages
+    #[prost(uint32, optional, tag = "2")]
+    pub pages: ::core::option::Option<u32>,
+}
+/// Nested message and enum types in `ButtonRequest`.
+pub mod button_request {
+    ///*
+    /// Type of button request
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum ButtonRequestType {
+        ButtonRequestOther = 1,
+        ButtonRequestFeeOverThreshold = 2,
+        ButtonRequestConfirmOutput = 3,
+        ButtonRequestResetDevice = 4,
+        ButtonRequestConfirmWord = 5,
+        ButtonRequestWipeDevice = 6,
+        ButtonRequestProtectCall = 7,
+        ButtonRequestSignTx = 8,
+        ButtonRequestFirmwareCheck = 9,
+        ButtonRequestAddress = 10,
+        ButtonRequestPublicKey = 11,
+        ButtonRequestMnemonicWordCount = 12,
+        ButtonRequestMnemonicInput = 13,
+        DeprecatedButtonRequestPassphraseType = 14,
+        ButtonRequestUnknownDerivationPath = 15,
+        ButtonRequestRecoveryHomepage = 16,
+        ButtonRequestSuccess = 17,
+        ButtonRequestWarning = 18,
+        ButtonRequestPassphraseEntry = 19,
+        ButtonRequestPinEntry = 20,
+    }
+}
+///*
+/// Request: Computer agrees to wait for HW button press
+/// @auxend
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ButtonAck {}
+///*
+/// Response: Device is asking computer to show PIN matrix and awaits PIN encoded using this matrix scheme
+/// @auxstart
+/// @next PinMatrixAck
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PinMatrixRequest {
+    #[prost(enumeration = "pin_matrix_request::PinMatrixRequestType", optional, tag = "1")]
+    pub r#type: ::core::option::Option<i32>,
+}
+/// Nested message and enum types in `PinMatrixRequest`.
+pub mod pin_matrix_request {
+    ///*
+    /// Type of PIN request
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum PinMatrixRequestType {
+        Current = 1,
+        NewFirst = 2,
+        NewSecond = 3,
+        WipeCodeFirst = 4,
+        WipeCodeSecond = 5,
+    }
+}
+///*
+/// Request: Computer responds with encoded PIN
+/// @auxend
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PinMatrixAck {
+    /// matrix encoded PIN entered by user
+    #[prost(string, required, tag = "1")]
+    pub pin: ::prost::alloc::string::String,
+}
+///*
+/// Response: Device awaits encryption passphrase
+/// @auxstart
+/// @next PassphraseAck
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PassphraseRequest {
+    /// <2.3.0
+    #[deprecated]
+    #[prost(bool, optional, tag = "1")]
+    pub on_device: ::core::option::Option<bool>,
+}
+///*
+/// Request: Send passphrase back
+/// @auxend
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PassphraseAck {
+    #[prost(string, optional, tag = "1")]
+    pub passphrase: ::core::option::Option<::prost::alloc::string::String>,
+    /// <2.3.0
+    #[deprecated]
+    #[prost(bytes = "vec", optional, tag = "2")]
+    pub state: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// user wants to enter passphrase on the device
+    #[prost(bool, optional, tag = "3")]
+    pub on_device: ::core::option::Option<bool>,
+}
+///*
+/// Response: Device awaits passphrase state
+/// Deprecated in 2.3.0
+/// @next Deprecated_PassphraseStateAck
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeprecatedPassphraseStateRequest {
+    /// actual device state
+    #[prost(bytes = "vec", optional, tag = "1")]
+    pub state: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+}
+///*
+/// Request: Send passphrase state back
+/// Deprecated in 2.3.0
+/// @auxend
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DeprecatedPassphraseStateAck {}
+///*
+/// Structure representing BIP32 (hierarchical deterministic) node
+/// Used for imports of private key into the device and exporting public key out of device
+/// @embed
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct HdNodeType {
+    #[prost(uint32, required, tag = "1")]
+    pub depth: u32,
+    #[prost(uint32, required, tag = "2")]
+    pub fingerprint: u32,
+    #[prost(uint32, required, tag = "3")]
+    pub child_num: u32,
+    #[prost(bytes = "vec", required, tag = "4")]
+    pub chain_code: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", optional, tag = "5")]
+    pub private_key: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    #[prost(bytes = "vec", required, tag = "6")]
+    pub public_key: ::prost::alloc::vec::Vec<u8>,
+}
diff --git a/mm2src/trezor/src/proto/messages_management.rs b/mm2src/trezor/src/proto/messages_management.rs
new file mode 100644
index 0000000000..958d8ef038
--- /dev/null
+++ b/mm2src/trezor/src/proto/messages_management.rs
@@ -0,0 +1,566 @@
+///*
+/// Request: Reset device to default state and ask for device details
+/// @start
+/// @next Features
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Initialize {
+    /// assumed device session id; Trezor clears caches if it is different or empty
+    #[prost(bytes = "vec", optional, tag = "1")]
+    pub session_id: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+}
+///*
+/// Request: Ask for device details (no device reset)
+/// @start
+/// @next Features
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetFeatures {}
+///*
+/// Response: Reports various information about the device
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Features {
+    /// name of the manufacturer, e.g. "trezor.io"
+    #[prost(string, optional, tag = "1")]
+    pub vendor: ::core::option::Option<::prost::alloc::string::String>,
+    /// major version of the firmware/bootloader, e.g. 1
+    #[prost(uint32, required, tag = "2")]
+    pub major_version: u32,
+    /// minor version of the firmware/bootloader, e.g. 0
+    #[prost(uint32, required, tag = "3")]
+    pub minor_version: u32,
+    /// patch version of the firmware/bootloader, e.g. 0
+    #[prost(uint32, required, tag = "4")]
+    pub patch_version: u32,
+    /// is device in bootloader mode?
+    #[prost(bool, optional, tag = "5")]
+    pub bootloader_mode: ::core::option::Option<bool>,
+    /// device's unique identifier
+    #[prost(string, optional, tag = "6")]
+    pub device_id: ::core::option::Option<::prost::alloc::string::String>,
+    /// is device protected by PIN?
+    #[prost(bool, optional, tag = "7")]
+    pub pin_protection: ::core::option::Option<bool>,
+    /// is node/mnemonic encrypted using passphrase?
+    #[prost(bool, optional, tag = "8")]
+    pub passphrase_protection: ::core::option::Option<bool>,
+    /// device language
+    #[prost(string, optional, tag = "9")]
+    pub language: ::core::option::Option<::prost::alloc::string::String>,
+    /// device description label
+    #[prost(string, optional, tag = "10")]
+    pub label: ::core::option::Option<::prost::alloc::string::String>,
+    /// does device contain seed?
+    #[prost(bool, optional, tag = "12")]
+    pub initialized: ::core::option::Option<bool>,
+    /// SCM revision of firmware
+    #[prost(bytes = "vec", optional, tag = "13")]
+    pub revision: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// hash of the bootloader
+    #[prost(bytes = "vec", optional, tag = "14")]
+    pub bootloader_hash: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// was storage imported from an external source?
+    #[prost(bool, optional, tag = "15")]
+    pub imported: ::core::option::Option<bool>,
+    /// is the device unlocked? called "pin_cached" previously
+    #[prost(bool, optional, tag = "16")]
+    pub unlocked: ::core::option::Option<bool>,
+    ///    optional bool passphrase_cached = 17;       // is passphrase already cached in session?  DEPRECATED
+    ///
+    /// is valid firmware loaded?
+    #[prost(bool, optional, tag = "18")]
+    pub firmware_present: ::core::option::Option<bool>,
+    /// does storage need backup? (equals to Storage.needs_backup)
+    #[prost(bool, optional, tag = "19")]
+    pub needs_backup: ::core::option::Option<bool>,
+    /// device flags (equals to Storage.flags)
+    #[prost(uint32, optional, tag = "20")]
+    pub flags: ::core::option::Option<u32>,
+    /// device hardware model
+    #[prost(string, optional, tag = "21")]
+    pub model: ::core::option::Option<::prost::alloc::string::String>,
+    /// reported firmware version if in bootloader mode
+    #[prost(uint32, optional, tag = "22")]
+    pub fw_major: ::core::option::Option<u32>,
+    /// reported firmware version if in bootloader mode
+    #[prost(uint32, optional, tag = "23")]
+    pub fw_minor: ::core::option::Option<u32>,
+    /// reported firmware version if in bootloader mode
+    #[prost(uint32, optional, tag = "24")]
+    pub fw_patch: ::core::option::Option<u32>,
+    /// reported firmware vendor if in bootloader mode
+    #[prost(string, optional, tag = "25")]
+    pub fw_vendor: ::core::option::Option<::prost::alloc::string::String>,
+    /// reported firmware vendor keys (their hash)
+    #[prost(bytes = "vec", optional, tag = "26")]
+    pub fw_vendor_keys: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// report unfinished backup (equals to Storage.unfinished_backup)
+    #[prost(bool, optional, tag = "27")]
+    pub unfinished_backup: ::core::option::Option<bool>,
+    /// report no backup (equals to Storage.no_backup)
+    #[prost(bool, optional, tag = "28")]
+    pub no_backup: ::core::option::Option<bool>,
+    /// is recovery mode in progress
+    #[prost(bool, optional, tag = "29")]
+    pub recovery_mode: ::core::option::Option<bool>,
+    /// list of supported capabilities
+    #[prost(enumeration = "features::Capability", repeated, packed = "false", tag = "30")]
+    pub capabilities: ::prost::alloc::vec::Vec<i32>,
+    /// type of device backup (BIP-39 / SLIP-39 basic / SLIP-39 advanced)
+    #[prost(enumeration = "BackupType", optional, tag = "31")]
+    pub backup_type: ::core::option::Option<i32>,
+    /// is SD card present
+    #[prost(bool, optional, tag = "32")]
+    pub sd_card_present: ::core::option::Option<bool>,
+    /// is SD Protect enabled
+    #[prost(bool, optional, tag = "33")]
+    pub sd_protection: ::core::option::Option<bool>,
+    /// is wipe code protection enabled
+    #[prost(bool, optional, tag = "34")]
+    pub wipe_code_protection: ::core::option::Option<bool>,
+    #[prost(bytes = "vec", optional, tag = "35")]
+    pub session_id: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    /// device enforces passphrase entry on Trezor
+    #[prost(bool, optional, tag = "36")]
+    pub passphrase_always_on_device: ::core::option::Option<bool>,
+    /// safety check level, set to Prompt to limit path namespace enforcement
+    #[prost(enumeration = "SafetyCheckLevel", optional, tag = "37")]
+    pub safety_checks: ::core::option::Option<i32>,
+    /// number of milliseconds after which the device locks itself
+    #[prost(uint32, optional, tag = "38")]
+    pub auto_lock_delay_ms: ::core::option::Option<u32>,
+    /// in degrees from North
+    #[prost(uint32, optional, tag = "39")]
+    pub display_rotation: ::core::option::Option<u32>,
+    /// are experimental message types enabled?
+    #[prost(bool, optional, tag = "40")]
+    pub experimental_features: ::core::option::Option<bool>,
+}
+/// Nested message and enum types in `Features`.
+pub mod features {
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum Capability {
+        Bitcoin = 1,
+        /// Altcoins based on the Bitcoin source code
+        BitcoinLike = 2,
+        Binance = 3,
+        Cardano = 4,
+        /// generic crypto operations for GPG, SSH, etc.
+        Crypto = 5,
+        Eos = 6,
+        Ethereum = 7,
+        Lisk = 8,
+        Monero = 9,
+        Nem = 10,
+        Ripple = 11,
+        Stellar = 12,
+        Tezos = 13,
+        U2f = 14,
+        Shamir = 15,
+        ShamirGroups = 16,
+        /// the device is capable of passphrase entry directly on the device
+        PassphraseEntry = 17,
+    }
+}
+///*
+/// Request: soft-lock the device. Following actions will require PIN. Passphrases remain cached.
+/// @start
+/// @next Success
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct LockDevice {}
+///*
+/// Request: end the current sesson. Following actions must call Initialize again.
+/// Cache for the current session is discarded, other sessions remain intact.
+/// Device is not PIN-locked.
+/// @start
+/// @next Success
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EndSession {}
+///*
+/// Request: change language and/or label of the device
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ApplySettings {
+    #[prost(string, optional, tag = "1")]
+    pub language: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(string, optional, tag = "2")]
+    pub label: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(bool, optional, tag = "3")]
+    pub use_passphrase: ::core::option::Option<bool>,
+    #[prost(bytes = "vec", optional, tag = "4")]
+    pub homescreen: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+    ///    optional PassphraseSourceType passphrase_source = 5;  DEPRECATED
+    #[prost(uint32, optional, tag = "6")]
+    pub auto_lock_delay_ms: ::core::option::Option<u32>,
+    /// in degrees from North
+    #[prost(uint32, optional, tag = "7")]
+    pub display_rotation: ::core::option::Option<u32>,
+    /// do not prompt for passphrase, enforce device entry
+    #[prost(bool, optional, tag = "8")]
+    pub passphrase_always_on_device: ::core::option::Option<bool>,
+    /// Safety check level, set to Prompt to limit path namespace enforcement
+    #[prost(enumeration = "SafetyCheckLevel", optional, tag = "9")]
+    pub safety_checks: ::core::option::Option<i32>,
+    /// enable experimental message types
+    #[prost(bool, optional, tag = "10")]
+    pub experimental_features: ::core::option::Option<bool>,
+}
+///*
+/// Request: set flags of the device
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ApplyFlags {
+    /// bitmask, can only set bits, not unset
+    #[prost(uint32, required, tag = "1")]
+    pub flags: u32,
+}
+///*
+/// Request: Starts workflow for setting/changing/removing the PIN
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ChangePin {
+    /// is PIN removal requested?
+    #[prost(bool, optional, tag = "1")]
+    pub remove: ::core::option::Option<bool>,
+}
+///*
+/// Request: Starts workflow for setting/removing the wipe code
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ChangeWipeCode {
+    /// is wipe code removal requested?
+    #[prost(bool, optional, tag = "1")]
+    pub remove: ::core::option::Option<bool>,
+}
+///*
+/// Request: Starts workflow for enabling/regenerating/disabling SD card protection
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SdProtect {
+    #[prost(enumeration = "sd_protect::SdProtectOperationType", required, tag = "1")]
+    pub operation: i32,
+}
+/// Nested message and enum types in `SdProtect`.
+pub mod sd_protect {
+    ///*
+    /// Structure representing SD card protection operation
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum SdProtectOperationType {
+        Disable = 0,
+        Enable = 1,
+        Refresh = 2,
+    }
+}
+///*
+/// Request: Test if the device is alive, device sends back the message in Success response
+/// @start
+/// @next Success
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Ping {
+    /// message to send back in Success message
+    #[prost(string, optional, tag = "1", default = "")]
+    pub message: ::core::option::Option<::prost::alloc::string::String>,
+    /// ask for button press
+    #[prost(bool, optional, tag = "2")]
+    pub button_protection: ::core::option::Option<bool>,
+}
+///*
+/// Request: Abort last operation that required user interaction
+/// @start
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Cancel {}
+///*
+/// Request: Request a sample of random data generated by hardware RNG. May be used for testing.
+/// @start
+/// @next Entropy
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetEntropy {
+    /// size of requested entropy
+    #[prost(uint32, required, tag = "1")]
+    pub size: u32,
+}
+///*
+/// Response: Reply with random data generated by internal RNG
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Entropy {
+    /// chunk of random generated bytes
+    #[prost(bytes = "vec", required, tag = "1")]
+    pub entropy: ::prost::alloc::vec::Vec<u8>,
+}
+///*
+/// Request: Request device to wipe all sensitive data and settings
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct WipeDevice {}
+///*
+/// Request: Load seed and related internal settings from the computer
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct LoadDevice {
+    /// seed encoded as mnemonic (12, 18 or 24 words for BIP39, 20 or 33 for SLIP39)
+    #[prost(string, repeated, tag = "1")]
+    pub mnemonics: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    /// set PIN protection
+    #[prost(string, optional, tag = "3")]
+    pub pin: ::core::option::Option<::prost::alloc::string::String>,
+    /// enable master node encryption using passphrase
+    #[prost(bool, optional, tag = "4")]
+    pub passphrase_protection: ::core::option::Option<bool>,
+    /// device language (IETF BCP 47 language tag)
+    #[prost(string, optional, tag = "5", default = "en-US")]
+    pub language: ::core::option::Option<::prost::alloc::string::String>,
+    /// device label
+    #[prost(string, optional, tag = "6")]
+    pub label: ::core::option::Option<::prost::alloc::string::String>,
+    /// do not test mnemonic for valid BIP-39 checksum
+    #[prost(bool, optional, tag = "7")]
+    pub skip_checksum: ::core::option::Option<bool>,
+    /// U2F counter
+    #[prost(uint32, optional, tag = "8")]
+    pub u2f_counter: ::core::option::Option<u32>,
+    /// set "needs backup" flag
+    #[prost(bool, optional, tag = "9")]
+    pub needs_backup: ::core::option::Option<bool>,
+    /// indicate that no backup is going to be made
+    #[prost(bool, optional, tag = "10")]
+    pub no_backup: ::core::option::Option<bool>,
+}
+///*
+/// Request: Ask device to do initialization involving user interaction
+/// @start
+/// @next EntropyRequest
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ResetDevice {
+    /// display entropy generated by the device before asking for additional entropy
+    #[prost(bool, optional, tag = "1")]
+    pub display_random: ::core::option::Option<bool>,
+    /// strength of seed in bits
+    #[prost(uint32, optional, tag = "2", default = "256")]
+    pub strength: ::core::option::Option<u32>,
+    /// enable master node encryption using passphrase
+    #[prost(bool, optional, tag = "3")]
+    pub passphrase_protection: ::core::option::Option<bool>,
+    /// enable PIN protection
+    #[prost(bool, optional, tag = "4")]
+    pub pin_protection: ::core::option::Option<bool>,
+    /// device language (IETF BCP 47 language tag)
+    #[prost(string, optional, tag = "5", default = "en-US")]
+    pub language: ::core::option::Option<::prost::alloc::string::String>,
+    /// device label
+    #[prost(string, optional, tag = "6")]
+    pub label: ::core::option::Option<::prost::alloc::string::String>,
+    /// U2F counter
+    #[prost(uint32, optional, tag = "7")]
+    pub u2f_counter: ::core::option::Option<u32>,
+    /// postpone seed backup to BackupDevice workflow
+    #[prost(bool, optional, tag = "8")]
+    pub skip_backup: ::core::option::Option<bool>,
+    /// indicate that no backup is going to be made
+    #[prost(bool, optional, tag = "9")]
+    pub no_backup: ::core::option::Option<bool>,
+    /// type of the mnemonic backup
+    #[prost(enumeration = "BackupType", optional, tag = "10", default = "Bip39")]
+    pub backup_type: ::core::option::Option<i32>,
+}
+///*
+/// Request: Perform backup of the device seed if not backed up using ResetDevice
+/// @start
+/// @next Success
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BackupDevice {}
+///*
+/// Response: Ask for additional entropy from host computer
+/// @next EntropyAck
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EntropyRequest {}
+///*
+/// Request: Provide additional entropy for seed generation function
+/// @next Success
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct EntropyAck {
+    /// 256 bits (32 bytes) of random data
+    #[prost(bytes = "vec", required, tag = "1")]
+    pub entropy: ::prost::alloc::vec::Vec<u8>,
+}
+///*
+/// Request: Start recovery workflow asking user for specific words of mnemonic
+/// Used to recovery device safely even on untrusted computer.
+/// @start
+/// @next WordRequest
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct RecoveryDevice {
+    /// number of words in BIP-39 mnemonic
+    #[prost(uint32, optional, tag = "1")]
+    pub word_count: ::core::option::Option<u32>,
+    /// enable master node encryption using passphrase
+    #[prost(bool, optional, tag = "2")]
+    pub passphrase_protection: ::core::option::Option<bool>,
+    /// enable PIN protection
+    #[prost(bool, optional, tag = "3")]
+    pub pin_protection: ::core::option::Option<bool>,
+    /// device language (IETF BCP 47 language tag)
+    #[prost(string, optional, tag = "4")]
+    pub language: ::core::option::Option<::prost::alloc::string::String>,
+    /// device label
+    #[prost(string, optional, tag = "5")]
+    pub label: ::core::option::Option<::prost::alloc::string::String>,
+    /// enforce BIP-39 wordlist during the process
+    #[prost(bool, optional, tag = "6")]
+    pub enforce_wordlist: ::core::option::Option<bool>,
+    /// 7 reserved for unused recovery method
+    ///
+    /// supported recovery type
+    #[prost(enumeration = "recovery_device::RecoveryDeviceType", optional, tag = "8")]
+    pub r#type: ::core::option::Option<i32>,
+    /// U2F counter
+    #[prost(uint32, optional, tag = "9")]
+    pub u2f_counter: ::core::option::Option<u32>,
+    /// perform dry-run recovery workflow (for safe mnemonic validation)
+    #[prost(bool, optional, tag = "10")]
+    pub dry_run: ::core::option::Option<bool>,
+}
+/// Nested message and enum types in `RecoveryDevice`.
+pub mod recovery_device {
+    ///*
+    /// Type of recovery procedure. These should be used as bitmask, e.g.,
+    /// `RecoveryDeviceType_ScrambledWords | RecoveryDeviceType_Matrix`
+    /// listing every method supported by the host computer.
+    ///
+    /// Note that ScrambledWords must be supported by every implementation
+    /// for backward compatibility; there is no way to not support it.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum RecoveryDeviceType {
+        /// use powers of two when extending this field
+        ///
+        /// words in scrambled order
+        ScrambledWords = 0,
+        /// matrix recovery type
+        Matrix = 1,
+    }
+}
+///*
+/// Response: Device is waiting for user to enter word of the mnemonic
+/// Its position is shown only on device's internal display.
+/// @next WordAck
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct WordRequest {
+    #[prost(enumeration = "word_request::WordRequestType", required, tag = "1")]
+    pub r#type: i32,
+}
+/// Nested message and enum types in `WordRequest`.
+pub mod word_request {
+    ///*
+    /// Type of Recovery Word request
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum WordRequestType {
+        Plain = 0,
+        Matrix9 = 1,
+        Matrix6 = 2,
+    }
+}
+///*
+/// Request: Computer replies with word from the mnemonic
+/// @next WordRequest
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct WordAck {
+    /// one word of mnemonic on asked position
+    #[prost(string, required, tag = "1")]
+    pub word: ::prost::alloc::string::String,
+}
+///*
+/// Request: Set U2F counter
+/// @start
+/// @next Success
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SetU2fCounter {
+    #[prost(uint32, required, tag = "1")]
+    pub u2f_counter: u32,
+}
+///*
+/// Request: Set U2F counter
+/// @start
+/// @next NextU2FCounter
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GetNextU2fCounter {}
+///*
+/// Request: Set U2F counter
+/// @end
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct NextU2fCounter {
+    #[prost(uint32, required, tag = "1")]
+    pub u2f_counter: u32,
+}
+///*
+/// Request: Ask device to prepare for a preauthorized operation.
+/// @start
+/// @next PreauthorizedRequest
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct DoPreauthorized {}
+///*
+/// Request: Device awaits a preauthorized operation.
+/// @start
+/// @next SignTx
+/// @next GetOwnershipProof
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PreauthorizedRequest {}
+///*
+/// Request: Cancel any outstanding authorization in the current session.
+/// @start
+/// @next Success
+/// @next Failure
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct CancelAuthorization {}
+///*
+/// Request: Reboot firmware to bootloader
+/// @start
+/// @next Success
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct RebootToBootloader {}
+///*
+/// Type of the mnemonic backup given/received by the device during reset/recovery.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum BackupType {
+    /// also called "Single Backup", see BIP-0039
+    Bip39 = 0,
+    /// also called "Shamir Backup", see SLIP-0039
+    Slip39Basic = 1,
+    /// also called "Super Shamir" or "Shamir with Groups", see SLIP-0039#two-level-scheme
+    Slip39Advanced = 2,
+}
+///*
+/// Level of safety checks for unsafe actions like spending from invalid path namespace or setting high transaction fee.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum SafetyCheckLevel {
+    /// disallow unsafe actions, this is the default
+    Strict = 0,
+    /// ask user before unsafe action
+    PromptAlways = 1,
+    /// like PromptAlways but reverts to Strict after reboot
+    PromptTemporarily = 2,
+}
diff --git a/mm2src/trezor/src/proto/mod.rs b/mm2src/trezor/src/proto/mod.rs
new file mode 100644
index 0000000000..a85a76f2ef
--- /dev/null
+++ b/mm2src/trezor/src/proto/mod.rs
@@ -0,0 +1,100 @@
+//! This file is inspired by https://github.com/tezedge/tezedge-client/blob/master/trezor_api/src/messages.rs
+//! In this module we implement the `message_type` getter for all protobuf message types.
+
+use prost::bytes::BytesMut;
+
+pub mod messages;
+pub mod messages_bitcoin;
+pub mod messages_common;
+pub mod messages_management;
+
+/// This is needed by generated protobuf modules.
+pub(crate) use messages_common as common;
+
+use messages::MessageType;
+use messages_bitcoin::*;
+use messages_common::*;
+use messages_management::*;
+
+/// This macro provides the TrezorMessage trait for a protobuf message.
+macro_rules! trezor_message_impl {
+    ($struct:ident, $mtype:expr) => {
+        impl TrezorMessage for $struct {
+            fn message_type() -> MessageType { $mtype }
+        }
+    };
+}
+
+/// A protobuf message accompanied by the message type.
+/// This type is used to pass messages over the transport
+/// and used to contain messages received from the transport.
+pub struct ProtoMessage {
+    message_type: MessageType,
+    payload: Vec<u8>,
+}
+
+impl ProtoMessage {
+    pub fn new(message_type: MessageType, payload: Vec<u8>) -> ProtoMessage { ProtoMessage { message_type, payload } }
+
+    pub fn message_type(&self) -> MessageType { self.message_type }
+
+    pub fn payload(&self) -> &[u8] { &self.payload }
+
+    pub fn into_payload(self) -> Vec<u8> { self.payload }
+
+    /// Take the payload from the ProtoMessage and parse it to a protobuf message.
+    pub fn into_message<M: prost::Message + Default>(self) -> Result<M, prost::DecodeError> {
+        let bytes = BytesMut::from(self.payload.as_slice());
+        prost::Message::decode(bytes)
+    }
+}
+
+/// This trait extends the protobuf Message trait to also have a static getter for the message
+/// type code.
+pub trait TrezorMessage: prost::Message + Default + 'static {
+    fn message_type() -> MessageType;
+}
+
+// Management
+trezor_message_impl!(Initialize, MessageType::Initialize);
+trezor_message_impl!(Ping, MessageType::Ping);
+trezor_message_impl!(ChangePin, MessageType::ChangePin);
+trezor_message_impl!(WipeDevice, MessageType::WipeDevice);
+trezor_message_impl!(GetEntropy, MessageType::GetEntropy);
+trezor_message_impl!(Entropy, MessageType::Entropy);
+trezor_message_impl!(LoadDevice, MessageType::LoadDevice);
+trezor_message_impl!(ResetDevice, MessageType::ResetDevice);
+trezor_message_impl!(Features, MessageType::Features);
+trezor_message_impl!(Cancel, MessageType::Cancel);
+trezor_message_impl!(EndSession, MessageType::EndSession);
+trezor_message_impl!(ApplySettings, MessageType::ApplySettings);
+trezor_message_impl!(ApplyFlags, MessageType::ApplyFlags);
+trezor_message_impl!(BackupDevice, MessageType::BackupDevice);
+trezor_message_impl!(EntropyRequest, MessageType::EntropyRequest);
+trezor_message_impl!(EntropyAck, MessageType::EntropyAck);
+trezor_message_impl!(RecoveryDevice, MessageType::RecoveryDevice);
+trezor_message_impl!(WordRequest, MessageType::WordRequest);
+trezor_message_impl!(WordAck, MessageType::WordAck);
+trezor_message_impl!(GetFeatures, MessageType::GetFeatures);
+// Common
+trezor_message_impl!(Success, MessageType::Success);
+trezor_message_impl!(Failure, MessageType::Failure);
+trezor_message_impl!(PinMatrixRequest, MessageType::PinMatrixRequest);
+trezor_message_impl!(PinMatrixAck, MessageType::PinMatrixAck);
+trezor_message_impl!(ButtonRequest, MessageType::ButtonRequest);
+trezor_message_impl!(ButtonAck, MessageType::ButtonAck);
+// Bitcoin
+trezor_message_impl!(GetAddress, MessageType::GetAddress);
+trezor_message_impl!(Address, MessageType::Address);
+trezor_message_impl!(GetPublicKey, MessageType::GetPublicKey);
+trezor_message_impl!(PublicKey, MessageType::PublicKey);
+trezor_message_impl!(SignTx, MessageType::SignTx);
+trezor_message_impl!(TxRequest, MessageType::TxRequest);
+
+// Bitcoin (compatible)
+trezor_message_impl!(TxAckOutput, MessageType::TxAck);
+trezor_message_impl!(TxAckInput, MessageType::TxAck);
+trezor_message_impl!(TxAckPrevMeta, MessageType::TxAck);
+trezor_message_impl!(TxAckPrevInput, MessageType::TxAck);
+trezor_message_impl!(TxAckPrevOutput, MessageType::TxAck);
+trezor_message_impl!(TxAckPrevExtraData, MessageType::TxAck);
diff --git a/mm2src/trezor/src/response.rs b/mm2src/trezor/src/response.rs
new file mode 100644
index 0000000000..81599c13f8
--- /dev/null
+++ b/mm2src/trezor/src/response.rs
@@ -0,0 +1,177 @@
+use crate::client::TrezorSession;
+use crate::proto::messages_common as proto_common;
+use crate::result_handler::ResultHandler;
+use crate::user_interaction::TrezorUserInteraction;
+use crate::{TrezorError, TrezorResult};
+use async_trait::async_trait;
+use mm2_err_handle::prelude::*;
+use std::fmt;
+
+pub use crate::proto::messages_common::button_request::ButtonRequestType;
+pub use crate::proto::messages_common::pin_matrix_request::PinMatrixRequestType;
+use crate::response_processor::{ProcessTrezorResponse, TrezorProcessingError, TrezorRequestProcessor};
+
+/// The different types of user interactions the Trezor device can request.
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub enum InteractionType {
+    Button,
+    PinMatrix,
+    Passphrase,
+    PassphraseState,
+}
+
+/// A response from a Trezor device.
+///
+/// On every message exchange, instead of the expected/desired response,
+/// the Trezor can ask for some user interaction, or can send a failure.
+#[derive(Debug)]
+pub enum TrezorResponse<'a, 'b, T> {
+    Ready(T),
+    ButtonRequest(ButtonRequest<'a, 'b, T>),
+    PinMatrixRequest(PinMatrixRequest<'a, 'b, T>),
+}
+
+impl<'a, 'b, T: 'static> TrezorResponse<'a, 'b, T> {
+    /// Get the actual `Ok` response value or an error if not `Ok`.
+    pub fn ok(self) -> TrezorResult<T> {
+        match self {
+            TrezorResponse::Ready(m) => Ok(m),
+            TrezorResponse::ButtonRequest(_) => MmError::err(TrezorError::UnexpectedInteractionRequest(
+                TrezorUserInteraction::ButtonRequest,
+            )),
+            TrezorResponse::PinMatrixRequest(_) => MmError::err(TrezorError::UnexpectedInteractionRequest(
+                TrezorUserInteraction::PinMatrix3x3,
+            )),
+        }
+    }
+
+    /// Agrees to wait for all `HW button press` requests and returns final `Result`.
+    ///
+    /// # Error
+    ///
+    /// Will error if it receives requests, which require input like: `PinMatrixRequest`.
+    pub async fn ack_all(self) -> TrezorResult<T> {
+        let mut resp = self;
+        loop {
+            resp = match resp {
+                Self::Ready(val) => {
+                    return Ok(val);
+                },
+                Self::ButtonRequest(req) => req.ack().await?,
+                Self::PinMatrixRequest(_) => {
+                    return MmError::err(TrezorError::UnexpectedInteractionRequest(
+                        TrezorUserInteraction::PinMatrix3x3,
+                    ));
+                },
+            };
+        }
+    }
+
+    pub(crate) fn new_button_request(
+        session: &'b mut TrezorSession<'a>,
+        message: proto_common::ButtonRequest,
+        result_handler: ResultHandler<T>,
+    ) -> Self {
+        TrezorResponse::ButtonRequest(ButtonRequest {
+            session,
+            message,
+            result_handler,
+        })
+    }
+
+    pub(crate) fn new_pin_matrix_request(
+        session: &'b mut TrezorSession<'a>,
+        message: proto_common::PinMatrixRequest,
+        result_handler: ResultHandler<T>,
+    ) -> Self {
+        TrezorResponse::PinMatrixRequest(PinMatrixRequest {
+            session,
+            message,
+            result_handler,
+        })
+    }
+}
+
+#[async_trait]
+impl<'a, 'b, T> ProcessTrezorResponse<T> for TrezorResponse<'a, 'b, T>
+where
+    T: Send + Sync + 'static,
+{
+    async fn process<Processor>(self, processor: &Processor) -> MmResult<T, TrezorProcessingError<Processor::Error>>
+    where
+        Processor: TrezorRequestProcessor + Sync,
+    {
+        let fut = async move {
+            let mut response = self;
+            loop {
+                response = match response {
+                    TrezorResponse::Ready(result) => return Ok(result),
+                    TrezorResponse::ButtonRequest(button_req) => {
+                        processor.on_button_request().await?;
+                        button_req.ack().await?
+                    },
+                    TrezorResponse::PinMatrixRequest(pin_req) => {
+                        let pin_response = processor.on_pin_request().await?;
+                        pin_req.ack_pin(pin_response.pin).await?
+                    },
+                };
+            }
+        };
+        let res = fut.await;
+        processor.on_ready().await?;
+        res
+    }
+}
+
+/// A button request message sent by the device.
+pub struct ButtonRequest<'a, 'b, T> {
+    session: &'b mut TrezorSession<'a>,
+    message: proto_common::ButtonRequest,
+    result_handler: ResultHandler<T>,
+}
+
+impl<'a, 'b, T> fmt::Debug for ButtonRequest<'a, 'b, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{:?}", self.message) }
+}
+
+impl<'a, 'b, T: 'static> ButtonRequest<'a, 'b, T> {
+    /// The type of button request.
+    pub fn request_type(&self) -> Option<ButtonRequestType> { self.message.code.and_then(ButtonRequestType::from_i32) }
+
+    /// Ack the request and get the next message from the device.
+    pub async fn ack(self) -> TrezorResult<TrezorResponse<'a, 'b, T>> {
+        let req = proto_common::ButtonAck {};
+        self.session.call(req, self.result_handler).await
+    }
+
+    /// TODO add an optional `timeout` param.
+    pub async fn ack_all(self) -> TrezorResult<T> { self.ack().await?.ack_all().await }
+
+    pub async fn cancel(self) { self.session.cancel_last_op().await }
+}
+
+/// A PIN matrix request message sent by the device.
+pub struct PinMatrixRequest<'a, 'b, T> {
+    session: &'b mut TrezorSession<'a>,
+    message: proto_common::PinMatrixRequest,
+    result_handler: ResultHandler<T>,
+}
+
+impl<'a, 'b, T> fmt::Debug for PinMatrixRequest<'a, 'b, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{:?}", self.message) }
+}
+
+impl<'a, 'b, T: 'static> PinMatrixRequest<'a, 'b, T> {
+    /// The type of PIN matrix request.
+    pub fn request_type(&self) -> Option<PinMatrixRequestType> {
+        self.message.r#type.and_then(PinMatrixRequestType::from_i32)
+    }
+
+    /// Ack the request with a PIN and get the next message from the device.
+    pub async fn ack_pin(self, pin: String) -> TrezorResult<TrezorResponse<'a, 'b, T>> {
+        let req = proto_common::PinMatrixAck { pin };
+        self.session.call(req, self.result_handler).await
+    }
+
+    pub async fn cancel(self) { self.session.cancel_last_op().await }
+}
diff --git a/mm2src/trezor/src/response_processor.rs b/mm2src/trezor/src/response_processor.rs
new file mode 100644
index 0000000000..1059a0acc9
--- /dev/null
+++ b/mm2src/trezor/src/response_processor.rs
@@ -0,0 +1,39 @@
+use crate::{TrezorError, TrezorPinMatrix3x3Response};
+use async_trait::async_trait;
+use derive_more::Display;
+use mm2_err_handle::prelude::*;
+
+#[derive(Display)]
+pub enum TrezorProcessingError<E> {
+    TrezorError(TrezorError),
+    ProcessorError(E),
+}
+
+impl<E> From<TrezorError> for TrezorProcessingError<E> {
+    fn from(e: TrezorError) -> Self { TrezorProcessingError::TrezorError(e) }
+}
+
+/// This is required for implementing `MmError<TrezorProcessingError<E>>: From<MmError<TrezorError>>`.
+impl<E> NotEqual for TrezorProcessingError<E> {}
+
+#[async_trait]
+pub trait TrezorRequestProcessor {
+    type Error: NotMmError + Send;
+
+    async fn on_button_request(&self) -> MmResult<(), TrezorProcessingError<Self::Error>>;
+
+    async fn on_pin_request(&self) -> MmResult<TrezorPinMatrix3x3Response, TrezorProcessingError<Self::Error>>;
+
+    async fn on_ready(&self) -> MmResult<(), TrezorProcessingError<Self::Error>>;
+}
+
+#[async_trait]
+pub trait ProcessTrezorResponse<T>
+where
+    T: Send + Sync + 'static,
+{
+    async fn process<Processor>(self, processor: &Processor) -> MmResult<T, TrezorProcessingError<Processor::Error>>
+    where
+        Self: Sized,
+        Processor: TrezorRequestProcessor + Sync;
+}
diff --git a/mm2src/trezor/src/result_handler.rs b/mm2src/trezor/src/result_handler.rs
new file mode 100644
index 0000000000..d23e9541b4
--- /dev/null
+++ b/mm2src/trezor/src/result_handler.rs
@@ -0,0 +1,39 @@
+//! This file is inspired by https://github.com/tezedge/tezedge-client/blob/master/trezor_api/src/client.rs
+
+use crate::proto::messages::MessageType;
+use crate::proto::{ProtoMessage, TrezorMessage};
+use crate::{TrezorError, TrezorResult};
+use mm2_err_handle::prelude::*;
+
+/// Function to be passed to the [`TrezorClient::call`] method
+/// to process the Trezor response message into a general-purpose type.
+pub(crate) type RawResultHandler<T> = dyn FnOnce(ProtoMessage) -> TrezorResult<T> + Send;
+
+pub struct ResultHandler<T> {
+    result_message_type: MessageType,
+    handler: Box<RawResultHandler<T>>,
+}
+
+impl<T> ResultHandler<T> {
+    pub fn new<H, R>(result_handler: H) -> ResultHandler<T>
+    where
+        H: FnOnce(R) -> TrezorResult<T> + 'static + Send,
+        R: TrezorMessage,
+    {
+        let handler = move |proto: ProtoMessage| {
+            if R::message_type() != proto.message_type() {
+                return MmError::err(TrezorError::UnexpectedMessageType(proto.message_type()));
+            }
+            let resp_msg = proto.into_message()?;
+            result_handler(resp_msg)
+        };
+        ResultHandler {
+            result_message_type: R::message_type(),
+            handler: Box::new(handler),
+        }
+    }
+
+    pub fn message_type(&self) -> MessageType { self.result_message_type }
+
+    pub fn handle_raw(self, proto: ProtoMessage) -> TrezorResult<T> { (self.handler)(proto) }
+}
diff --git a/mm2src/trezor/src/transport/mod.rs b/mm2src/trezor/src/transport/mod.rs
new file mode 100644
index 0000000000..399a4b49ab
--- /dev/null
+++ b/mm2src/trezor/src/transport/mod.rs
@@ -0,0 +1,64 @@
+use crate::proto::ProtoMessage;
+use crate::TrezorResult;
+use async_trait::async_trait;
+use rand::RngCore;
+
+mod protocol;
+#[cfg(not(target_arch = "wasm32"))] pub mod usb;
+#[cfg(target_arch = "wasm32")] pub mod webusb;
+
+pub const TREZOR_DEVICES: [TrezorDevice; 3] = [
+    // TREZOR v1
+    // won't get opened, but we can show error at least
+    TrezorDevice::new(0x534c, 0x0001),
+    // TREZOR webusb Bootloader
+    TrezorDevice::new(0x1209, 0x53c0),
+    // TREZOR webusb Firmware
+    TrezorDevice::new(0x1209, 0x53c1),
+];
+
+#[derive(Clone, Copy)]
+pub struct TrezorDevice {
+    pub vendor_id: u16,
+    pub product_id: u16,
+}
+
+impl TrezorDevice {
+    const fn new(vendor_id: u16, product_id: u16) -> TrezorDevice { TrezorDevice { vendor_id, product_id } }
+}
+
+/// The transport interface that is implemented by the different ways to communicate with a Trezor
+/// device.
+#[async_trait]
+pub trait Transport {
+    async fn session_begin(&mut self) -> TrezorResult<()>;
+    async fn session_end(&mut self) -> TrezorResult<()>;
+
+    async fn write_message(&mut self, message: ProtoMessage) -> TrezorResult<()>;
+    async fn read_message(&mut self) -> TrezorResult<ProtoMessage>;
+}
+
+/// The Trezor session identifier.
+/// https://docs.trezor.io/trezor-firmware/common/communication/sessions.html#session-lifecycle
+#[allow(dead_code)]
+#[derive(Clone, Debug)]
+pub struct SessionId([u8; 32]);
+
+impl Default for SessionId {
+    fn default() -> Self { SessionId::new() }
+}
+
+impl SessionId {
+    /// Generate a new random `SessionId`.
+    pub fn new() -> SessionId {
+        let mut rng = rand::thread_rng();
+
+        let mut bytes = [0; 32];
+        rng.fill_bytes(&mut bytes);
+        SessionId(bytes)
+    }
+}
+
+impl AsRef<[u8]> for SessionId {
+    fn as_ref(&self) -> &[u8] { &self.0 }
+}
diff --git a/mm2src/trezor/src/transport/protocol.rs b/mm2src/trezor/src/transport/protocol.rs
new file mode 100644
index 0000000000..eaab782a1c
--- /dev/null
+++ b/mm2src/trezor/src/transport/protocol.rs
@@ -0,0 +1,101 @@
+//! This file is inspired by https://github.com/tezedge/tezedge-client/blob/master/trezor_api/src/transport/protocol.rs
+
+use crate::proto::messages::MessageType;
+use crate::proto::ProtoMessage;
+use crate::{TrezorError, TrezorResult};
+use async_trait::async_trait;
+use byteorder::{BigEndian, ByteOrder};
+use mm2_err_handle::prelude::*;
+
+const CHUNK_LEN: u32 = 64;
+const CHUNK_HEADER_LEN: usize = 9;
+
+/// A link represents a serial connection to send and receive byte chunks from and to a Trezor device.
+#[async_trait]
+pub trait Link {
+    async fn write_chunk(&mut self, chunk: Vec<u8>) -> TrezorResult<()>;
+    async fn read_chunk(&mut self, chunk_len: u32) -> TrezorResult<Vec<u8>>;
+}
+
+/// A protocol is used to encode messages in chunks that can be sent to the device and to parse
+/// chunks into messages.
+#[async_trait]
+pub trait Protocol {
+    async fn session_begin(&mut self) -> TrezorResult<()>;
+    async fn session_end(&mut self) -> TrezorResult<()>;
+    async fn write(&mut self, message: ProtoMessage) -> TrezorResult<()>;
+    async fn read(&mut self) -> TrezorResult<ProtoMessage>;
+}
+
+/// The original binary protocol.
+pub struct ProtocolV1<L: Link> {
+    pub link: L,
+}
+
+#[async_trait]
+impl<L: Link + Send> Protocol for ProtocolV1<L> {
+    /// Protocol V1 doesn't support sessions.
+    async fn session_begin(&mut self) -> TrezorResult<()> { Ok(()) }
+
+    /// Protocol V1 doesn't support sessions.
+    async fn session_end(&mut self) -> TrezorResult<()> { Ok(()) }
+
+    async fn write(&mut self, message: ProtoMessage) -> TrezorResult<()> {
+        // First generate the total payload, then write it to the transport in chunks.
+        let mut data = vec![0; 8];
+        data[0] = 0x23;
+        data[1] = 0x23;
+        BigEndian::write_u16(&mut data[2..4], message.message_type() as u16);
+        BigEndian::write_u32(&mut data[4..8], message.payload().len() as u32);
+        data.extend(message.into_payload());
+
+        let mut cur: usize = 0;
+        while cur < data.len() {
+            let mut chunk = vec![0x3f];
+            let end = std::cmp::min(cur + (CHUNK_LEN - 1) as usize, data.len());
+            chunk.extend(&data[cur..end]);
+            cur = end;
+            debug_assert!(chunk.len() <= CHUNK_LEN as usize);
+            chunk.resize(CHUNK_LEN as usize, 0);
+
+            self.link.write_chunk(chunk).await?;
+        }
+
+        Ok(())
+    }
+
+    async fn read(&mut self) -> TrezorResult<ProtoMessage> {
+        let chunk = self.link.read_chunk(CHUNK_LEN).await?;
+        if chunk.len() < CHUNK_HEADER_LEN as usize {
+            return MmError::err(TrezorError::ProtocolError(format!(
+                "Invalid chunk length '{}', expected at least '{}'",
+                chunk.len(),
+                CHUNK_HEADER_LEN
+            )));
+        }
+        if chunk[0] != 0x3f || chunk[1] != 0x23 || chunk[2] != 0x23 {
+            let error = format!(
+                "bad magic in v1 read: 0x{:x}{:x}{:x} instead of 0x3f2323",
+                chunk[0], chunk[1], chunk[2]
+            );
+            return MmError::err(TrezorError::ProtocolError(error));
+        }
+        let message_type_id = BigEndian::read_u16(&chunk[3..5]) as u32;
+        let message_type = MessageType::from_i32(message_type_id as i32)
+            .or_mm_err(|| TrezorError::ProtocolError(format!("Invalid message type: {}", message_type_id)))?;
+        let data_length = BigEndian::read_u32(&chunk[5..9]) as usize;
+        let mut data: Vec<u8> = chunk[9..].into();
+
+        while data.len() < data_length {
+            let chunk = self.link.read_chunk(CHUNK_LEN).await?;
+            if chunk[0] != 0x3f {
+                let error = format!("bad magic in v1 read: {:x} instead of 0x3f", chunk[0]);
+                return MmError::err(TrezorError::ProtocolError(error));
+            }
+
+            data.extend(&chunk[1..]);
+        }
+
+        Ok(ProtoMessage::new(message_type, data[0..data_length].into()))
+    }
+}
diff --git a/mm2src/trezor/src/transport/usb.rs b/mm2src/trezor/src/transport/usb.rs
new file mode 100644
index 0000000000..69440c9858
--- /dev/null
+++ b/mm2src/trezor/src/transport/usb.rs
@@ -0,0 +1,93 @@
+use crate::proto::ProtoMessage;
+use crate::transport::protocol::{Link, Protocol, ProtocolV1};
+use crate::transport::{Transport, TREZOR_DEVICES};
+use crate::TrezorResult;
+use async_trait::async_trait;
+use hw_common::transport::libusb::{GetDevicesFilters, UsbAvailableDevice as UsbAvailableDeviceImpl, UsbContext,
+                                   UsbDevice};
+use std::time::Duration;
+
+pub use hw_common::transport::libusb::UsbDeviceInfo;
+
+// TODO these timeouts should be optional and depend on the context of use.
+const READ_TIMEOUT: Duration = Duration::from_secs(600);
+const WRITE_TIMEOUT: Duration = Duration::from_secs(600);
+
+// The following constants are imported from
+// https://github.com/tezedge/tezedge-client/blob/master/trezor_api/src/transport/usb.rs
+const CONFIG_ID: u8 = 0;
+const INTERFACE: u8 = 0;
+const INTERFACE_DESCRIPTOR: u8 = 0;
+const LIBUSB_CLASS_VENDOR_SPEC: u8 = 0xff;
+
+pub struct UsbTransport {
+    protocol: ProtocolV1<UsbLink>,
+}
+
+#[async_trait]
+impl Transport for UsbTransport {
+    async fn session_begin(&mut self) -> TrezorResult<()> { self.protocol.session_begin().await }
+
+    async fn session_end(&mut self) -> TrezorResult<()> { self.protocol.session_end().await }
+
+    async fn write_message(&mut self, message: ProtoMessage) -> TrezorResult<()> { self.protocol.write(message).await }
+
+    async fn read_message(&mut self) -> TrezorResult<ProtoMessage> { self.protocol.read().await }
+}
+
+struct UsbLink {
+    device: UsbDevice,
+}
+
+#[async_trait]
+impl Link for UsbLink {
+    async fn write_chunk(&mut self, chunk: Vec<u8>) -> TrezorResult<()> {
+        // don't try to reconnect since libusb requires to enumerate all devices, ope and, claim interface again
+        Ok(self.device.write_chunk(chunk, WRITE_TIMEOUT).await?)
+    }
+
+    async fn read_chunk(&mut self, chunk_len: u32) -> TrezorResult<Vec<u8>> {
+        // don't try to reconnect since libusb requires to enumerate all devices, ope and, claim interface again
+        Ok(self.device.read_chunk(chunk_len as usize, READ_TIMEOUT).await?)
+    }
+}
+
+pub fn find_devices() -> TrezorResult<Vec<UsbAvailableDevice>> {
+    let context = UsbContext::new()?;
+    let filters = GetDevicesFilters {
+        config_id: CONFIG_ID,
+        interface_id: INTERFACE,
+        interface_descriptor: INTERFACE_DESCRIPTOR,
+        interface_class_code: LIBUSB_CLASS_VENDOR_SPEC,
+    };
+    Ok(context
+        .get_devices(filters)?
+        .into_iter()
+        .filter(is_trezor)
+        .map(UsbAvailableDevice)
+        .collect())
+}
+
+pub struct UsbAvailableDevice(UsbAvailableDeviceImpl);
+
+impl UsbAvailableDevice {
+    /// Please note [`hw_common::transport::libusb::UsbAvailableDevice::connect`] spawns a thread.
+    pub fn connect(self) -> TrezorResult<UsbTransport> {
+        let link = UsbLink {
+            device: self.0.connect()?,
+        };
+        Ok(UsbTransport {
+            protocol: ProtocolV1 { link },
+        })
+    }
+
+    pub fn device_info(&self) -> &UsbDeviceInfo { self.0.device_info() }
+}
+
+fn is_trezor(device: &UsbAvailableDeviceImpl) -> bool {
+    let device_info = device.device_info();
+    let (vendor_id, product_id) = (device_info.vendor_id, device_info.product_id);
+    TREZOR_DEVICES
+        .iter()
+        .any(|expected| vendor_id == expected.vendor_id && product_id == expected.product_id)
+}
diff --git a/mm2src/trezor/src/transport/webusb.rs b/mm2src/trezor/src/transport/webusb.rs
new file mode 100644
index 0000000000..6fa29c64ae
--- /dev/null
+++ b/mm2src/trezor/src/transport/webusb.rs
@@ -0,0 +1,168 @@
+use crate::proto::ProtoMessage;
+use crate::transport::protocol::{Link, Protocol, ProtocolV1};
+use crate::transport::{Transport, TrezorDevice, TREZOR_DEVICES};
+use crate::{TrezorError, TrezorResult};
+use async_trait::async_trait;
+use common::executor::Timer;
+use common::log::warn;
+use hw_common::transport::webusb_driver::{DeviceFilter, WebUsbDevice, WebUsbWrapper};
+use mm2_err_handle::prelude::*;
+
+pub use hw_common::transport::webusb_driver::WebUsbDeviceInfo;
+
+const T1HID_VENDOR: u16 = 0x534c;
+const CONFIGURATION_ID: u8 = 1;
+const DEBUG_ENDPOINT_ID: u8 = 2;
+
+impl From<TrezorDevice> for DeviceFilter {
+    fn from(d: TrezorDevice) -> Self { DeviceFilter::with_product_id(d.vendor_id, d.product_id) }
+}
+
+pub struct WebUsbTransport {
+    protocol: ProtocolV1<WebUsbLink>,
+}
+
+#[async_trait]
+impl Transport for WebUsbTransport {
+    async fn session_begin(&mut self) -> TrezorResult<()> { self.protocol.session_begin().await }
+
+    async fn session_end(&mut self) -> TrezorResult<()> { self.protocol.session_end().await }
+
+    async fn write_message(&mut self, message: ProtoMessage) -> TrezorResult<()> { self.protocol.write(message).await }
+
+    async fn read_message(&mut self) -> TrezorResult<ProtoMessage> { self.protocol.read().await }
+}
+
+struct WebUsbLink {
+    device: WebUsbDevice,
+    interface_number: u8,
+    endpoint_number: u8,
+    debug: bool,
+}
+
+#[async_trait]
+impl Link for WebUsbLink {
+    async fn write_chunk(&mut self, chunk: Vec<u8>) -> TrezorResult<()> {
+        if !self.device.is_open().await? {
+            self.reconnect().await?;
+        }
+        Ok(self.device.write_chunk(self.endpoint_number, chunk).await?)
+    }
+
+    async fn read_chunk(&mut self, chunk_len: u32) -> TrezorResult<Vec<u8>> {
+        if !self.device.is_open().await? {
+            self.reconnect().await?;
+        }
+        Ok(self.device.read_chunk(self.endpoint_number, chunk_len).await?)
+    }
+}
+
+impl WebUsbLink {
+    #[allow(dead_code)]
+    pub fn is_debug(&self) -> bool { self.debug }
+
+    async fn reconnect(&self) -> TrezorResult<()> {
+        let attempts = 5usize;
+        let first = false;
+        for i in 0..attempts {
+            match self.establish_connection(first).await {
+                Ok(()) => return Ok(()),
+                Err(e) if i != attempts - 1 => {
+                    warn!(
+                        "Unsuccessful attempt to connect: '{}'. Attempts left: {}",
+                        e,
+                        attempts - i - 1
+                    );
+                    Timer::sleep_ms(500).await;
+                },
+                Err(_) => (),
+            }
+        }
+        return MmError::err(TrezorError::DeviceDisconnected);
+    }
+
+    /// Configure the WebUSB device.
+    async fn establish_connection(&self, first: bool) -> TrezorResult<()> {
+        self.device.open().await?;
+        if first {
+            self.device.select_configuration(CONFIGURATION_ID).await?;
+            if let Err(e) = self.device.reset_device().await {
+                // Reset fails on ChromeOS and Windows.
+                warn!("{}", e);
+            }
+        }
+        self.device.claim_interface(self.interface_number).await?;
+        Ok(())
+    }
+}
+
+pub struct WebUsbAvailableDevice(WebUsbLink);
+
+impl WebUsbAvailableDevice {
+    pub async fn connect(self) -> TrezorResult<WebUsbTransport> {
+        let first = true;
+        self.0.establish_connection(first).await?;
+        Ok(WebUsbTransport {
+            protocol: ProtocolV1 { link: self.0 },
+        })
+    }
+
+    fn from_webusb_device(device: WebUsbDevice) -> Result<WebUsbAvailableDevice, String> {
+        let (interface_number, endpoint_number) = match device.device_info.interface {
+            Some(ref interface) => (interface.interface_number, interface.endpoint_number),
+            None => return Err(format!("Unknown interface: {:?}", device.device_info)),
+        };
+        Ok(WebUsbAvailableDevice(WebUsbLink {
+            device,
+            interface_number,
+            endpoint_number,
+            debug: endpoint_number == DEBUG_ENDPOINT_ID,
+        }))
+    }
+}
+
+pub struct FoundDevices {
+    pub available: Vec<WebUsbAvailableDevice>,
+    pub not_supported: Vec<WebUsbDeviceInfo>,
+}
+
+/// The implementation is inspired by (WebUsbPlugin::_listDevices)[https://github.com/trezor/trezor-link/blob/master/src/lowlevel/webusb.js#L74].
+///
+/// # Usage
+///
+/// This function **must** be called via a user gesture like a touch or mouse click.
+pub async fn find_devices() -> TrezorResult<FoundDevices> {
+    let wrapper = WebUsbWrapper::new()?;
+    wrapper
+        .request_device(TREZOR_DEVICES.iter().copied().map(DeviceFilter::from).collect())
+        .await?;
+    let devices_iter = wrapper.get_devices().await?.into_iter().filter(is_trezor);
+    let mut available = Vec::new();
+    let mut not_supported = Vec::new();
+    for device in devices_iter {
+        if is_hid(&device) {
+            not_supported.push(device.device_info);
+            continue;
+        }
+        match WebUsbAvailableDevice::from_webusb_device(device) {
+            Ok(device) => available.push(device),
+            Err(e) => {
+                warn!("Skip the device: {}", e);
+                continue;
+            },
+        }
+    }
+    Ok(FoundDevices {
+        available,
+        not_supported,
+    })
+}
+
+fn is_trezor(device: &WebUsbDevice) -> bool {
+    let (vendor_id, product_id) = (device.device_info.vendor_id, device.device_info.product_id);
+    TREZOR_DEVICES
+        .iter()
+        .any(|expected| vendor_id == expected.vendor_id && product_id == expected.product_id)
+}
+
+fn is_hid(device: &WebUsbDevice) -> bool { device.device_info.vendor_id == T1HID_VENDOR }
diff --git a/mm2src/trezor/src/trezor_rpc_task.rs b/mm2src/trezor/src/trezor_rpc_task.rs
new file mode 100644
index 0000000000..1dcd3275fb
--- /dev/null
+++ b/mm2src/trezor/src/trezor_rpc_task.rs
@@ -0,0 +1,78 @@
+use crate::response_processor::{TrezorProcessingError, TrezorRequestProcessor};
+use crate::TrezorPinMatrix3x3Response;
+use async_trait::async_trait;
+use mm2_err_handle::prelude::*;
+use std::convert::TryInto;
+use std::time::Duration;
+
+pub use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle};
+
+const DEFAULT_PIN_REQUEST_TIMEOUT: Duration = Duration::from_secs(300);
+
+pub struct TrezorRequestStatuses<InProgressStatus, AwaitingStatus> {
+    pub on_button_request: InProgressStatus,
+    pub on_pin_request: AwaitingStatus,
+    pub on_ready: InProgressStatus,
+}
+
+pub struct TrezorRpcTaskProcessor<'a, Task: RpcTask> {
+    task_handle: &'a RpcTaskHandle<Task>,
+    statuses: TrezorRequestStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    pin_timeout: Duration,
+}
+
+#[async_trait]
+impl<'a, Task> TrezorRequestProcessor for TrezorRpcTaskProcessor<'a, Task>
+where
+    Task: RpcTask,
+    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError> + Send,
+{
+    type Error = RpcTaskError;
+
+    async fn on_button_request(&self) -> MmResult<(), TrezorProcessingError<RpcTaskError>> {
+        self.update_in_progress_status(self.statuses.on_button_request.clone())
+    }
+
+    async fn on_pin_request(&self) -> MmResult<TrezorPinMatrix3x3Response, TrezorProcessingError<RpcTaskError>> {
+        let user_action = self
+            .task_handle
+            .wait_for_user_action(self.pin_timeout, self.statuses.on_pin_request.clone())
+            .await
+            .mm_err(TrezorProcessingError::ProcessorError)?;
+        let pin_response: TrezorPinMatrix3x3Response = user_action
+            .try_into()
+            .map_to_mm(TrezorProcessingError::ProcessorError)?;
+        Ok(pin_response)
+    }
+
+    async fn on_ready(&self) -> MmResult<(), TrezorProcessingError<RpcTaskError>> {
+        self.update_in_progress_status(self.statuses.on_ready.clone())
+    }
+}
+
+impl<'a, Task: RpcTask> TrezorRpcTaskProcessor<'a, Task> {
+    pub fn new(
+        task_handle: &'a RpcTaskHandle<Task>,
+        statuses: TrezorRequestStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    ) -> TrezorRpcTaskProcessor<'a, Task> {
+        TrezorRpcTaskProcessor {
+            task_handle,
+            statuses,
+            pin_timeout: DEFAULT_PIN_REQUEST_TIMEOUT,
+        }
+    }
+
+    pub fn with_pin_timeout(mut self, pin_timeout: Duration) -> Self {
+        self.pin_timeout = pin_timeout;
+        self
+    }
+
+    pub fn update_in_progress_status(
+        &self,
+        in_progress: Task::InProgressStatus,
+    ) -> MmResult<(), TrezorProcessingError<RpcTaskError>> {
+        self.task_handle
+            .update_in_progress_status(in_progress)
+            .mm_err(TrezorProcessingError::ProcessorError)
+    }
+}
diff --git a/mm2src/trezor/src/user_interaction.rs b/mm2src/trezor/src/user_interaction.rs
new file mode 100644
index 0000000000..8bca7d3bca
--- /dev/null
+++ b/mm2src/trezor/src/user_interaction.rs
@@ -0,0 +1,19 @@
+use derive_more::Display;
+
+#[derive(Clone, Debug, Deserialize, Display, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum TrezorUserInteraction {
+    ButtonRequest,
+    PinMatrix3x3,
+    Other(String),
+}
+
+/// Use the numeric keypad to describe number positions.
+/// The layout is:
+/// 7 8 9
+/// 4 5 6
+/// 1 2 3
+#[derive(Debug, Deserialize, Serialize)]
+pub struct TrezorPinMatrix3x3Response {
+    pub pin: String,
+}
diff --git a/mm2src/trezor/src/utxo/mod.rs b/mm2src/trezor/src/utxo/mod.rs
new file mode 100644
index 0000000000..b59aba04f3
--- /dev/null
+++ b/mm2src/trezor/src/utxo/mod.rs
@@ -0,0 +1,21 @@
+use derive_more::Display;
+
+mod prev_tx;
+mod sign_utxo;
+mod unsigned_tx;
+mod utxo_command;
+
+pub use prev_tx::{PrevTx, PrevTxInput, PrevTxOutput};
+pub use sign_utxo::TxSignResult;
+pub use unsigned_tx::{TrezorInputScriptType, TrezorOutputScriptType, TxOutput, UnsignedTxInput, UnsignedUtxoTx};
+
+pub type TxHash = Vec<u8>;
+pub type Signature = Vec<u8>;
+pub type ScriptPubkey = Vec<u8>;
+
+#[derive(Clone, Copy, Debug, Display, Deserialize, Serialize)]
+pub enum TrezorUtxoCoin {
+    Bitcoin,
+    Komodo,
+    Qtum,
+}
diff --git a/mm2src/trezor/src/utxo/prev_tx.rs b/mm2src/trezor/src/utxo/prev_tx.rs
new file mode 100644
index 0000000000..46731723d0
--- /dev/null
+++ b/mm2src/trezor/src/utxo/prev_tx.rs
@@ -0,0 +1,148 @@
+use crate::proto::messages_bitcoin as proto_bitcoin;
+use crate::utxo::{ScriptPubkey, Signature};
+use crate::{TrezorError, TrezorResult};
+use mm2_err_handle::prelude::*;
+
+/// Missing fields:
+/// * decred_tree - only for Decred
+pub struct PrevTxInput {
+    /// Hash of previous transaction output to spend by this input.
+    pub prev_hash: Vec<u8>,
+    /// Index of previous output to spend.
+    pub prev_index: u32,
+    /// Script signature.
+    pub script_sig: Signature,
+    /// Sequence.
+    pub sequence: u32,
+}
+
+impl PrevTxInput {
+    fn to_proto(&self) -> proto_bitcoin::TxAckPrevInput {
+        let input = proto_bitcoin::PrevInput {
+            prev_hash: self.prev_hash.clone(),
+            prev_index: self.prev_index,
+            script_sig: self.script_sig.clone(),
+            sequence: self.sequence,
+            decred_tree: None,
+        };
+
+        let tx = proto_bitcoin::tx_ack_prev_input::TxAckPrevInputWrapper { input };
+        proto_bitcoin::TxAckPrevInput { tx }
+    }
+}
+
+/// Missing fields:
+/// * decred_script_version - only for Decred
+pub struct PrevTxOutput {
+    /// Amount sent to this output.
+    pub amount: u64,
+    /// Script Pubkey of this output.
+    pub script_pubkey: ScriptPubkey,
+}
+
+impl PrevTxOutput {
+    fn to_proto(&self) -> proto_bitcoin::TxAckPrevOutput {
+        let output = proto_bitcoin::PrevOutput {
+            amount: self.amount,
+            script_pubkey: self.script_pubkey.clone(),
+            decred_script_version: None,
+        };
+
+        let tx = proto_bitcoin::tx_ack_prev_output::TxAckPrevOutputWrapper { output };
+        proto_bitcoin::TxAckPrevOutput { tx }
+    }
+}
+
+/// Missing fields:
+/// * extra_data_len - only for Dash, Zcash
+/// * expiry - only for Decred and Zcash
+/// * optional uint32 version_group_id = 12;  // only for Zcash, nVersionGroupId
+/// * timestamp - only for Peercoin
+pub struct PrevTx {
+    /// Transaction inputs.
+    pub inputs: Vec<PrevTxInput>,
+    /// Transaction outputs.
+    pub outputs: Vec<PrevTxOutput>,
+    /// Transaction version.
+    pub version: u32,
+    /// Transaction lock_time.
+    pub lock_time: u32,
+    /// only for Zcash, nVersionGroupId.
+    pub version_group_id: Option<u32>,
+    /// only for Zcash, BRANCH_ID.
+    pub branch_id: Option<u32>,
+    /// only for Zcash, BRANCH_ID.
+    pub extra_data: Vec<u8>,
+}
+
+impl PrevTx {
+    pub(crate) fn meta_message(&self) -> proto_bitcoin::TxAckPrevMeta {
+        let extra_data_len = if self.extra_data.is_empty() {
+            None
+        } else {
+            Some(self.extra_data.len() as u32)
+        };
+
+        let tx = proto_bitcoin::PrevTx {
+            version: self.version,
+            lock_time: self.lock_time,
+            inputs_count: self.inputs.len() as u32,
+            outputs_count: self.outputs.len() as u32,
+            extra_data_len,
+            expiry: None,
+            version_group_id: self.version_group_id,
+            timestamp: None,
+            branch_id: self.branch_id,
+        };
+
+        proto_bitcoin::TxAckPrevMeta { tx }
+    }
+
+    pub(crate) fn input_message(&self, input_index: usize) -> TrezorResult<proto_bitcoin::TxAckPrevInput> {
+        match self.inputs.get(input_index) {
+            Some(prev_input) => Ok(prev_input.to_proto()),
+            None => {
+                let error = format!(
+                    "Unexpected index '{}' of the prev-tx input. Actual count of inputs: {}",
+                    input_index,
+                    self.inputs.len()
+                );
+                MmError::err(TrezorError::ProtocolError(error))
+            },
+        }
+    }
+
+    pub(crate) fn output_message(&self, output_index: usize) -> TrezorResult<proto_bitcoin::TxAckPrevOutput> {
+        match self.outputs.get(output_index) {
+            Some(prev_output) => Ok(prev_output.to_proto()),
+            None => {
+                let error = format!(
+                    "Unexpected index '{}' of the prev-tx output. Actual count of outputs: {}",
+                    output_index,
+                    self.outputs.len()
+                );
+                MmError::err(TrezorError::ProtocolError(error))
+            },
+        }
+    }
+
+    pub(crate) fn extra_data_message(
+        &self,
+        offset: usize,
+        len: usize,
+    ) -> TrezorResult<proto_bitcoin::TxAckPrevExtraData> {
+        if self.extra_data.len() < offset + len {
+            let error = format!(
+                "Unexpected extra-data request: actual len '{}', offset '{}', requested len '{}'",
+                self.extra_data.len(),
+                offset,
+                len
+            );
+            return MmError::err(TrezorError::ProtocolError(error));
+        }
+        let extra_data_chunk = self.extra_data[offset..offset + len].to_vec();
+
+        let tx = proto_bitcoin::tx_ack_prev_extra_data::TxAckPrevExtraDataWrapper { extra_data_chunk };
+        Ok(proto_bitcoin::TxAckPrevExtraData { tx })
+    }
+}
diff --git a/mm2src/trezor/src/utxo/sign_utxo.rs b/mm2src/trezor/src/utxo/sign_utxo.rs
new file mode 100644
index 0000000000..9c3a452b24
--- /dev/null
+++ b/mm2src/trezor/src/utxo/sign_utxo.rs
@@ -0,0 +1,232 @@
+use crate::proto::messages_bitcoin as proto_bitcoin;
+use crate::result_handler::ResultHandler;
+use crate::utxo::unsigned_tx::UnsignedUtxoTx;
+use crate::utxo::Signature;
+use crate::{TrezorError, TrezorResponse, TrezorResult, TrezorSession};
+use common::log::{debug, info};
+use mm2_err_handle::prelude::*;
+
+const NO_DETAILS_ERROR: &str = "'TxRequest::details' is expected to be set";
+const NO_REQUEST_INDEX_ERROR: &str = "'TxRequestDetailsType::request_index' is expected to be set";
+const NO_EXTRA_DATA_OFFSET_ERROR: &str = "'TxRequestDetailsType::extra_data_offset' is expected to be set";
+const NO_EXTRA_DATA_LEN_ERROR: &str = "'TxRequestDetailsType::extra_data_len' is expected to be set";
+const NO_SIGNATURE_INDEX_ERROR: &str = "'TxRequestSerializedType::signature_index' is expected to be set";
+
+pub struct TxSignResult {
+    pub signatures: Vec<Signature>,
+    pub serialized_tx: Vec<u8>,
+}
+
+impl TxSignResult {
+    fn new_with_inputs_count(inputs_count: usize) -> TxSignResult {
+        TxSignResult {
+            signatures: vec![Signature::new(); inputs_count],
+            serialized_tx: Vec::new(),
+        }
+    }
+}
+
+impl<'a> TrezorSession<'a> {
+    /// https://docs.trezor.io/trezor-firmware/common/communication/bitcoin-signing.html#pseudo-code
+    /// TODO add a `timeout` param.
+    ///
+    /// # Fail
+    ///
+    /// Currently, this method fails if a device requests a PIN.
+    pub async fn sign_utxo_tx<'b>(&'b mut self, unsigned: UnsignedUtxoTx) -> TrezorResult<TxSignResult> {
+        use proto_bitcoin::tx_request::RequestType as ProtoTxRequestType;
+
+        let mut result = TxSignResult::new_with_inputs_count(unsigned.inputs.len());
+        // Please note `tx_request` is changed within the following loop.
+        let mut tx_request = self.sign_tx(unsigned.sign_tx_message()).await?.ack_all().await?;
+
+        info!(
+            "Start transaction signing: COIN={} INPUTS_COUNT={} OUTPUTS_COUNT={} OVERWINTERED={}",
+            unsigned.coin,
+            unsigned.inputs.len(),
+            unsigned.outputs.len(),
+            unsigned.version_group_id.is_some() || unsigned.branch_id.is_some()
+        );
+
+        loop {
+            extract_serialized_data(&tx_request, &mut result)?;
+
+            let request_type = tx_request.request_type.and_then(ProtoTxRequestType::from_i32);
+            let request_type = match request_type {
+                Some(ProtoTxRequestType::Txfinished) => return Ok(result),
+                Some(req_type) => req_type,
+                None => {
+                    let error = format!(
+                        "Received unexpected 'TxRequest::request_type': {:?}",
+                        tx_request.request_type
+                    );
+                    return MmError::err(TrezorError::ProtocolError(error));
+                },
+            };
+
+            let tx_request_details = match tx_request.details {
+                Some(ref details) => details,
+                None => return MmError::err(TrezorError::ProtocolError(NO_DETAILS_ERROR.to_owned())),
+            };
+
+            let is_prev = tx_request_details.tx_hash.is_some();
+            debug!("TxRequest: REQUEST_TYPE={:?} PREV={}", request_type, is_prev);
+
+            tx_request = match (request_type, &tx_request_details.tx_hash) {
+                (ProtoTxRequestType::Txinput, Some(prev_hash)) => {
+                    self.send_prev_input(&unsigned, tx_request_details, prev_hash).await?
+                },
+                (ProtoTxRequestType::Txinput, None) => self.send_input(&unsigned, tx_request_details).await?,
+                (ProtoTxRequestType::Txoutput, Some(prev_hash)) => {
+                    self.send_prev_output(&unsigned, tx_request_details, prev_hash).await?
+                },
+                (ProtoTxRequestType::Txoutput, None) => self.send_output(&unsigned, tx_request_details).await?,
+                (ProtoTxRequestType::Txmeta, Some(prev_hash)) => self.send_prev_tx_meta(&unsigned, prev_hash).await?,
+                (ProtoTxRequestType::Txextradata, Some(prev_hash)) => {
+                    self.send_extra_data(&unsigned, tx_request_details, prev_hash).await?
+                },
+                _ => {
+                    let error = format!("Unexpected tx request: {:?}, is_prev: {}", request_type, is_prev);
+                    return MmError::err(TrezorError::ProtocolError(error));
+                },
+            };
+        }
+    }
+
+    async fn send_prev_tx_meta<'b>(
+        &'b mut self,
+        unsigned: &UnsignedUtxoTx,
+        prev_tx_hash: &[u8],
+    ) -> TrezorResult<proto_bitcoin::TxRequest> {
+        let prev_tx = unsigned.prev_tx(prev_tx_hash)?;
+        let req = prev_tx.meta_message();
+
+        let result_handler = ResultHandler::<proto_bitcoin::TxRequest>::new(Ok);
+        self.call(req, result_handler).await?.ack_all().await
+    }
+
+    async fn send_prev_input<'b>(
+        &'b mut self,
+        unsigned: &UnsignedUtxoTx,
+        request_details: &proto_bitcoin::tx_request::TxRequestDetailsType,
+        prev_tx_hash: &[u8],
+    ) -> TrezorResult<proto_bitcoin::TxRequest> {
+        let prev_input_index = request_details
+            .request_index
+            .or_mm_err(|| TrezorError::ProtocolError(NO_REQUEST_INDEX_ERROR.to_owned()))?
+            as usize;
+
+        let prev_tx = unsigned.prev_tx(prev_tx_hash)?;
+        let req = prev_tx.input_message(prev_input_index)?;
+
+        let result_handler = ResultHandler::<proto_bitcoin::TxRequest>::new(Ok);
+        self.call(req, result_handler).await?.ack_all().await
+    }
+
+    async fn send_prev_output<'b>(
+        &'b mut self,
+        unsigned: &UnsignedUtxoTx,
+        request_details: &proto_bitcoin::tx_request::TxRequestDetailsType,
+        prev_tx_hash: &[u8],
+    ) -> TrezorResult<proto_bitcoin::TxRequest> {
+        let prev_output_index = request_details
+            .request_index
+            .or_mm_err(|| TrezorError::ProtocolError(NO_REQUEST_INDEX_ERROR.to_owned()))?
+            as usize;
+
+        let prev_tx = unsigned.prev_tx(prev_tx_hash)?;
+        let req = prev_tx.output_message(prev_output_index)?;
+
+        let result_handler = ResultHandler::<proto_bitcoin::TxRequest>::new(Ok);
+        self.call(req, result_handler).await?.ack_all().await
+    }
+
+    async fn send_input<'b>(
+        &'b mut self,
+        unsigned: &UnsignedUtxoTx,
+        request_details: &proto_bitcoin::tx_request::TxRequestDetailsType,
+    ) -> TrezorResult<proto_bitcoin::TxRequest> {
+        let input_index = request_details
+            .request_index
+            .or_mm_err(|| TrezorError::ProtocolError(NO_REQUEST_INDEX_ERROR.to_owned()))?
+            as usize;
+        let req = unsigned.input_message(input_index)?;
+
+        let result_handler = ResultHandler::<proto_bitcoin::TxRequest>::new(Ok);
+        self.call(req, result_handler).await?.ack_all().await
+    }
+
+    async fn send_output<'b>(
+        &'b mut self,
+        unsigned: &UnsignedUtxoTx,
+        request_details: &proto_bitcoin::tx_request::TxRequestDetailsType,
+    ) -> TrezorResult<proto_bitcoin::TxRequest> {
+        let output_index = request_details
+            .request_index
+            .or_mm_err(|| TrezorError::ProtocolError(NO_REQUEST_INDEX_ERROR.to_owned()))?
+            as usize;
+        let req = unsigned.output_message(output_index)?;
+
+        let result_handler = ResultHandler::<proto_bitcoin::TxRequest>::new(Ok);
+        self.call(req, result_handler).await?.ack_all().await
+    }
+
+    async fn send_extra_data<'b>(
+        &'b mut self,
+        unsigned: &UnsignedUtxoTx,
+        request_details: &proto_bitcoin::tx_request::TxRequestDetailsType,
+        prev_tx_hash: &[u8],
+    ) -> TrezorResult<proto_bitcoin::TxRequest> {
+        let offset = request_details
+            .extra_data_offset
+            .or_mm_err(|| TrezorError::ProtocolError(NO_EXTRA_DATA_OFFSET_ERROR.to_owned()))?
+            as usize;
+        let len = request_details
+            .extra_data_len
+            .or_mm_err(|| TrezorError::ProtocolError(NO_EXTRA_DATA_LEN_ERROR.to_owned()))? as usize;
+
+        let prev_tx = unsigned.prev_tx(prev_tx_hash)?;
+        let req = prev_tx.extra_data_message(offset, len)?;
+
+        let result_handler = ResultHandler::<proto_bitcoin::TxRequest>::new(Ok);
+        self.call(req, result_handler).await?.ack_all().await
+    }
+
+    async fn sign_tx<'b>(
+        &'b mut self,
+        req: proto_bitcoin::SignTx,
+    ) -> TrezorResult<TrezorResponse<'a, 'b, proto_bitcoin::TxRequest>> {
+        let result_handler = ResultHandler::<proto_bitcoin::TxRequest>::new(Ok);
+        self.call(req, result_handler).await
+    }
+}
+
+fn extract_serialized_data(tx_request: &proto_bitcoin::TxRequest, result: &mut TxSignResult) -> TrezorResult<()> {
+    let serialized = match tx_request.serialized {
+        Some(ref serialized) => serialized,
+        None => return Ok(()),
+    };
+
+    if let Some(signature) = serialized.signature.clone() {
+        let input_index = serialized
+            .signature_index
+            .or_mm_err(|| TrezorError::ProtocolError(NO_SIGNATURE_INDEX_ERROR.to_owned()))?
+            as usize;
+        if input_index >= result.signatures.len() {
+            let error = format!(
+                "Received a signature of unknown Transaction Input: {}. Number of inputs: {}",
+                input_index,
+                result.signatures.len()
+            );
+            return MmError::err(TrezorError::ProtocolError(error));
+        }
+
+        result.signatures[input_index] = signature;
+    }
+
+    if let Some(serialized_tx) = serialized.serialized_tx.as_ref() {
+        result.serialized_tx.extend_from_slice(serialized_tx);
+    }
+
+    Ok(())
+}
diff --git a/mm2src/trezor/src/utxo/unsigned_tx.rs b/mm2src/trezor/src/utxo/unsigned_tx.rs
new file mode 100644
index 0000000000..0e6d99e5dc
--- /dev/null
+++ b/mm2src/trezor/src/utxo/unsigned_tx.rs
@@ -0,0 +1,220 @@
+use crate::proto::messages_bitcoin as proto_bitcoin;
+use crate::utxo::prev_tx::PrevTx;
+use crate::utxo::TrezorUtxoCoin;
+use crate::{serialize_derivation_path, TrezorError, TrezorResult};
+use hw_common::primitives::DerivationPath;
+use mm2_err_handle::prelude::*;
+
+/// https://github.com/trezor/trezor-common/blob/master/protob/messages-bitcoin.proto#L16
+#[derive(Clone, Copy)]
+pub enum TrezorInputScriptType {
+    /// Standard P2PKH address.
+    SpendAddress,
+    /// P2SH multisig address.
+    SpendMultiSig,
+    /// Reserved for external inputs (coinjoin).
+    External,
+    /// Native SegWit.
+    SpendWitness,
+    /// SegWit over P2SH (backward compatible).
+    SpendP2SHWitness,
+}
+
+impl From<TrezorInputScriptType> for proto_bitcoin::InputScriptType {
+    fn from(script: TrezorInputScriptType) -> Self {
+        match script {
+            TrezorInputScriptType::SpendAddress => proto_bitcoin::InputScriptType::Spendaddress,
+            TrezorInputScriptType::SpendMultiSig => proto_bitcoin::InputScriptType::Spendmultisig,
+            TrezorInputScriptType::External => proto_bitcoin::InputScriptType::External,
+            TrezorInputScriptType::SpendWitness => proto_bitcoin::InputScriptType::Spendwitness,
+            TrezorInputScriptType::SpendP2SHWitness => proto_bitcoin::InputScriptType::Spendp2shwitness,
+        }
+    }
+}
+
+#[derive(Clone, Copy)]
+pub enum TrezorOutputScriptType {
+    /// Used for all addresses (bitcoin, p2sh, witness).
+    PayToAddress,
+    /// OP_RETURN.
+    PayToOpReturn,
+}
+
+impl From<TrezorOutputScriptType> for proto_bitcoin::OutputScriptType {
+    fn from(script: TrezorOutputScriptType) -> Self {
+        match script {
+            TrezorOutputScriptType::PayToAddress => proto_bitcoin::OutputScriptType::Paytoaddress,
+            TrezorOutputScriptType::PayToOpReturn => proto_bitcoin::OutputScriptType::Paytoopreturn,
+        }
+    }
+}
+
+/// Missing fields:
+/// * script_sig - https://docs.trezor.io/trezor-firmware/common/communication/bitcoin-signing.html#external-inputs
+/// * multisig - filled if input is going to spend multisig tx
+/// * decred_tree - only for Decred, 0 is a normal transaction while 1 is a stake transaction
+/// * witness - witness data, only set for EXTERNAL inputs
+/// * ownership_proof - SLIP-0019 proof of ownership, only set for EXTERNAL inputs
+/// * commitment_data - optional commitment data for the SLIP-0019 proof of ownership
+/// * orig_hash - tx_hash of the original transaction where this input was spent (used when creating a replacement transaction)
+/// * orig_index - index of the input in the original transaction (used when creating a replacement transaction)
+/// * decred_staking_spend - if not None this holds the type of stake spend: revocation or stake generation
+pub struct UnsignedTxInput {
+    /// BIP-32 path to derive the key from master node.
+    /// TODO I guess this field shouldn't be set if the input script type is Multisig, for example.
+    pub address_derivation_path: Option<DerivationPath>,
+    /// Info of previous transaction.
+    pub prev_tx: PrevTx,
+    /// Hash of previous transaction output to spend by this input.
+    pub prev_hash: Vec<u8>,
+    /// Index of previous output to spend.
+    pub prev_index: u32,
+    /// Sequence.
+    pub sequence: u32,
+    /// Defines template of input script.
+    pub input_script_type: TrezorInputScriptType,
+    /// Amount of previous transaction output.
+    pub amount: u64,
+}
+
+impl UnsignedTxInput {
+    fn to_proto(&self) -> proto_bitcoin::TxAckInput {
+        let address_n = match self.address_derivation_path {
+            Some(ref address_n) => serialize_derivation_path(address_n),
+            None => Vec::new(),
+        };
+        let input = proto_bitcoin::TxInput {
+            address_n,
+            prev_hash: self.prev_hash.clone(),
+            prev_index: self.prev_index,
+            script_sig: None,
+            sequence: Some(self.sequence),
+            script_type: Some(proto_bitcoin::InputScriptType::from(self.input_script_type) as i32),
+            multisig: None,
+            amount: self.amount,
+            decred_tree: None,
+            witness: None,
+            ownership_proof: None,
+            commitment_data: None,
+            orig_hash: None,
+            orig_index: None,
+            decred_staking_spend: None,
+        };
+
+        let tx = proto_bitcoin::tx_ack_input::TxAckInputWrapper { input };
+        proto_bitcoin::TxAckInput { tx }
+    }
+}
+
+/// Missing fields:
+/// * address_n - BIP-32 path to derive the key from master node | TODO consider adding the field
+/// * multisig - defines multisig address; script_type must be PAYTOMULTISIG
+/// * op_return_data - defines op_return data; script_type must be PAYTOOPRETURN, amount must be 0
+/// * orig_hash - tx_hash of the original transaction where this output was present (used when creating a replacement transaction)
+/// * orig_index - index of the output in the original transaction (used when creating a replacement transaction)
+pub struct TxOutput {
+    /// Destination address in Base58 encoding; script_type must be PAYTOADDRESS.
+    pub address: String,
+    /// Amount to spend in satoshis.
+    pub amount: u64,
+    /// Output script type.
+    pub script_type: TrezorOutputScriptType,
+}
+
+impl TxOutput {
+    fn to_proto(&self) -> proto_bitcoin::TxAckOutput {
+        let output = proto_bitcoin::TxOutput {
+            address: Some(self.address.clone()),
+            address_n: Vec::new(),
+            amount: self.amount,
+            script_type: Some(proto_bitcoin::OutputScriptType::from(self.script_type) as i32),
+            multisig: None,
+            op_return_data: None,
+            orig_hash: None,
+            orig_index: None,
+        };
+
+        let tx = proto_bitcoin::tx_ack_output::TxAckOutputWrapper { output };
+        proto_bitcoin::TxAckOutput { tx }
+    }
+}
+
+/// Missing fields:
+/// * expiry_height - only for Decred and Zcash
+/// * overwintered - deprecated in 2.3.2, the field is not needed as it can be derived from `version`.
+///                  The main reason why it's ignored is that this can be requested asa extra data:
+///                  https://docs.trezor.io/trezor-firmware/common/communication/bitcoin-signing.html#extra-data
+pub struct UnsignedUtxoTx {
+    pub coin: TrezorUtxoCoin,
+    /// Transaction inputs.
+    pub inputs: Vec<UnsignedTxInput>,
+    /// Transaction outputs.
+    pub outputs: Vec<TxOutput>,
+    /// Transaction version.
+    pub version: u32,
+    /// Transaction lock_time.
+    pub lock_time: u32,
+    /// only for Zcash, nVersionGroupId.
+    pub version_group_id: Option<u32>,
+    /// only for Zcash, BRANCH_ID.
+    pub branch_id: Option<u32>,
+}
+
+impl UnsignedUtxoTx {
+    pub(crate) fn sign_tx_message(&self) -> proto_bitcoin::SignTx {
+        #[allow(deprecated)]
+        proto_bitcoin::SignTx {
+            outputs_count: self.outputs.len() as u32,
+            inputs_count: self.inputs.len() as u32,
+            coin_name: Some(self.coin.to_string()),
+            version: Some(self.version),
+            lock_time: Some(self.lock_time),
+            expiry: None,
+            overwintered: None,
+            version_group_id: self.version_group_id,
+            timestamp: None,
+            branch_id: self.branch_id,
+            amount_unit: None,
+            decred_staking_ticket: None,
+        }
+    }
+
+    pub(crate) fn prev_tx(&self, hash: &[u8]) -> TrezorResult<&PrevTx> {
+        self.inputs
+            .iter()
+            .find(|input| input.prev_hash == hash)
+            .map(|input| &input.prev_tx)
+            .or_mm_err(|| {
+                let error = format!("Previous tx not found by the hash '{:?}'", hash);
+                TrezorError::ProtocolError(error)
+            })
+    }
+
+    pub(crate) fn input_message(&self, input_index: usize) -> TrezorResult<proto_bitcoin::TxAckInput> {
+        match self.inputs.get(input_index) {
+            Some(prev_input) => Ok(prev_input.to_proto()),
+            None => {
+                let error = format!(
+                    "Unexpected index '{}' of the tx input. Actual count of inputs: {}",
+                    input_index,
+                    self.inputs.len()
+                );
+                MmError::err(TrezorError::ProtocolError(error))
+            },
+        }
+    }
+
+    pub(crate) fn output_message(&self, output_index: usize) -> TrezorResult<proto_bitcoin::TxAckOutput> {
+        match self.outputs.get(output_index) {
+            Some(prev_output) => Ok(prev_output.to_proto()),
+            None => {
+                let error = format!(
+                    "Unexpected index '{}' of the tx output. Actual count of outputs: {}",
+                    output_index,
+                    self.outputs.len()
+                );
+                MmError::err(TrezorError::ProtocolError(error))
+            },
+        }
+    }
+}
diff --git a/mm2src/trezor/src/utxo/utxo_command.rs b/mm2src/trezor/src/utxo/utxo_command.rs
new file mode 100644
index 0000000000..f2103ff8f2
--- /dev/null
+++ b/mm2src/trezor/src/utxo/utxo_command.rs
@@ -0,0 +1,46 @@
+use crate::client::TrezorSession;
+use crate::proto::messages_bitcoin as proto_bitcoin;
+use crate::result_handler::ResultHandler;
+use crate::utxo::TrezorUtxoCoin;
+use crate::{ecdsa_curve_to_string, serialize_derivation_path, TrezorResponse, TrezorResult};
+use hw_common::primitives::{DerivationPath, EcdsaCurve, XPub};
+
+// Bitcoin(UTXO) operations.
+impl<'a> TrezorSession<'a> {
+    pub async fn get_utxo_address<'b>(
+        &'b mut self,
+        path: DerivationPath,
+        coin: TrezorUtxoCoin,
+        show_display: bool,
+    ) -> TrezorResult<TrezorResponse<'a, 'b, String>> {
+        let req = proto_bitcoin::GetAddress {
+            address_n: serialize_derivation_path(&path),
+            coin_name: Some(coin.to_string()),
+            show_display: Some(show_display),
+            multisig: None,
+            script_type: None,
+            ignore_xpub_magic: None,
+        };
+        let result_handler = ResultHandler::new(|m: proto_bitcoin::Address| Ok(m.address));
+        self.call(req, result_handler).await
+    }
+
+    pub async fn get_public_key<'b>(
+        &'b mut self,
+        path: DerivationPath,
+        coin: TrezorUtxoCoin,
+        ecdsa_curve: EcdsaCurve,
+    ) -> TrezorResult<TrezorResponse<'a, 'b, XPub>> {
+        let req = proto_bitcoin::GetPublicKey {
+            address_n: serialize_derivation_path(&path),
+            ecdsa_curve_name: Some(ecdsa_curve_to_string(ecdsa_curve)),
+            show_display: None,
+            coin_name: Some(coin.to_string()),
+            script_type: None,
+            ignore_xpub_magic: None,
+        };
+
+        let result_handler = ResultHandler::new(|m: proto_bitcoin::PublicKey| Ok(m.xpub));
+        self.call(req, result_handler).await
+    }
+}
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 02f1db4edf..7744a7653b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2021-05-17"
-components = ["rustfmt"]
+channel = "nightly-2022-02-01"
+components = ["rustfmt", "clippy"]
diff --git a/rustfmt.toml b/rustfmt.toml
index a19e1d6209..55d1bb5ff2 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -32,7 +32,7 @@ max_width = 120
 
 # Unix or Windows line endings
 # https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#newline_style
-newline_style = "Unix"
+newline_style = "Auto"
 
 # When structs, slices, arrays, and block/array-like macros are used as the last argument in an expression list,
 # allow them to overflow (like blocks/closures) instead of being indented on a new line.
diff --git a/wasm_build/README.md b/wasm_build/README.md
index cd1651b1dd..6f2faff136 100644
--- a/wasm_build/README.md
+++ b/wasm_build/README.md
@@ -1,35 +1,18 @@
-# MarketMaker2 wasm example
-
-**wasm_build** is an example of using **MarketMaker2** in webpages via [WebAssembly](https://developer.mozilla.org/en-US/docs/WebAssembly)
-
-## How to build
-
-The below steps are performed in the `atomicDEX-API/` root directory.
-
-### Compile MarketMaker2 to wasm
-
-```
-wasm-pack build --target web --out-dir wasm_build/deps/pkg/
-```
-
-Note the command above compiles and optimizes the wasm binary. If you want to disable optimizations to reduce the compilation time, run the following:
-```
-wasm-pack build --dev --target web --out-dir wasm_build/deps/pkg/
-```
-
-### Running a local HTTP server
-
-If you have Python 3, run
-```
-python3 -m http.server 8000
-```
-Or run
-```
-python -m SimpleHTTPServer 8000
-```
-
-Read more about [running a simple local HTTP server](https://developer.mozilla.org/en-US/docs/Learn/Common_questions/set_up_a_local_testing_server#running_a_simple_local_http_server)
-
-### Open webpage in your browser
-
-`http://localhost:8000/wasm_build/index.html`
+# AtomicDEX-API WASM example
+
+**wasm_build** is an example of using **MarketMaker2** in webpages
+via [WebAssembly](https://developer.mozilla.org/en-US/docs/WebAssembly)
+
+1. Build WASM binary according to the [WASM Build Guide](../docs/WASM_BUILD.md)
+2. Run a local HTTP server
+    - if you use Python 3, run:
+   ```
+   python3 -m http.server 8000
+   ```
+    - if you use Python 2, run:
+   ```
+   python -m SimpleHTTPServer 8000
+   ```
+   Read more about
+   [running a simple local HTTP server](https://developer.mozilla.org/en-US/docs/Learn/Common_questions/set_up_a_local_testing_server#running_a_simple_local_http_server)
+3. Open webpage in your browser http://localhost:8000/wasm_build/index.html
diff --git a/wasm_build/index.html b/wasm_build/index.html
index c733b8f2a4..6e7fe3a75f 100644
--- a/wasm_build/index.html
+++ b/wasm_build/index.html
@@ -9,7 +9,7 @@
 <div>
     <label for="wid_conf_input">Config JSON</label>
     <br>
-    <textarea id="wid_conf_input" cols="100" rows="7">{"gui":"WASMTEST","mm2":1,"passphrase":"wasmtest","rpc_password":"testpsw","netid":7777,"coins":[{"coin":"ETH","protocol":{"type":"ETH"}},{"coin":"RICK","overwintered":1,"txversion":4,"protocol":{"type":"UTXO"}},{"coin":"MORTY","overwintered":1,"txversion":4,"protocol":{"type":"UTXO"}}]}</textarea>
+    <textarea id="wid_conf_input" cols="100" rows="7">{"gui":"WASMTEST","mm2":1,"passphrase":"wasmtest","allow_weak_password":true,"rpc_password":"testpsw","netid":7777,"coins":[{"coin":"ETH","protocol":{"type":"ETH"}},{"coin":"RICK","overwintered":1,"txversion":4,"protocol":{"type":"UTXO"}},{"coin":"MORTY","overwintered":1,"txversion":4,"protocol":{"type":"UTXO"}}]}</textarea>
     <br>
     <button id="wid_run_mm2_button" disabled="disabled">Start MM2</button>
     <br>
diff --git a/wasm_build/script.js b/wasm_build/script.js
index c3baa2cca7..4257e1f619 100644
--- a/wasm_build/script.js
+++ b/wasm_build/script.js
@@ -2,10 +2,19 @@
 // that we have compiled.
 //
 // Note that the `default` import is an initialization function which
-// will "boot" the module and make it ready to use. Currently browsers
-// don't support natively imported WebAssembly as an ES module, but
+// will "boot" the module and make it ready to use.
+// Currently, browsers don't support natively imported WebAssembly as an ES module, but
 // eventually the manual initialization won't be required!
-import init, {mm2_main, mm2_main_status, mm2_rpc, LogLevel, Mm2MainErr, MainStatus, Mm2RpcErr} from "./deps/pkg/mm2.js";
+import init, {
+    mm2_main,
+    mm2_main_status,
+    mm2_rpc,
+    mm2_version,
+    LogLevel,
+    Mm2MainErr,
+    MainStatus,
+    Mm2RpcErr
+} from "./deps/pkg/mm2.js";
 
 const LOG_LEVEL = LogLevel.Debug;
 
@@ -24,6 +33,9 @@ async function init_wasm() {
 async function run_mm2(params) {
     // run an MM2 instance
     try {
+        const version = mm2_version();
+        console.info(`run_mm2() version=${version.result} datetime=${version.datetime}`);
+
         mm2_main(params, handle_log);
     } catch (e) {
         switch (e) {